Преглед изворни кода

Merge branch 'develop_szhj07' of http://git.chelingzhu.com/jianguan-web/qpls-md-app into develop_szhj07

lilei пре 2 година
родитељ
комит
0df5b4d60d
2 измењених фајлова са 21 додато и 13 уклоњено
  1. 18 11
      pages/shuntBackManage/addBackOrder.vue
  2. 3 2
      pages/shuntBackManage/detail.vue

+ 18 - 11
pages/shuntBackManage/addBackOrder.vue

@@ -173,8 +173,8 @@ export default {
 	},
 	onBackPress(e) {
 		if (this.sortShow) {
-			this.sortShow = false;
-			this.isSortFlag = 0;
+			this.chooseShow = false;
+			this.detailPopup = false;
 			return true;
 		}
 	},
@@ -183,8 +183,9 @@ export default {
 		loadData(params) {
 			const _this = this;
 			uni.showLoading({
-				title: '加载中...'
-			});
+				mask:true,
+				title:"正在加载..."
+			})
 			controlQueryList(params).then(res => {
 				if (res.status == 200) {
 					res.data.forEach(item=>{
@@ -193,7 +194,9 @@ export default {
 					})
 					this.recallBillList=res.data;
 				}
-				uni.hideLoading()
+				setTimeout(()=>{
+					uni.hideLoading()
+				},this.recallBillList.length*40)
 			});
 		},
 		checkGroupChange(e){
@@ -287,7 +290,7 @@ export default {
 				queryWord:undefined
 			};
 			this.queryParam = ajaxData;
-			this.loadData(this.queryParam);
+			this.loadData(ajaxData);
 		},
 		handelFilter(){
 			if(this.checkValueRange()){
@@ -299,11 +302,13 @@ export default {
 		// 搜索
 		getSearchCon() {
 			var reg = new RegExp('[\\u4E00-\\u9FFF]+', 'g');
-			if (reg.test(this.keyword)) {
-				//包含汉字
-				this.queryParam.productName = this.keyword.trim()
-			} else {
-				this.queryParam.productCode=this.keyword.trim()
+			if(!this.queryParam.queryWord){
+				if (reg.test(this.keyword)) {
+					//包含汉字
+					this.queryParam.productName = this.keyword.trim()
+				} else {
+					this.queryParam.productCode=this.keyword.trim()
+				}
 			}
 			this.queryParam.shelfSn = this.shelfSn
 			this.loadData(this.queryParam);
@@ -339,8 +344,10 @@ export default {
 			if(data.scanType == 'QRCODE'){
 				const ret = data.scanValue.split("&")
 				this.queryParam.queryWord = ret[1] // 产品编码
+				this.keyword= ret[1]
 			}else{
 				this.queryParam.queryWord = data.scanValue;
+				this.keyword= data.scanValue
 			}
 			this.queryParam.shelfSn = this.shelfSn
 			this.loadData(this.queryParam);

+ 3 - 2
pages/shuntBackManage/detail.vue

@@ -27,7 +27,7 @@
 			<view style="font-size: 28upx;">
 				<view style="padding: 10upx;" class="flex align_center justify_between" v-if="basicInfoData">
 					<view>产品总款数:<text style="color: red;">{{basicInfoData.totalCategory}}</text></view>
-					<view>产品总件数:<text style="color: red;">{{basicInfoData.totalQty}}</text></view>
+					<view>产品总件数:<text style="color: red;">{{basicInfoData.viewQty}}</text></view>
 				</view>
 				<view v-if="salesOrderList.length">
 					<view style="padding: 0 10upx 10upx;font-size: 26rpx;">此调回单已经存在对应的销售退货单?</view>
@@ -98,7 +98,7 @@
 						this.salesOrderList = res.data.salesReturnBillList ? res.data.salesReturnBillList:[];
 						//#ifdef APP-PLUS
 						let webView = this.$mp.page.$getAppWebview();
-						if(res.data.billState == 'CANCEL'){
+						if(res.data.billState == 'CANCEL' ||res.data.billState == 'FINISH'){
 							webView.setTitleNViewButtonStyle(0,{
 								"color": "transparent",
 								"width": "0px"
@@ -135,6 +135,7 @@
 				   })
 				  setTimeout(()=>{
 					   this.refundModal = false
+					   this.getDetail();
 				  },800)
 				  }else{
 					 uni.showToast({