10/14 yaopinn优化

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

@@ -338,7 +338,7 @@ export default {
         };
         deletetUdiInfos(tquery).then(res => {
           if (res.code != 20000) {
-            this.$message.error("删除错误")
+            this.$message.error(res.message)
             this.getList()
           } else {
             this.$message.success("删除成功！")

src/views/basic/product/udiInfoselectErpUdi.vue

@@ -273,7 +273,7 @@ export default {
         measname: null,
         page: 1,
         limit: 10,
-
+        productType:1
       },
       thisData: null,
       thrProductsDetailVisible: false,

src/views/supplier/companyDrug/basicCompanyDrugProducts.vue

@@ -360,13 +360,18 @@
         v-if="editDialogVisible"
         :before-close="refresh"
       >
+        <!--:productRemarkSet="productRemarkSet"-->
         <basicProductEdit
-          :productRemarkSet="productRemarkSet"
-          :editQuery="editQuery"
           :closeDialog="closeDialog"
+          :rowData="rowData"
           :type="type"
+          :relevanceEdit="relevanceEdit"
+          :uuid="uuid"
+          :relId="relId"
+          :thisData="thisData"
         >
         </basicProductEdit>
+
         <!--<selectDrugProductsEdit>-->
 
         <!--</selectDrugProductsEdit>-->
@@ -387,6 +392,7 @@
           :type="type"
         >
         </basicProductEdit>
+
         <!--<basicProductDetail-->
         <!--  :productRemarkSet="productRemarkSet"-->
         <!--  :editQuery="editQuery"-->
@@ -546,13 +552,19 @@ export default {
       addProductVisible: false,
       selectVersionVisible: false,
       editQuery: null,
+      rowData: null,
       productRemarkSet: {},
       relevanceEdit: {
         id: null,
         thirdId: "",
         isDisable: null,
         isUseDy: false,
+        isLock: null,
         isAdavence: null,
+        allowNoBatch: null,
+        allowNoExpire: null,
+        allowNoProduct: null,
+        allowNoSerial: null,
         pId: null,
       },
       pId: 0,
@@ -607,7 +619,7 @@ export default {
       isUseDyCheck: false,
       loading: false,
       activeNames: ['1'],
-      type: 2
+      type: null
     };
   },
 
@@ -941,6 +953,23 @@ export default {
         });
     },
     handleModifyClick(row) {
+      this.fromName = 'edit'
+
+      this.type = 2
+      this.uuid = row.uuid;
+      this.relId = row.rlId;
+      this.isImport = false;
+      this.thisData = row;
+      this.pId = row.rlId;
+      this.relevanceEdit = {
+        id: row.rlId,
+        isUseDy: row.isUseDy,
+        isDisable: row.isDisable,
+        isLock: row.isLock,
+        isAdavence: row.isAdavence,
+      };
+      this.editFormat = JSON.parse(JSON.stringify(row));
+      this.rowData = row
       this.editQuery = row;
       this.type = 1
       this.editDialogVisible = true;

src/views/supplier/companyDrug/basicCompanyProductsImport.vue

@@ -4,8 +4,8 @@
       <el-form :model="filterQuery" label-width="120px" v-show="showSearch">
         <el-row>
           <el-col :span="6">
-            <el-form-item label="最小销售标识:">
+            <el-form-item label="药品编码:">
-              <el-input v-model="filterQuery.unionCode" style="width: 90%" placeholder="最小销售标识"
+              <el-input v-model="filterQuery.nameCode" style="width: 90%" placeholder="药品编码"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
@@ -16,27 +16,32 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="规格型号:">
+            <el-form-item label="医保编码:">
-              <el-input v-model="filterQuery.ggxh" style="width: 90%" placeholder="规格型号" clearable="true"></el-input>
+              <el-input v-model="filterQuery.ybbm" style="width: 90%" placeholder="医保编码" clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="生产企业:">
+            <el-form-item label="批准文号:">
-              <el-input v-model="filterQuery.ylqxzcrbarmc" style="width: 90%" placeholder="生产企业/注册备案人"
+              <el-input v-model="filterQuery.zczbhhzbapzbh" style="width: 90%" placeholder="批准文号"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="6">
-            <el-form-item label="配送企业:">
+            <el-form-item label="生产企业:">
-              <el-input v-model="filterQuery.supName" style="width: 90%" placeholder="配送企业" clearable="true"></el-input>
+              <el-input v-model="filterQuery.manufactory" style="width: 90%" placeholder="生产企业" clearable="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="第三方编码:">
+            <el-form-item label="对照条件:" class="query-form-item">
-              <el-input v-model="filterQuery.thrPiId" style="width: 90%" placeholder="第三方主系统编码"
+              <el-select v-model="filterQuery.filterType" style="width: 100%" placeholder="对照条件" clearable>
-                        clearable="true"></el-input>
+                <el-option label="全部" :value="0"></el-option>
+                <el-option label="对照完成" :value="1"></el-option>
+                <el-option label="未对照产品编码" :value="2"></el-option>
+                <!--<el-option label="未对照" :value="3"></el-option>-->
+                <el-option label="未对照其他产品编码" :value="4"></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -59,17 +64,19 @@
                 :header-cell-class-name="cellClass" @current-change="handleSelectionChange">
         <el-table-column label width="45">
           <template slot-scope="scope">
-            <el-radio :label="scope.row.nameCode" v-model="radioCheck"><span></span></el-radio>
+            <el-radio :label="scope.row.mainId" v-model="radioCheck"><span></span></el-radio>
           </template>
         </el-table-column>
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="药品标识" prop="nameCode" width="140"></el-table-column>
         <el-table-column label="第三方主系统编码" prop="thirdId" show-overflow-tooltip width="140"></el-table-column>
         <el-table-column label="药品名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
-        <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
+        <!--<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>-->
         <el-table-column label="包装规格" prop="bzgg" show-overflow-tooltip></el-table-column>
         <el-table-column label="制剂规格" prop="prepnSpec" show-overflow-tooltip></el-table-column>
-        <el-table-column label="制剂单位" prop="prepnUnit" show-overflow-tooltip></el-table-column>
+        <el-table-column label="剂型" prop="prepnUnit" show-overflow-tooltip></el-table-column>
+        <el-table-column label="最小包装单位" prop="measname" show-overflow-tooltip width="120"></el-table-column>
+        <el-table-column label="包装材质" prop="packMatrial" show-overflow-tooltip width="120"></el-table-column>
         <el-table-column label="批准文号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
         <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip></el-table-column>
         <el-table-column width="120" label="操作">
@@ -141,7 +148,7 @@
             </el-col>
 
             <el-col :span="12" class="el-col">
-              <el-form-item label="制剂单位" prop="prepnUnit">
+              <el-form-item label="剂型" prop="prepnUnit">
                 <el-input style="width: 90%" :disabled="true" size="small" splaceholder="请输入内容"
                           v-model="editQuery.prepnUnit"></el-input>
               </el-form-item>
@@ -353,6 +360,13 @@
           </el-col>
         </el-row>
         <el-row  type="flex" style="margin-top: 15px">
+          <el-col :span="11" class="el-col">
+            <el-form-item label="医保编码:" prop="ybbm">
+              <el-input style="width: 90%" size="small" placeholder="请输入内容"
+                        v-model.trim="repEditQuery.ybbm"
+              ></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="11" class="el-col">
             <el-form-item label="商品条码:" prop="cpmctymc">
               <el-input style="width: 90%" size="small" placeholder="请输入内容"
@@ -360,10 +374,27 @@
               ></el-input>
             </el-form-item>
           </el-col>
+
+        </el-row>
+        <el-row  type="flex">
+          <!--<el-col :span="11" class="el-col">-->
+          <!--  <el-form-item label="耗材材质:" prop="matrial">-->
+          <!--    <el-input style="width: 90%" size="small" placeholder="请输入内容"-->
+          <!--              v-model.trim="repEditQuery.matrial"-->
+          <!--    ></el-input>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
+          <el-col :span="11" class="el-col">
+            <el-form-item label="药品名称:" prop="cpmctymc">
+              <el-input style="width: 90%" size="small" placeholder="请输入内容"
+                        v-model.trim="repEditQuery.cpmctymc"
+              ></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="11" class="el-col">
-            <el-form-item label="医保编码:" prop="ybbm">
+            <el-form-item label="包装规格:" prop="bzgg">
               <el-input style="width: 90%" size="small" placeholder="请输入内容"
-                        v-model.trim="repEditQuery.ybbm"
+                        v-model.trim="repEditQuery.bzgg"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -377,23 +408,23 @@
           <!--  </el-form-item>-->
           <!--</el-col>-->
           <el-col :span="11" class="el-col">
-            <el-form-item label="药品价格:" prop="price">
+            <el-form-item label="包装材质:" prop="packMatrial">
               <el-input style="width: 90%" size="small" placeholder="请输入内容"
-                        v-model.trim="repEditQuery.price"
+                        v-model.trim="repEditQuery.packMatrial"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11" class="el-col">
-            <el-form-item label="规格型号:" prop="ggxh">
+            <el-form-item label="最小包装单位:" prop="measname">
               <el-input style="width: 90%" size="small" placeholder="请输入内容"
-                        v-model.trim="repEditQuery.ggxh"
+                        v-model.trim="repEditQuery.measname"
               ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row  type="flex">
           <el-col :span="11" class="el-col">
-            <el-form-item label="制剂单位:" prop="prepnUnit">
+            <el-form-item label="剂型:" prop="prepnUnit">
               <el-input style="width: 90%" size="small" placeholder="请输入内容"
                         v-model.trim="repEditQuery.prepnUnit"
               ></el-input>
@@ -425,9 +456,9 @@
         </el-row>
         <el-row  type="flex">
           <el-col :span="11" class="el-col">
-            <el-form-item label="商品名称:" prop="spmc">
+            <el-form-item label="批准文号:" prop="zczbhhzbapzbh">
               <el-input style="width: 90%" size="small" placeholder="请输入内容"
-                        v-model.trim="repEditQuery.spmc"
+                        v-model.trim="repEditQuery.zczbhhzbapzbh"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -1022,7 +1053,7 @@ export default {
         });
     },
     handleSelectionChange(selection) {
-      this.radioCheck = selection.nameCode;
+      this.radioCheck = selection.mainId;
       this.curSelectDi = selection;
       if (selection.length > 1) {
         this.$refs.diList.clearSelection();
@@ -1041,8 +1072,12 @@ export default {
       this.repEditQuery.flbm = this.currentRow.flbm;
       this.repEditQuery.prepnUnit = this.currentRow.prepnUnit;
       this.repEditQuery.prepnSpec = this.currentRow.prepnSpec;
-      this.repEditQuery.ggxh = this.currentRow.ggxh;
+      this.repEditQuery.bzgg = this.currentRow.bzgg;
       this.repEditQuery.price = this.currentRow.price;
+      this.repEditQuery.cpmctymc = this.currentRow.cpmctymc;
+      this.repEditQuery.zczbhhzbapzbh = this.currentRow.zczbhhzbapzbh;
+      this.repEditQuery.packMatrial = this.currentRow.packMatrial;
+      this.repEditQuery.measname = this.currentRow.measname;
       this.getYbHcData()
       this.classifySearch()
       // if (isBlank(this.relevanceEdit.cpms)) {
@@ -1206,6 +1241,7 @@ export default {
     // }
     // if (this.editQuery.basicPrductRemak7 != null) {
     this.findThrTypeMethod(this.repEditQuery.basicPrductRemak7);
+    this.getList();
   },
  directives: {
   'debounce-input': {