耗材字典相关迁移

src/views/basic/product/SelectDIDetailDialog.vue

@@ -458,6 +458,11 @@ export default {
     return {
       activeNames: ['1']
     }
+
+
+
+
+
   },
   methods: {},
 

src/views/basic/product/product.vue

@@ -3,19 +3,18 @@
     <el-card>
       <el-row>
         <el-col :span="3" v-show="showSearch">
-          <div style="height: 100%;margin-left: 0px">
-              <el-tree :data="treeList"
-                       class="tree"
-                       @node-click="handleNodeClick"
-                       :expand-on-click-node="false">
+          <div style="height: 100%">
+            <el-tree :data="treeList"
+                     class="tree"
+                     :default-expand-all="true"
+                     @node-click="handleNodeClick"
+                     :expand-on-click-node="false">
                  <span class="custom-tree-node" slot-scope="{ node, data }">
-                   <span style="font-size: 12px;font-weight: 500;">{{ node.label }}</span></span>
-              </el-tree>
+                   <span style="font-size: 14px;font-weight: 500;">{{ node.label }}</span></span>
+            </el-tree>
           </div>
-          <el-divider direction="vertical"></el-divider>
         </el-col>
-
-        <el-col :span="21" style="border-left: 1px solid rgb(229 224 224)">
+        <el-col :span="21" style="border-left:  3px solid #dddddd">
           <el-form :model="filterQuery" size="mini" label-width="100px" v-show="showSearch">
             <el-row>
               <el-col :span="18">
@@ -37,8 +36,8 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item class="query-form-item" label="产品通用名:">
-                  <el-input v-model="filterQuery.cpmctymc" placeholder="产品通用名" clearable="true"
+                <el-form-item class="query-form-item" label="物资名称:">
+                  <el-input v-model="filterQuery.cpmctymc" placeholder="物资名称" clearable="true"
                             style="width: 90%"></el-input>
                 </el-form-item>
               </el-col>
@@ -104,9 +103,9 @@
               <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
               <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
               <el-button type="primary" icon="el-icon-search" @click="submit">查询</el-button>
-              <el-button type="primary" icon="el-icon-plus" @click="editUdiType">编辑菜单分类</el-button>
-              <el-button type="primary" icon="el-icon-plus" @click="intentImportUdi">添加DI信息</el-button>
-              <el-button type="primary" icon="el-icon-plus" @click="intentImportErp">添加产品信息</el-button>
+              <el-button type="primary" icon="el-icon-plus" @click="editUdiType">物资分类管理</el-button>
+              <el-button type="primary" icon="el-icon-plus" @click="intentImportUdi">选入DI信息</el-button>
+              <el-button type="primary" icon="el-icon-plus" @click="intentImportErp">添加院内字典</el-button>
               <el-button type="primary" icon="el-icon-plus" @click="intentDetail">关联添加</el-button>
             </el-button-group>
           </div>
@@ -137,7 +136,7 @@
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
-              label="产品通用名"
+              label="物资名称"
               prop="cpmctymc"
               show-overflow-tooltip
             ></el-table-column>
@@ -200,8 +199,8 @@
                 <el-table-column label="产品编码" prop="thirdId" show-overflow-tooltip></el-table-column>
                 <el-table-column label="产品名称" prop="thirdName" show-overflow-tooltip></el-table-column>
                 <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
-                <el-table-column label="注册/备案凭证号" prop="registerNo" show-overflow-tooltip></el-table-column>
-                <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
+                <el-table-column label="注册/备案号" prop="registerNo" show-overflow-tooltip></el-table-column>
+                <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
               </el-table>
             </el-card>
             <el-card>
@@ -215,7 +214,7 @@
               <el-table v-loading="loading" :data="detailList" style="width: 100%; " border key="3"
                         highlight-current-row @current-change="handleDetail">
                 <el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
-                <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+                <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
                 <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
                 <el-table-column label="包装单位" prop="packUnit" show-overflow-tooltip></el-table-column>
               </el-table>
@@ -646,7 +645,7 @@
                       <el-col :span="12" class="el-col">
                         <div class="text item">
                           <div class="itemTag">
-                            <span>生产厂家:&nbsp;</span>
+                            <span>生产企业:&nbsp;</span>
                           </div>
                           <el-input
                             style="width: 65%"
@@ -985,7 +984,7 @@
             :visible.sync="editDiDialogVisible"
             :close-on-click-modal="false"
             :close-on-press-escape="false"
-            width="60%"
+            width="70%"
             v-if="editDiDialogVisible"
           >
             <product-edit
@@ -1547,7 +1546,7 @@ export default {
       this.getList();
     },
     handleCurrentChange(val) {
-      this.filterQuery.page = val;
+      this.filterQuery.page = val.page;
       this.getList();
     },
     handleModifyClick(row) {

src/views/basic/product/productSingleEdit.vue

@@ -9,37 +9,57 @@
     >
 
       <el-row>
-        <el-form-item label="产品标识:">
-          <el-input style="width: 80%" size="small" :disabled="true"  v-model="editQuery.nameCode"></el-input>
-        </el-form-item>
+        <el-col span="20">
+          <el-form-item label="产品标识:">
+            <el-input
+              disabled
+              style="width: 90%"
+              size="small"
+              splaceholder="请输入内容"
+              v-model="editQuery.nameCode"
+            ></el-input>
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row>
-        <el-form-item label="产品通用名:">
-          <el-input style="width: 80%" size="small"  :disabled="true" v-model="editQuery.cpmctymc"></el-input>
-        </el-form-item>
+        <el-col span="20">
+          <el-form-item label="物资名称:">
+            <el-input
+              style="width: 90%"
+              size="small"
+              disabled
+              splaceholder="请输入内容"
+              v-model="editQuery.cpmctymc"
+            ></el-input>
+          </el-form-item>
+        </el-col>
       </el-row>
 
       <el-row>
-        <el-form-item label="商品条码:">
-          <el-input
-            style="width: 80%"
-            size="small"
-            splaceholder="请输入内容"
-            v-model="editQuery.sptm"
-          ></el-input>
-        </el-form-item>
+        <el-col span="20">
+          <el-form-item label="商品条码:">
+            <el-input
+              style="width: 90%"
+              size="small"
+              splaceholder="请输入内容"
+              v-model="editQuery.sptm"
+            ></el-input>
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row>
-        <el-form-item label="包装单位:">
-          <el-input
-            style="width: 80%"
-            size="small"
-            splaceholder="请输入内容"
-            v-model="editQuery.packUnit"
-          ></el-input>
-        </el-form-item>
+        <el-col span="20">
+          <el-form-item label="包装单位:">
+            <el-input
+              style="width: 90%"
+              size="small"
+              splaceholder="请输入内容"
+              v-model="editQuery.packUnit"
+            ></el-input>
+          </el-form-item>
+        </el-col>
       </el-row>
-<!--      <el-row>-->
+      <!--      <el-row>-->
       <!--        <el-form-item label="计量单位:">-->
       <!--          <el-input-->
       <!--            style="width: 80%"-->

src/views/basic/product/productUdiType.vue

@@ -62,13 +62,13 @@
               </el-form-item>
             </el-col>
             <el-col :span="12" class="el-col">
-            <el-form-item label="名称" prop="name" class="query-form-item">
-              <el-input
-                v-model="subData.name" style="width: 80%"
-                placeholder="请输入名称"
-                auto-complete="off"
-              ></el-input>
-            </el-form-item>
+              <el-form-item label="名称" prop="name" class="query-form-item">
+                <el-input
+                  v-model="subData.name" style="width: 80%"
+                  placeholder="请输入名称"
+                  auto-complete="off"
+                ></el-input>
+              </el-form-item>
             </el-col>
           </el-row>
           <el-row class="el-row" type="flex">
@@ -148,7 +148,6 @@ export default {
         // page: 1,
         // limit: 10,
       },
-      pCode:null,
       isShow: null,
       loading: true,
       list: [],
@@ -179,7 +178,7 @@ export default {
       checkSubThrWarehouseRow: null,
       selectHospProductVisible: false,
       selectUnBindHospProductVisible:false,
-
+      pCode:null,
       subTotal: 0,
       sysList: [],
       sysSubList: [],
@@ -226,9 +225,7 @@ export default {
       this.getTreeselect();
       this.subFormVisible = true;
     },
-    getTreeName(obj){
-      this.pCode=obj.parentCode;
-    },
+
     hideForm() {    // 新增，编辑---取消
       this.formVisible = false;
       this.subFormVisible = false;
@@ -255,31 +252,31 @@ export default {
         this.$message.error("名称不能为空！");
         return
       }
-          if(this.subData.id!=null){
-            uodateBasicHospType(this.subData).then((response) => {
-              if (response.code == 20000) {
-                this.subFormVisible = false;
-                this.getList();
-              } else {
-                this.$message.error(response.message);
-                this.subFormVisible = false;
-              }
-            }).catch(() => {
-              this.subFormVisible = false;
-            });
-          }else{
-            saveBasicHospType(this.subData).then((response) => {
-              if (response.code == 20000) {
-                this.subFormVisible = false;
-                this.getList();
-              } else {
-                this.$message.error(response.message);
-                this.subFormVisible = false;
-              }
-            }).catch(() => {
-              this.subFormVisible = false;
-            });
+      if(this.subData.id!=null){
+        uodateBasicHospType(this.subData).then((response) => {
+          if (response.code == 20000) {
+            this.subFormVisible = false;
+            this.getList();
+          } else {
+            this.$message.error(response.message);
+            this.subFormVisible = false;
+          }
+        }).catch(() => {
+          this.subFormVisible = false;
+        });
+      }else{
+        saveBasicHospType(this.subData).then((response) => {
+          if (response.code == 20000) {
+            this.subFormVisible = false;
+            this.getList();
+          } else {
+            this.$message.error(response.message);
+            this.subFormVisible = false;
           }
+        }).catch(() => {
+          this.subFormVisible = false;
+        });
+      }
     },
 
     /** 查询菜单下拉树结构 */
@@ -329,6 +326,9 @@ export default {
           });
       }
     },
+    getTreeName(obj){
+      this.pCode=obj.parentCode;
+    },
     addHospProduct(data) {
       this.rId = data.code
       this.selectHospProductVisible = true;