Merge branch 'fencang' into busUser

# Conflicts:
#	public/config.json
#	src/views/warehouse/IOSearchOrder.vue

public/config.json

@@ -1,6 +1,6 @@
 {
-    "BASE_URL": "http://192.168.0.66:8500/SPMS_SERVER",
+    "BASE_URL": "http://192.168.0.109:9906",
-    "SERVER_IP": "http://192.168.0.66:8500/SPMS_SERVER",
+    "SERVER_IP": "http://192.168.0.109:9906",
     "hosp_name": "诏安县总医院（测试）"
-
 }
+

public/打包设置.txt

@@ -22,3 +22,11 @@
     "BASE_URL": "http://127.0.0.1:9906",
     "SERVER_IP": "http://127.0.0.1:9906",
     "hosp_name": "诏安县总医院（测试）"
+
+
+{
+    "BASE_URL": "http://139.9.174.242:9150/SPMS_SERVER",
+    "SERVER_IP": "http://139.9.174.242:9150",
+    "hosp_name": "诏安县总医院"
+}
+

src/views/warehouse/IOSearchOrder.vue

@@ -103,9 +103,12 @@
                     show-overflow-tooltip="true"
                 ></el-table-column>
                 <el-table-column label="来源" prop="fromType">
+
                     <template slot-scope="scope">
                         <span>{{ fromTypeMap[scope.row.fromType] }}</span>
                     </template>
+
+
                 </el-table-column>
                 <el-table-column label="往来单位" prop="fromCorp" width="250">
                 </el-table-column>
@@ -557,7 +560,6 @@ export default {
                 .then((response) => {
                     this.storageList = response.data || [];
                     if (this.storageList.length > 0) {
-                        this.filterQuery.locStorageCode = this.storageList[0].code;
                         this.getSubInvList();
                         this.getList();
                     }

src/views/warehouse/IOWaitOrder.vue

@@ -947,6 +947,7 @@ export default {
                 .then((response) => {
                     this.storageList = response.data || [];
                     if (this.storageList.length > 0) {
+                        this.getSubInvList();
                         this.getList();
                     }
                 })