9/18 优化药品信息

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

@@ -80,10 +80,10 @@
 
       <el-table :data="erpList" style="width: 100%" highlight-current-row="true" border ref="multipleTable" @row-click="handleRowClick"
                 v-loading="erpLloading" @current-change="handleErpChange" @selection-change="handleSelectionChange">
-        <el-table-column v-if="isImport" type="selection" width="55" ></el-table-column>
+        <el-table-column v-if="isImport" type="selection" width="55" :selectable="checkSelectable"></el-table-column>
         <el-table-column label width="45" v-if="!isImport">
           <template slot-scope="scope">
-            <el-radio :label="scope.row.id" v-model="chenck"><span></span></el-radio>
+            <el-radio :label="scope.row.id" v-model="chenck" ><span></span></el-radio>
           </template>
         </el-table-column>
         <!--<el-table-column v-if="!isImport" type="selection" width="55"></el-table-column>-->
@@ -265,6 +265,10 @@ export default {
     intentThirdId: {
       type: Object,
       required: true,
+    },
+    mainIds: {
+      type: Array,
+      required: true,
     }
 
   },
@@ -346,9 +350,9 @@ export default {
       this.thrProductsDetailVisible = true;
     },
 
-    checkSelectable(row) {
+    // checkSelectable(row) {
-      return !row.checked;
+    //   return !row.checked;
-    },
+    // },
     handleCurrentChange(val) {
       this.unionQuery.page = val;
       this.getList();
@@ -361,7 +365,7 @@ export default {
     },
     handleRowClick(row){
       row.isSelected = !row.isSelected;
-      this.$refs.multipleTable.toggleRowSelection(row);
+      // this.$refs.multipleTable.toggleRowSelection(row);
     },
     hideSearch() {
       this.showSearch = !this.showSearch;
@@ -597,6 +601,17 @@ export default {
           this.list = [];
         });
     },
+    checkSelectable(row) {
+      if (this.mainIds == null) {
+        return true
+      } else {
+        if (this.mainIds.length > 0) {
+          return this.mainIds.indexOf(row.code) === -1
+        } else {
+          return true
+        }
+      }
+    }
   },
 
   components: {
@@ -606,7 +621,6 @@ export default {
   created() {
     this.getBasicThirdSys();
     this.erpQuery.code = this.intentThirdId;
-
   },
 };
 </script>

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

@@ -904,7 +904,7 @@ export default {
           uuid: this.newProductData.uuid,
           id: this.newProductData.id,
           nameCode:this.newProductData.nameCode,
-          productType:this.newProductData.productType,
+          productType:this.newProductData.productsType,
         }
         this.loading = true
         filterByUuid(query)

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

@@ -185,6 +185,7 @@
           :isImport="isImport"
           :data="thisData"
           :defaultSys="defaultSys"
+          :mainIds="mainIds"
           @closeUdi="closeDialog"
           :supEnable="false"
         ></chooseHouseDrug>
@@ -224,6 +225,7 @@ export default {
       filterBadInv: true,
       query: {},
       list: [],
+      mainIds:[],
       filterQuery: {
         productsType: 2,
         page: 1,
@@ -315,6 +317,7 @@ export default {
         .then((response) => {
           this.loading = false
           this.list = response.data.list || []
+          this.mainIds = this.list.map(item => item.mainId);
           this.total = response.data.total || 0
         })
         .catch(() => {

src/views/collect/IoDestroyOrder.vue

@@ -300,6 +300,7 @@ export default {
         limit: 10,
         startTime: null,
         endTime: null,
+        keywords: null,
       },
       options: {
         getWorkPlaceList: [],
@@ -404,6 +405,7 @@ export default {
         limit: 10,
         startTime: null,
         endTime: null,
+        keywords: null,
 
       };
       this.actDateRange = [];