Merge branch 'hella_online_20240803' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into hella_online_20240803

src/components/show-modal/show-modal.vue

@@ -82,7 +82,9 @@
 
 			cancelClose() {
 				clearInterval(this.timer) //清空timer
+				if(this.$refs.modal){
 					this.$refs.modal.popupClose();
+				}
 				this.success({
 					// cancel: true,
 					confirm: false,

src/mycomponents/common/comMessage.vue

@@ -109,7 +109,9 @@
 				if (this.show) {
 					this.show = false;
 					clearInterval(this.timer) //清空timer
+					if(this.$refs.modal){
 						this.$refs.modal.popupClose();
+					}
 					this.success({
 						// cancel: false,
 						confirm: true,

src/pages/productReceipt/job/ccProductReceiptDetail.vue

@@ -346,6 +346,8 @@
 					if (!this.checkLocation()) {
 						return
 					}
+				}else{
+					this.toLocationCode = this.jobToLocationCode
 				}
 
 

src/pages/productReceipt/job/fgProductReceiptDetail.vue

@@ -448,6 +448,8 @@
 					if (!this.checkLocation()) {
 						return
 					}
+				}else{
+					this.toLocationCode = this.jobToLocationCode
 				}
 				this.detailSource.forEach(item => {
 					item.subList.forEach(subitem => {