From 7a77e1d438225c7e5e9754c01afbe5cfc316a957 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, 26 Dec 2022 11:41:25 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/UdiInfoManage.vue          | 6 +++++-
 src/views/inventory/InvProducts.vue        | 4 ++--
 src/views/purchase/purPlanDetailDialog.vue | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/views/basic/UdiInfoManage.vue b/src/views/basic/UdiInfoManage.vue
index 572bd52..c8ab106 100644
--- a/src/views/basic/UdiInfoManage.vue
+++ b/src/views/basic/UdiInfoManage.vue
@@ -1064,6 +1064,7 @@ export default {
             },
             productType: null,
             editQuery: null,
+            pId:0,
             productRemarkSet: {},
             relevanceEdit: {
                 id: null,
@@ -1075,7 +1076,8 @@ export default {
                 allowNoBatch: null,
                 allowNoExpire: null,
                 allowNoProduct: null,
-                cpdls: null
+                cpdls: null,
+                pId:null,
             },
             defaultSys: null,
             isImport: false,
@@ -1451,6 +1453,7 @@ export default {
             this.thisData = row;
             this.editDialogVisible = true;
             this.editQuery = row;
+            this.pId=row.id;
             this.relevanceEdit = {
                 id: row.id,
                 isUseDy: row.isUseDy,
@@ -1561,6 +1564,7 @@ export default {
             this.relevanceEdit.isLock = this.editQuery.isLock;
             this.relevanceEdit.isAdavence = this.editQuery.isAdavence;
             this.relevanceEdit = this.editQuery;
+            this.relevanceEdit.pid = this.pId;
             if (this.checked == true) {
                 this.relevanceEdit.isUseDy = 1;
             } else {
diff --git a/src/views/inventory/InvProducts.vue b/src/views/inventory/InvProducts.vue
index 5504135..fa8c97d 100644
--- a/src/views/inventory/InvProducts.vue
+++ b/src/views/inventory/InvProducts.vue
@@ -242,7 +242,7 @@ export default {
             this.getList();
         },
         onSubmit() {
-           
+
             if(this.filterQuery.invStorageCode==null || this.filterQuery.invStorageCode==""){
                 this.$message.error("当前仓库不能为空");
                 return
@@ -275,7 +275,7 @@ export default {
             this.getList();
         },
         getList() {
-          
+
 
             this.loading = true;
             this.filterQuery.customerId = store.getters.customerId;
diff --git a/src/views/purchase/purPlanDetailDialog.vue b/src/views/purchase/purPlanDetailDialog.vue
index 437ae8a..4712d78 100644
--- a/src/views/purchase/purPlanDetailDialog.vue
+++ b/src/views/purchase/purPlanDetailDialog.vue
@@ -62,8 +62,8 @@
 
                     <el-col :span="7">
                         <el-form-item prop="locStorageCode">
-                           
-                            <el-select v-model="formData.invWarehouseCode" placeholder="采购分库信息" style="width: 100%"
+
+                            <el-select v-model="formData.invWarehouseCode" placeholder="采购仓库信息" style="width: 100%"
                                        :disabled="true" clearable>
                                 <el-option
                                     v-for="item in subInvList"

From b1137eec45438c70709a49dfed178931a13dd2c5 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, 26 Dec 2022 11:53:01 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=AA=E6=9C=89?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E4=BB=93=E5=BA=93=E6=90=9C=E7=B4=A2=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/inventory/InvProducts.vue         | 31 ++++++-------
 src/views/inventory/InvStatistics.vue       | 43 +++++++----------
 src/views/warehouse/stockOrderInvSearch.vue | 51 ++++++++-------------
 3 files changed, 50 insertions(+), 75 deletions(-)

diff --git a/src/views/inventory/InvProducts.vue b/src/views/inventory/InvProducts.vue
index fa8c97d..ce2efa9 100644
--- a/src/views/inventory/InvProducts.vue
+++ b/src/views/inventory/InvProducts.vue
@@ -49,21 +49,21 @@
                     <el-form-item class="query-form-item">
                         <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产厂家" clearable></el-input>
                     </el-form-item>
+<!--                    <el-form-item class="query-form-item">-->
+<!--                        <el-select v-model="filterQuery.invStorageCode" placeholder="请选择当前仓库" clearable="true"-->
+<!--                                   @change="invChange"-->
+<!--                                   size="mini">-->
+<!--                            <el-option-->
+<!--                                v-for="item in storageList"-->
+<!--                                :key="item.name"-->
+<!--                                :label="item.name"-->
+<!--                                :value="item.code">-->
+<!--                                <span style="float: left">{{ item.name }}</span>-->
+<!--                            </el-option>-->
+<!--                        </el-select>-->
+<!--                    </el-form-item>-->
                     <el-form-item class="query-form-item">
-                        <el-select v-model="filterQuery.invStorageCode" placeholder="请选择当前仓库" clearable="true"
-                                   @change="invChange"
-                                   size="mini">
-                            <el-option
-                                v-for="item in storageList"
-                                :key="item.name"
-                                :label="item.name"
-                                :value="item.code">
-                                <span style="float: left">{{ item.name }}</span>
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item class="query-form-item">
-                        <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
+                        <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
                                    :disabled="invWarehouseDisabled"
                                    size="mini">
                             <el-option
@@ -367,7 +367,7 @@ export default {
             if (this.filterQuery.invStorageCode != null && this.filterQuery.invStorageCode != "") {
                 this.invWarehouseDisabled = false;
                 let query = {
-                    pcode: this.filterQuery.invStorageCode
+                    filter: 3,
                 };
                 filterSubByInv(query)
                     .then((response) => {
@@ -407,7 +407,6 @@ export default {
         };
     },
     created() {
-        this.getStorage();
         this.findMethod();
         let query = this.$route.query;
         this.filterQuery = Object.assign(this.filterQuery, query);
diff --git a/src/views/inventory/InvStatistics.vue b/src/views/inventory/InvStatistics.vue
index 4848c7a..4e48650 100644
--- a/src/views/inventory/InvStatistics.vue
+++ b/src/views/inventory/InvStatistics.vue
@@ -49,20 +49,20 @@
                     <el-form-item class="query-form-item">
                         <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产厂家" clearable></el-input>
                     </el-form-item>
+<!--                    <el-form-item class="query-form-item">-->
+<!--                        <el-select v-model="filterQuery.invStorageCode" placeholder="请选择当前仓库" clearable="true"-->
+<!--                                   @change="invChange" size="mini">-->
+<!--                            <el-option-->
+<!--                                v-for="item in storageList"-->
+<!--                                :key="item.name"-->
+<!--                                :label="item.name"-->
+<!--                                :value="item.code">-->
+<!--                                <span style="float: left">{{ item.name }}</span>-->
+<!--                            </el-option>-->
+<!--                        </el-select>-->
+<!--                    </el-form-item>-->
                     <el-form-item class="query-form-item">
-                        <el-select v-model="filterQuery.invStorageCode" placeholder="请选择当前仓库" clearable="true"
-                                   @change="invChange" size="mini">
-                            <el-option
-                                v-for="item in storageList"
-                                :key="item.name"
-                                :label="item.name"
-                                :value="item.code">
-                                <span style="float: left">{{ item.name }}</span>
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item class="query-form-item">
-                        <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
+                        <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
                                    size="mini">
                             <el-option
                                 v-for="item in subInvList"
@@ -320,21 +320,10 @@ export default {
                 }
             }
         },
-        getStorage() {
-            this.storageList = [];
-            filterUplLocInv()
-                .then((response) => {
-                    this.storageList = response.data || [];
-                })
-                .catch(() => {
-                });
-        },
-        invChange() {
-            // this.$set(this.filterQuery, "entrustUser", "");
-            this.filterQuery.invWarehouseCode = "";
+        getSubInvList() {
             this.subInvList = [];
             let query = {
-                pcode: this.filterQuery.invStorageCode
+                filter: 3,
             };
             filterSubByInv(query)
                 .then((response) => {
@@ -367,7 +356,7 @@ export default {
         this.loading = true;
         this.getList();
         this.findStorageCode();
-        this.getStorage();
+        this.getSubInvList();
     },
 };
 </script>
diff --git a/src/views/warehouse/stockOrderInvSearch.vue b/src/views/warehouse/stockOrderInvSearch.vue
index d8fcee0..77af4b5 100644
--- a/src/views/warehouse/stockOrderInvSearch.vue
+++ b/src/views/warehouse/stockOrderInvSearch.vue
@@ -26,21 +26,21 @@
                     <el-form-item class="query-form-item" v-if="isSp ==110">
                         <el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
                     </el-form-item>
+<!--                    <el-form-item class="query-form-item">-->
+<!--                        <el-select v-model="query.locStorageCode"-->
+<!--                                   @change="invChange"-->
+<!--                                   placeholder="请选择当前仓库" clearable="true" size="mini">-->
+<!--                            <el-option-->
+<!--                                v-for="item in storageList"-->
+<!--                                :key="item.name"-->
+<!--                                :label="item.name"-->
+<!--                                :value="item.code">-->
+<!--                                <span style="float: left">{{ item.name }}</span>-->
+<!--                            </el-option>-->
+<!--                        </el-select>-->
+<!--                    </el-form-item>-->
                     <el-form-item class="query-form-item">
-                        <el-select v-model="query.locStorageCode"
-                                   @change="invChange"
-                                   placeholder="请选择当前仓库" clearable="true" size="mini">
-                            <el-option
-                                v-for="item in storageList"
-                                :key="item.name"
-                                :label="item.name"
-                                :value="item.code">
-                                <span style="float: left">{{ item.name }}</span>
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item class="query-form-item">
-                        <el-select v-model="query.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
+                        <el-select v-model="query.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
                                    size="mini"
                                    @change="subInvChange"
                         >
@@ -825,25 +825,10 @@ export default {
                 }
             }
         },
-        getStorage() {
-            this.storageList = [];
-            filterAllByUser()
-                .then((response) => {
-                    this.storageList = response.data || [];
-                    if (this.storageList.length > 0) {
-                        this.getSubInvList();
-                        this.getList();
-                    }
-                })
-                .catch(() => {
-                });
-        },
-
         invChange() {
-            this.query.invWarehouseCode = "";
             this.subInvList = [];
             let query = {
-                pcode: this.query.locStorageCode
+                filter: 3,
             };
             filterSubByInv(query)
                 .then((response) => {
@@ -855,11 +840,13 @@ export default {
 
         getSubInvList() {
             let query = {
-                pcode: this.query.locStorageCode
+                filter: 3,
             };
             filterSubByInv(query)
                 .then((response) => {
                     this.subInvList = response.data || [];
+                    this.getList();
+
                 })
                 .catch(() => {
                 });
@@ -936,7 +923,7 @@ export default {
         }
     },
     created() {
-        this.getStorage();
+        this.getSubInvList();
         this.getBusType();
         let end = new Date();
         let start = new Date();

From a6933194a633ec4a74160b5345609866d5cf26c1 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Wed, 28 Dec 2022 22:16:03 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BA=A7=E5=93=81=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/config.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/config.json b/public/config.json
index ea701d5..559e2ca 100644
--- a/public/config.json
+++ b/public/config.json
@@ -1,6 +1,6 @@
 {
-    "BASE_URL": "http://192.168.0.166:9906",
-    "SERVER_IP": "http://192.168.0.166:9906",
+    "BASE_URL": "http://192.168.1.20:9906",
+    "SERVER_IP": "http://192.168.1.20:9906",
     "hosp_name": "福建省XX市医院"
 }
 

From 23af0b99638e7cab57ffa7b569068330782d38a3 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Wed, 28 Dec 2022 22:16:24 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BA=A7=E5=93=81=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/UdiInfoManage.vue        | 3 +--
 src/views/basic/UdiInfoManageSp.vue      | 6 +++++-
 src/views/basic/basicCompanyProducts.vue | 6 +++++-
 src/views/basic/basicProductEdit.vue     | 2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/views/basic/UdiInfoManage.vue b/src/views/basic/UdiInfoManage.vue
index c8ab106..371fc68 100644
--- a/src/views/basic/UdiInfoManage.vue
+++ b/src/views/basic/UdiInfoManage.vue
@@ -212,6 +212,7 @@
                         border
                         key="3"
                         @current-change="handleDetail"
+                        highlight-current-row
                     >
                         <el-table-column
                             label="产品标识"
@@ -1570,8 +1571,6 @@ export default {
             } else {
                 this.relevanceEdit.isUseDy = 0;
             }
-
-
             updatetUdiInfos(this.relevanceEdit)
                 .then((response) => {
                     this.loading = false;
diff --git a/src/views/basic/UdiInfoManageSp.vue b/src/views/basic/UdiInfoManageSp.vue
index 625a5e5..5e8a8d6 100644
--- a/src/views/basic/UdiInfoManageSp.vue
+++ b/src/views/basic/UdiInfoManageSp.vue
@@ -192,7 +192,7 @@
                 v-if="editDialogVisible"
             >
 
-                <el-table :data="sysList" style="width: 100%" key="2" border>
+                <el-table :data="sysList" style="width: 100%" key="2" border highlight-current-row>
                     <el-table-column label="序号" type="index"></el-table-column>
                     <el-table-column
                         label="系统名称"
@@ -843,7 +843,9 @@ export default {
                 isUseDy: false,
                 isLock: null,
                 isAdavence: null,
+                pId: null,
             },
+            pId: 0,
             defaultSys: null,
             isImport: false,
             isImportUdi: false,
@@ -1097,6 +1099,7 @@ export default {
             this.thisData = row;
             this.editDialogVisible = true;
             this.editQuery = row;
+            this.pId = row.id;
             this.relevanceEdit = {
                 id: row.rlId,
                 // thirdId: row.thirdId,
@@ -1218,6 +1221,7 @@ export default {
             this.relevanceEdit.isDisable = this.editQuery.isDisable;
             this.relevanceEdit.isLock = this.editQuery.isLock;
             this.relevanceEdit.isAdavence = this.editQuery.isAdavence;
+            this.relevanceEdit.pid = this.pId;
             updatetUdiInfos(this.relevanceEdit)
                 .then((response) => {
                     this.loading = false;
diff --git a/src/views/basic/basicCompanyProducts.vue b/src/views/basic/basicCompanyProducts.vue
index b71fde5..16a5a3c 100644
--- a/src/views/basic/basicCompanyProducts.vue
+++ b/src/views/basic/basicCompanyProducts.vue
@@ -353,7 +353,9 @@ export default {
                 isDisable: null,
                 isUseDy: false,
                 isAdavence: null,
+                pId: null,
             },
+            pId: 0,
             productType: null,
             defaultSys: null,
             isImport: false,
@@ -735,6 +737,7 @@ export default {
             this.thisData = row;
             this.editDialogVisible = true;
             this.editQuery = row;
+            this.pId = row.id;
             this.relevanceEdit = {
                 id: row.rlId,
                 isUseDy: row.isUseDy,
@@ -826,7 +829,8 @@ export default {
             this.relevanceEdit.isDisable = this.editQuery.isDisable;
             this.relevanceEdit.isLock = this.editQuery.isLock;
             this.relevanceEdit.isAdavence = this.editQuery.isAdavence;
-            this.relevanceEdit = this.editQuery;
+            this.relevanceEdit = this.editQuery
+            this.relevanceEdit.pid = this.pId;
             if (this.checked == true) {
                 this.relevanceEdit.isUseDy = 1;
             } else {
diff --git a/src/views/basic/basicProductEdit.vue b/src/views/basic/basicProductEdit.vue
index d5f044f..eaf89d1 100644
--- a/src/views/basic/basicProductEdit.vue
+++ b/src/views/basic/basicProductEdit.vue
@@ -58,6 +58,7 @@
             <el-table
                 v-loading="loading"
                 :data="detailList"
+                highlight-current-row
                 style="width: 100%; margin-top: 20px"
                 border
                 @current-change="handleDetail"
@@ -94,7 +95,6 @@
                 style="margin-top: 20px"
             >
                 <el-row :gutter="20" class="el-row" type="flex">
-
                     <el-col :span="12" class="el-col">
                         <div class="text item">
                             <div class="itemTag">