diff --git a/.env.hella16 b/.env.hella16 index 0f02f522..aab54cc5 100644 --- a/.env.hella16 +++ b/.env.hella16 @@ -2,4 +2,4 @@ VITE_BASE_URL=http://172.21.32.16:81/api/admin-api VITE_BASE_URL_IMAGE=http://172.21.32.16:81/admin-api # 租户配置 -VITE_TENANT='[{"text":"长春","value":1}]' \ No newline at end of file +VITE_TENANT='[{"text":"长春","value":1},{"text":"成都","value":2}]' \ No newline at end of file diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue index 375ee95d..996e189d 100644 --- a/src/pages/purchaseReceipt/job/receiptDetail.vue +++ b/src/pages/purchaseReceipt/job/receiptDetail.vue @@ -391,8 +391,12 @@ } else if (this.scanCount < this.subList.length) { //扫描数量小于任务数量,判断是否允许部分提交 if (this.jobContent.allowPartialComplete == "TRUE") { - //提交 - this.submitJob(); + //提交 + this.$refs.comMessage.showQuestionMessage('还有未扫描的物料,是否继续提交?', res => { + if (res) { + this.submitJob(); + } + }); } else { //不允许部分提交,提示 this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount +