diff --git a/src/views/collect/CollectOrderTabs.vue b/src/views/collect/CollectOrderTabs.vue index bd6eec22..cb28bbf5 100644 --- a/src/views/collect/CollectOrderTabs.vue +++ b/src/views/collect/CollectOrderTabs.vue @@ -118,10 +118,10 @@ 上货记录 - + - 处理预验收 - + + diff --git a/src/views/collect/device/DevicesDealOrderPre.vue b/src/views/collect/device/DevicesDealOrderPre.vue index a9ed53f1..ae9de138 100644 --- a/src/views/collect/device/DevicesDealOrderPre.vue +++ b/src/views/collect/device/DevicesDealOrderPre.vue @@ -29,15 +29,15 @@ - - - - - - + + + + + + 选预验收入库单 @@ -429,10 +429,10 @@ import errOrder from "@/views/inout/IoCreateErrorOrder"; import {executeFuc, getHead} from "@/utils/customConfig"; import {convertDate} from "@/utils/date"; import selectPrescribeDialog from "@/views/collect/selectCollectOrderDialog"; -import PanelOrderManuTagCode from "./DevicesPanelOrderManuTagCode"; -import prescribeOriginPanel from "./DevicesPannelOrderBiz"; -import prescribeCodePanel from "./DevicesPanelOrderTagCode"; -import PannelOrderBiz from "./DevicesPannelOrderBiz"; +import PanelOrderManuTagCode from "./PanelOrderManuTagCode"; +import prescribeOriginPanel from "./PannelOrderBiz"; +import prescribeCodePanel from "./PanelOrderTagCode"; +import PannelOrderBiz from "./PannelOrderBiz"; import {listPage} from "@/api/basic/workPlace/sysWorkplaceManage"; import {enterCodeWeb, batchVailCode, enterCodeBillNo, saveOrderWeb, batchUpdateCode} from "@/api/inout/order"; import { @@ -533,6 +533,7 @@ export default { }, curRow: null, panelALive: false, + addCodeFlag: false, autoFinishOrderFlag: true,//是否对完成的单据提示立即提交 //扫码相关 @@ -1129,6 +1130,7 @@ export default { this.formData.insert = false; this.formData = res.data; this.curRow = this.formData; + this.addCodeFlag = true this.$refs.inputRef.focus(); this.refreshCodesPanel(this); } else { @@ -1556,6 +1558,7 @@ export default { fromCorp: null, }; this.checkPreInArray = [] + this.addCodeFlag = false this.selectSysParam() this.curRow = null this.formData.confirmFinish = false; @@ -1722,7 +1725,7 @@ export default { this.$message.error("请先选入单据!"); return } - const verify = this.verifyScanCount(fullScanData) + const verify = this.verifyScanCount(fullScanData) if (verify){ this.batchVailCode(params) }