From c3dc2e4b5fba7ff840b660b587da02dddc0a7051 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 5 Jun 2023 21:57:11 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B3=E8=B4=AD=E5=8D=95=E6=8D=AE=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 4 +- src/views/myLogin.vue | 2 +- .../purApply/purOrderSelectProduct.vue | 53 ++-- .../purchase/purOrder/purOrderEditDialog.vue | 255 +++++++++--------- 4 files changed, 159 insertions(+), 155 deletions(-) diff --git a/.env.production b/.env.production index 00918520..6a51a463 100644 --- a/.env.production +++ b/.env.production @@ -8,9 +8,9 @@ ENV = 'production' #林纪裕cd -VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:5003/UDI_WMS_MC/' +# VUE_APP_BASE_API = 'http://r.jiyuudims.cloud:5003/UDI_WMS_MC/' -# VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_WMS_MC/' +VUE_APP_BASE_API = 'http://127.0.0.1:9150/UDI_WMS_MC/' # 测试服务器 # VUE_APP_BASE_API = 'http://192.168.0.66:9150/UDI_WMS_MC/' diff --git a/src/views/myLogin.vue b/src/views/myLogin.vue index 1a97d14c..d48f03c5 100644 --- a/src/views/myLogin.vue +++ b/src/views/myLogin.vue @@ -6,7 +6,7 @@ + :row-class-name="tableRowClassName" @current-change="handleChange" + @selection-change="handleSelectionChange" ref="multipleTable"> - + @@ -187,7 +188,7 @@ export default { keys: [], }, ids: [], - lists:[], + lists: [], radioCheck: null, dataList: [], pageTotal: 1, @@ -199,12 +200,12 @@ export default { thirdSysFk: null, busTypes: [], actDateRange: [], - tQuery : { - productId:"", + tQuery: { + productId: "", productName: "", count: "", orderIdFk: "", - supId:"", + supId: "", }, pickerOptions: { shortcuts: [ @@ -328,16 +329,16 @@ export default { intentBack() { this.closeDialog(); }, - handleSelectionChange(val){ - this.lists=[]; - for (var i=0;i 0) { - for (var i = 0; i < this.ids.length; i++) { - if (this.ids[i] == this.multipleSelection.id) { - this.$message.error("该产品已录入！"); - return - } - } - } + debugger + // if (this.ids.length > 0) { + // for (var i = 0; i < this.ids.length; i++) { + // if (this.ids[i] == this.multipleSelection.id) { + // this.$message.error("该产品已录入！"); + // return + // } + // } + // } // let str = this.multipleSelection.zczbhhzbapzbh; @@ -365,7 +366,7 @@ export default { // this.certList = str.split(','); // this.dialogFormVisible = true; // } else { - this.combine(); + this.combine(); // } }, diff --git a/src/views/purchase/purOrder/purOrderEditDialog.vue b/src/views/purchase/purOrder/purOrderEditDialog.vue index 9194a3ff..d70dfca1 100644 --- a/src/views/purchase/purOrder/purOrderEditDialog.vue +++ b/src/views/purchase/purOrder/purOrderEditDialog.vue @@ -18,13 +18,13 @@ @@ -45,12 +45,12 @@ @@ -64,10 +64,10 @@ + v-for="item in invCodeList" + :key="item.name" + :label="item.name" + :value="item.code"> {{ item.name }} {{ item.warehouseName }} @@ -77,25 +77,25 @@ {{ item.name }} @@ -185,36 +185,36 @@ @@ -351,6 +351,9 @@ export default { if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") { return this.$message.error('单据数量不能为0'); } + if (this.$isBlank(this.codeArray[i].supName)) { + return this.$message.error('请选择产品对应供应商'); + } } } if (status == "1") { @@ -381,18 +384,18 @@ export default { type: 1, } inserThrOrderWeb(tQuery) - .then(response => { - this.loading = false; - if (response.code === 20000) { - this.$message.success(tMessage + "成功"); - this.closeDialog(true); - } else { - this.$message.error(response.message); - } - }) - .catch(() => { - this.loading = false; - }) + .then(response => { + this.loading = false; + if (response.code === 20000) { + this.$message.success(tMessage + "成功"); + this.closeDialog(true); + } else { + this.$message.error(response.message); + } + }) + .catch(() => { + this.loading = false; + }) }, selectProductFunction() { if (this.$isBlank(this.formData.supId)) { @@ -422,30 +425,30 @@ export default { orderIdFk: this.pId } selectOrderDetail(this.query) //查找该单号下的所有条码 - .then((response) => { - this.codeArray = response.data.list || []; - this.total = response.data.total || 0; - if (this.total > 0) { - this.corpOrderIdDisabled = true; - } - this.loading = false; - }) - .catch(() => { - this.loading = false; - this.list = []; - this.total = 0; - }); + .then((response) => { + this.codeArray = response.data.list || []; + this.total = response.data.total || 0; + if (this.total > 0) { + this.corpOrderIdDisabled = true; + } + this.loading = false; + }) + .catch(() => { + this.loading = false; + this.list = []; + this.total = 0; + }); }, rowChange(val) { this.currentRow = val; this.selectedIndex = val.index; - filterSupList({productId:val.productId}) //查找该单号下的所有条码 - .then((response) => { - this.suppliers = response.data || []; - }) - .catch(() => { + filterSupList({productId: val.productId}) //查找该单号下的所有条码 + .then((response) => { + this.suppliers = response.data || []; + }) + .catch(() => { - }); + }); }, tableCountChange(row) { if (this.$isNotBlank(row)) { @@ -481,19 +484,19 @@ export default { let delIds = []; delIds.push(row.id) delOrderDetail(delIds) - .then(response => { - this.detailLoading = false; - if (response.code === 20000) { - this.$message.success(response.data); - // this.getStockOrderDetailList(); - this.codeArray.splice(index, 1); - } else { - this.$message.error(response.message); - } - }) - .catch(() => { - this.detailLoading = false; - }) + .then(response => { + this.detailLoading = false; + if (response.code === 20000) { + this.$message.success(response.data); + // this.getStockOrderDetailList(); + this.codeArray.splice(index, 1); + } else { + this.$message.error(response.message); + } + }) + .catch(() => { + this.detailLoading = false; + }) } else { this.$message.success('删除成功'); this.codeArray.splice(index, 1); @@ -509,17 +512,17 @@ export default { getStockOrderDetailList() { this.loading = true; listOrderDetail(this.query) //查找该单号下的所有条码 - .then((response) => { - console.log(response) - this.codeArray = response.data.list || []; - this.total = response.data.total || 0; - this.loading = false; - }) - .catch(() => { - this.loading = false; - this.list = []; - this.total = 0; - }); + .then((response) => { + console.log(response) + this.codeArray = response.data.list || []; + this.total = response.data.total || 0; + this.loading = false; + }) + .catch(() => { + this.loading = false; + this.list = []; + this.total = 0; + }); }, findSubInvs() { this.invCodeList = []; @@ -527,14 +530,14 @@ export default { filter: 3 }; filterSubByInv(query) - .then((response) => { - this.invCodeList = response.data || []; - if (this.invCodeList != null && this.invCodeList.length == 1) { - this.formData.invCode = this.invCodeList[0].code; - } - }) - .catch(() => { - }); + .then((response) => { + this.invCodeList = response.data || []; + if (this.invCodeList != null && this.invCodeList.length == 1) { + this.formData.invCode = this.invCodeList[0].code; + } + }) + .catch(() => { + }); }, selectApply() { this.selectApplyVisible = true; @@ -562,13 +565,13 @@ export default { limit: 20, }; getBasicUnitMaintains(cQuery) - .then((response) => { - this.loading = false; - this.fromOptions = response.data.list || []; - }) - .catch(() => { - this.loading = false; - }); + .then((response) => { + this.loading = false; + this.fromOptions = response.data.list || []; + }) + .catch(() => { + this.loading = false; + }); }, }, @@ -601,8 +604,8 @@ export default { deptCode: null, incCode: null, createTime: parseTime( - date, - "{y}-{m}-{d} {h}:{i}:{s}" + date, + "{y}-{m}-{d} {h}:{i}:{s}" ), }; this.orderEditor = false;