Merge remote-tracking branch 'origin/orderChange' into orderChange

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"
 }

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>

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: {

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

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 || [];