lilei 3 yıl önce
ebeveyn
işleme
ca76dcd3a4

+ 8 - 2
pages/sales/list.vue

@@ -58,7 +58,13 @@
 			// 获取查询参数 刷新列表
 			refresh(params){
 				const _this = this
-				this.searchParams = Object.assign(params, this.searchForm)
+				// this.searchParams = Object.assign(this.searchForm,params)
+				if(this.searchForm.billStatus){
+					params.billStatus = this.searchForm.billStatus
+				}
+				if(this.searchForm.financialStatus){
+					params.financialStatus = this.searchForm.financialStatus
+				}
 				this.$nextTick(function(){
 					_this.$refs.salesList.getList(1)
 				})
@@ -106,7 +112,7 @@
 			background-color: #fff;
 		}
 		.list-box{
-			padding: 20upx 20upx;
+			padding: 20upx 20upx 0;
 		}
 	}
 </style>

+ 11 - 6
pages/sales/listComponent.vue

@@ -29,7 +29,7 @@
 						<u-button @click="handleFun('audit', item)" size="mini" :hair-line="false" plain type="primary" hover-class="none" v-if="item.billStatus == 'WAIT_AUDIT'">审核</u-button>
 						<u-button @click="handleFun('out', item)" size="mini" :hair-line="false" plain type="primary" hover-class="none" v-if="item.billStatus == 'WAIT_OUT_WAREHOUSE'">出库</u-button>
 						<u-button @click="handleEdit(item)" size="mini" :hair-line="false" plain type="primary" hover-class="none" v-if="(item.salesBillSource == 'SATELLITE' || item.salesBillSource == 'SALES' || item.salesBillSource == 'TEMPORARY_DISPATCHING') && (item.billStatus == 'WAIT_AUDIT' || item.billStatus == 'WAIT_SUBMIT' || item.billStatus == 'AUDIT_REJECT')">编辑</u-button>
-						<u-button @click="handleFun('del', item)" size="mini" :hair-line="false" plain type="primary" hover-class="none" v-if="((item.salesBillSource == 'SATELLITE' || item.salesBillSource == 'SALES' || item.salesBillSource == 'TEMPORARY_DISPATCHING') && item.billStatus != 'FINISH')">删除</u-button>
+						<u-button @click="handleFun('del', item)" size="mini" :hair-line="false" plain type="error" hover-class="none" v-if="((item.salesBillSource == 'SATELLITE' || item.salesBillSource == 'SALES' || item.salesBillSource == 'TEMPORARY_DISPATCHING') && item.billStatus != 'FINISH')">删除</u-button>
 						<u-button @click="handleEdit(item)" size="mini" :hair-line="false" plain type="primary" hover-class="none" v-if="item.salesBillSource == 'PURCHASE' && (item.billStatus == 'WAIT_AUDIT' || item.billStatus == 'SUPERIOR_CHANGE')">改单</u-button>
 						<u-button @click="handleFun('cancel', item)" size="mini" :hair-line="false" plain type="primary" hover-class="none" v-if="item.salesBillSource == 'PURCHASE' && (item.billStatus == 'WAIT_AUDIT' || item.billStatus == 'SUPERIOR_CHANGE')">取消</u-button>
 					</view>
@@ -37,6 +37,9 @@
 				<view v-if="listData && listData.length == 0">
 					<u-empty :text="noDataText" mode="list" :img-width="200" :margin-top="30"></u-empty>
 				</view>
+				<view style="padding-bottom: 20upx;">
+					<u-loadmore v-if="totalNum>listData.length || status=='loading'" :status="status" />
+				</view>
 			</view>
 		</scroll-view>
 		<!-- 审核弹框 -->
@@ -70,8 +73,9 @@
 			return{
 				listData: [],
 				pageNo: 1,
-				pageSize: 6,
+				pageSize: 10,
 				totalNum: 0,
+				status: 'loadmore',
 				noDataText: '暂无数据',
 				toThousands,
 				auditModal: false,  // 审核弹框
@@ -103,6 +107,7 @@
 					pageNo: this.pageNo,
 					pageSize: this.pageSize
 				}
+				this.status = "loading"
 				salesList(Object.assign(params, this.params)).then(res => {
 					if (res.status == 200) {
 						if(this.pageNo>1){
@@ -116,6 +121,7 @@
 						this.totalNum = 0
 						this.noDataText = res.message
 					}
+					this.status = "loadmore"
 				})
 			},
 			// scroll-view到底部加载更多
@@ -208,8 +214,9 @@
 					border-radius: 25upx;
 					box-shadow: 1px 1px 3px #EEEEEE;
 					.list-item-tit{
-						padding-bottom: 12upx;
-						border-bottom: 1px dashed #e4e7ed;
+						padding-bottom: 18upx;
+						padding-top: 10upx;
+						border-bottom: 1px solid #e4e7ed;
 						white-space: nowrap;
 						overflow: hidden;
 						text-overflow: ellipsis;
@@ -233,8 +240,6 @@
 					}
 					.button-box{
 						text-align: right;
-						padding-top: 10upx;
-						border-top: 1px dashed #e4e7ed;
 						button{
 							margin: 0 10upx;
 						}

+ 3 - 3
pages/sales/productPricing.vue

@@ -7,7 +7,7 @@
 		</view>
 		<scroll-view class="product-list" scroll-y @scrolltolower="onreachBottom">
 			<view class="st-detailList-main">
-				<view class="st-detailList-main-item" v-for="(item, index) in listData" :key="item.id" @click="getDetail(item)">
+				<view class="st-detailList-main-item" v-for="(item, index) in listData" :key="item.id">
 					<view class="st-detailList-tit flex">
 						<view class="u-line" :style="{backgroundColor: $config('primaryColor')}"></view>
 						<view class="u-name">
@@ -50,8 +50,8 @@
 						</view>
 					</view>
 				</view>
-					<u-empty v-if="listData.length == 0 &&status!='loading'" :text="noDataText" mode="list" ></u-empty>
-					<view style="padding-bottom: 20upx;">
+				<u-empty v-if="listData.length == 0 &&status!='loading'" :text="noDataText" mode="list" ></u-empty>
+				<view style="padding-bottom: 20upx;">
 					<u-loadmore v-if="totalNum>listData.length || status=='loading'" :status="status" />
 				</view>
 			</view>