暂存

src/HDrpManagement/orderManage/index.vue

@@ -104,10 +104,10 @@
           <span style="color:#b2c0ea" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '关闭'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname == 'ischange'">
-          {{ scope.data.column.data.ischange ? '是' : '否' }}
+          {{ scope.data.column.data.ischange == 1 ? '是' : '否' }}
         </div>
         <div v-else-if="scope.data.column.columnname == 'isreturn'">
-          {{ scope.data.column.data.isreturn ? '是' : '否' }}
+          {{ scope.data.column.data.isreturn == 1 ? '是' : '否' }}
         </div>
         <div v-else-if="scope.data.column.columnname == 'amount'">
           {{ tool.formatAmount(scope.data.column.data.amount,2) }}

src/SDrpManagement/ProductGroup/modules/Select.vue

@@ -2,12 +2,12 @@
   <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="field_act === item.sys_enterprise_tradefieldid?'act':''" class="brand-item margin-notAll" v-for="item in fields" :key="item.sys_enterprise_tradefieldid" @click="clickField(item)">{{item.tradefield}}</li>
+        <!-- <li  :class="field_act === ''?'act':''" class="brand-item border-all" @click="clickField({})" >全部领域</li> -->
+        <li  :class="field_act === item.sys_enterprise_tradefieldid?'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 == item.sa_brandid?'act':''" class="brand-item margin-notAll" v-for="item in brands" :key="item.sa_brandid" @click="clickBrand(item.sa_brandid)">{{item.brandname}}</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>
@@ -60,7 +60,7 @@ export default {
         }
       })
       this.fields = res1.data
-      this.field_act = ''
+      this.field_act = res1.data[0].sys_enterprise_tradefieldid
     },
     async queryBrands () {
       const res = await this.$api.requested({