11/13 界面优化1.0

src/views/basic/product/drug/drugMaintain.vue

@@ -114,7 +114,7 @@
         <!--<el-table-column label="收费项目编码" prop="payFeeCode" width="100"></el-table-column>-->
         <el-table-column label="药品通用名称" prop="cpmctymc" width="160"></el-table-column>
         <el-table-column label="制剂规格" prop="prepnSpec" width="90"></el-table-column>
-        <el-table-column label="制剂单位" prop="prepnUnit" width="90"></el-table-column>
+        <el-table-column label="剂型" prop="prepnUnit" width="90"></el-table-column>
         <el-table-column label="包装规格" prop="bzgg" width="100"></el-table-column>
         <el-table-column label="包装单位" prop="packUnit" width="90"></el-table-column>
         <!--<el-table-column label="包装比例" prop="packRatio" width="90"></el-table-column>-->

src/views/supplier/companyDrug/basicCompanyProductsImport.vue

@@ -75,7 +75,7 @@
                 :header-cell-class-name="cellClass" @current-change="handleSelectionChange">
         <el-table-column label width="45">
           <template slot-scope="scope">
-            <el-radio :label="scope.row.mainId" v-model="radioCheck"><span></span></el-radio>
+            <el-radio :label="scope.row.nameCode" v-model="radioCheck"><span></span></el-radio>
           </template>
         </el-table-column>
         <el-table-column label="序号" type="index"></el-table-column>
@@ -372,8 +372,8 @@
         </el-row>
         <el-row  type="flex" style="margin-top: 15px">
           <el-col :span="11" class="el-col">
-            <el-form-item label="明细分类:" prop="detailSort">
-              <el-select v-model="repEditQuery.detailSort" style="width: 90%" placeholder="选择明细分类">
+            <el-form-item label="药品明细分类:" prop="detailSort">
+              <el-select v-model="repEditQuery.detailSort" style="width: 90%" placeholder="选择药品明细分类">
                 <el-option label="麻醉药品原料药" :value="1"></el-option>
                 <el-option label="第一类精神药品原料药" :value="2"></el-option>
                 <el-option label="第二类精神药品原料药" :value="3"></el-option>
@@ -848,7 +848,8 @@ export default {
         hcType: null,
         flbm: null,
         requireScanCode: null,
-        ggxh:null
+        ggxh:null,
+        detailSort:null
 
       },
       relevanceEdit: {
@@ -1038,6 +1039,11 @@ export default {
         this.$message.error("请输入或者正确填写药品价格");
         return;
       }
+      if (this.repEditQuery.detailSort == null) {
+        this.$message.error("请补充分药品类明细后重新选入");
+        return;
+      }
+
       this.$refs['editQuery'].validate((valid) => {
         if (!valid) {
           return this.$message.error('请补充必要数据')
@@ -1112,13 +1118,13 @@ export default {
         });
     },
     handleSelectionChange(selection) {
-      this.radioCheck = selection.mainId;
+      this.radioCheck = selection.nameCode;
       this.curSelectDi = selection;
       if (selection.length > 1) {
         this.$refs.diList.clearSelection();
         this.$refs.diList.toggleRowSelection(selection.pop());
       }
-
+      this.repEditQuery.detailSort = null
       this.multipleSelection = selection
       this.currentRow = selection;
       this.replTitle = "(" + this.currentRow.cpmctymc + ")" + "药品信息补齐:";