diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue index b888679..03108a3 100644 --- a/src/views/inout/DialogCreateOrder.vue +++ b/src/views/inout/DialogCreateOrder.vue @@ -247,7 +247,7 @@ import codesPanel from "./PanelCreateOrderCodes" import codeDetailPanel from "./PanelCreateOrderCodeDetail" import bizDetailPanel from "./PanelCreateOrderBizDetail" import A from "../../plugins/KeyScaner" -import { findByInvUser, getLocalJoinByUser } from '@/api/basic/busType' +import {findByInvUser, getLocalJoinByUser} from '@/api/basic/busType' export default { name: "ioCreateOrder", @@ -289,6 +289,7 @@ export default { //扫码相关 codeFormData: { + orderId: null, code: "", batchNo: null, produceDate: null, @@ -598,6 +599,7 @@ export default { this.codeFormData.expireDate = response.data.expireDate; this.codeFormData.batchNo = response.data.batchNo; this.codeFormData.serialNo = response.data.serialNo; + this.codeFormData.orderId = this.orderFormData.billNo; this.$message({ type: 'error', message: "提交失败!" + this.editTitle, diff --git a/src/views/inout/DialogEditCode.vue b/src/views/inout/DialogEditCode.vue index 0524b8f..a08a74d 100644 --- a/src/views/inout/DialogEditCode.vue +++ b/src/views/inout/DialogEditCode.vue @@ -106,18 +106,26 @@ export default { methods: { saveCode() { - saveCode(this.editData) - .then((response) => { - console.log(response) - if (response.code === 20000) { - this.$message.success("提交成功"); - this.codeDetail = this.editData; - this.closeCodeDialog(); - } else { - this.$message.error(response.message); - } - this.loading = false; - }); + + + if (this.editTye == 1) { + this.repeatAddCode(this.editData); + } else { + saveCode(this.editData) + .then((response) => { + console.log(response) + if (response.code === 20000) { + this.$message.success("提交成功"); + this.codeDetail = this.editData; + this.closeCodeDialog(); + } else { + this.$message.error(response.message); + } + this.loading = false; + }); + } + + } , cancelDialog() { diff --git a/src/views/inout/DialogInvoice.vue b/src/views/inout/DialogInvoice.vue index 38a46fc..fefc39d 100644 --- a/src/views/inout/DialogInvoice.vue +++ b/src/views/inout/DialogInvoice.vue @@ -136,7 +136,7 @@ {{ choiceFile }} -
只能上传 jpg,png,pdf,doc 文件,且不超过 3 MB
+
只能上传 jpg,png,pdf,doc 文件,且不超过 10 MB
diff --git a/src/views/inout/DialogReviewOrder.vue b/src/views/inout/DialogReviewOrder.vue index d6facff..4f9ce3e 100644 --- a/src/views/inout/DialogReviewOrder.vue +++ b/src/views/inout/DialogReviewOrder.vue @@ -202,6 +202,9 @@ export default { this.originCode = this.udiCode; } else if (response.code == 501) { this.checkSuccess = false; + this.$refs.inputRef.focus(); + this.$refs.inputRef.select(); + this.originCode = ""; this.$message.error(response.message); } else if (response.code == 503) { this.checkSuccess = false; diff --git a/src/views/inout/DialogThrReviewOrder.vue b/src/views/inout/DialogThrReviewOrder.vue index e13b9d7..6d50f6a 100644 --- a/src/views/inout/DialogThrReviewOrder.vue +++ b/src/views/inout/DialogThrReviewOrder.vue @@ -202,6 +202,9 @@ export default { this.originCode = this.udiCode; } else if (response.code == 501) { this.checkSuccess = false; + this.$refs.inputRef.focus(); + this.$refs.inputRef.select(); + this.originCode = ""; this.$message.error(response.message); } else if (response.code == 503) { this.checkSuccess = false; diff --git a/src/views/inout/PanelCreateOrderCodes.vue b/src/views/inout/PanelCreateOrderCodes.vue index e18a0d8..3492962 100644 --- a/src/views/inout/PanelCreateOrderCodes.vue +++ b/src/views/inout/PanelCreateOrderCodes.vue @@ -52,12 +52,12 @@ width="120" show-overflow-tooltip > - - - - - - + + + + + +