diff --git a/src/views/userManage/phoneRegisterManage.vue b/src/views/userManage/phoneRegisterManage.vue index 7e2063a..09c956d 100644 --- a/src/views/userManage/phoneRegisterManage.vue +++ b/src/views/userManage/phoneRegisterManage.vue @@ -31,9 +31,31 @@
+ + +
+
+ 当前系统:  +
+ +
+
+
+ 保存 + 取消 + +
@@ -184,6 +206,8 @@ import {registerList, check, deleterKey} from "../../api/auth/deviceCheck"; import QRCode from 'qrcodejs2' import axios from "axios"; +import store from "@/store"; +import {getCompany, modifyCompany} from "@/api/warehouse/company"; export default { data() { @@ -213,6 +237,7 @@ export default { editDialogVisible: false, qrCodeVisible: false, serverUrl: false, + companyInfo: {}, }; }, @@ -328,6 +353,13 @@ export default { this.centerDialogVisible = false; }, qrCodeGeneration() { + let tquery = { + customerId: 110, + }; + getCompany(tquery).then((response) => { + this.loading = false; + this.companyInfo = response.data; + }); this.qrCodeVisible = true; this.$nextTick(function () { document.getElementById("qrCodeUrl").innerHTML = ""; @@ -339,6 +371,14 @@ export default { colorLight: "#fff" }); }); + }, + saveNameClick() { + modifyCompany(this.companyInfo).then((response) => { + if (response.code == 20000) { + this.$message.success("保存成功!"); + this.qrCodeVisible = false; + } + }); } }, diff --git a/src/views/warehouse/DialogSelectRl.vue b/src/views/warehouse/DialogSelectRl.vue index 96ea47e..8cbcec1 100644 --- a/src/views/warehouse/DialogSelectRl.vue +++ b/src/views/warehouse/DialogSelectRl.vue @@ -462,13 +462,13 @@ 是否寄售 - 允许无批次号 - 允许无失效日期 - 允许无生产日期 diff --git a/src/views/warehouse/addHosOrder.vue b/src/views/warehouse/addHosOrder.vue index 98a1f67..4f3efb8 100644 --- a/src/views/warehouse/addHosOrder.vue +++ b/src/views/warehouse/addHosOrder.vue @@ -172,7 +172,7 @@ 是否预验收产品 + >是否只采集预验收产品 @@ -560,6 +560,7 @@ export default { this.checkSuccess = false; this.formData.code = response.data; this.originCode = this.formData.code; + this.$message.error(response.message); } else if (response.code == 503) { this.checkSuccess = false; this.formData.code = response.data; diff --git a/src/views/warehouse/addOrder.vue b/src/views/warehouse/addOrder.vue index 1699359..2073e60 100644 --- a/src/views/warehouse/addOrder.vue +++ b/src/views/warehouse/addOrder.vue @@ -473,6 +473,7 @@ export default { this.checkSuccess = false; this.formData.code = response.data; this.originCode = this.formData.code; + this.$message.error(response.message); } else if (response.code == 503) { this.checkSuccess = false; this.formData.code = response.data; @@ -507,6 +508,12 @@ export default { } else event.target.select(); this.sictomText = ""; this.originCode = ""; + this.formData.corpOrderId = this.formData.corpOrderId.trim(); + this.formData.batchNo = ""; + this.formData.produceDate = ""; + this.formData.expireDate = ""; + this.formData.serialNo = ""; + this.actionEnable = true; this.$refs.inputRef.select(); if (this.$isBlank(this.formData.billType)) { this.$message.warning("请选择单据类型!"); @@ -531,6 +538,7 @@ export default { tQuery.action = tQuery.billType console.log("tQuery = " + tQuery) this.addCodeSubmit(tQuery); + this.$refs.inputRef.select(); }, addCodeSubmit(tQuery) {