2023-5-23

src/SDrpManagement/ProductGroup/index.vue

@@ -67,7 +67,7 @@ export default {
   data() {
     return {
       brandList:'',
-      brandId:0,
+      brandId:[],
       tablecols:[],
       productGroup:'',
       params: {
@@ -147,7 +147,7 @@ export default {
           value:item.sa_brandid
         }
       })
-      this.brandId = this.brandList ? [this.brandList[0].value] : [0]
+      // this.brandId = this.brandList ? [this.brandList[0].value] : [0]
       this.getProductGroup()
     },
     async getProductGroup() {
@@ -184,6 +184,7 @@ export default {
       })
     },
     brandChange(id) {
+      console.log(id);
       this.brandId = id
       this.$refs.class.clickClass(false)
       this.getProductGroup()

src/SDrpManagement/ProductGroup/modules/Select2.vue

@@ -2,20 +2,20 @@
   <div class="border-bottom">
     <div>
       <ul class="flex-align-center normal-margin-new" >
-        <!-- <li  :class="field_act === ''?'act':''" class="brand-item border-all" @click="clickField({})" >全部领域</li> -->
+        <li  :class="areaBase === ''?'act':''" class="brand-item border-all" @click="clickAreaBase('')" >全部标准</li>
         <li style="margin-left:0" :class="areaBase === item?'act':''" class="brand-item margin-notAll" v-for="item in areaBases" :key="item" @click="clickAreaBase(item)">{{item}}</li>
       </ul>
       <ul class="flex-align-center normal-margin-new" >
-        <!-- <li  :class="field_act === ''?'act':''" class="brand-item border-all" @click="clickField({})" >全部领域</li> -->
+        <li  :class="field_act === ''?'act':''" class="brand-item border-all" @click="clickField('')" >全部领域</li>
         <li  :class="tradefield === item.tradefield?'act':''" class="brand-item" style="margin-left:0" v-for="item in fields" :key="item.sys_enterprise_tradefieldid" @click="clickField(item)">{{item.tradefield}}</li>
       </ul>
       <ul class="flex-align-center normal-margin-new">
-        <!-- <li :class="!brand_act?'act':''" class="brand-item border-all" @click="clickBrand('')">全部品牌</li> -->
+        <li :class="!brand_act?'act':''" class="brand-item border-all" @click="clickBrand('')">全部品牌</li>
         <li  :class="brand_act == item.sa_brandid?'act':''" class="brand-item " style="margin-left:0" v-for="item in brands" :key="item.sa_brandid" @click="clickBrand(item.sa_brandid)">{{item.brandname}}</li>
       </ul>
       <ul class="flex-align-center normal-margin-new">
         <li  :class="class_act === ''?'act':''" class="brand-item border-all" @click="clickClass('')">全部分类</li>
-        <li  :class="class_act === item.itemclassnum?'act':''" class="brand-item margin-notAll" v-for="item in itemclass" :key="item.itemclassnum" @click="clickClass(item)">{{item.itemclassname}}</li>
+        <li  :class="class_act === item.itemclassnum?'act':''" class="brand-item margin-notAll right-line" v-for="item in itemclass" :key="item.itemclassnum" @click="clickClass(item)">{{item.itemclassname}}</li>
       </ul>
       <classTree ref="tree" style="padding-left:80px" :data="activeClass.subdep" @onClassChange="change"></classTree>
     </div>
@@ -65,12 +65,12 @@ export default {
         },
       })
       if (res1.data.length) {
-        this.areaBase = res1.data[0]
+        // this.areaBase = res1.data[0]
         this.areaBases = res1.data
-        this.$emit('clickAreaBase',res1.data[0])
+        // this.$emit('clickAreaBase',res1.data[0])
       } else {
         this.areaBases = res1.data
-        this.areaBase = ''
+        // this.areaBase = ''
       }
       console.log('标准',this.areaBases);
     },
@@ -88,13 +88,13 @@ export default {
       const res1 = await this.$api.requested(param)
       this.fields = res1.data
       if (this.fields.length) {
-        this.field_act = res1.data[0].sys_enterprise_tradefieldid
-        this.tradefield = res1.data[0].tradefield
-        this.$emit('clickField',res1.data[0])
+        // this.field_act = res1.data[0].sys_enterprise_tradefieldid
+        // this.tradefield = res1.data[0].tradefield
+        // this.$emit('clickField',res1.data[0])
         // this.clickField({sys_enterprise_tradefieldid:this.field_act,tradefield:res1.data[0].tradefield})
       } else {
-        this.field_act = 0
-        this.tradefield = ''
+        // this.field_act = 0
+        // this.tradefield = ''
         // this.clickField(false)
       }
       callback && callback()
@@ -114,10 +114,10 @@ export default {
       const res = await this.$api.requested(param)
       this.brands = res.data
       if (this.brands.length) {
-        this.brand_act = res.data[0].sa_brandid
+        // this.brand_act = res.data[0].sa_brandid
         // this.clickBrand(res.data[0].sa_brandid)
       } else {
-        this.brand_act = 0
+        // this.brand_act = 0
         // this.clickBrand(this.brand_act)
       }
       callback && callback()
@@ -141,7 +141,7 @@ export default {
     clickBrand (id) {
       this.brand_act = id ? id : 0
       this.queryClass()
-      this.$emit('brandChange',[this.brand_act])
+      this.$emit('brandChange',this.brand_act ? [this.brand_act] : []) 
       
     },
     clickField (item) {
@@ -187,6 +187,11 @@ export default {
   cursor: pointer;
   transition: .2s all linear;
   font-size: 14px;
+  /* border-right: 1px solid #ccc; */
+}
+.right-line {
+  border-right: 1px solid #e3e5ea;
+  padding-right: 10px;
 }
 .act{
   color:#3874f6;

src/SDrpManagement/ProductGroup/modules/classTree.vue

@@ -40,6 +40,10 @@ export default {
   font-size: 14px;
   
 }
+.right-line {
+  border-right: 1px solid #e3e5ea;
+  padding-right: 10px;
+}
 .act{
   color:#3874f6;
   font-weight: bold;
@@ -49,17 +53,19 @@ export default {
   !important;
 }
 .classItem{
-  flex: 0 1 auto;
-  width:110px ;
-  margin:10px 0px 10px 0;
+  margin: 10px 40px;
+  padding-right: 10px;
+  border-right: 1px solid #e3e5ea;
   font-size:14px !important;
   cursor: pointer;
 }
+.classItem:nth-of-type(1) {
+  margin-left: 0;
+}
 .flex-start{
   display: flex;
   flex-wrap: nowrap;
   align-items: flex-start;
   position: relative;
-  width: 80px;
 }
 </style>