1、优化选入药品层级增加连带选入

2、选入药品剔除当前的药品

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

@@ -536,21 +536,26 @@
 
       <el-form :model="filterQueryDrugLevel" class="query-form" label-width="100px">
         <el-row>
-          <el-col :span="6">
+          <el-col :span="4">
             <el-form-item label="层级标识:">
               <el-input v-model="filterQueryDrugLevel.nameCode" placeholder="请输入层级标识" clearable></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="4">
             <el-form-item label="通用名称:">
               <el-input v-model="filterQueryDrugLevel.cpmctymc" placeholder="请输入通用名称" clearable></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="4">
             <el-form-item label="批准文号:">
               <el-input v-model="filterQueryDrugLevel.approvalNum" placeholder="请输入批准文号" clearable></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="4">
+            <el-form-item label="生产厂家:">
+              <el-input v-model="filterQueryDrugLevel.manufacturer" placeholder="请输入生产厂家" clearable></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <div style=" float: right;
                         text-align: right;
@@ -1014,6 +1019,8 @@ export default {
       row.rowDisabled = false
     },
     selectDrugLevel(){
+      this.filterQueryDrugLevel.uuid = this.newProductData.uuid
+        this.filterQueryDrugLevel.ybbm = this.newProductData.ybbm
       //获取分页列表
       // this.filterQueryDrugLevel.approvalNum = this.newProductData.zczbhhzbapzbh
       getDrugLevelList(this.filterQueryDrugLevel).then((response) => {
@@ -1026,20 +1033,20 @@ export default {
       })
     },
     selectDrugLevelItem(row){
-      var drug = {
+      this.filterQueryDrugLevel.uuid = this.newProductData.uuid
-        "nameCode":row.nameCode,
+        this.filterQueryDrugLevel.ybbm = this.newProductData.ybbm
-        "uuid":this.newProductData.uuid,
+      this.filterQueryDrugLevel.nameCodeRow =  row.nameCode
-        "ybbm":this.newProductData.ybbm,
-      }
       // console.log('drug',drug)
-      updateLevelDrugAli(drug).then((response) => {
+      updateLevelDrugAli(this.filterQueryDrugLevel).then((response) => {
         if (response.code == 20000) {
           // this.selectedIndex = this.detailList.length - 1
           // this.isSave = false
           this.selectDrugLevelVisible = false
+          var filterQueryDrugLevelNew = this.filterQueryDrugLevel
           this.getDiLevel()
           this.getDetailList()
           this.getThirdSysDetail()
+          this.filterQueryDrugLevel = filterQueryDrugLevelNew
         }
       }).catch(() => {
       })

src/views/supplier/companyDrug/basicCompanyproductEdit.vue

@@ -698,21 +698,26 @@
 
       <el-form :model="filterQueryDrugLevel" class="query-form" label-width="100px">
         <el-row>
-          <el-col :span="6">
+          <el-col :span="4">
             <el-form-item label="层级标识:">
               <el-input v-model="filterQueryDrugLevel.nameCode" placeholder="请输入层级标识" clearable></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="4">
             <el-form-item label="通用名称:">
               <el-input v-model="filterQueryDrugLevel.cpmctymc" placeholder="请输入通用名称" clearable></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="4">
             <el-form-item label="批准文号:">
               <el-input v-model="filterQueryDrugLevel.approvalNum" placeholder="请输入批准文号" clearable></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="4">
+            <el-form-item label="生产厂家:">
+              <el-input v-model="filterQueryDrugLevel.manufacturer" placeholder="请输入生产厂家" clearable></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <div style=" float: right;
                         text-align: right;
@@ -1174,9 +1179,11 @@ export default {
       }
       this.selectDrugLevel()
     },
-    selectDrugLevel() {
+    selectDrugLevel(){
+      this.filterQueryDrugLevel.uuid = this.newProductData.uuid
+      this.filterQueryDrugLevel.ybbm = this.newProductData.ybbm
       //获取分页列表
-      this.filterQueryDrugLevel.approvalNum = this.newProductData.zczbhhzbapzbh
+      // this.filterQueryDrugLevel.approvalNum = this.newProductData.zczbhhzbapzbh
       getDrugLevelList(this.filterQueryDrugLevel).then((response) => {
         if (response.code == 20000) {
           this.selectDrugLevelList = response.data.list || []
@@ -1187,20 +1194,20 @@ export default {
       })
     },
     selectDrugLevelItem(row){
-      var drug = {
+      this.filterQueryDrugLevel.uuid = this.newProductData.uuid
-        "nameCode":row.nameCode,
+      this.filterQueryDrugLevel.ybbm = this.newProductData.ybbm
-        "uuid":this.newProductData.uuid,
+      this.filterQueryDrugLevel.nameCodeRow =  row.nameCode
-        "ybbm":this.newProductData.ybbm,
-      }
       // console.log('drug',drug)
-      updateLevelDrugAli(drug).then((response) => {
+      updateLevelDrugAli(this.filterQueryDrugLevel).then((response) => {
         if (response.code == 20000) {
           // this.selectedIndex = this.detailList.length - 1
           // this.isSave = false
           this.selectDrugLevelVisible = false
+          var filterQueryDrugLevelNew = this.filterQueryDrugLevel
           this.getDiLevel()
           this.getDetailList()
           this.getThirdSysDetail()
+          this.filterQueryDrugLevel = filterQueryDrugLevelNew
         }
       }).catch(() => {
       })
@@ -1208,6 +1215,7 @@ export default {
 
     }
     ,
+
     addDrugLevel() {
       this.detailList.push({
         nameCode: '',