2023-3-9

src/SDrpManagement/ProductGroup/modules/Select.vue

@@ -103,22 +103,11 @@ export default {
     },
 
     async queryClass () {
-<<<<<<< HEAD
-      const res = await this.$api.requested({
-        "id":"20220922110403","content":{
-          "sa_brandid":this.brand_act,
-          // "sys_enterpriseid":this.sys_enterpriseid(),
-           where:{istool:0}
-          }
-      })
-      console.log(res.data,'pop')
-=======
       let param = {
         "id":"20220922110403","content":{"sa_brandid":this.brand_act,"sys_enterpriseid":this.sys_enterpriseid(),where:{istool:0}}
       }
       if (!this.sys_enterpriseid()) delete param.content.sys_enterpriseid
       const res = await this.$api.requested(param)
->>>>>>> xiaoqin
       this.itemclass = res.data[0].ttemclass
     },
     clickBrand (id) {