From 1ccb334d8640ac7491f75b83146a243aff5f3e90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Tue, 27 Jun 2023 10:52:57 +0800
Subject: [PATCH 01/38] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development | 2 +-
 .env.production  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.env.development b/.env.development
index eed92e7d..d6a9fa2a 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ VUE_APP_TITLE = UDI管理系统
 ENV = 'development'
 
 # 开发环境
-VUE_APP_BASE_API = 'http://127.0.0.1:9991'
+VUE_APP_BASE_API = 'http://192.168.0.43:9991'
 
 VUE_APP_SYNC_API ="http://127.0.0.1:10001"
 
diff --git a/.env.production b/.env.production
index 21ea9a52..9de78aa4 100644
--- a/.env.production
+++ b/.env.production
@@ -16,9 +16,9 @@ ENV = 'production'
 # VUE_APP_BASE_API = 'http://192.168.0.66:9150/UDI_WMS_MC/'
 
 # 文明东1
-# VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_WMS_MC/'
+VUE_APP_BASE_API = 'http://192.168.0.61:9150/UDI_WMS_MC/'
 # 文明东2
-# VUE_APP_BASE_API = 'http://192.168.0.61:9150/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://192.168.0.153:9150/UDI_WMS_MC/'
 # VUE_APP_SYNC_API ="http://192.168.0.62:9150/SP_SYNC_SERVER"
 
 刘恩典
@@ -31,7 +31,7 @@ ENV = 'production'
 # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/'
 
 # 漳州中医院
-VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/'
 
 
 # 应用访问路径 例如使用前缀 /admin/

From 97de905cc96e123a48ed3304cf7ce5360d71f0c2 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 27 Jun 2023 18:35:32 +0800
Subject: [PATCH 02/38] =?UTF-8?q?=E6=8A=A5=E5=91=8A=E9=A2=84=E8=A7=88bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/DialogCheck.vue         | 6 ++++++
 src/views/inout/IoAuditedOrder.vue      | 6 ++++++
 src/views/inout/IoCheckAuditOrder.vue   | 6 ++++++
 src/views/inout/IoCheckSuccessOrder.vue | 6 ++++++
 4 files changed, 24 insertions(+)

diff --git a/src/views/inout/DialogCheck.vue b/src/views/inout/DialogCheck.vue
index 4912f568..fb8bf616 100644
--- a/src/views/inout/DialogCheck.vue
+++ b/src/views/inout/DialogCheck.vue
@@ -455,6 +455,9 @@ export default {
       return isJPG || isPNG;
     },
     showImgViewer(row) {
+      if(this.inputQuery.filePath.substr(-1) == ','){
+        this.inputQuery.filePath=this.inputQuery.filePath.slice(0, this.inputQuery.filePath.length-1);
+      }
       this.certFileUrl =
         this.BASE_URL +
         "/udiwms/image/register/file/getImage?type=image2&name="+this.inputQuery.filePath;
@@ -493,6 +496,9 @@ export default {
     },
 
     showImgViewerCold(row){
+      if(this.inputQuery.coldFilePath.substr(-1) == ','){
+        this.inputQuery.coldFilePath=this.inputQuery.coldFilePath.slice(0, this.inputQuery.coldFilePath.length-1);
+      }
       this.certFileUrl =
         this.BASE_URL +
         "/udiwms/image/register/file/getImage?type=image2&name="+this.inputQuery.coldFilePath;
diff --git a/src/views/inout/IoAuditedOrder.vue b/src/views/inout/IoAuditedOrder.vue
index b741b13b..621f5f75 100644
--- a/src/views/inout/IoAuditedOrder.vue
+++ b/src/views/inout/IoAuditedOrder.vue
@@ -654,6 +654,9 @@ export default {
       this.getList();
     },
     showImgViewer(row) {
+      if(row.filePath.substr(-1) == ','){
+        row.filePath=row.filePath.slice(0, row.filePath.length-1);
+      }
       this.certFileUrl =
         this.BASE_URL +
         "/udiwms/image/register/file/getImage?type=image2&name="+row.filePath;
@@ -693,6 +696,9 @@ export default {
 
 
     showImgViewerCold(row) {
+      if(row.coldFilePath.substr(-1) == ','){
+        row.coldFilePath=row.coldFilePath.slice(0, row.coldFilePath.length-1);
+      }
       this.certFileUrl =
         this.BASE_URL +
         "/udiwms/image/register/file/getImage?type=image2&name="+row.coldFilePath;
diff --git a/src/views/inout/IoCheckAuditOrder.vue b/src/views/inout/IoCheckAuditOrder.vue
index c8bf5c47..6e2bd66c 100644
--- a/src/views/inout/IoCheckAuditOrder.vue
+++ b/src/views/inout/IoCheckAuditOrder.vue
@@ -753,6 +753,9 @@ export default {
       this.showSearch = !this.showSearch;
     },
     showImgViewer(row) {
+      if(row.filePath.substr(-1) == ','){
+        row.filePath=row.filePath.slice(0, row.filePath.length-1);
+      }
       this.certFileUrl =
         this.BASE_URL +
         "/udiwms/image/register/file/getImage?type=image2&name="+row.filePath;
@@ -791,6 +794,9 @@ export default {
     },
 
     showImgViewerCold(row) {
+      if(row.coldFilePath.substr(-1) == ','){
+        row.coldFilePath=row.coldFilePath.slice(0, row.coldFilePath.length-1);
+      }
       this.certFileUrl =
         this.BASE_URL +
         "/udiwms/image/register/file/getImage?type=image2&name="+row.coldFilePath;
diff --git a/src/views/inout/IoCheckSuccessOrder.vue b/src/views/inout/IoCheckSuccessOrder.vue
index b2eec70b..9d317f6e 100644
--- a/src/views/inout/IoCheckSuccessOrder.vue
+++ b/src/views/inout/IoCheckSuccessOrder.vue
@@ -620,6 +620,9 @@ export default {
     },
 
     showImgViewer(row) {
+      if(row.filePath.substr(-1) == ','){
+        row.filePath=row.filePath.slice(0, row.filePath.length-1);
+      }
       this.certFileUrl =
         this.BASE_URL +
         "/udiwms/image/register/file/getImage?type=image2&name="+row.filePath;
@@ -658,6 +661,9 @@ export default {
     },
 
     showImgViewerCold(row) {
+      if(row.coldFilePath.substr(-1) == ','){
+        row.coldFilePath=row.coldFilePath.slice(0, row.coldFilePath.length-1);
+      }
       this.certFileUrl =
         this.BASE_URL +
         "/udiwms/image/register/file/getImage?type=image2&name="+row.coldFilePath;

From 32245ac978fd565bfc9b643106202156ccc7e5b5 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Wed, 28 Jun 2023 10:42:28 +0800
Subject: [PATCH 03/38] =?UTF-8?q?=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.production b/.env.production
index 21ea9a52..8cc9d4c3 100644
--- a/.env.production
+++ b/.env.production
@@ -18,8 +18,8 @@ ENV = 'production'
 # 文明东1
 # VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_WMS_MC/'
 # 文明东2
-# VUE_APP_BASE_API = 'http://192.168.0.61:9150/UDI_WMS_MC/'
-# VUE_APP_SYNC_API ="http://192.168.0.62:9150/SP_SYNC_SERVER"
+ #VUE_APP_BASE_API = 'http://192.168.0.61:9150/UDI_WMS_MC/'
+ #VUE_APP_SYNC_API ="http://192.168.0.62:9150/SP_SYNC_SERVER"
 
 刘恩典
 # VUE_APP_BASE_API = 'http://192.168.0.54:9150/UDI_WMS_MC/'

From 15d9403e3f379c85d97a2eee7c13e23f5c865d8a Mon Sep 17 00:00:00 2001
From: 1178634255 <1178634255@qq.com>
Date: Thu, 6 Jul 2023 11:17:27 +0800
Subject: [PATCH 04/38] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=9A=E5=BE=80=E6=9D=A5=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/DialogCreateOrder.vue         | 2 +-
 src/views/inout/PanelCreateOrderBizDetail.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index e4c53f00..1df9bf72 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -128,7 +128,7 @@
               "
             >
               <el-select
-                v-model="orderFormData.fromCorp"
+                v-model="orderFormData.fromCorpName"
                 filterable
                 remote
                 clearable
diff --git a/src/views/inout/PanelCreateOrderBizDetail.vue b/src/views/inout/PanelCreateOrderBizDetail.vue
index a0616924..972b3dd3 100644
--- a/src/views/inout/PanelCreateOrderBizDetail.vue
+++ b/src/views/inout/PanelCreateOrderBizDetail.vue
@@ -364,7 +364,7 @@ export default {
         return;
       }
 
-      if (this.$isBlank(this.idQuery.fromCorp) && this.$isBlank(this.idQuery.fromInvCode)) {
+      if (this.$isBlank(this.idQuery.fromCorpName) && this.$isBlank(this.idQuery.fromInvCode)) {
         this.$message.error("往来信息不能为空！");
         return;
       }

From d92920ecf15ed05e20c0461965b68f6734583bc3 Mon Sep 17 00:00:00 2001
From: schry <2433098676@qq.com>
Date: Thu, 6 Jul 2023 14:14:24 +0800
Subject: [PATCH 05/38] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=A1=A5=E5=8D=95?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=97=B4=E9=9A=94=E4=B8=8D=E5=BA=94=E4=B8=BA?=
 =?UTF-8?q?=E8=B4=9F=E6=95=B0=20230522?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/dept/invRelUsers.vue    | 1 -
 src/views/system/param/busTypeChange.vue | 9 ++++++++-
 src/views/system/param/busTypePre.vue    | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/views/system/dept/invRelUsers.vue b/src/views/system/dept/invRelUsers.vue
index 5a77c4a9..120f19c4 100644
--- a/src/views/system/dept/invRelUsers.vue
+++ b/src/views/system/dept/invRelUsers.vue
@@ -216,7 +216,6 @@ export default {
       warehouseUserList(this.userQuery).then((res) => {
         this.userData = res.data.list;
         this.userTotal = res.data.total;
-
       }).catch((error) => {
         this.$message.error("数据正在处理，请勿重复提交")
       });
diff --git a/src/views/system/param/busTypeChange.vue b/src/views/system/param/busTypeChange.vue
index 7034e6b0..b26b13ea 100644
--- a/src/views/system/param/busTypeChange.vue
+++ b/src/views/system/param/busTypeChange.vue
@@ -239,7 +239,14 @@ export default {
         this.$message.error("请选择类型！");
         return;
       }
-
+      if (this.inputQuery.beforeTime < 0){
+        this.$message.error("生成出入库单时间间隔不能为负数！")
+        return;
+      }
+      if (this.inputQuery.busBeforeTime < 0){
+        this.$message.error("生成业务单时间间隔不能为负数！")
+        return;
+      }
       if (this.formName === "add") {
         let numRegExp = '^[0-9]*$';
         let numReg = new RegExp(numRegExp);
diff --git a/src/views/system/param/busTypePre.vue b/src/views/system/param/busTypePre.vue
index 30388134..a6ffdf7e 100644
--- a/src/views/system/param/busTypePre.vue
+++ b/src/views/system/param/busTypePre.vue
@@ -235,11 +235,11 @@ export default {
         return;
       }
       if (this.inputQuery.beforeTime < 0){
-        this.$message.error("时间间隔不能为负数！")
+        this.$message.error("生成出入库单时间间隔不能为负数！")
         return;
       }
       if (this.inputQuery.busBeforeTime < 0){
-        this.$message.error("时间间隔不能为负数！")
+        this.$message.error("生成业务单时间间隔不能为负数！")
         return;
       }
       // if (isBlank(this.inputQuery.invCode)) {

From 4d0902c7c2e5cb45fbcb6ade7b298b5fe4484c18 Mon Sep 17 00:00:00 2001
From: schry <2433098676@qq.com>
Date: Thu, 6 Jul 2023 15:02:52 +0800
Subject: [PATCH 06/38] =?UTF-8?q?=E9=80=89=E5=85=A5=E9=A2=84=E9=AA=8C?=
 =?UTF-8?q?=E6=94=B6=E5=BA=93=E5=8D=95=E7=AA=97=E5=8F=A3=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AE=E6=8C=89=E9=92=AE=EF=BC=8C=E2=80=99=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E6=97=B6=E9=97=B4=E2=80=98=E4=BF=A1=E6=81=AF=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E8=81=94=E5=8A=A8=E6=B8=85=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/DialogCreateOrderSelect.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/inout/DialogCreateOrderSelect.vue b/src/views/inout/DialogCreateOrderSelect.vue
index 5536a78d..08f95120 100644
--- a/src/views/inout/DialogCreateOrderSelect.vue
+++ b/src/views/inout/DialogCreateOrderSelect.vue
@@ -449,6 +449,7 @@ export default {
         startTime: null,
         endTime: null,
       };
+      this.actDateRange = null
       this.getList();
     },
     //查询

From 4904f8109e65549d7ec134eb51340e3844e2e1f0 Mon Sep 17 00:00:00 2001
From: schry <2433098676@qq.com>
Date: Thu, 6 Jul 2023 15:29:24 +0800
Subject: [PATCH 07/38] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=AE=A1=E6=A0=B8=E6=8B=92=E7=BB=9D=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E4=BC=9A=E6=98=BE=E7=A4=BA=E2=80=98=E6=8B=92?=
 =?UTF-8?q?=E7=BB=9D=E2=80=99=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/muti/ioOrderMutiSelect.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/inout/muti/ioOrderMutiSelect.vue b/src/views/inout/muti/ioOrderMutiSelect.vue
index 41a24468..857efd00 100644
--- a/src/views/inout/muti/ioOrderMutiSelect.vue
+++ b/src/views/inout/muti/ioOrderMutiSelect.vue
@@ -169,6 +169,7 @@ export default {
         0: "草稿",
         1: "未审核",
         2: "已审核",
+        3: "已拒绝"
       },
       orderMutiVisible: false,
       actDateRange: [],
@@ -210,7 +211,9 @@ export default {
     statusFilterType(status) {
       const statusMap = {
         0: "warning",
-        1: "success",
+        1: "primary",
+        2: "success",
+        3: "danger"
       };
       return statusMap[status];
     },

From fc6e17a699b462aaf9252e6bc2c8b0cca0a1b263 Mon Sep 17 00:00:00 2001
From: 1178634255 <1178634255@qq.com>
Date: Thu, 6 Jul 2023 15:43:53 +0800
Subject: [PATCH 08/38] =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=E6=89=AB=E7=A0=81?=
 =?UTF-8?q?=E5=8D=95=E6=A8=A1=E5=9D=97=E5=88=B0=E5=BE=85=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=A8=A1=E5=9D=97=EF=BC=8C=E5=A4=87=E6=B3=A8?=
 =?UTF-8?q?=E4=BC=9A=E6=B6=88=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/DialogCreateOrder.vue         | 6 ++++--
 src/views/inout/PanelCreateOrderBizDetail.vue | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index 1df9bf72..74a50762 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -119,7 +119,7 @@
         <el-row>
           <el-col :span="11">
             <el-form-item
-              prop="fromCorp"
+              prop="fromName"
               label="往来信息:"
               v-if="
                 curAction.corpType === 0 ||
@@ -128,7 +128,7 @@
               "
             >
               <el-select
-                v-model="orderFormData.fromCorpName"
+                v-model="orderFormData.fromName"
                 filterable
                 remote
                 clearable
@@ -565,6 +565,8 @@ export default {
         action: null,
         invCode: null,
         fromCorp: null,
+        fromCorpName: null,
+        fromName: null,
         fromInvCode: null,
         remark: null,
         fromType: 2,
diff --git a/src/views/inout/PanelCreateOrderBizDetail.vue b/src/views/inout/PanelCreateOrderBizDetail.vue
index 972b3dd3..a0616924 100644
--- a/src/views/inout/PanelCreateOrderBizDetail.vue
+++ b/src/views/inout/PanelCreateOrderBizDetail.vue
@@ -364,7 +364,7 @@ export default {
         return;
       }
 
-      if (this.$isBlank(this.idQuery.fromCorpName) && this.$isBlank(this.idQuery.fromInvCode)) {
+      if (this.$isBlank(this.idQuery.fromCorp) && this.$isBlank(this.idQuery.fromInvCode)) {
         this.$message.error("往来信息不能为空！");
         return;
       }

From ca7d0b41b2882a14bae17c8bdc683956e6bba80b Mon Sep 17 00:00:00 2001
From: 1178634255 <1178634255@qq.com>
Date: Thu, 6 Jul 2023 16:44:45 +0800
Subject: [PATCH 09/38] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/DialogCreateOrder.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index 74a50762..3dbb2bb9 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -119,7 +119,7 @@
         <el-row>
           <el-col :span="11">
             <el-form-item
-              prop="fromName"
+              prop="fromCorp"
               label="往来信息:"
               v-if="
                 curAction.corpType === 0 ||
@@ -128,7 +128,7 @@
               "
             >
               <el-select
-                v-model="orderFormData.fromName"
+                v-model="orderFormData.fromCorp"
                 filterable
                 remote
                 clearable
@@ -566,7 +566,6 @@ export default {
         invCode: null,
         fromCorp: null,
         fromCorpName: null,
-        fromName: null,
         fromInvCode: null,
         remark: null,
         fromType: 2,
@@ -1448,6 +1447,7 @@ export default {
       this.corpOrderIdDisabled = true;
       this.orderFormData = this.orderQuery;
       this.actionEnable = true;
+      this.orderFormData.fromCorp=this.orderFormData.fromCorpName;
       if (this.$isNotBlank(this.orderFormData.checkPreInOrders)) {
         this.checkPreInArray = this.orderFormData.split(",");
       }

From 0474f4323bfe19530462d6038633ff6c21eb4cc8 Mon Sep 17 00:00:00 2001
From: 1178634255 <1178634255@qq.com>
Date: Thu, 6 Jul 2023 17:01:59 +0800
Subject: [PATCH 10/38] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?=
 =?UTF-8?q?=E7=A5=A8=E4=BF=A1=E6=81=AF=E4=B8=AD=E7=9A=84=E9=A2=84=E8=A7=88?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=97=A0=E6=B3=95=E6=89=8B=E5=8A=A8=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/InvoiceRegistration.vue | 38 +++++++++++--------------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue
index d7066054..6dfd59ba 100644
--- a/src/views/inout/InvoiceRegistration.vue
+++ b/src/views/inout/InvoiceRegistration.vue
@@ -798,41 +798,37 @@ export default {
     showImgViewer(row) {
       this.certFileUrl =
         this.BASE_URL +
-        "/udiwms/image/register/file/getImage?type=image2&name="+row.licenseUrl;
+        "/udiwms/image/register/file/getImage?type=image2&name=" + row.licenseUrl;
       this.imgList = [];
-      this.imgList.push(this.certFileUrl)
+      this.imgList.push(this.certFileUrl);
       let index = row.licenseUrl.lastIndexOf('.');
-      if(index===-1){
-        this.$message.error("文件名异常!")
-        return false
+      if (index === -1) {
+        this.$message.error("文件名异常!");
+        return false;
       }
-      if(row.licenseUrl.substr(index+1)==='pdf'){
-        let pdf = "application/pdf"
+      if (row.licenseUrl.substr(index + 1) === 'pdf') {
+        let pdf = "application/pdf";
         let binaryData = [];
-        previewFile(this.certFileUrl).then(res=>{
+        previewFile(this.certFileUrl).then(res => {
           binaryData.push(res);
-          let URL = window.URL.createObjectURL(new Blob(binaryData, {type: pdf}));
+          let URL = window.URL.createObjectURL(new Blob(binaryData, { type: pdf }));
           window.open(URL);
-        })
-        // window.open(this.imgList[0])
-        return false
+        });
+        return false;
       }
       this.imgViewerVisible = true;
-      // previewImage({
-      //   imageUrl: this.inputQuery.licenseUrl,
-      //   certFileUrl: this.certFileUrl,
-      // }).then((response) => {
-      //   if (response.code === 20000) {
-      //   }
-      //   console.log(this.imgList);
-      // });
       const m = (e) => {
         e.preventDefault();
       };
       document.body.style.overflow = "hidden";
       document.addEventListener("touchmove", m, false); // 禁止页面滑动
-
     },
+    closeImgViewer() {
+      this.imgViewerVisible = false;
+      document.body.style.overflow = "auto"; // 恢复页面滑动
+      document.removeEventListener("touchmove", m, false); // 移除禁止页面滑动的事件
+    },
+
 
 
     invChange() {

From c11f8e4b3aedba792771998301172cd0c123f9cc Mon Sep 17 00:00:00 2001
From: schry <2433098676@qq.com>
Date: Thu, 6 Jul 2023 18:05:36 +0800
Subject: [PATCH 11/38] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=AA=97=E5=8F=A3=E6=89=A7=E8=A1=8C=E2=80=98?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E5=85=A8=E9=83=A8=E5=AF=BC=E5=87=BA=E2=80=99?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=EF=BC=8C=E5=AF=BC=E5=87=BA=E7=9A=84=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E6=95=B0=E6=8D=AE=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/thrsys/thrProductsExport.js           |  8 ++++++
 .../thirdSys/product/thrProductsExport.vue    |  4 +--
 .../thirdSys/product/thrProductsSelect.vue    | 28 +++++++++++++++++--
 3 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/src/api/thrsys/thrProductsExport.js b/src/api/thrsys/thrProductsExport.js
index dac0a27e..ad941681 100644
--- a/src/api/thrsys/thrProductsExport.js
+++ b/src/api/thrsys/thrProductsExport.js
@@ -31,3 +31,11 @@ export function exportExcel(query) {
     });
 }
 
+export function exportExcelAll(query) {
+  return axios({
+    url: "/udiwms/thrProducts/importLog/exportAll",
+    method: "post",
+    data: query
+  });
+}
+
diff --git a/src/views/thirdSys/product/thrProductsExport.vue b/src/views/thirdSys/product/thrProductsExport.vue
index 8b11fc1f..eddb7c33 100644
--- a/src/views/thirdSys/product/thrProductsExport.vue
+++ b/src/views/thirdSys/product/thrProductsExport.vue
@@ -34,8 +34,8 @@
             <el-tag :type="statusFilterType(scope.row.status)">{{ status[scope.row.status] }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="下载次数" prop="dlCount" show-overflow-tooltip>
-        </el-table-column>
+        <el-table-column label="下载次数" prop="dlCount" show-overflow-tooltip></el-table-column>
+        <el-table-column label="下载信息" prop="remark" show-overflow-tooltip></el-table-column>
         <el-table-column label="操作"  width="120">
           <template slot-scope="scope">
             <el-button type="text" @click.native.stop="downloadExcel(scope.row)">下载
diff --git a/src/views/thirdSys/product/thrProductsSelect.vue b/src/views/thirdSys/product/thrProductsSelect.vue
index 422cc234..9090365d 100644
--- a/src/views/thirdSys/product/thrProductsSelect.vue
+++ b/src/views/thirdSys/product/thrProductsSelect.vue
@@ -113,7 +113,7 @@ import {getInvbasdoc} from "@/api/thrsys/getErps";
 import {getBasicThirdSys, filterDetailByKey} from "@/api/thrsys/basicThirdSys";
 import {selectIp} from "@/api/system/systemParamConfig";
 import thrProductsDetail from "./thrProductsDetail";
-import {exportExcel} from "@/api/thrsys/thrProductsExport"
+import {exportExcel,exportExcelAll} from "@/api/thrsys/thrProductsExport"
 import {thrProductUpload} from "@/api/thrsys/smp"
 
 export default {
@@ -155,6 +155,7 @@ export default {
       },
       thrProductsDetailVisible: false,
       thisData: null,
+      multipleSelection: []
     };
   },
 
@@ -395,11 +396,32 @@ export default {
       selectData.forEach((obj) => {
         this.filterQuery.thrProductsEntities.push(obj);
       });
-      this.allExport();
+      exportExcel(this.filterQuery)
+        .then((response) => {
+          if (response.code == 20000) {
+            this.$message({
+              type: "success",
+              message: "导出成功，后台正在生成Json文件，请稍后刷新查看！",
+            });
+            this.$emit("cancelDialog", true);
+          } else {
+            this.$message({
+              type: "error",
+              message: response.message,
+            });
+            this.$emit("cancelDialog", true);
+          }
+        })
+        .catch(() => {
+          this.$message({
+            type: "error",
+            message: "上传失败",
+          });
+        });
     },
     allExport() {
       this.filterQuery.thrProductsEntities=this.list;
-      exportExcel(this.filterQuery)
+      exportExcelAll(this.filterQuery)
         .then((response) => {
           if (response.code == 20000) {
             this.$message({

From 193ab67756d62cf2ddc2f00b038fb0f0b839bfa5 Mon Sep 17 00:00:00 2001
From: schry <2433098676@qq.com>
Date: Fri, 7 Jul 2023 11:08:46 +0800
Subject: [PATCH 12/38] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/auth/authAdmin.js                   |  1 -
 src/views/basic/product/udiInfoManageSp.vue | 29 +++++++-
 src/views/system/user/authUser.vue          | 75 ++++++++++++---------
 3 files changed, 72 insertions(+), 33 deletions(-)

diff --git a/src/api/auth/authAdmin.js b/src/api/auth/authAdmin.js
index 1523a56e..8bec8713 100644
--- a/src/api/auth/authAdmin.js
+++ b/src/api/auth/authAdmin.js
@@ -9,7 +9,6 @@ export function authAdminList(query) {
   });
 }
 
-
 //根据当前角色，获取是否为客户角色
 export function roleCustomers(query) {
   return axios({
diff --git a/src/views/basic/product/udiInfoManageSp.vue b/src/views/basic/product/udiInfoManageSp.vue
index cffe0252..ff53de71 100644
--- a/src/views/basic/product/udiInfoManageSp.vue
+++ b/src/views/basic/product/udiInfoManageSp.vue
@@ -125,6 +125,7 @@
         <el-table-column width="120" label="操作">
           <template slot-scope="scope">
             <el-button type="text" @click.native.stop="handleModifyClick(scope.row)">详情</el-button>
+            <el-button type="text" @click.native.stop="handleDeleteClick(scope.row.id)">移除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -485,7 +486,33 @@ export default {
       };
       this.checked = row.isUseDy == 1;
     },
-
+    handleDeleteClick(rowId){
+      this.$confirm("此操作将删除该供应商器械信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          let dQuery = {
+            id: rowId,
+          };
+          deleteCompanyProductRelevance(dQuery)
+            .then((response) => {
+              this.loading = false;
+              if (response.code == 20000) {
+                this.$message.success("删除成功");
+              } else {
+                this.$message.error(response.message);
+              }
+              this.getList();
+            })
+            .catch(() => {
+              this.loading = false;
+            });
+        })
+        .catch(() => {
+        });
+    },
     lockProducts(status) {
       let selectData = this.multipleSelection;
       let postQuery = {
diff --git a/src/views/system/user/authUser.vue b/src/views/system/user/authUser.vue
index 7bb18229..7fc018fc 100644
--- a/src/views/system/user/authUser.vue
+++ b/src/views/system/user/authUser.vue
@@ -1,38 +1,42 @@
 <template>
   <div>
     <el-card>
-      <el-form :inline="true" :model="query" size="mini">
-        <el-form-item label="用户账号:">
-          <el-input v-model="query.userName" placeholder="用户账号" clearable></el-input>
-        </el-form-item>
-        <el-form-item class="query-form-item" label="账号状态:">
-          <el-select v-model="query.userFlag" placeholder="请选择账号状态:">
-            <el-option label="全部" value=""></el-option>
-            <el-option label="禁用" value="0"></el-option>
-            <el-option label="正常" value="1"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item>
-          <el-button-group>
-            <el-button
-              type="primary"
-              icon="el-icon-refresh"
-              @click="onReset"
-            >重置
-            </el-button>
-            <el-button type="primary" icon="el-icon-search" @click="onSubmit"
-            >查询
-            </el-button
-            >
-            <el-button type="primary" @click.native="handleForm(null, null)" icon="el-icon-plus"
-                       :disabled="!configParms.sysUser && query.customerId == 110"
-                       v-hasPermi="['system:user:add']"
-            >新增
-            </el-button
-            >
-          </el-button-group>
-        </el-form-item>
+      <el-form :inline="true" :model="query" size="mini" v-show="showSearch">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="用户账号:">
+              <el-input v-model="query.userName" placeholder="用户账号" clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item class="query-form-item" label="账号状态:">
+              <el-select v-model="query.userFlag" placeholder="请选择账号状态:">
+                <el-option label="全部" value=""></el-option>
+                <el-option label="禁用" value="0"></el-option>
+                <el-option label="正常" value="1"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="所属部门:">
+              <el-input v-model="query.deptName" placeholder="所属部门" clearable></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
       </el-form>
+      <div class="top-right-btn">
+        <el-button-group>
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
+          <el-button type="primary" @click.native="handleForm(null, null)" icon="el-icon-plus"
+                     :disabled="!configParms.sysUser && query.customerId == 110"
+                     v-hasPermi="['system:user:add']">新增</el-button>
+        </el-button-group>
+      </div>
+
+      <el-divider style="margin: 15px"></el-divider>
       <el-table v-loading="loading" :data="list"
                 style="width: 100%"
                 border highlight-current-row>
@@ -292,10 +296,12 @@ export default {
       }
     };
     return {
+      showSearch: true,
       roles: [],
       query: {
         userName: "",
         userFlag: "1",
+        deptName: "",
         page: 1,
         limit: 10,
         roleId: "",
@@ -363,6 +369,12 @@ export default {
     };
   },
   methods: {
+    getDeptList(){
+
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
     onReset() {
       this.$router.push({
         path: ""
@@ -370,6 +382,7 @@ export default {
       this.query = {
         userName: "",
         userFlag: "1",
+        deptName: null,
         page: 1,
         limit: 10,
         roleId: "",

From 04cc06340cd3e325439dec012c1af2f39592d0ed Mon Sep 17 00:00:00 2001
From: 1178634255 <1178634255@qq.com>
Date: Fri, 7 Jul 2023 11:18:31 +0800
Subject: [PATCH 13/38] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/auth/authAdmin.js        |   8 +-
 src/layout/components/Navbar.vue | 155 +++++++++++++++++++++++++++++--
 2 files changed, 153 insertions(+), 10 deletions(-)

diff --git a/src/api/auth/authAdmin.js b/src/api/auth/authAdmin.js
index 1523a56e..c25af705 100644
--- a/src/api/auth/authAdmin.js
+++ b/src/api/auth/authAdmin.js
@@ -67,4 +67,10 @@ export function selectUser(query) {
     });
 }
 
-
+export function modifyPasswd(data) {
+  return axios({
+    url: "/salewarehouse/r",
+    method: "post",
+    data: data
+  });
+}
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 4df395bc..0d4da56b 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -40,6 +40,9 @@
           <el-dropdown-item divided @click.native="changeInv">
             <span>切换仓库</span>
           </el-dropdown-item>
+          <el-dropdown-item divided @click.native="modifyPassword">
+            <span>修改密码</span>
+          </el-dropdown-item>
           <el-dropdown-item divided @click.native="logout">
             <span>退出登录</span>
           </el-dropdown-item>
@@ -102,6 +105,78 @@
       </el-form>
     </el-dialog>
 
+
+    <el-dialog
+      title="修改密码"
+      :visible.sync="isVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="35%"
+      v-if="isVisible"
+    >
+      <el-form :model="inputQuery" label-width="100px" :rules="rules" ref="inputQuery">
+        <el-row :gutter="20">
+          <el-col :span="20">
+            <el-form-item prop="userName" label="用户账号:">
+              <el-input
+                size="small"
+                placeholder="请输入登录用户账号"
+                v-model="inputQuery.userName"
+                @input="change()"
+                :disabled="true"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="20">
+            <el-form-item prop="locInvCode" label="当前密码:">
+              <el-input
+                size="small"
+                placeholder="请输入当前密码"
+                type="password"
+                v-model="inputQuery.password"
+                @input="change()"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="20">
+            <el-form-item prop="locInvCode" label="新密码:">
+              <el-input
+                size="small"
+                placeholder="请输入新密码"
+                type="password"
+                v-model="inputQuery.password"
+                @input="change()"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="20">
+            <el-form-item prop="locInvCode" label="确认密码:">
+              <el-input
+                size="small"
+                placeholder="请输入确认密码"
+                type="password"
+                v-model="inputQuery.confirmPassword"
+                @input="change()"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+
+        <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
+          <el-button type="primary" @click="onSubmit('inputQuery')">修改密码</el-button>
+          <el-button type="primary" @click="closeDialog">取消</el-button>
+        </div>
+      </el-form>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -118,17 +193,34 @@ import RuoYiDoc from '@/components/RuoYi/Doc'
 import store from "@/store";
 import {filterAllByUser} from "@/api/system/invWarehouse";
 import {filterSubByInv, findByDeptUser} from "@/api/system/invSubWarehouse";
-import {updateInv} from "@/api/auth/authAdmin";
+import {updateInv,modifyPasswd} from "@/api/auth/authAdmin";
 import {isRelogin} from "@/utils/request";
 import router from "@/router";
 
 export default {
   data() {
+    let validatePass2 = (rule, value, callback) => {
+      if (value === "") {
+        callback(new Error("请再次输入密码"));
+      } else if (value !== this.inputQuery.password) {
+        callback(new Error("两次输入密码不一致!"));
+      } else {
+        callback();
+      }
+    };
     return {
       inv: store.getters.locInvName,
       deptName: store.getters.locDeptName,
       selInvVisible: false,
+      isVisible: false,
       userInfo: {},
+      inputQuery: {
+        password: "",
+        confirmPassword: "",
+        userName: "",
+        locInvCode:"",
+
+      },
       deptList: [],
       invList: [],
       formRules: {
@@ -140,6 +232,14 @@ export default {
         ],
 
       },
+      rules: {
+        password: [{required: true, message: "请输入密码", trigger: "blur"}],
+        confirmPassword: [
+          {required: true, message: "请确认密码", trigger: "blur"},
+          {validator: validatePass2, trigger: "blur"},
+        ],
+
+      },
     };
   },
   components: {
@@ -176,6 +276,33 @@ export default {
     }
   },
   methods: {
+    onSubmit(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.loading = true;
+          modifyPasswd(this.inputQuery).then((response) => {
+            if (response.code === 20000) {
+              this.loading = false;
+              this.$confirm('密码重置成功，请点击确定重新登录', '提示', {
+                confirmButtonText: '确定',
+                // cancelButtonText: '取消',
+                type: 'warning'
+              }).then(() => {
+                this.$store.dispatch('LogOut').then(() => {
+                  location.href = process.env.VUE_APP_CONTEXT_PATH;
+                })
+              }).catch(() => {
+              });
+            } else {
+              this.$message.error(response.message);
+            }
+          });
+        } else {
+          return false;
+        }
+      });
+    },
+
     toggleSideBar() {
       this.$store.dispatch('app/toggleSideBar')
     },
@@ -186,7 +313,7 @@ export default {
         type: 'warning'
       }).then(() => {
         this.$store.dispatch('LogOut').then(() => {
-          location.href = process.env.VUE_APP_CONTEXT_PATH ;
+          location.href = process.env.VUE_APP_CONTEXT_PATH;
         })
       }).catch(() => {
       });
@@ -195,6 +322,9 @@ export default {
     changeInv() {
       this.selInvVisible = true;
     },
+    modifyPassword() {
+      this.isVisible = true;
+    },
 
     getDeptList() {
       this.deptList = [];
@@ -209,7 +339,7 @@ export default {
 
     deptChange() {
       this.getInvList();
-      this.userInfo.locInvCode="";
+      this.userInfo.locInvCode = "";
     },
 
     getInvList() {
@@ -225,7 +355,7 @@ export default {
           }
         })
         .catch(() => {
-          this.selInvVisible=true;
+          this.selInvVisible = true;
         });
     },
 
@@ -261,6 +391,8 @@ export default {
 
     closeDialog() {
       this.selInvVisible = false;
+      this.isVisible = false;
+
       this.getDeptList()
       this.resetForm();
     },
@@ -278,11 +410,16 @@ export default {
   },
   created() {
     this.userName = this.$store.getters.name;
-      this.userInfo = {
-        id: store.getters.adminId,
-        locInvCode: store.getters.locInvCode,
-        locDeptCode: store.getters.locDeptCode,
-      };
+    this.userInfo = {
+      id: store.getters.adminId,
+      locInvCode: store.getters.locInvCode,
+      locDeptCode: store.getters.locDeptCode,
+    };
+    this.inputQuery={
+      userName:this.$store.getters.name,
+
+      locInvCode: store.getters.locInvCode,
+    };
 
     this.getDeptList();
     //this.getInvList()

From 037695dfc06fe00bc42a74d7dc8b9292eeb30bfc Mon Sep 17 00:00:00 2001
From: 1178634255 <1178634255@qq.com>
Date: Fri, 7 Jul 2023 11:32:44 +0800
Subject: [PATCH 14/38] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/auth/authAdmin.js        | 10 +++++++++-
 src/layout/components/Navbar.vue | 22 ++++++++++++++++------
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/api/auth/authAdmin.js b/src/api/auth/authAdmin.js
index feda0746..30340561 100644
--- a/src/api/auth/authAdmin.js
+++ b/src/api/auth/authAdmin.js
@@ -68,8 +68,16 @@ export function selectUser(query) {
 
 export function modifyPasswd(data) {
   return axios({
-    url: "/salewarehouse/r",
+    url: "/admin/auth/admin/updateUser",
     method: "post",
     data: data
   });
 }
+
+export function filterByUser(query) {
+  return axios({
+    url: "/admin/auth/admin/selectUser",
+    method: "get",
+    params: query
+  });
+}
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 0d4da56b..fa3df8ad 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -193,7 +193,7 @@ import RuoYiDoc from '@/components/RuoYi/Doc'
 import store from "@/store";
 import {filterAllByUser} from "@/api/system/invWarehouse";
 import {filterSubByInv, findByDeptUser} from "@/api/system/invSubWarehouse";
-import {updateInv,modifyPasswd} from "@/api/auth/authAdmin";
+import {updateInv, modifyPasswd,filterByUser} from "@/api/auth/authAdmin";
 import {isRelogin} from "@/utils/request";
 import router from "@/router";
 
@@ -218,7 +218,7 @@ export default {
         password: "",
         confirmPassword: "",
         userName: "",
-        locInvCode:"",
+        locInvCode: "",
 
       },
       deptList: [],
@@ -336,6 +336,16 @@ export default {
         .catch(() => {
         });
     },
+    getInputQuery() {
+      this.inputQuery = [];
+      filterByUser()
+        .then((response) => {
+          this.inputQuery = response.data || [];
+          // this.getInvList();
+        })
+        .catch(() => {
+        });
+    },
 
     deptChange() {
       this.getInvList();
@@ -415,12 +425,12 @@ export default {
       locInvCode: store.getters.locInvCode,
       locDeptCode: store.getters.locDeptCode,
     };
-    this.inputQuery={
-      userName:this.$store.getters.name,
+    this.inputQuery = {
+      userName: this.$store.getters.name,
 
-      locInvCode: store.getters.locInvCode,
+      // locInvCode: store.getters.locInvCode,
     };
-
+    this.getInputQuery();
     this.getDeptList();
     //this.getInvList()
 

From aab4e5701f909ff3f561af1c37dbdefb3cc6f1c0 Mon Sep 17 00:00:00 2001
From: 1178634255 <1178634255@qq.com>
Date: Fri, 7 Jul 2023 14:02:10 +0800
Subject: [PATCH 15/38] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index fa3df8ad..441d93cc 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -135,7 +135,7 @@
                 size="small"
                 placeholder="请输入当前密码"
                 type="password"
-                v-model="inputQuery.password"
+                v-model="inputQuery.passWord"
                 @input="change()"
               ></el-input>
             </el-form-item>
@@ -148,7 +148,7 @@
                 size="small"
                 placeholder="请输入新密码"
                 type="password"
-                v-model="inputQuery.password"
+                v-model="inputQuery.newPassword"
                 @input="change()"
               ></el-input>
             </el-form-item>
@@ -215,7 +215,8 @@ export default {
       isVisible: false,
       userInfo: {},
       inputQuery: {
-        password: "",
+        passWord: "",
+        newPassword: "",
         confirmPassword: "",
         userName: "",
         locInvCode: "",
@@ -285,7 +286,7 @@ export default {
               this.loading = false;
               this.$confirm('密码重置成功，请点击确定重新登录', '提示', {
                 confirmButtonText: '确定',
-                // cancelButtonText: '取消',
+                cancelButtonText: '取消',
                 type: 'warning'
               }).then(() => {
                 this.$store.dispatch('LogOut').then(() => {

From f7b4e0b28ccbd186cacae06e954aa2cdab3c34be 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, 7 Jul 2023 16:42:30 +0800
Subject: [PATCH 16/38] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E5=8D=95=E5=A1=AB?=
 =?UTF-8?q?=E5=86=99=E5=BE=80=E6=9D=A5=E5=8D=95=E4=BD=8D=E6=97=B6=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=A7=E5=93=81=E4=BC=A0=E9=94=99=E5=BE=80=E6=9D=A5?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8Did=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/DialogCreateOrder.vue | 8 ++++++++
 src/views/inout/DialogSelectRl.vue    | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index f7e1733e..1cd3bac0 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -102,6 +102,7 @@
                 placeholder="请选择单据类型"
                 :disabled="corpOrderIdDisabled"
                 style="width: 90%"
+                filterable
                 @change="actionChange"
               >
                 <el-option
@@ -1070,6 +1071,7 @@ export default {
     //添加条码后提交
     addCodeSubmit(tQuery) {
       addOrderWeb(tQuery).then((response) => {
+        debugger
         if (response.code === 20000) {
           this.orderFormData.billNo = response.data.orderId;
           if (response.data.errMsg != null) {
@@ -1093,9 +1095,15 @@ export default {
             this.refreshCodesPanel();
             this.$message.error(response.message);
             this.selectRlTitle = response.message;
+            //判断是出库需要选择供应商的时候把供应商值传过去
+            if(tQuery.selectSupId!=null){
+              this.codeFormData.selectSupId=tQuery.selectSupId
+            }
+
             this.selectRlVisible = true;
           } else if (response.code == 503) {
             //该产品绑定多个供应商处理
+            debugger
             this.curRow = response.data;
             this.orderFormData.billNo = this.curRow.orderId;
             this.codeFormData.relId = this.curRow.relId;
diff --git a/src/views/inout/DialogSelectRl.vue b/src/views/inout/DialogSelectRl.vue
index ed68ed0c..35f6e283 100644
--- a/src/views/inout/DialogSelectRl.vue
+++ b/src/views/inout/DialogSelectRl.vue
@@ -713,6 +713,8 @@ export default {
     ,
     bindId(val) {
       if (this.curRow.code != null || this.type == 1) {
+        debugger
+
         this.$emit("selectBindRl", val);
       } else {
         let query = {
@@ -860,6 +862,10 @@ export default {
   components: {}
   ,
   created() {
+    debugger
+    if(this.curRow.selectSupId!=null){
+      this.fromCorp=this.curRow.selectSupId
+    }
     this.getList();
   }
   ,

From 58de2582ae9d7119f300dce95b5b09f8ea6ccfc5 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, 7 Jul 2023 16:45:22 +0800
Subject: [PATCH 17/38] =?UTF-8?q?=E5=8E=BB=E9=99=A4debugger?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/DialogCreateOrder.vue | 3 ---
 src/views/inout/DialogSelectRl.vue    | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index 1cd3bac0..ce65f167 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -792,7 +792,6 @@ export default {
         page: 1,
         limit: 20,
       };
-      debugger
       if (this.curAction.corpType == 3) {
         //内部科室
         cQuery.corpType = 3;
@@ -1071,7 +1070,6 @@ export default {
     //添加条码后提交
     addCodeSubmit(tQuery) {
       addOrderWeb(tQuery).then((response) => {
-        debugger
         if (response.code === 20000) {
           this.orderFormData.billNo = response.data.orderId;
           if (response.data.errMsg != null) {
@@ -1103,7 +1101,6 @@ export default {
             this.selectRlVisible = true;
           } else if (response.code == 503) {
             //该产品绑定多个供应商处理
-            debugger
             this.curRow = response.data;
             this.orderFormData.billNo = this.curRow.orderId;
             this.codeFormData.relId = this.curRow.relId;
diff --git a/src/views/inout/DialogSelectRl.vue b/src/views/inout/DialogSelectRl.vue
index 35f6e283..e4dcf3ce 100644
--- a/src/views/inout/DialogSelectRl.vue
+++ b/src/views/inout/DialogSelectRl.vue
@@ -713,8 +713,6 @@ export default {
     ,
     bindId(val) {
       if (this.curRow.code != null || this.type == 1) {
-        debugger
-
         this.$emit("selectBindRl", val);
       } else {
         let query = {
@@ -862,7 +860,6 @@ export default {
   components: {}
   ,
   created() {
-    debugger
     if(this.curRow.selectSupId!=null){
       this.fromCorp=this.curRow.selectSupId
     }

From 23475c9b80bad61878110150ef4debd1b18bf737 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Mon, 10 Jul 2023 10:14:33 +0800
Subject: [PATCH 18/38] =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E6=B5=8B=E8=AF=95ip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.env.production b/.env.production
index d4bcb835..91adeb43 100644
--- a/.env.production
+++ b/.env.production
@@ -15,17 +15,21 @@ ENV = 'production'
 # 测试服务器
 # VUE_APP_BASE_API = 'http://192.168.0.66:9150/UDI_WMS_MC/'
 
+
+# 林淑波
+VUE_APP_BASE_API = 'http://192.168.0.231:9150/UDI_WMS_MC/'
+
 # 文明东1
 # VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_WMS_MC/'
 # 文明东2
-# VUE_APP_BASE_API = 'http://192.168.0.61:9150/UDI_WMS_MC/'
-# VUE_APP_SYNC_API ="http://192.168.0.62:9150/SP_SYNC_SERVER"
+#  VUE_APP_BASE_API = 'http://192.168.0.61:9150/UDI_WMS_MC/'
+#  VUE_APP_SYNC_API ="http://192.168.0.62:9150/SP_SYNC_SERVER"
 
 刘恩典
 # VUE_APP_BASE_API = 'http://192.168.0.54:9150/UDI_WMS_MC/'
 
 # 平潭正式
-VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
 
 # 吴总测试服务器
 # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/'

From 568873c67372a866c90a304b8043b157de814b44 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 10 Jul 2023 11:46:13 +0800
Subject: [PATCH 19/38] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=87=BA=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=8D=95=20di=E7=BB=91=E5=AE=9A=E5=A4=9A=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=20=E4=BA=A7=E5=93=81=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E5=92=8C=E8=B5=84=E8=B4=A8=E9=A2=84?=
 =?UTF-8?q?=E8=AD=A6=E9=87=8D=E7=BD=AE=E6=95=B0=E6=8D=AE=E4=B8=8D=E6=B8=85?=
 =?UTF-8?q?=E7=A9=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/DialogCreateOrder.vue | 3 ++-
 src/views/inout/DialogSelectRl.vue    | 1 +
 src/views/remind/invRemindMsg.vue     | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index ce65f167..4398824f 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -1097,7 +1097,8 @@ export default {
             if(tQuery.selectSupId!=null){
               this.codeFormData.selectSupId=tQuery.selectSupId
             }
-
+            //DI绑定多个产品,请指定对应产品 时候传递关键字做过滤
+            this.codeFormData.key ="key";
             this.selectRlVisible = true;
           } else if (response.code == 503) {
             //该产品绑定多个供应商处理
diff --git a/src/views/inout/DialogSelectRl.vue b/src/views/inout/DialogSelectRl.vue
index e4dcf3ce..2236d2bb 100644
--- a/src/views/inout/DialogSelectRl.vue
+++ b/src/views/inout/DialogSelectRl.vue
@@ -587,6 +587,7 @@ export default {
       this.filterQuery.nameCode = this.curRow.nameCode;
       this.filterQuery.bindRlIds = this.curRow.bindRlIds;
       this.filterQuery.unitFk = this.fromCorp;
+      this.filterQuery.key = this.curRow.key;
       getMutiUdiInfos(this.filterQuery)
         .then((response) => {
           this.loading = false;
diff --git a/src/views/remind/invRemindMsg.vue b/src/views/remind/invRemindMsg.vue
index 5062d49c..1c73b216 100644
--- a/src/views/remind/invRemindMsg.vue
+++ b/src/views/remind/invRemindMsg.vue
@@ -362,6 +362,8 @@ export default {
         listInv:this.invCodeList,
       };
       this.getList();
+      this.spaceList = [];
+      this.ggxhList = [];
     },
     search() {
       this.filterQuery.page = 1;

From 88ff28e3caab88192fcb4a815dceb38c441f4f3b Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Mon, 10 Jul 2023 14:13:58 +0800
Subject: [PATCH 20/38] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9EDI/=E7=89=A9=E8=B5=84=E7=BC=96=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E7=94=B3=E8=B4=AD=E6=96=B0=E5=A2=9E=E5=A4=87=E6=B3=A8?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                                       |  6 +++---
 src/views/inout/IoAuditedOrder.vue                    |  5 +++++
 src/views/inout/IoCheckAuditBusOrder.vue              |  5 +++++
 src/views/inout/IoCheckAuditOrder.vue                 | 10 ++++++++++
 src/views/inout/IoCheckErrorOrder.vue                 | 10 ++++++++++
 src/views/inout/IoCheckSuccessOrder.vue               |  5 +++++
 src/views/inout/IoDealOrder.vue                       |  5 +++++
 src/views/inout/IoEditOrder.vue                       | 10 ++++++++++
 src/views/inout/IoUploadOrder.vue                     |  5 +++++
 src/views/inout/IoWaitAllocateOrder.vue               |  5 +++++
 src/views/inout/PanelCreateOrderBizDetail.vue         |  5 +++++
 src/views/inout/PanelCreateOrderCodeDetail.vue        |  5 +++++
 src/views/purchase/purApply/purOrderSelectProduct.vue | 10 ++++++++++
 13 files changed, 83 insertions(+), 3 deletions(-)

diff --git a/.env.production b/.env.production
index b35329eb..b6b3ef2b 100644
--- a/.env.production
+++ b/.env.production
@@ -22,13 +22,13 @@ VUE_APP_BASE_API = 'http://192.168.0.231:9150/UDI_WMS_MC/'
 # 文明东1
 # VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_WMS_MC/'
 # 文明东2
-VUE_APP_BASE_API = 'http://192.168.0.61:9150/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://192.168.0.61:9150/UDI_WMS_MC/'
 
 刘恩典
 # VUE_APP_BASE_API = 'http://192.168.0.54:9150/UDI_WMS_MC/'
 
 # 平潭正式
-# VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
+VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
 
 # 吴总测试服务器
 # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/'
@@ -37,7 +37,7 @@ VUE_APP_BASE_API = 'http://192.168.0.61:9150/UDI_WMS_MC/'
 # VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/'
 
 # 片仔癀诊断
-# VUE_APP_BASE_API = 'http://192.168.0.100:9160/UDI_WMS_MC/'
+VUE_APP_BASE_API = 'http://192.168.0.100:9160/UDI_WMS_MC/'
 
 
 # 应用访问路径 例如使用前缀 /admin/
diff --git a/src/views/inout/IoAuditedOrder.vue b/src/views/inout/IoAuditedOrder.vue
index 573dde03..f650fd8b 100644
--- a/src/views/inout/IoAuditedOrder.vue
+++ b/src/views/inout/IoAuditedOrder.vue
@@ -232,6 +232,11 @@
                   row-key="id"
         >
           <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column
+            label="DI/物资编码" width="150"
+            prop="nameCode"
+            show-overflow-tooltip
+          ></el-table-column>
           <el-table-column
             label="物资名称"
             prop="coName" width="160"
diff --git a/src/views/inout/IoCheckAuditBusOrder.vue b/src/views/inout/IoCheckAuditBusOrder.vue
index d3089de0..99612ced 100644
--- a/src/views/inout/IoCheckAuditBusOrder.vue
+++ b/src/views/inout/IoCheckAuditBusOrder.vue
@@ -220,6 +220,11 @@
                   row-key="id"
         >
           <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column
+            label="DI/物资编码" width="150"
+            prop="nameCode"
+            show-overflow-tooltip
+          ></el-table-column>
           <el-table-column
             label="物资名称" width="150"
             prop="coName"
diff --git a/src/views/inout/IoCheckAuditOrder.vue b/src/views/inout/IoCheckAuditOrder.vue
index 6e2bd66c..9b46c629 100644
--- a/src/views/inout/IoCheckAuditOrder.vue
+++ b/src/views/inout/IoCheckAuditOrder.vue
@@ -225,6 +225,11 @@
                   row-key="id"
         >
           <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column
+            label="DI/物资编码" width="150"
+            prop="nameCode"
+            show-overflow-tooltip
+          ></el-table-column>
           <el-table-column
             label="物资名称"
             prop="coName" width="160"
@@ -361,6 +366,11 @@
                   row-key="id"
         >
           <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column
+            label="DI/物资编码" width="150"
+            prop="nameCode"
+            show-overflow-tooltip
+          ></el-table-column>
           <el-table-column
             label="物资名称" width="160"
             prop="coName"
diff --git a/src/views/inout/IoCheckErrorOrder.vue b/src/views/inout/IoCheckErrorOrder.vue
index d3dbbd6c..617ee68e 100644
--- a/src/views/inout/IoCheckErrorOrder.vue
+++ b/src/views/inout/IoCheckErrorOrder.vue
@@ -203,6 +203,11 @@
                   row-key="id"
         >
           <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column
+            label="DI/物资编码" width="150"
+            prop="nameCode"
+            show-overflow-tooltip
+          ></el-table-column>
           <el-table-column
             label="物资名称"
             prop="coName" width="160"
@@ -291,6 +296,11 @@
                   row-key="id"
         >
           <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column
+            label="DI/物资编码" width="150"
+            prop="nameCode"
+            show-overflow-tooltip
+          ></el-table-column>
           <el-table-column
             label="物资名称" width="160"
             prop="coName"
diff --git a/src/views/inout/IoCheckSuccessOrder.vue b/src/views/inout/IoCheckSuccessOrder.vue
index 9d317f6e..353e3452 100644
--- a/src/views/inout/IoCheckSuccessOrder.vue
+++ b/src/views/inout/IoCheckSuccessOrder.vue
@@ -199,6 +199,11 @@
                   row-key="id"
         >
           <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column
+            label="DI/物资编码" width="150"
+            prop="nameCode"
+            show-overflow-tooltip
+          ></el-table-column>
           <el-table-column
             label="物资名称"
             prop="coName" width="160"
diff --git a/src/views/inout/IoDealOrder.vue b/src/views/inout/IoDealOrder.vue
index e9f24dc7..55a2f058 100644
--- a/src/views/inout/IoDealOrder.vue
+++ b/src/views/inout/IoDealOrder.vue
@@ -247,6 +247,11 @@
                   row-key="id"
         >
           <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column
+            label="DI/物资编码" width="150"
+            prop="nameCode"
+            show-overflow-tooltip
+          ></el-table-column>
           <el-table-column
             label="物资名称" width="150"
             prop="coName"
diff --git a/src/views/inout/IoEditOrder.vue b/src/views/inout/IoEditOrder.vue
index a831bb86..97369e4a 100644
--- a/src/views/inout/IoEditOrder.vue
+++ b/src/views/inout/IoEditOrder.vue
@@ -106,6 +106,11 @@
                   row-key="id"
         >
           <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column
+            label="DI/物资编码" width="150"
+            prop="nameCode"
+            show-overflow-tooltip
+          ></el-table-column>
           <el-table-column
             label="物资名称"
             prop="coName" width="160"
@@ -195,6 +200,11 @@
                   row-key="id"
         >
           <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column
+            label="DI/物资编码" width="150"
+            prop="nameCode"
+            show-overflow-tooltip
+          ></el-table-column>
           <el-table-column
             label="物资名称"
             prop="coName"
diff --git a/src/views/inout/IoUploadOrder.vue b/src/views/inout/IoUploadOrder.vue
index 22b57e19..dd23419e 100644
--- a/src/views/inout/IoUploadOrder.vue
+++ b/src/views/inout/IoUploadOrder.vue
@@ -203,6 +203,11 @@
                   row-key="id"
         >
           <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column
+            label="DI/物资编码" width="150"
+            prop="nameCode"
+            show-overflow-tooltip
+          ></el-table-column>
           <el-table-column
             label="物资名称"
             prop="coName" width="160"
diff --git a/src/views/inout/IoWaitAllocateOrder.vue b/src/views/inout/IoWaitAllocateOrder.vue
index 50f7e237..95f47406 100644
--- a/src/views/inout/IoWaitAllocateOrder.vue
+++ b/src/views/inout/IoWaitAllocateOrder.vue
@@ -247,6 +247,11 @@
                   row-key="id"
         >
           <el-table-column label="序号" type="index"></el-table-column>
+          <el-table-column
+            label="DI/物资编码" width="150"
+            prop="nameCode"
+            show-overflow-tooltip
+          ></el-table-column>
           <el-table-column
             label="物资名称" width="150"
             prop="coName"
diff --git a/src/views/inout/PanelCreateOrderBizDetail.vue b/src/views/inout/PanelCreateOrderBizDetail.vue
index a0616924..207308c8 100644
--- a/src/views/inout/PanelCreateOrderBizDetail.vue
+++ b/src/views/inout/PanelCreateOrderBizDetail.vue
@@ -22,6 +22,11 @@
               :row-style="rowStyle"
               max-height="350" height="350" ref="multipleTable">
       <el-table-column label="序号" type="index" width="50"></el-table-column>
+      <el-table-column
+        label="DI/物资编码" width="150"
+        prop="nameCode"
+        show-overflow-tooltip
+      ></el-table-column>
       <el-table-column width="150"
                        label="物资名称"
                        prop="coName"
diff --git a/src/views/inout/PanelCreateOrderCodeDetail.vue b/src/views/inout/PanelCreateOrderCodeDetail.vue
index 3da63672..aa95b50f 100644
--- a/src/views/inout/PanelCreateOrderCodeDetail.vue
+++ b/src/views/inout/PanelCreateOrderCodeDetail.vue
@@ -5,6 +5,11 @@
               :row-style="rowStyle"
               ref="multipleTable">
       <el-table-column type="index" label="序号" width="50"></el-table-column>
+      <el-table-column
+        label="DI/物资编码" width="150"
+        prop="nameCode"
+        show-overflow-tooltip
+      ></el-table-column>
       <el-table-column label="物资名称" width="150" prop="coName" show-overflow-tooltip></el-table-column>
       <el-table-column label="规格型号" width="150" prop="spec" show-overflow-tooltip></el-table-column>
       <el-table-column label="批次号" width="150" prop="batchNo" show-overflow-tooltip></el-table-column>
diff --git a/src/views/purchase/purApply/purOrderSelectProduct.vue b/src/views/purchase/purApply/purOrderSelectProduct.vue
index 3cdb0a9b..3247e9bf 100644
--- a/src/views/purchase/purApply/purOrderSelectProduct.vue
+++ b/src/views/purchase/purApply/purOrderSelectProduct.vue
@@ -115,6 +115,16 @@
         <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
         <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
         <el-table-column label="供应商" prop="companyName" show-overflow-tooltip></el-table-column>
+
+        <el-table-column
+          v-if="productRemarkSet.remarkEnable1"
+          :label="productRemarkSet.remarkTitle1" prop="basicPrductRemak1"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column
+          v-if="productRemarkSet.remarkEnable2"
+          :label="productRemarkSet.remarkTitle2" prop="basicPrductRemak2"
+                         show-overflow-tooltip></el-table-column>
+
         <el-table-column label="操作" width="160">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.native.stop="handleDetailClick(scope.row)">详情</el-button>

From efb6b0055d0b02ddc581698ac5a71e5aaa2fe879 Mon Sep 17 00:00:00 2001
From: schry <2433098676@qq.com>
Date: Mon, 10 Jul 2023 15:26:27 +0800
Subject: [PATCH 21/38] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=8D=95=E9=A9=B3?=
 =?UTF-8?q?=E5=9B=9E=E5=90=8E=E6=8F=90=E7=A4=BA=E6=A1=86=E6=9C=89=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue           | 2 +-
 src/views/inventory/InvCountOrderAudit.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 441d93cc..a8b8de03 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -202,7 +202,7 @@ export default {
     let validatePass2 = (rule, value, callback) => {
       if (value === "") {
         callback(new Error("请再次输入密码"));
-      } else if (value !== this.inputQuery.password) {
+      } else if (value !== this.inputQuery.passWord) {
         callback(new Error("两次输入密码不一致!"));
       } else {
         callback();
diff --git a/src/views/inventory/InvCountOrderAudit.vue b/src/views/inventory/InvCountOrderAudit.vue
index 57e4d8fa..3aa436a7 100644
--- a/src/views/inventory/InvCountOrderAudit.vue
+++ b/src/views/inventory/InvCountOrderAudit.vue
@@ -328,7 +328,7 @@ export default {
           updateCountOrderStatus(params).then((res) => {
             if (res.code === 20000) {
               this.$message.success("审核通过");
-              this.$message.success("已驳回");
+              this.$message.warning("已驳回");
               this.getList();
               this.onRestDetail();
             } else {

From d718bfc60d8115b7860470b05c4d290d7eee7f3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Mon, 10 Jul 2023 16:53:11 +0800
Subject: [PATCH 22/38] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E9=80=89=E5=85=A5=E5=A4=9A=E4=B8=AA=E4=BA=A7=E5=93=81=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/DialogCreateOrder.vue | 2 ++
 src/views/inout/DialogSelectRl.vue    | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index 4398824f..cb6cd368 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -1096,6 +1096,8 @@ export default {
             //判断是出库需要选择供应商的时候把供应商值传过去
             if(tQuery.selectSupId!=null){
               this.codeFormData.selectSupId=tQuery.selectSupId
+            }else{
+              this.codeFormData.selectSupId=false
             }
             //DI绑定多个产品,请指定对应产品 时候传递关键字做过滤
             this.codeFormData.key ="key";
diff --git a/src/views/inout/DialogSelectRl.vue b/src/views/inout/DialogSelectRl.vue
index 2236d2bb..5200ac05 100644
--- a/src/views/inout/DialogSelectRl.vue
+++ b/src/views/inout/DialogSelectRl.vue
@@ -862,7 +862,11 @@ export default {
   ,
   created() {
     if(this.curRow.selectSupId!=null){
-      this.fromCorp=this.curRow.selectSupId
+      if(this.curRow.selectSupId!=false){
+        this.fromCorp=this.curRow.selectSupId
+      }else{
+        this.fromCorp=''
+      }
     }
     this.getList();
   }

From 16cb7c7daeb3882efd056056b9d2048d7f187809 Mon Sep 17 00:00:00 2001
From: schry <2433098676@qq.com>
Date: Tue, 11 Jul 2023 15:54:34 +0800
Subject: [PATCH 23/38] =?UTF-8?q?=E9=83=A8=E9=97=A8=EF=BC=8C=E4=BB=93?=
 =?UTF-8?q?=E5=BA=93=E6=8E=92=E7=89=88=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index a8b8de03..840df881 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -10,10 +10,10 @@
 
         <div class="inv-hos-title">
             <span
-              style="margin-left:8px;color: #2d8cf0;font-size: 14px;">部门:{{ deptName }}</span>
+              style="margin: 10px;color: #2d8cf0;font-size: 14px;">部门&nbsp:&nbsp{{ deptName }}</span>
           <span
-            style="margin-right: 18px;margin-left:8px;color: #2d8cf0;font-size: 14px;">仓库:{{ inv }}</span>
-          <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户:{{ this.companyName }}</span>
+            style="margin-right: 18px;margin-left:8px;color: #2d8cf0;font-size: 14px;">仓库&nbsp:&nbsp{{ inv }}</span>
+          <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp吴XX{{ this.companyName }}</span>
           <span
             style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px">({{
               this.userName

From 213d38cbb55886265b04ea761bf56ca42fb7d619 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Tue, 11 Jul 2023 16:35:27 +0800
Subject: [PATCH 24/38] =?UTF-8?q?=E5=AE=9A=E6=95=B0=E5=8C=85bug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/destiny/destiny.vue                   | 10 +++++-----
 src/views/basic/destiny/destinyModelEdit.vue          |  6 ++++++
 src/views/basic/destiny/destinyModelSelectProduct.vue |  9 ++++-----
 src/views/basic/destiny/destinySelectProduct.vue      |  1 +
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/views/basic/destiny/destiny.vue b/src/views/basic/destiny/destiny.vue
index efa933bd..58f290b6 100644
--- a/src/views/basic/destiny/destiny.vue
+++ b/src/views/basic/destiny/destiny.vue
@@ -3,12 +3,12 @@
     <el-card>
       <el-form :model="filterQuery" label-width="100px" size="mini">
         <el-row>
-          <el-col :span="4">
+          <el-col :span="6">
             <el-form-item label="模板名称:" class="query-form-item">
               <el-input v-model="filterQuery.name" placeholder="请输入模板名称"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+          <el-col :span="6">
             <el-form-item label="模板编码:" class="query-form-item">
               <el-input v-model="filterQuery.code" placeholder="请输入模板编码"></el-input>
             </el-form-item>
@@ -28,8 +28,8 @@
       <el-table v-loading="loading" :data="list" @current-change="handleDetail" border highlight-current-row
                 style="width: 100%">
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="模板编码" prop="name" width="260"></el-table-column>
-        <el-table-column label="模板名称" prop="code" width="260"></el-table-column>
+        <el-table-column label="模板编码" prop="code" width="260"></el-table-column>
+        <el-table-column label="模板名称" prop="name" width="260"></el-table-column>
         <el-table-column label="备注" prop="remark" width="260"></el-table-column>
         <el-table-column label="创建人" prop="createByName" width="260"></el-table-column>
         <el-table-column label="创建时间" prop="createTime" width="260"></el-table-column>
@@ -61,7 +61,7 @@
         <el-table-column label="计量单位" prop="measname"></el-table-column>
         <el-table-column label="数量" prop="count"></el-table-column>
         <el-table-column label="生产企业" prop="ylqxzcrbarmc"></el-table-column>
-        <el-table-column label="注册/备案号" prop="certCode"></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
       </el-table>
       <pagination
           v-show="delectTotal>0"
diff --git a/src/views/basic/destiny/destinyModelEdit.vue b/src/views/basic/destiny/destinyModelEdit.vue
index 4fcbdfda..f243e7d2 100644
--- a/src/views/basic/destiny/destinyModelEdit.vue
+++ b/src/views/basic/destiny/destinyModelEdit.vue
@@ -73,6 +73,12 @@ export default {
   },
   methods: {
     onModifySubmit() {
+      if(isBlank(this.editLogin.name)){
+        return this.$message.error("模板名称不能为空");
+      }
+      if(isBlank(this.editLogin.code)){
+        return this.$message.error("模板编号不能为空");
+      }
       if (this.editLogin.id != null) {
         editModeldestiny(this.editLogin).then(res => {
           if (res.code == 20000) {
diff --git a/src/views/basic/destiny/destinyModelSelectProduct.vue b/src/views/basic/destiny/destinyModelSelectProduct.vue
index 1ff5a657..8d4df949 100644
--- a/src/views/basic/destiny/destinyModelSelectProduct.vue
+++ b/src/views/basic/destiny/destinyModelSelectProduct.vue
@@ -27,9 +27,9 @@
 
         <el-table v-loading="loading" :data="list" border highlight-current-row style="width: 100%">
           <el-table-column label="序号" type="index"></el-table-column>
-          <el-table-column label="产品DI" prop="nameCode" width="260"></el-table-column>
-          <el-table-column label="产品编码" prop="thirdId" width="260"></el-table-column>
-          <el-table-column label="产品名称" prop="cpmctymc" width="260"></el-table-column>
+          <el-table-column label="产品DI" prop="nameCode" ></el-table-column>
+          <el-table-column label="产品编码" prop="thirdId" ></el-table-column>
+          <el-table-column label="产品名称" prop="cpmctymc" ></el-table-column>
           <el-table-column label="规格型号" prop="ggxh"></el-table-column>
           <el-table-column label="计量单位" prop="measname"></el-table-column>
           <el-table-column label="数量" prop="count">
@@ -73,7 +73,7 @@
         :close-on-click-modal="false"
         :close-on-press-escape="false"
         width="80%"
-        :before-close="closeDialog"
+        :before-close="closeProudDialog"
         v-if="selectFormVisible"
     >
       <destinySelectProduct
@@ -140,7 +140,6 @@ export default {
           .then((response) => {
             this.loading = false;
             if (response.code === 20000) {
-              console.log(response)
               this.list = response.data.list || [];
               this.total = response.data.total || 0;
             } else {
diff --git a/src/views/basic/destiny/destinySelectProduct.vue b/src/views/basic/destiny/destinySelectProduct.vue
index e4ed795c..ee6cd67e 100644
--- a/src/views/basic/destiny/destinySelectProduct.vue
+++ b/src/views/basic/destiny/destinySelectProduct.vue
@@ -317,6 +317,7 @@ export default {
   components: {udiRlDetailDialog},
 
   created() {
+    this.getList();
   },
 };
 </script>

From 210793bcb70447f0d88bcbb607f4cb20d67b7b67 Mon Sep 17 00:00:00 2001
From: 1178634255 <1178634255@qq.com>
Date: Tue, 11 Jul 2023 18:06:08 +0800
Subject: [PATCH 25/38] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=A4=87=E6=B3=A8=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue               | 2 --
 src/views/inout/DialogCreateOrderSelect.vue    | 2 ++
 src/views/inout/IoAuditedOrder.vue             | 2 ++
 src/views/inout/IoCheckAuditBusOrder.vue       | 2 ++
 src/views/inout/IoCheckAuditNewOrder.vue       | 2 ++
 src/views/inout/IoCheckAuditOrder.vue          | 2 ++
 src/views/inout/IoCheckErrorOrder.vue          | 2 ++
 src/views/inout/IoCheckSuccessOrder.vue        | 2 ++
 src/views/inout/IoCreateBusOrder.vue           | 2 ++
 src/views/inout/IoCreateErrorOrder.vue         | 2 ++
 src/views/inout/IoCreateOrder.vue              | 2 ++
 src/views/inout/IoCreateScanOrder.vue          | 2 ++
 src/views/inout/IoDealOrder.vue                | 2 ++
 src/views/inout/IoEditOrder.vue                | 2 ++
 src/views/inout/IoWaitAllocateOrder.vue        | 3 +++
 src/views/purchase/purApply/pureApplyAudit.vue | 2 ++
 16 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 840df881..5965d858 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -428,8 +428,6 @@ export default {
     };
     this.inputQuery = {
       userName: this.$store.getters.name,
-
-      // locInvCode: store.getters.locInvCode,
     };
     this.getInputQuery();
     this.getDeptList();
diff --git a/src/views/inout/DialogCreateOrderSelect.vue b/src/views/inout/DialogCreateOrderSelect.vue
index 08f95120..e9771cd2 100644
--- a/src/views/inout/DialogCreateOrderSelect.vue
+++ b/src/views/inout/DialogCreateOrderSelect.vue
@@ -141,6 +141,8 @@
             <span>{{ scope.row.createTime }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <!--        <el-table-column label="校验状态" prop="status" width="100">-->
         <!--          <template slot-scope="scope">-->
         <!--            <el-tag :type="(scope.row.status ===-1 ) | statusFilterType">{{-->
diff --git a/src/views/inout/IoAuditedOrder.vue b/src/views/inout/IoAuditedOrder.vue
index 621f5f75..b41a586b 100644
--- a/src/views/inout/IoAuditedOrder.vue
+++ b/src/views/inout/IoAuditedOrder.vue
@@ -153,6 +153,8 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="操作" width="200" fixed="right">
           <template slot-scope="scope">
             <el-button
diff --git a/src/views/inout/IoCheckAuditBusOrder.vue b/src/views/inout/IoCheckAuditBusOrder.vue
index d3089de0..726ff50d 100644
--- a/src/views/inout/IoCheckAuditBusOrder.vue
+++ b/src/views/inout/IoCheckAuditBusOrder.vue
@@ -122,6 +122,8 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="操作" width="150" fixed="right">
           <template slot-scope="scope">
             <el-button
diff --git a/src/views/inout/IoCheckAuditNewOrder.vue b/src/views/inout/IoCheckAuditNewOrder.vue
index e6a59c10..9feb2291 100644
--- a/src/views/inout/IoCheckAuditNewOrder.vue
+++ b/src/views/inout/IoCheckAuditNewOrder.vue
@@ -120,6 +120,8 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="操作" width="150" fixed="right">
           <template slot-scope="scope">
             <el-button
diff --git a/src/views/inout/IoCheckAuditOrder.vue b/src/views/inout/IoCheckAuditOrder.vue
index 6e2bd66c..3d668f26 100644
--- a/src/views/inout/IoCheckAuditOrder.vue
+++ b/src/views/inout/IoCheckAuditOrder.vue
@@ -138,6 +138,8 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="操作" width="220" fixed="right">
           <template slot-scope="scope">
 
diff --git a/src/views/inout/IoCheckErrorOrder.vue b/src/views/inout/IoCheckErrorOrder.vue
index d3dbbd6c..bc5148e8 100644
--- a/src/views/inout/IoCheckErrorOrder.vue
+++ b/src/views/inout/IoCheckErrorOrder.vue
@@ -141,6 +141,8 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="操作" width="150">
           <template slot-scope="scope">
             <el-button
diff --git a/src/views/inout/IoCheckSuccessOrder.vue b/src/views/inout/IoCheckSuccessOrder.vue
index 9d317f6e..b795cb55 100644
--- a/src/views/inout/IoCheckSuccessOrder.vue
+++ b/src/views/inout/IoCheckSuccessOrder.vue
@@ -120,6 +120,8 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="操作" width="200" fixed="right">
           <template slot-scope="scope">
             <el-button
diff --git a/src/views/inout/IoCreateBusOrder.vue b/src/views/inout/IoCreateBusOrder.vue
index 155705c5..0ca7306c 100644
--- a/src/views/inout/IoCreateBusOrder.vue
+++ b/src/views/inout/IoCreateBusOrder.vue
@@ -150,6 +150,8 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="操作" width="150" fixed="right">
           <template slot-scope="scope">
             <el-button
diff --git a/src/views/inout/IoCreateErrorOrder.vue b/src/views/inout/IoCreateErrorOrder.vue
index da88a6ba..2f06082f 100644
--- a/src/views/inout/IoCreateErrorOrder.vue
+++ b/src/views/inout/IoCreateErrorOrder.vue
@@ -135,6 +135,8 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="操作" width="150" fixed="right">
           <template slot-scope="scope">
             <el-button
diff --git a/src/views/inout/IoCreateOrder.vue b/src/views/inout/IoCreateOrder.vue
index 32bccd1c..a3f20751 100644
--- a/src/views/inout/IoCreateOrder.vue
+++ b/src/views/inout/IoCreateOrder.vue
@@ -170,6 +170,8 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="操作" width="150" fixed="right">
           <template slot-scope="scope">
             <el-button
diff --git a/src/views/inout/IoCreateScanOrder.vue b/src/views/inout/IoCreateScanOrder.vue
index daaf65f9..d8eed1f9 100644
--- a/src/views/inout/IoCreateScanOrder.vue
+++ b/src/views/inout/IoCreateScanOrder.vue
@@ -138,6 +138,8 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="操作" width="150" fixed="right">
 
           <template slot-scope="scope">
diff --git a/src/views/inout/IoDealOrder.vue b/src/views/inout/IoDealOrder.vue
index e9f24dc7..628af59e 100644
--- a/src/views/inout/IoDealOrder.vue
+++ b/src/views/inout/IoDealOrder.vue
@@ -149,6 +149,8 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="操作" width="150" fixed="right">
           <template slot-scope="scope">
             <el-button
diff --git a/src/views/inout/IoEditOrder.vue b/src/views/inout/IoEditOrder.vue
index 3cae6b20..0e178cde 100644
--- a/src/views/inout/IoEditOrder.vue
+++ b/src/views/inout/IoEditOrder.vue
@@ -45,6 +45,8 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="操作" fixed="right" width="150">
           <template slot-scope="scope">
             <el-button
diff --git a/src/views/inout/IoWaitAllocateOrder.vue b/src/views/inout/IoWaitAllocateOrder.vue
index 50f7e237..bc710f5c 100644
--- a/src/views/inout/IoWaitAllocateOrder.vue
+++ b/src/views/inout/IoWaitAllocateOrder.vue
@@ -149,6 +149,8 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="操作" width="150" fixed="right">
           <template slot-scope="scope">
             <el-button
@@ -283,6 +285,7 @@
             prop="certCode"
             show-overflow-tooltip
           ></el-table-column>
+
         </el-table>
       </el-tab-pane>
     </el-tabs>
diff --git a/src/views/purchase/purApply/pureApplyAudit.vue b/src/views/purchase/purApply/pureApplyAudit.vue
index ef9470e7..7854627a 100644
--- a/src/views/purchase/purApply/pureApplyAudit.vue
+++ b/src/views/purchase/purApply/pureApplyAudit.vue
@@ -103,6 +103,8 @@
         </el-table-column>
         <el-table-column label="创建时间" prop="createTime"
                          sortable="custom" :sort-orders="['ascending', 'descending']"></el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="操作" width="60px">
           <template slot-scope="scope">
             <el-button type="text" :disabled="scope.row.status!=2"

From 5b3f08940226c8f6d2137b67d03f0c259f34e490 Mon Sep 17 00:00:00 2001
From: schry <2433098676@qq.com>
Date: Tue, 11 Jul 2023 19:10:32 +0800
Subject: [PATCH 26/38] =?UTF-8?q?=E5=AF=86=E7=A0=81=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue | 51 ++++++++++++++++++++------------
 1 file changed, 32 insertions(+), 19 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 840df881..db5d0dfb 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -114,7 +114,7 @@
       width="35%"
       v-if="isVisible"
     >
-      <el-form :model="inputQuery" label-width="100px" :rules="rules" ref="inputQuery">
+      <el-form :model="inputQuery" label-width="100px" :rules="formRules" ref="dataForm">
         <el-row :gutter="20">
           <el-col :span="20">
             <el-form-item prop="userName" label="用户账号:">
@@ -130,7 +130,7 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="20">
-            <el-form-item prop="locInvCode" label="当前密码:">
+            <el-form-item prop="passWord" label="当前密码:">
               <el-input
                 size="small"
                 placeholder="请输入当前密码"
@@ -143,7 +143,7 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="20">
-            <el-form-item prop="locInvCode" label="新密码:">
+            <el-form-item prop="newPassword" label="新密码:">
               <el-input
                 size="small"
                 placeholder="请输入新密码"
@@ -157,7 +157,7 @@
 
         <el-row :gutter="20">
           <el-col :span="20">
-            <el-form-item prop="locInvCode" label="确认密码:">
+            <el-form-item prop="confirmPassword" label="确认密码:">
               <el-input
                 size="small"
                 placeholder="请输入确认密码"
@@ -171,8 +171,8 @@
 
 
         <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
-          <el-button type="primary" @click="onSubmit('inputQuery')">修改密码</el-button>
-          <el-button type="primary" @click="closeDialog">取消</el-button>
+          <el-button type="primary" @click="onSubmit">修改密码</el-button>
+          <el-button @click="closeDialog">取消</el-button>
         </div>
       </el-form>
     </el-dialog>
@@ -199,15 +199,15 @@ import router from "@/router";
 
 export default {
   data() {
-    let validatePass2 = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("请再次输入密码"));
-      } else if (value !== this.inputQuery.passWord) {
-        callback(new Error("两次输入密码不一致!"));
-      } else {
-        callback();
-      }
-    };
+    // let validatePass2 = (rule, value, callback) => {
+    //   if (value === "") {
+    //     callback(new Error("请再次输入密码"));
+    //   } else if (value !== this.inputQuery.passWord) {
+    //     callback(new Error("两次输入密码不一致!"));
+    //   } else {
+    //     callback();
+    //   }
+    // };
     return {
       inv: store.getters.locInvName,
       deptName: store.getters.locDeptName,
@@ -231,13 +231,18 @@ export default {
         locInvCode: [
           {required: true, message: "请选择当前仓库", trigger: "blur"}
         ],
-
+        password: [{required: true, message: "请输入密码", trigger: "blur"}],
+        newPassword: [{required: true, message: "请输入密码", trigger: "blur"}],
+        confirmPassword: [
+          {required: true, message: "请确认密码", trigger: "blur"},
+          // {validator: validatePass2, trigger: "blur"},
+        ],
       },
       rules: {
         password: [{required: true, message: "请输入密码", trigger: "blur"}],
         confirmPassword: [
           {required: true, message: "请确认密码", trigger: "blur"},
-          {validator: validatePass2, trigger: "blur"},
+          // {validator: validatePass2, trigger: "blur"},
         ],
 
       },
@@ -277,8 +282,16 @@ export default {
     }
   },
   methods: {
-    onSubmit(formName) {
-      this.$refs[formName].validate((valid) => {
+    onSubmit() {
+      if (this.inputQuery.newPassword != this.inputQuery.confirmPassword) {
+        this.$message.error("新密码与确认密码不一致！！！！");
+        return
+      }
+      if (this.inputQuery.passWord == this.inputQuery.newPassword) {
+        this.$message.error("旧密码与新密码不能相同！！！！");
+        return
+      }
+      this.$refs["dataForm"].validate((valid) => {
         if (valid) {
           this.loading = true;
           modifyPasswd(this.inputQuery).then((response) => {

From c2beaf4df206a50b832be343fa509fd710f70d7a Mon Sep 17 00:00:00 2001
From: schry <2433098676@qq.com>
Date: Wed, 12 Jul 2023 10:38:44 +0800
Subject: [PATCH 27/38] =?UTF-8?q?=E8=BF=9B=E5=85=A5=E2=80=9C=E5=BE=80?=
 =?UTF-8?q?=E6=9D=A5=E5=8D=95=E4=BD=8D=E4=BF=A1=E6=81=AF=E7=BB=B4=E6=8A=A4?=
 =?UTF-8?q?=E2=80=9D=EF=BC=8C=E9=BB=98=E8=AE=A4=E6=98=BE=E7=A4=BA=20?=
 =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E4=BF=A1=E6=81=AF=20=EF=BC=8C?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E2=80=9C=E5=85=A8=E9=83=A8=E2=80=9D=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=B9=9F=E6=98=AF=E6=98=BE=E7=A4=BA=E4=BE=9B=E5=BA=94?=
 =?UTF-8?q?=E5=95=86=E7=B1=BB=E5=9E=8B=E7=9A=84=E5=BE=80=E6=9D=A5=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/corpMaintain/corpMaintain.vue | 2 ++
 src/views/inventory/inner/innerCodeDetail.vue | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/basic/corpMaintain/corpMaintain.vue b/src/views/basic/corpMaintain/corpMaintain.vue
index f1418213..c171f6e2 100644
--- a/src/views/basic/corpMaintain/corpMaintain.vue
+++ b/src/views/basic/corpMaintain/corpMaintain.vue
@@ -213,6 +213,7 @@ export default {
     return {
       query: {
         key: "",
+        corpType: "2",
         page: 1,
         limit: 20,
       },
@@ -303,6 +304,7 @@ export default {
       });
       this.query = {
         key: "",
+        corpType: "2",
         page: 1,
         limit: 20,
       };
diff --git a/src/views/inventory/inner/innerCodeDetail.vue b/src/views/inventory/inner/innerCodeDetail.vue
index 3b248202..8de253d6 100644
--- a/src/views/inventory/inner/innerCodeDetail.vue
+++ b/src/views/inventory/inner/innerCodeDetail.vue
@@ -42,7 +42,7 @@
         <el-table-column label="序号" type="index" width="50"></el-table-column>
         <el-table-column label="码" prop="udiCode"></el-table-column>
 
-        <el-table-column label="状态" width="120">
+        <el-table-column label="状态" width="120" prop="status">
           <template slot-scope="scope">
             <span>{{ statusMap[scope.row.status] }}</span>
           </template>

From 34b60e8c58a96269bf566310c89b4c272d4e1fa7 Mon Sep 17 00:00:00 2001
From: 1178634255 <1178634255@qq.com>
Date: Wed, 12 Jul 2023 10:50:09 +0800
Subject: [PATCH 28/38] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=8F=91=E7=A5=A8?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=85=B3=E9=97=AD=E5=90=8E=E5=8F=98=E6=88=90?=
 =?UTF-8?q?=E6=9A=82=E6=97=A0=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/InvoiceRegistration.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue
index 6dfd59ba..d37f8ea1 100644
--- a/src/views/inout/InvoiceRegistration.vue
+++ b/src/views/inout/InvoiceRegistration.vue
@@ -837,7 +837,7 @@ export default {
     },
     freshen() {
       this.Upinvoice = false;
-      this.getBizDetailListInv();
+      // this.getBizDetailListInv();
     },
     printOrder(row) {
       this.currentManufacturer = row;

From 95fde11ea2ad72136f7daa6c88a93be2ef5c0691 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Wed, 12 Jul 2023 18:06:44 +0800
Subject: [PATCH 29/38] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/destiny/addDestinyProcess.vue         | 7 ++++++-
 src/views/basic/destiny/destinyModelSelectProduct.vue | 2 +-
 src/views/basic/destiny/destinyProcess.vue            | 4 ++--
 src/views/basic/destiny/destinyProcessDelect.vue      | 2 +-
 src/views/inout/DialogNewReviewOrder.vue              | 2 +-
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/views/basic/destiny/addDestinyProcess.vue b/src/views/basic/destiny/addDestinyProcess.vue
index f30db7a3..b7e92264 100644
--- a/src/views/basic/destiny/addDestinyProcess.vue
+++ b/src/views/basic/destiny/addDestinyProcess.vue
@@ -107,7 +107,7 @@
         width="60%"
         append-to-body
         v-if="orderMutiVisible"
-        @close='closeDialog'
+        @close='closedeStinyDialog'
         :close-on-click-modal="false"
         :close-on-press-escape="false"
     >
@@ -250,6 +250,11 @@ export default {
       this.filterQuery.page = val.page;
       this.getList();
     },
+    closedeStinyDialog(){
+      this.orderMutiVisible = false;
+      this.destinyProcessDelectShow = false;
+      this.destinyProcessCodeShow = false;
+    },
     closeDialog(row) {
       this.destinyId = row;
       var query = {
diff --git a/src/views/basic/destiny/destinyModelSelectProduct.vue b/src/views/basic/destiny/destinyModelSelectProduct.vue
index 8d4df949..b5def680 100644
--- a/src/views/basic/destiny/destinyModelSelectProduct.vue
+++ b/src/views/basic/destiny/destinyModelSelectProduct.vue
@@ -42,7 +42,7 @@
             </template>
           </el-table-column>
           <el-table-column label="生产企业" prop="ylqxzcrbarmc"></el-table-column>
-          <el-table-column label="注册/备案号" prop="certCode"></el-table-column>
+          <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
           <el-table-column label="操作" width="220">
             <template slot-scope="scope">
               <el-button type="text" size="small" :disabled="scope.row.index === selectedIndex"
diff --git a/src/views/basic/destiny/destinyProcess.vue b/src/views/basic/destiny/destinyProcess.vue
index 97e4ffed..0cf05c49 100644
--- a/src/views/basic/destiny/destinyProcess.vue
+++ b/src/views/basic/destiny/destinyProcess.vue
@@ -131,8 +131,8 @@ export default {
       codeArray: [],
       editQuery: {},
       formMap: {
-        "add": "新增定数包模板",
-        "edit": "编辑定数包模板"
+        "add": "新增定数包",
+        "edit": "编辑定数包"
       },
       statusMap: {
         0: "草稿",
diff --git a/src/views/basic/destiny/destinyProcessDelect.vue b/src/views/basic/destiny/destinyProcessDelect.vue
index 9c9dc9dc..77a0a111 100644
--- a/src/views/basic/destiny/destinyProcessDelect.vue
+++ b/src/views/basic/destiny/destinyProcessDelect.vue
@@ -10,7 +10,7 @@
       <el-table-column label="单据数量" prop="count"></el-table-column>
       <el-table-column label="扫码数量" prop="reCount"></el-table-column>
       <el-table-column label="生产企业" prop="ylqxzcrbarmc"></el-table-column>
-      <el-table-column label="注册/备案号" prop="certCode"></el-table-column>
+      <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
     </el-table>
 
   </div>
diff --git a/src/views/inout/DialogNewReviewOrder.vue b/src/views/inout/DialogNewReviewOrder.vue
index 4d488c87..eb6984c0 100644
--- a/src/views/inout/DialogNewReviewOrder.vue
+++ b/src/views/inout/DialogNewReviewOrder.vue
@@ -344,7 +344,7 @@ export default {
 
     checkFinish() {
       let query = {
-        orderId: this.orderQuery.billNo,
+        billNo: this.formData.billNo,
       };
       getAcceptStatus(query)
         .then((response) => {

From e0d1fd6925b98c05bfa680394f499c79e9e39b66 Mon Sep 17 00:00:00 2001
From: schry <2433098676@qq.com>
Date: Thu, 13 Jul 2023 09:51:34 +0800
Subject: [PATCH 30/38] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=A4=87=E6=B3=A8?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/InvoiceRegistration.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue
index d37f8ea1..dceff7c9 100644
--- a/src/views/inout/InvoiceRegistration.vue
+++ b/src/views/inout/InvoiceRegistration.vue
@@ -209,6 +209,7 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" show-overflow-tooltip width="180"></el-table-column>
         <el-table-column label="操作" width="180" fixed="right">
           <template slot-scope="scope">
             <el-button type="text" :disabled="scope.row.checkStatus==1" size="small"

From 5b8a987bb674043f0d544518bc91dfe155c94506 Mon Sep 17 00:00:00 2001
From: schry <2433098676@qq.com>
Date: Thu, 13 Jul 2023 09:51:34 +0800
Subject: [PATCH 31/38] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=A4=87=E6=B3=A8?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit e0d1fd6925b98c05bfa680394f499c79e9e39b66)
---
 src/views/inout/InvoiceRegistration.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/inout/InvoiceRegistration.vue b/src/views/inout/InvoiceRegistration.vue
index d7066054..a732880f 100644
--- a/src/views/inout/InvoiceRegistration.vue
+++ b/src/views/inout/InvoiceRegistration.vue
@@ -209,6 +209,7 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" show-overflow-tooltip width="180"></el-table-column>
         <el-table-column label="操作" width="180" fixed="right">
           <template slot-scope="scope">
             <el-button type="text" :disabled="scope.row.checkStatus==1" size="small"

From 2c03209a2c66b749612591c61e7aadb159f53b20 Mon Sep 17 00:00:00 2001
From: 1178634255 <1178634255@qq.com>
Date: Tue, 11 Jul 2023 18:06:08 +0800
Subject: [PATCH 32/38] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=A4=87=E6=B3=A8=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 210793bcb70447f0d88bcbb607f4cb20d67b7b67)

# Conflicts:
#	src/layout/components/Navbar.vue
---
 src/views/inout/DialogCreateOrderSelect.vue    | 2 ++
 src/views/inout/IoAuditedOrder.vue             | 2 ++
 src/views/inout/IoCheckAuditBusOrder.vue       | 2 ++
 src/views/inout/IoCheckAuditNewOrder.vue       | 2 ++
 src/views/inout/IoCheckAuditOrder.vue          | 2 ++
 src/views/inout/IoCheckErrorOrder.vue          | 2 ++
 src/views/inout/IoCheckSuccessOrder.vue        | 2 ++
 src/views/inout/IoCreateBusOrder.vue           | 2 ++
 src/views/inout/IoCreateErrorOrder.vue         | 2 ++
 src/views/inout/IoCreateOrder.vue              | 2 ++
 src/views/inout/IoCreateScanOrder.vue          | 2 ++
 src/views/inout/IoDealOrder.vue                | 2 ++
 src/views/inout/IoEditOrder.vue                | 2 ++
 src/views/inout/IoWaitAllocateOrder.vue        | 3 +++
 src/views/purchase/purApply/pureApplyAudit.vue | 2 ++
 15 files changed, 31 insertions(+)

diff --git a/src/views/inout/DialogCreateOrderSelect.vue b/src/views/inout/DialogCreateOrderSelect.vue
index 5536a78d..8bebd22a 100644
--- a/src/views/inout/DialogCreateOrderSelect.vue
+++ b/src/views/inout/DialogCreateOrderSelect.vue
@@ -141,6 +141,8 @@
             <span>{{ scope.row.createTime }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <!--        <el-table-column label="校验状态" prop="status" width="100">-->
         <!--          <template slot-scope="scope">-->
         <!--            <el-tag :type="(scope.row.status ===-1 ) | statusFilterType">{{-->
diff --git a/src/views/inout/IoAuditedOrder.vue b/src/views/inout/IoAuditedOrder.vue
index f650fd8b..9d72559a 100644
--- a/src/views/inout/IoAuditedOrder.vue
+++ b/src/views/inout/IoAuditedOrder.vue
@@ -153,6 +153,8 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="操作" width="200" fixed="right">
           <template slot-scope="scope">
             <el-button
diff --git a/src/views/inout/IoCheckAuditBusOrder.vue b/src/views/inout/IoCheckAuditBusOrder.vue
index 99612ced..1b87e80a 100644
--- a/src/views/inout/IoCheckAuditBusOrder.vue
+++ b/src/views/inout/IoCheckAuditBusOrder.vue
@@ -122,6 +122,8 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="操作" width="150" fixed="right">
           <template slot-scope="scope">
             <el-button
diff --git a/src/views/inout/IoCheckAuditNewOrder.vue b/src/views/inout/IoCheckAuditNewOrder.vue
index e6a59c10..9feb2291 100644
--- a/src/views/inout/IoCheckAuditNewOrder.vue
+++ b/src/views/inout/IoCheckAuditNewOrder.vue
@@ -120,6 +120,8 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="操作" width="150" fixed="right">
           <template slot-scope="scope">
             <el-button
diff --git a/src/views/inout/IoCheckAuditOrder.vue b/src/views/inout/IoCheckAuditOrder.vue
index 9b46c629..dad61891 100644
--- a/src/views/inout/IoCheckAuditOrder.vue
+++ b/src/views/inout/IoCheckAuditOrder.vue
@@ -138,6 +138,8 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="操作" width="220" fixed="right">
           <template slot-scope="scope">
 
diff --git a/src/views/inout/IoCheckErrorOrder.vue b/src/views/inout/IoCheckErrorOrder.vue
index 617ee68e..83337fac 100644
--- a/src/views/inout/IoCheckErrorOrder.vue
+++ b/src/views/inout/IoCheckErrorOrder.vue
@@ -141,6 +141,8 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="操作" width="150">
           <template slot-scope="scope">
             <el-button
diff --git a/src/views/inout/IoCheckSuccessOrder.vue b/src/views/inout/IoCheckSuccessOrder.vue
index 353e3452..9ea60d9c 100644
--- a/src/views/inout/IoCheckSuccessOrder.vue
+++ b/src/views/inout/IoCheckSuccessOrder.vue
@@ -120,6 +120,8 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="操作" width="200" fixed="right">
           <template slot-scope="scope">
             <el-button
diff --git a/src/views/inout/IoCreateBusOrder.vue b/src/views/inout/IoCreateBusOrder.vue
index 155705c5..0ca7306c 100644
--- a/src/views/inout/IoCreateBusOrder.vue
+++ b/src/views/inout/IoCreateBusOrder.vue
@@ -150,6 +150,8 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="操作" width="150" fixed="right">
           <template slot-scope="scope">
             <el-button
diff --git a/src/views/inout/IoCreateErrorOrder.vue b/src/views/inout/IoCreateErrorOrder.vue
index da88a6ba..2f06082f 100644
--- a/src/views/inout/IoCreateErrorOrder.vue
+++ b/src/views/inout/IoCreateErrorOrder.vue
@@ -135,6 +135,8 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="操作" width="150" fixed="right">
           <template slot-scope="scope">
             <el-button
diff --git a/src/views/inout/IoCreateOrder.vue b/src/views/inout/IoCreateOrder.vue
index 32bccd1c..a3f20751 100644
--- a/src/views/inout/IoCreateOrder.vue
+++ b/src/views/inout/IoCreateOrder.vue
@@ -170,6 +170,8 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="操作" width="150" fixed="right">
           <template slot-scope="scope">
             <el-button
diff --git a/src/views/inout/IoCreateScanOrder.vue b/src/views/inout/IoCreateScanOrder.vue
index daaf65f9..d8eed1f9 100644
--- a/src/views/inout/IoCreateScanOrder.vue
+++ b/src/views/inout/IoCreateScanOrder.vue
@@ -138,6 +138,8 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="操作" width="150" fixed="right">
 
           <template slot-scope="scope">
diff --git a/src/views/inout/IoDealOrder.vue b/src/views/inout/IoDealOrder.vue
index 55a2f058..68af47cd 100644
--- a/src/views/inout/IoDealOrder.vue
+++ b/src/views/inout/IoDealOrder.vue
@@ -149,6 +149,8 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="操作" width="150" fixed="right">
           <template slot-scope="scope">
             <el-button
diff --git a/src/views/inout/IoEditOrder.vue b/src/views/inout/IoEditOrder.vue
index 97369e4a..67013cf1 100644
--- a/src/views/inout/IoEditOrder.vue
+++ b/src/views/inout/IoEditOrder.vue
@@ -45,6 +45,8 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="操作" fixed="right" width="150">
           <template slot-scope="scope">
             <el-button
diff --git a/src/views/inout/IoWaitAllocateOrder.vue b/src/views/inout/IoWaitAllocateOrder.vue
index 95f47406..00d83b91 100644
--- a/src/views/inout/IoWaitAllocateOrder.vue
+++ b/src/views/inout/IoWaitAllocateOrder.vue
@@ -149,6 +149,8 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="操作" width="150" fixed="right">
           <template slot-scope="scope">
             <el-button
@@ -288,6 +290,7 @@
             prop="certCode"
             show-overflow-tooltip
           ></el-table-column>
+
         </el-table>
       </el-tab-pane>
     </el-tabs>
diff --git a/src/views/purchase/purApply/pureApplyAudit.vue b/src/views/purchase/purApply/pureApplyAudit.vue
index ef9470e7..7854627a 100644
--- a/src/views/purchase/purApply/pureApplyAudit.vue
+++ b/src/views/purchase/purApply/pureApplyAudit.vue
@@ -103,6 +103,8 @@
         </el-table-column>
         <el-table-column label="创建时间" prop="createTime"
                          sortable="custom" :sort-orders="['ascending', 'descending']"></el-table-column>
+        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>
+        </el-table-column>
         <el-table-column label="操作" width="60px">
           <template slot-scope="scope">
             <el-button type="text" :disabled="scope.row.status!=2"

From 3863a23f35e130905a29325ab53e080df46d7db7 Mon Sep 17 00:00:00 2001
From: 1178634255 <1178634255@qq.com>
Date: Tue, 11 Jul 2023 18:06:08 +0800
Subject: [PATCH 33/38] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=A4=87=E6=B3=A8?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/IoUploadOrder.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/inout/IoUploadOrder.vue b/src/views/inout/IoUploadOrder.vue
index dd23419e..1a515347 100644
--- a/src/views/inout/IoUploadOrder.vue
+++ b/src/views/inout/IoUploadOrder.vue
@@ -153,6 +153,7 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="备注" prop="remark" show-overflow-tooltip width="180"></el-table-column>
         <el-table-column label="操作" width="200" fixed="right">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.native.stop="printOrder(scope.row)">打印</el-button>

From e0a0695a8798894095311949dedea069d77ff8c3 Mon Sep 17 00:00:00 2001
From: schry <2433098676@qq.com>
Date: Thu, 13 Jul 2023 11:01:49 +0800
Subject: [PATCH 34/38] =?UTF-8?q?=E7=8E=B0=E5=9C=A8=E5=85=BB=E6=8A=A4?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=EF=BC=8C=E7=BC=96=E8=BE=91=E5=85=BB=E6=8A=A4?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=90=8E=EF=BC=8C=E7=82=B9=E5=87=BB=E2=80=9C?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E2=80=9D=E6=B2=A1=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inventory/InvMAOrderModify.vue | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/views/inventory/InvMAOrderModify.vue b/src/views/inventory/InvMAOrderModify.vue
index 18d0f38c..64925e06 100644
--- a/src/views/inventory/InvMAOrderModify.vue
+++ b/src/views/inventory/InvMAOrderModify.vue
@@ -137,10 +137,10 @@
               <el-input :disabled="scope.$index !== currentIndex" v-model="scope.row.remark"></el-input>
             </template>
           </el-table-column>
-          <el-table-column label="生产日期(yyMMdd)" prop="productionDate"></el-table-column>
-          <el-table-column label="失效日期(yyMMdd)" prop="expireDate"
+          <el-table-column label="生产日期" prop="productionDate"></el-table-column>
+          <el-table-column label="失效日期" prop="expireDate"
                            show-overflow-tooltip></el-table-column>
-          <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh"
+          <el-table-column width="150" label="注册/备案凭证号" prop="zczbhhzbapzbh"
                            show-overflow-tooltip></el-table-column>
           <el-table-column label="生产企业" prop="ylqxzcrbarmc"
                            show-overflow-tooltip></el-table-column>
@@ -158,7 +158,7 @@
                 type="text"
                 size="small"
                 @click.stop="true"
-                @click.native="updateOrderDetail(scope.row)"
+                @click.native="updateOrderDetail(scope.$index,scope.row)"
               >保存
               </el-button
               >
@@ -473,13 +473,14 @@ export default {
         }
       })
     },
-    updateOrderDetail(row) {
+    updateOrderDetail(index,row) {
       updateInvMAOrderDetail(row).then((res) => {
         if (res.code === 20000) {
           this.$message.success("保存成功！")
           this.getList();
         }
       })
+      this.currentIndex = -1;
     },
     editOrderDetail(index, row) {
       this.currentIndex = index;

From 7d0e897a5cb537150e3f79a5922cb0ab66d936fd Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 13 Jul 2023 11:09:46 +0800
Subject: [PATCH 35/38] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AC=AC=E4=B8=89?=
 =?UTF-8?q?=E6=96=B9=E6=95=B0=E6=8D=AEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/dept/invWarehouse.vue       | 3 ++-
 src/views/thirdSys/api/DialogEditBusDown.vue | 2 +-
 src/views/thirdSys/inv/index.vue             | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/system/dept/invWarehouse.vue b/src/views/system/dept/invWarehouse.vue
index 87c89bdb..42d420bc 100644
--- a/src/views/system/dept/invWarehouse.vue
+++ b/src/views/system/dept/invWarehouse.vue
@@ -578,7 +578,7 @@ export default {
           this.subData = {advanceType: data.advanceType.toString(), spUse: false, parentCode: data.code};
         }
       }
-
+        debugger
       this.subFormVisible = true;
       this.getSubThrsysDetailData();
       if (this.subData.parentCode != null && this.subData.parentCode != "") {
@@ -592,6 +592,7 @@ export default {
       }
       filterSubAll(this.query)
         .then((response) => {
+          debugger
           let invList = response.data || [];
           //上级仓库中去除当前仓库节点
           if (invList.length > 0) {
diff --git a/src/views/thirdSys/api/DialogEditBusDown.vue b/src/views/thirdSys/api/DialogEditBusDown.vue
index 44d8f451..4b0d441c 100644
--- a/src/views/thirdSys/api/DialogEditBusDown.vue
+++ b/src/views/thirdSys/api/DialogEditBusDown.vue
@@ -71,7 +71,7 @@
     </el-form>
 
     <div slot="footer" class="dialog-footer">
-      <el-button @click.native="editGeOrderParamVisible = !editGeOrderParamVisible"
+      <el-button @click.native="closeDialog( editGeOrderParamVisible = !editGeOrderParamVisible)"
       >取消
       </el-button
       >
diff --git a/src/views/thirdSys/inv/index.vue b/src/views/thirdSys/inv/index.vue
index b57d4658..4e5d28cd 100644
--- a/src/views/thirdSys/inv/index.vue
+++ b/src/views/thirdSys/inv/index.vue
@@ -564,7 +564,7 @@ export default {
         this.subData.code = JSON.parse(localStorage.getItem("code"));
         this.subFormVisible = false;
       });
-      this.resetForm();
+    //  this.resetForm();
 
     },
 

From bc6189f1447a5f956c4644b6231f3eef1af80a90 Mon Sep 17 00:00:00 2001
From: schry <2433098676@qq.com>
Date: Thu, 13 Jul 2023 11:10:05 +0800
Subject: [PATCH 36/38] =?UTF-8?q?=E7=89=A9=E8=B5=84=E7=B1=BB=E5=88=AB?=
 =?UTF-8?q?=E2=80=94=E2=80=94=E9=80=89=E5=85=A5-=E8=80=97=E6=9D=90?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=AA=97=E5=8F=A3=E4=B8=AD=E7=9A=84=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E9=A1=BA=E5=BA=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/product/bindProduct.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/basic/product/bindProduct.vue b/src/views/basic/product/bindProduct.vue
index 3f358434..a768d43b 100644
--- a/src/views/basic/product/bindProduct.vue
+++ b/src/views/basic/product/bindProduct.vue
@@ -82,11 +82,12 @@
         <el-table-column type="selection" width="55" :selectable="selectable"></el-table-column>
         <el-table-column label="最小销售产品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>
         <!--<el-table-column label="主系统编码" prop="mainId" show-overflow-tooltip></el-table-column>-->
-        <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
+
         <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
         <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
         <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
+        <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
       </el-table>
       <pagination
         v-show="total>0"

From 7cea8707a869a1474a3fd4deede8f9ad28592288 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Thu, 13 Jul 2023 14:40:01 +0800
Subject: [PATCH 37/38] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BE=85=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E5=8D=95=E6=8D=AE=E8=80=97=E6=9D=90=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E4=B8=8D=E5=AD=98=E5=9C=A8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/DialogCreateOrder.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index 10349d2a..2e0c56cf 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -1048,6 +1048,7 @@ export default {
       );
       tQuery.code = this.codeFormData.code;
       tQuery.orderType = this.viewType;
+      debugger
       this.addCodeSubmit(tQuery);
       this.$refs.inputRef.select();
     },
@@ -1462,7 +1463,6 @@ export default {
       this.corpOrderIdDisabled = true;
       this.orderFormData = this.orderQuery;
       this.actionEnable = true;
-      this.orderFormData.fromCorp=this.orderFormData.fromCorpName;
       if (this.$isNotBlank(this.orderFormData.checkPreInOrders)) {
         this.checkPreInArray = this.orderFormData.split(",");
       }

From a94dbff11e43df0a6ce05d792e243dd64cca73d9 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Thu, 13 Jul 2023 15:08:12 +0800
Subject: [PATCH 38/38] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development |  2 +-
 .env.production  | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.env.development b/.env.development
index d6a9fa2a..c36d00d3 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ VUE_APP_TITLE = UDI管理系统
 ENV = 'development'
 
 # 开发环境
-VUE_APP_BASE_API = 'http://192.168.0.43:9991'
+VUE_APP_BASE_API = 'http://192.168.0.166:9991'
 
 VUE_APP_SYNC_API ="http://127.0.0.1:10001"
 
diff --git a/.env.production b/.env.production
index b6b3ef2b..8dd33959 100644
--- a/.env.production
+++ b/.env.production
@@ -17,7 +17,7 @@ ENV = 'production'
 
 
 # 林淑波
-VUE_APP_BASE_API = 'http://192.168.0.231:9150/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://192.168.0.231:9150/UDI_WMS_MC/'
 
 # 文明东1
 # VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_WMS_MC/'
@@ -28,16 +28,18 @@ VUE_APP_BASE_API = 'http://192.168.0.231:9150/UDI_WMS_MC/'
 # VUE_APP_BASE_API = 'http://192.168.0.54:9150/UDI_WMS_MC/'
 
 # 平潭正式
-VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
 
 # 吴总测试服务器
 # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/'
 
 # 漳州中医院
-# VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/'
+VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/'
 
 # 片仔癀诊断
-VUE_APP_BASE_API = 'http://192.168.0.100:9160/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://192.168.0.100:9160/UDI_WMS_MC/'
+# 协调平台测试（片仔癀诊断）
+# VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_WMS_MC/'
 
 
 # 应用访问路径 例如使用前缀 /admin/