From 9dc5519a86506ca442e4de443a411b901f69c0c8 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Sun, 8 Jan 2023 16:57:11 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E7=B3=BB=E7=BB=9F=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=B7=E4=BF=A1=E6=81=AF=202.=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=92=8C=E9=85=8D=E8=B4=A7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/invWarehouse.vue                   | 13 +++++++------
 src/views/home/index.vue                           | 12 ++++++++----
 src/views/warehouse/stockOrderEditDistribution.vue |  6 +++---
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue
index 3d06aaa..a5df128 100644
--- a/src/views/basic/invWarehouse.vue
+++ b/src/views/basic/invWarehouse.vue
@@ -388,7 +388,7 @@
                         </el-button
                         >
                     </template>
-                 
+
                 </el-table-column>
             </el-table>
             <div slot="footer" class="dialog-footer">
@@ -899,6 +899,7 @@ export default {
             thirdQuery: {
                 key: null,
                 page: 1,
+                status: 1,
                 limit: 10,
                 thirdSysFk: "thirdId",
             },
@@ -1455,7 +1456,7 @@ export default {
                 var action=obj.toString();
                 this.bussinessTypeQuery.ids=action;
             }
-           
+
             this.bussinessTypeQuery.code=this.busQuery.code;
             getJoinBussinessType(this.bussinessTypeQuery).then((res) => {
                 this.selectBussinessTypeList = [];
@@ -1466,7 +1467,7 @@ export default {
                     if (that.$refs.typeList) {
                         that.$refs.typeList.clearSelection();
                     }
-                    
+
                     that.bussinessTypeList.forEach(row => {
                         if (row.checkSelect==true) {
                                 that.$refs.typeList.toggleRowSelection(row, true);
@@ -1558,7 +1559,7 @@ export default {
                 this.getBussinessType(1,action);
         },
         selsectBussinessType(row){
-           
+
         //    if(row==null || row==undefined){
         //          this.$message.info("请先选择分库！");
         //          return;
@@ -1601,12 +1602,12 @@ export default {
                         this.busTotal = 0;
                     });
                  this.selectWhouseBussinessType();
-                    
+
 
                 } else {
                     this.$message.error(res.message);
                 }
-              
+
 
             }).catch((error) => {
             });
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 74a10f8..c1e41e0 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -13,7 +13,9 @@
                     src="../../assets/logo.png"
                 />
                 <!--文字logo-->
-                <span>医院供应商自助平台</span>
+                <div style="height: 50px;">
+                    <span style="display: block; color: #1e6abc; font-size: 20px;">{{version}}</span>
+                </div>
             </div>
             <el-menu
                 class="menu"
@@ -332,6 +334,7 @@ export default {
                 true: "请选择送货仓库和分库",
                 false: "请选择当前仓库和分库",
             },
+            version: null,
         };
     },
     components: {
@@ -398,7 +401,7 @@ export default {
                 this.company = response.data;
             });
         },
-      
+
 
         locCHange() {
 
@@ -446,7 +449,7 @@ export default {
                             this.$store.commit(types.RECEIVE_LOCSUBINVNAME, this.locSubInvName);
 
                         }
-                       
+
                     }
                 })
                 .catch(() => {
@@ -537,7 +540,6 @@ export default {
         },
     },
     created() {
-       
         this.getBreadcrumb();
         this.getCompanyData();
         // this.getStorage();
@@ -560,6 +562,7 @@ export default {
         axios.get("./config.json").then(res => {
             // 基础地址
             this.hospitalName = res.data.hosp_name;
+            this.version = res.data.version;
         });
 
     },
@@ -830,5 +833,6 @@ export default {
     .slide-toggle {
         display: none;
     }
+
 }
 </style>
diff --git a/src/views/warehouse/stockOrderEditDistribution.vue b/src/views/warehouse/stockOrderEditDistribution.vue
index 57a20fd..85871af 100644
--- a/src/views/warehouse/stockOrderEditDistribution.vue
+++ b/src/views/warehouse/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>
@@ -91,14 +91,14 @@
 
                     <el-col :span="3">
                         <div class="ao-text">
-                            <span>当前分库：</span>
+                            <span>当前仓库：</span>
                         </div>
                     </el-col>
 
                     <el-col :span="7">
                         <el-form-item prop="invWarehouseCode">
                             <el-select v-model="formData.invWarehouseCode" disabled
-                                       placeholder="当前分库信息"
+                                       placeholder="当前仓库信息"
                                        clearable>
                                 <el-option
                                     v-for="item in subInvList"