page/transfer 文件迁移 8/8-10/25

src/pages/transfer/coms/comTransferRecord.vue

@@ -170,7 +170,7 @@
 						item.subList.push(newDetail);
 					} else {
 						if (detail.scaned == true) {
-							this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
+							this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]重复扫描")
 						}
 					}
 				}
@@ -263,7 +263,7 @@
 								transferIssueRecordSubmit(params).then(res => {
 									uni.hideLoading()
 									if (res.data) {
-										this.showCommitSuccessMessage("提交成功<br>生成调拨出库记录<br>" + res.data)
+										this.showCommitSuccessMessage("提交成功\n生成调拨出库记录\n" + res.data)
 									} else {
 										this.showErrorMessage("提交失败[" + res.msg + "]")
 									}
@@ -275,7 +275,7 @@
 								transferReceiptRecordSubmit(params).then(res => {
 									uni.hideLoading()
 									if (res.data) {
-										this.showCommitSuccessMessage("提交成功<br>生成调拨入库记录<br>" + res.data)
+										this.showCommitSuccessMessage("提交成功\n生成调拨入库记录\n" + res.data)
 									} else {
 										this.showErrorMessage("提交失败[" + res.msg + "]")
 									}

src/pages/transfer/job/issueDetail.vue

@@ -273,10 +273,14 @@ const commit = () => {
     // 扫描数量小于任务数量，判断是否允许部分提交
     if (jobContent.value.allowPartialComplete == 'TRUE') {
       // 提交
-      submitJob()
+      comMessageRef.value.showQuestionMessage1("任务明细未全部完成,是否提交?", 'red', res => {
+        if (res) {
+          submitJob()
+        }
+      });
     } else {
       // 不允许部分提交，提示
-      comMessageRef.value.showErrorMessage('请完成扫描后,再进行提交<br>' + `已经扫描[${scanCount.value}]箱总共[${subList.value.length}]箱`, (res) => {
+      comMessageRef.value.showErrorMessage('请完成扫描后,再进行提交\n' + `已经扫描[${scanCount.value}]箱总共[${subList.value.length}]箱`, (res) => {
         if (res) {
           openScanPopup()
         }
@@ -301,7 +305,7 @@ const submitJob = () => {
       transferIssueJobSubmit(params)
         .then((res) => {
           if (res.data) {
-            showCommitSuccessMessage(`提交成功<br>生成调拨出库记录${res.data}`)
+            showCommitSuccessMessage(`提交成功\n生成调拨出库记录${res.data}`)
           } else {
             showErrorMessage(`提交失败[${res.msg}]`)
           }

src/pages/transfer/job/receiptDetail.vue

@@ -294,10 +294,14 @@ const commit = () => {
     // 扫描数量小于任务数量，判断是否允许部分提交
     if (jobContent.value.allowPartialComplete == 'TRUE') {
       // 提交
-      submitJob()
+      comMessageRef.value.showQuestionMessage1("任务明细未全部完成,是否提交?", 'red', res => {
+        if (res) {
+          submitJob()
+        }
+      });
     } else {
       // 不允许部分提交，提示
-      comMessageRef.value.showErrorMessage('请完成扫描后,再进行提交<br>' + `已经扫描[${scanCount.value}]箱总共[${subList.value.length}]箱`, (res) => {
+      comMessageRef.value.showErrorMessage('请完成扫描后,再进行提交\n' + `已经扫描[${scanCount.value}]箱总共[${subList.value.length}]箱`, (res) => {
         if (res) {
           openScanPopup()
         }
@@ -327,7 +331,7 @@ const submitJob = () => {
         .then((res) => {
           uni.hideLoading()
           if (res.data) {
-            showCommitSuccessMessage(`提交成功<br>生成调拨入库记录<br>${res.data}`)
+            showCommitSuccessMessage(`提交成功\n生成调拨入库记录\n${res.data}`)
           } else {
             showErrorMessage(`提交失败[${res.msg}]`)
           }

src/pages/transfer/job/transferDetail.vue

@@ -14,7 +14,7 @@
 			<scroll-view scroll-y="true" class="page-main-scroll">
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
-						<comInventoryDetailCard :dataContent="item" :settingParam="jobContent" @remove="updateData"
+						<comInventoryDetailCard :allowEditQty="true" :dataContent="item" :settingParam="jobContent" @remove="updateData"
 							@updateData='updateData'>
 						</comInventoryDetailCard>
 					</view>

src/pages/transfer/record/deliverRecord.vue

@@ -119,7 +119,7 @@ const getScanResult = (result) => {
       const newDetail = createDetailInfo(label, pack)
       item.subList.push(newDetail)
     } else if (detail.scaned == true) {
-      showErrorMessage(`箱码[${balance.packingNumber}批次[${balance.batch}]已经在列表中`)
+      showErrorMessage(`箱码[${balance.packingNumber}批次[${balance.batch}]重复扫描`)
     }
   }
   handleCalcHandleQty()

src/pages/transfer/record/receiptRecord.vue

@@ -113,7 +113,7 @@ const getScanResult = (result) => {
       const newDetail = createDetailInfo(label, pack)
       item.subList.push(newDetail)
     } else if (detail.scaned == true) {
-      showErrorMessage(`箱码[${label.packingNumber}批次[${balance.batch}]已经在列表中`)
+      showErrorMessage(`箱码[${label.packingNumber}批次[${balance.batch}]重复扫描`)
     }
   }
   handleCalcHandleQty()