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

public/config.json

@@ -1,7 +1,7 @@
 {
-    "UDI_SYNC_SERVER_IP": "http://192.168.1.20:9989/",
-    "BASE_URL":"http://192.168.1.20:9989",
-    "SERVER_IP": "http://192.168.1.20:9989/",
-    "WEBSOCKET_URL": "ws://192.168.1.20:9991/UDI_WMS_MC/api/websocket/",
+    "UDI_SYNC_SERVER_IP": "http://192.168.0.166:9991/",
+    "BASE_URL":"http://192.168.0.166:9991",
+    "SERVER_IP": "http://192.168.0.166:9991/",
+    "WEBSOCKET_URL": "ws://192.168.0.166:9991/UDI_WMS_MC/api/websocket/",
     "hosp_name": "平和县医院"
 }

src/views/business/stockOrderDelSearch.vue

@@ -184,8 +184,8 @@
                 <el-table-column type="index" label="序号" width="50"></el-table-column>
                 <el-table-column label="产品通用名" width="200" prop="productName"></el-table-column>
                 <el-table-column label="包装规格" width="200" prop="spec"></el-table-column>
+                <el-table-column label="注册/备案凭证号" width="150" prop="zczbhhzbapzbh"></el-table-column>
                 <el-table-column label="批次号" width="100" prop="batchNo"></el-table-column>
-
                 <el-table-column label="生产日期" width="120" prop="productDate">
                     <template slot-scope="scope">
                         <span>{{ convertDateFun(scope.row.productDate) }}</span>

src/views/business/stockOrderSearch.vue

@@ -168,8 +168,8 @@
                 <el-table-column type="index" label="序号" width="50"></el-table-column>
                 <el-table-column label="产品通用名" width="200" prop="productName"></el-table-column>
                 <el-table-column label="包装规格" width="200" prop="spec"></el-table-column>
+                <el-table-column label="注册/备案凭证号" width="150" prop="zczbhhzbapzbh"></el-table-column>
                 <el-table-column label="批次号" width="100" prop="batchNo"></el-table-column>
-
                 <el-table-column label="生产日期" width="120" prop="productDate">
                     <template slot-scope="scope">
                         <span>{{ convertDateFun(scope.row.productDate) }}</span>