From bec5ba7444dca4fd00209be8e26005f67f703da9 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Fri, 6 Jan 2023 11:58:14 +0800
Subject: [PATCH 1/3] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E5=85=BB=E6=8A=A4=E8=AE=B0=E5=BD=95=E9=A1=B5=E9=9D=A2=E5=85=BB?=
 =?UTF-8?q?=E6=8A=A4=E5=A4=87=E6=B3=A8=E6=98=BE=E7=A4=BA=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/inventory/deviceMAOrderCompleted.vue b/src/views/inventory/deviceMAOrderCompleted.vue
index 9a52583..5132f1d 100644
--- a/src/views/inventory/deviceMAOrderCompleted.vue
+++ b/src/views/inventory/deviceMAOrderCompleted.vue
@@ -40,7 +40,7 @@
                 <el-table-column label="领用记录号" prop="collOrderId" width="180"></el-table-column>
                 <el-table-column label="养护日期" prop="createTime" width="180"></el-table-column>
                 <el-table-column label="养护人" prop="createUser" width="120"></el-table-column>
-                <el-table-column label="养护备注" prop="remark" width="120"></el-table-column>
+                <el-table-column label="养护备注" prop="remark" width="200" show-overflow-tooltip></el-table-column>
                 <el-table-column label="操作" width="180" fixed="right">
                     <template slot-scope="scope">
                         <el-button

From ba8d9bc86825fd6f18ae3f89022403611dfdb88e Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Fri, 6 Jan 2023 17:40:11 +0800
Subject: [PATCH 2/3] =?UTF-8?q?1.=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inventory/invPreInProducts.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/inventory/invPreInProducts.vue b/src/views/inventory/invPreInProducts.vue
index 3a594e3..99da54f 100644
--- a/src/views/inventory/invPreInProducts.vue
+++ b/src/views/inventory/invPreInProducts.vue
@@ -238,7 +238,6 @@ export default {
             this.filterQuery.customerId = store.getters.customerId;
             filterProducts(this.filterQuery)
                 .then((response) => {
-                    console.log(response)
                     this.loading = false;
                     this.showSup = response.data.showSup;
                     this.list = response.data.list || [];

From 11a298af3df81bd029c050f9c7071abeca0b79f9 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Sun, 8 Jan 2023 17:06:58 +0800
Subject: [PATCH 3/3] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E9=85=8D=E8=B4=A7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=8D=95=E6=8D=AE=E7=BC=96=E8=BE=91=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E6=98=BE=E7=A4=BA=E5=BE=80=E6=9D=A5=E5=8D=95=E4=BD=8D?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E9=97=AE=E9=A2=98=202.=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=89=88=E6=9C=AC=E4=BF=A1=E6=81=AF=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/config.json                                | 3 ++-
 src/views/business/stockOrderEditDistribution.vue | 2 +-
 src/views/home/index.vue                          | 6 +++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/public/config.json b/public/config.json
index e7474d4..f79e27c 100644
--- a/public/config.json
+++ b/public/config.json
@@ -3,5 +3,6 @@
     "BASE_URL":"http://127.0.0.1:9991",
     "SERVER_IP": "http://127.0.0.1:9991/",
     "WEBSOCKET_URL": "ws://127.0.0.1:9991/UDI_WMS_MC/api/websocket/",
-    "hosp_name": "平和县医院"
+    "hosp_name": "平和县医院",
+    "version": "V2.0"
 }
diff --git a/src/views/business/stockOrderEditDistribution.vue b/src/views/business/stockOrderEditDistribution.vue
index 5706d9c..21b30f8 100644
--- a/src/views/business/stockOrderEditDistribution.vue
+++ b/src/views/business/stockOrderEditDistribution.vue
@@ -62,7 +62,7 @@
                     </el-col>
                     <el-col :span="7">
                         <el-form-item prop="corpName">
-                            <el-input v-if="formData.fromSubInvName !=null" v-model="formData.fromSubInvName"
+                            <el-input v-if="formData.corpName !=null" v-model="formData.corpName"
                                       auto-complete="off" :disabled="true"></el-input>
                         </el-form-item>
                     </el-col>
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 35a0043..3f50f30 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -13,7 +13,9 @@
                     src="../../assets/ic_launcher.png"
                 />
                 <!--文字logo-->
-                <span>UDI管理系统</span>
+                <div style="height: 50px;">
+                    <span style="display: block; color: #1e6abc; font-size: 20px;">{{version}}</span>
+                </div>
             </div>
             <el-menu
                 class="menu"
@@ -321,6 +323,7 @@ export default {
             locInvName: "",
             locSubInvName: "",
             title: "udi管理系统",
+            version: null,
         };
     },
     components: {
@@ -537,6 +540,7 @@ export default {
 
             // 基础地址
             this.hospitalName = res.data.hosp_name;
+            this.version = res.data.version;
         });
     },
     watch: {