瀏覽代碼

对账单

chenrui 2 年之前
父節點
當前提交
da35cc7998
共有 3 個文件被更改,包括 15 次插入7 次删除
  1. 12 6
      pages/sales/bill.vue
  2. 2 1
      pages/shuntBackManage/chooseProduct.vue
  3. 1 0
      pages/soldOut/chooseProduct.vue

+ 12 - 6
pages/sales/bill.vue

@@ -207,10 +207,12 @@ export default {
 			this.curTab = uni.getStorageSync('curTab');
 		} else {
 			let systemList = this.$store.state.vuex_systemSetList;
-			let cycleObj = systemList.find(item => {
-				return item.remarks == 'sales_bill_period';
-			});
-			this.curTab = this.placeTab.findIndex(con => con.name == cycleObj.valueShow);
+			if(systemList){
+				let cycleObj = systemList.find(item => {
+					return item.remarks == 'sales_bill_period';
+				});
+				this.curTab = this.placeTab.findIndex(con => con.name == cycleObj.valueShow);
+			}
 		}
 		this.cycleName = this.changeShowTime();
 		// 获取选择客户
@@ -304,18 +306,22 @@ export default {
 			const _this = this;
 			queryUnsettleSaleList(this.params).then(res => {
 				if (res.status == 200) {
-					this.bill = res.data;
 					let chooseArr = uni.getStorageSync('chooseList');
 					if (chooseArr && chooseArr.length > 0) {
-						res.data.map(item => {
+					res.data.forEach(item => {
 							const row = chooseArr.findIndex(k => k.bizSn == item.bizSn);
 							item.checked = row > -1;
 						});
 					}
+					this.bill = res.data;
 					this.$refs.bill.setData(res.data);
+					this.getChooseList()
 				}
 			});
 		},
+		getChooseList(){
+			this.chooseList=this.bill.filter(item=>item.checked);
+		},
 		// 时间  change
 		dateChange(date) {
 			this.dateArray = date.startDate + ' ~ ' + date.endDate;

+ 2 - 1
pages/shuntBackManage/chooseProduct.vue

@@ -491,7 +491,8 @@
 	.check-list{
 		padding: 0 0.8rem;
 		flex-grow: 1;
-		overflow: auto; 
+		overflow: auto;
+		flex-basis: 0;
 	 }
 	.footer-bar{
 		background-color: #f8f8f8;

+ 1 - 0
pages/soldOut/chooseProduct.vue

@@ -462,6 +462,7 @@
 	.check-list{
 		padding: 0 0.8rem;
 		flex-grow: 1;
+		flex-basis: 0;
 		overflow: auto; 
 	 }
 	.footer-bar{