From 2b55091af5411ca19fd5090ebec961501cfccd09 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 21 Jul 2023 10:19:01 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=A4=8D=E5=88=B6?= =?UTF-8?q?=E5=BF=85=E5=A1=AB=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 1 - .env.production | 4 ++-- src/views/inout/DialogcChangeNewOrder.vue | 20 +++++++++---------- .../supplier/company/basicProductEdit.vue | 1 - 4 files changed, 11 insertions(+), 15 deletions(-) diff --git a/.env.development b/.env.development index 5539ad6..2554ec7 100644 --- a/.env.development +++ b/.env.development @@ -4,7 +4,6 @@ VUE_APP_TITLE = 供应商自助管理平台 # 开发环境配置 ENV = 'development' -# 若依管理系统/开发环境 VUE_APP_BASE_API = 'http://192.168.0.166:9993' # 应用访问路径 例如使用前缀 /admin/ diff --git a/.env.production b/.env.production index 035a00e..09677fb 100644 --- a/.env.production +++ b/.env.production @@ -14,10 +14,10 @@ ENV = 'production' # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_SPMS_SERVER/' # 平潭 -# VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/' +VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/' # 文明懂 -VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/' +# VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/' # 林淑波 # VUE_APP_BASE_API = 'http://192.168.0.231:9150/UDI_SPMS_SERVER/' diff --git a/src/views/inout/DialogcChangeNewOrder.vue b/src/views/inout/DialogcChangeNewOrder.vue index 8e98084..c227cd2 100644 --- a/src/views/inout/DialogcChangeNewOrder.vue +++ b/src/views/inout/DialogcChangeNewOrder.vue @@ -260,29 +260,27 @@ export default { this.$message.warning("请选择单据类型！"); return; } - if ((this.curAction.corpType === 0 || this.curAction.corpType === 2 || (this.curAction.corpType === 1 && !this.curAction.genUnit)) && this.$isBlank(this.formData.fromCorp)) { - this.$message.error('当前往来信息不能为空'); - return; - } if (this.$isBlank(this.formData.invCode)) { this.$message.error("当前分库不能为空"); return; } - - if (this.curAction.corpType === 0 || this.curAction.corpType === 2 || (this.curAction.corpType === 1 && !this.curAction.genUnit && this.$isBlank(this.formData.fromCorp))) { + if (this.curAction.corpType === 1 && this.$isBlank(this.formData.fromCorp)) { + this.$message.error('往来单位不能为空'); + return; + } + if ((this.curAction.corpType === 2 && this.$isBlank(this.formData.fromCorp))) { this.$message.error("往来单位不能为空"); return; } - - if (this.curAction.corpType == 3 && this.$isBlank(this.formData.fromInvCode)) { + if ((this.curAction.corpType === 4 && this.$isBlank(this.formData.fromCorp))) { this.$message.error("往来单位不能为空"); return; } - - if (this.curAction.corpType === 1 && this.$isBlank(this.formData.fromCorp)) { - this.$message.error('往来单位不能为空'); + if (this.curAction.corpType == 3 && this.$isBlank(this.formData.fromInvCode)) { + this.$message.error("往来单位不能为空"); return; } + if (this.detailList.length == 0) { this.$message.error("产品列表不能为空"); return; diff --git a/src/views/supplier/company/basicProductEdit.vue b/src/views/supplier/company/basicProductEdit.vue index fabd745..8c0741d 100644 --- a/src/views/supplier/company/basicProductEdit.vue +++ b/src/views/supplier/company/basicProductEdit.vue @@ -866,7 +866,6 @@ export default { }, methods: { - onAddSubmit() { this.relevanceEdit.isDisable = this.editQuery.isDisable; this.relevanceEdit.isLock = this.editQuery.isLock; From 2a92f1b2d1c3f78d9c47665605c08c17688ad684 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Fri, 21 Jul 2023 11:15:19 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E4=BB=93=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inout/InvoiceRegCkeck.vue | 32 ++++++++++++++++------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/src/views/inout/InvoiceRegCkeck.vue b/src/views/inout/InvoiceRegCkeck.vue index 87415b9..b9d819e 100644 --- a/src/views/inout/InvoiceRegCkeck.vue +++ b/src/views/inout/InvoiceRegCkeck.vue @@ -314,7 +314,6 @@ export default { limit: 10, startTime: null, endTime: null, - invCode: this.$store.getters.locInvCode }, corpLoading: false, @@ -601,6 +600,7 @@ export default { }, getCodeDetailLists() { + debugger this.filterQuery.invoiceEncode = this.inputQuery.invoiceEncode this.filterQuery.vueType = 'supInvoice' this.codeDetailLoading = true @@ -713,22 +713,26 @@ export default { this.$message.error('发票编码不能为空！') return } - //查询发票编码有没有重复 - checkInvoiceCode({invoiceEncode:this.inputQuery.invoiceEncode}) - .then((response) => { - if (response.code === 20000) { - this.invoiceSelectRegByOrderVisible = true - } else { + if(this.list.length==0){ + //查询发票编码有没有重复 + checkInvoiceCode({invoiceEncode:this.inputQuery.invoiceEncode}) + .then((response) => { + if (response.code === 20000) { + this.invoiceSelectRegByOrderVisible = true + } else { + this.$message.error(response.message) + } + }) + .catch((response) => { this.$message.error(response.message) - } - }) - .catch((response) => { - this.$message.error(response.message) - }) + }) + }else{ + this.invoiceSelectRegByOrderVisible = true + } }, closeAcceptDialog(){ this.invoiceSelectRegByOrderVisible = false - this.getCodeDetailLists() + this.getCodeDetailLists() }, delectSub(row){ deleteInvoiceByOrderFk({billNo:row.billNo,invoiceEncode:this.inputQuery.invoiceEncode}) @@ -787,7 +791,7 @@ export default { } if(this.curInvoice.id!=null){ this.inputQuery=this.curInvoice - this.getOrderDetail(); + this.getOrderDetail(); } } } From 601cd4b7b17b1e667429e2955c6fb6d8359331f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B3=BD=E8=85=BE?= <1178634255@qq.com> Date: Fri, 21 Jul 2023 11:18:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/purchase/cert/supCertSet.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/purchase/cert/supCertSet.vue b/src/views/purchase/cert/supCertSet.vue index 94f9434..2f69de5 100644 --- a/src/views/purchase/cert/supCertSet.vue +++ b/src/views/purchase/cert/supCertSet.vue @@ -309,11 +309,11 @@ - + - - - + + +