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,21 +102,22 @@
         <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>
 
         <el-table-column
-          v-if="productRemarkSet.remarkEnable1"
+            v-if="productRemarkSet.remarkEnable1"
-          :label="productRemarkSet.remarkTitle1" prop="basicPrductRemak1" width="140"
+            :label="productRemarkSet.remarkTitle1" prop="basicPrductRemak1" width="140"
-          show-overflow-tooltip></el-table-column>
+            show-overflow-tooltip></el-table-column>
         <el-table-column
-          v-if="productRemarkSet.remarkEnable2"
+            v-if="productRemarkSet.remarkEnable2"
-          :label="productRemarkSet.remarkTitle2" prop="basicPrductRemak2" width="140"
+            :label="productRemarkSet.remarkTitle2" prop="basicPrductRemak2" width="140"
-          show-overflow-tooltip></el-table-column>
+            show-overflow-tooltip></el-table-column>
 
         <el-table-column label="操作" width="80" fixed="right">
           <template slot-scope="scope">
@@ -126,23 +127,23 @@
       </el-table>
 
       <pagination
-        v-show="pageTotal>0"
+          v-show="pageTotal>0"
-        :total="pageTotal"
+          :total="pageTotal"
-        :page.sync="listQuery.page"
+          :page.sync="listQuery.page"
-        :limit.sync="listQuery.limit"
+          :limit.sync="listQuery.limit"
-        @pagination="handleErpPageChange"
+          @pagination="handleErpPageChange"
 
       ></pagination>
     </el-card>
 
     <el-dialog
-      title="耗材字典详情"
+        title="耗材字典详情"
-      :visible.sync="udiRlDetailVisible"
+        :visible.sync="udiRlDetailVisible"
-      width="80%"
+        width="80%"
-      :close-on-click-modal="false"
+        :close-on-click-modal="false"
-      :close-on-press-escape="false"
+        :close-on-press-escape="false"
-      append-to-body
+        append-to-body
-      v-if="udiRlDetailVisible"
+        v-if="udiRlDetailVisible"
     >
       <udiRlDetailDialog :editQuery="currentRow"></udiRlDetailDialog>
     </el-dialog>
@@ -365,43 +366,43 @@ export default {
       this.listQuery.customerId = store.getters.customerId;
       this.listQuery.id = this.pId;
       filterCompanyProductplanRelevance(this.listQuery)
-        .then((response) => {
+          .then((response) => {
-          this.loading = false;
+            this.loading = false;
-          if (response.code === 20000) {
+            if (response.code === 20000) {
-            this.dataList = response.data.list || [];
+              this.dataList = response.data.list || [];
-            this.pageTotal = response.data.total || 0;
+              this.pageTotal = response.data.total || 0;
-          } else {
+            } else {
-            this.$message.error(response.message);
+              this.$message.error(response.message);
+              this.dataList = [];
+              this.pageTotal = 0;
+            }
+          })
+          .catch(() => {
+            this.loading = false;
             this.dataList = [];
             this.pageTotal = 0;
-          }
+          });
-        })
-        .catch(() => {
-          this.loading = false;
-          this.dataList = [];
-          this.pageTotal = 0;
-        });
     },
 
     getRationList() {
       this.loading = true;
       filterCompanyProductRationRelevance(this.listQuery)
-        .then((response) => {
+          .then((response) => {
-          this.loading = false;
+            this.loading = false;
-          if (response.code === 20000) {
+            if (response.code === 20000) {
-            this.dataList = response.data.list || [];
+              this.dataList = response.data.list || [];
-            this.pageTotal = response.data.total || 0;
+              this.pageTotal = response.data.total || 0;
-          } else {
+            } else {
-            this.$message.error(response.message);
+              this.$message.error(response.message);
+              this.dataList = [];
+              this.pageTotal = 0;
+            }
+          })
+          .catch(() => {
+            this.loading = false;
             this.dataList = [];
             this.pageTotal = 0;
-          }
+          });
-        })
-        .catch(() => {
-          this.loading = false;
-          this.dataList = [];
-          this.pageTotal = 0;
-        });
     },
     intentBack() {
       this.closeDialog();