Merge remote-tracking branch 'origin/dev' into dev

src/views/basic/product/bindProduct.vue

@@ -107,6 +107,7 @@ import {bindBasicHospProduct, saveBasicHospType, getBindList} from "@/api/basic/
 import {saveRel, productList, SelectproductList} from "@/api/basic/basicCaterelType";
 
 import {sysFilter} from '@/api/basic/udiRelevance'
+import {isBlank} from "@/utils/strUtil";
 
 
 export default {
@@ -178,6 +179,13 @@ export default {
     },
 
     SelectInstentProduct(){
+      if( isBlank(this.filterQuery.udiCode) && isBlank(this.filterQuery.unionCode) &&
+        isBlank(this.filterQuery.cpmctymc) && isBlank(this.filterQuery.ggxh)
+        && isBlank(this.filterQuery.ylqxzcrbarmc)  && isBlank(this.filterQuery.thrPiId)){
+        this.$message("请先输入搜索条件!")
+        return;
+      }
+
           this.filterQuery.page = 1;
           this.getselectList();
     },

src/views/basic/product/product.vue

@@ -1925,7 +1925,6 @@ export default {
         isAdavence: row.isAdavence,
       };
       this.checked = row.isUseDy == 1;
-
       this.editQuery = row;
       //获取产品标识列表
       let ttquery = {

src/views/basic/product/productCategory.vue

@@ -1360,6 +1360,8 @@ import {finProductSet} from "@/api/param/systemParamConfig";
 export default {
   data() {
     return {
+      useNumEnable: true,
+      checked: false,
       sysList: [],
       productRemarkSet: {},
       inputQuery:{},
@@ -1461,7 +1463,6 @@ export default {
         isAdavence: row.isAdavence,
       };
       this.checked = row.isUseDy == 1;
-
       this.editQuery = row;
       //获取产品标识列表
       let ttquery = {