Merge remote-tracking branch 'origin/dev2.0' into dev2.0

.env.development

@@ -5,7 +5,7 @@ VUE_APP_TITLE = UDI管理系统
 ENV = 'development'
 
 # 开发环境
-VUE_APP_BASE_API = 'http://192.168.0.166:9991'
+VUE_APP_BASE_API = 'http://127.0.0.1:9991'
 
 VUE_APP_SYNC_API ="http://127.0.0.1:10001"
 

.env.production

@@ -13,10 +13,10 @@ ENV = 'production'
 
 
 刘恩典
-# VUE_APP_BASE_API = 'http://192.168.0.242:9150/UDI_WMS_MC/'
+VUE_APP_BASE_API = 'http://192.168.0.127:9150/UDI_WMS_MC/'
 
 # 平潭正式
-VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
+# VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
 
 # 漳州中医院
 # VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/'

src/views/purchase/purApply/purApplyEditDiaolog.vue

@@ -108,6 +108,7 @@
           <el-table-column label="序号" type="index" width="60"></el-table-column>
           <el-table-column label="DI/物资编码" prop="nameCode"></el-table-column>
           <el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
+          <el-table-column label="商品名称" prop="spmc" show-overflow-tooltip="true"></el-table-column>
           <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
           <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>
           <el-table-column width="150" label="申购数量">

src/views/purchase/purApply/purOrderSelectProduct.vue

@@ -102,10 +102,11 @@
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="最小销售产品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>
         <el-table-column label="第三方物资编码" prop="thirdId" width="120" show-overflow-tooltip></el-table-column>
-        <el-table-column label="医疗器械注册人" width="160" prop="ylqxzcrbarmc"></el-table-column>
         <el-table-column label="物资名称" prop="cpmctymc" width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column label="商品名称" prop="spmc" width="160" show-overflow-tooltip></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" width="140" show-overflow-tooltip></el-table-column>
         <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column label="医疗器械注册人" width="160" prop="ylqxzcrbarmc"></el-table-column>
         <el-table-column label="器械类别" prop="qxlb" width="100" show-overflow-tooltip></el-table-column>
         <el-table-column label="供应商" prop="companyName" width="160" show-overflow-tooltip></el-table-column>