Merge branch 'blueBranch' into allTestUrgent

src/HDrpManagement/orderManage/details/tabs/rebatesettlement.vue

@@ -3,9 +3,9 @@
     <el-tabs v-if="rebHeadData.length > 0" v-model="activeName" type="border-card" @tab-click="handleClick">
       <el-tab-pane v-for="item in rebHeadData" :key="item.index" :label="item.title" :name="item.title">
         <el-descriptions class="margin-top mt-10" title="居间明细" :column="2" size="small" border>
-          <el-descriptions-item :labelStyle="{width:'120px'}" label="订单金额比例">{{item.orderratio}}</el-descriptions-item>
+          <el-descriptions-item :labelStyle="{width:'120px'}" label="订单金额比例">{{item.calculatemodel == 1?item.orderratio:'--'}}</el-descriptions-item>
           <el-descriptions-item :labelStyle="{width:'120px'}" label="订单金额">{{item.amount?tool.formatAmount(item.amount,2):''}}</el-descriptions-item>
-          <el-descriptions-item :labelStyle="{width:'120px'}" label="居间产品折扣">{{Math.round((item.productdiscount * 100)*100)/100 + '%'}}</el-descriptions-item>
+          <el-descriptions-item :labelStyle="{width:'120px'}" label="居间产品折扣">{{item.calculatemodel == 2?Math.round((item.productdiscount * 100)*100)/100 + '%':'--'}}</el-descriptions-item>
           <el-descriptions-item :labelStyle="{width:'120px'}" label="居间费">{{tool.formatAmount(item.rebate,2)}}</el-descriptions-item>
           <el-descriptions-item :labelStyle="{width:'120px'}" label="结算经销商">{{item.enterprisename?item.enterprisename:'--'}}</el-descriptions-item>
         </el-descriptions>

src/SDrpManagement/ProductGroup/modules/Select2.vue

@@ -1,10 +1,11 @@
 <template>
   <div class="border-bottom">
     <div>
-      <ul class="flex-align-center normal-margin-new">
+      <ul class="normal-margin-new" ref="myUl">
         <li
           :class="areaBase === '' ? 'act' : ''"
           class="brand-item border-all"
+          style="float: left"
           v-if="(siteid == 'HY' && areaBases.length > 1) || siteid != 'HY'"
           @click="clickAreaBase('')"
         >
@@ -14,18 +15,20 @@
           :class="areaBase === item ? 'act' : ''"
           v-if="(siteid == 'HY' && areaBases.length > 1) || siteid != 'HY'"
           class="brand-item margin-notAll"
-          v-for="item in areaBases"
+          v-for="(item,index) in areaBases"
           :key="item"
           @click="clickAreaBase(item)"
         >
-          {{ $t(item) }}
+          <div v-if="index == 0"  class="brand-item margin-notAll" style="float: left">{{ $t(item) }}</div>
+          <div v-else class="brand-item margin-notAll" style="float: left;margin-left: 15px">{{ $t(item) }}</div>
         </li>
       </ul>
-      <ul class="flex-align-center normal-margin-new">
+      <ul class="normal-margin-new" style="clear: both">
         <li
           :class="field_act === '' ? 'act' : ''"
           v-if="(siteid == 'HY' && fields.length > 1) || siteid != 'HY'"
           class="brand-item border-all"
+          style="float: left"
           @click="clickField('')"
         >
           {{ $t("全部领域") }}
@@ -34,17 +37,20 @@
           :class="tradefield === item.tradefield ? 'act' : ''"
           v-if="(siteid == 'HY' && fields.length > 1) || siteid != 'HY'"
           class="brand-item margin-notAll"
-          v-for="item in fields"
+          v-for="(item,index) in fields"
           :key="item.sys_enterprise_tradefieldid"
           @click="clickField(item)"
         >
-          {{ $t(item.tradefield) }}
+<!--          {{ $t(item.tradefield) }}-->
+          <div v-if="item.rowindex == 1"  class="brand-item margin-notAll" style="float: left">{{ $t(item.tradefield) }}</div>
+          <div v-else class="brand-item margin-notAll" style="float: left;margin-left: 15px">{{ $t(item.tradefield) }}</div>
         </li>
       </ul>
-      <ul class="flex-align-center normal-margin-new">
+      <ul class="normal-margin-new" style="clear: both">
         <li
           :class="!brand_act ? 'act' : ''"
           class="brand-item border-all"
+          style="float: left"
           v-if="(siteid == 'HY' && brands.length > 1) || siteid != 'HY'"
           @click="clickBrand('')"
         >
@@ -54,14 +60,16 @@
           :class="brand_act == item.sa_brandid ? 'act' : ''"
           v-if="(siteid == 'HY' && brands.length > 1) || siteid != 'HY'"
           class="brand-item margin-notAll"
-          v-for="item in brands"
+          v-for="(item,index) in brands"
           :key="item.sa_brandid"
           @click="clickBrand(item.sa_brandid)"
         >
-          {{ item.brandname }}
+<!--          {{ item.brandname }}-->
+          <div v-if="index == 0"  class="brand-item margin-notAll" style="float: left">{{ $t(item.brandname) }}</div>
+          <div v-else class="brand-item margin-notAll" style="float: left;margin-left: 15px">{{ $t(item.brandname) }}</div>
         </li>
       </ul>
-      <ul class="flex-align-center normal-margin-new">
+      <ul class="flex-align-center normal-margin-new" style="clear: both">
         <li
           :class="class_act === '' ? 'act' : ''"
           class="brand-item border-all"
@@ -105,7 +113,7 @@ export default {
       class_act: "",
       areaBases: [],
       areaBase: "",
-      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid,
     };
   },
   provide() {
@@ -239,6 +247,16 @@ export default {
       this.$emit("clearSearch");
     },
   },
+  // watch:{
+  //   "height":function (){
+  //     console.log(this.height,'444444高度222')
+  //     const newHeight = this.$refs.myUl.offsetHeight; // 获取当前高度。
+  //     if (newHeight !== this.height) { // 检查是否真的发生了变化（可选）以避免不必要的操作。
+  //       this.height = newHeight; // 更新高度值。可以在这里执行其他基于高度变化的逻辑。例如：console.log(newHeight); 或者 this.doSomethingWithNewHeight(newHeight);。
+  //     }
+  //     console.log(this.height,'高度')
+  //   }
+  // },
   mounted() {
     this.queryClass();
     this.queryAgentiInfo();