lilei 4 weeks ago
parent
commit
8029006a47

+ 1 - 1
src/views/salesManagement/salesQueryNew/comps/activeStatisticsList.vue

@@ -238,7 +238,7 @@ export default {
           fixed: 'left',
           renderBodyCell: ({ row, column, rowIndex }, h) => {
             return (<div style="width:100%;display:flex;justify-content: space-between;" title={row[column.field]} onClick={() => _this.showDesc(row)}>
-              <div class="table-link-text" title={row.promotionTitle + '-' + row[column.field]}>
+              <div class="table-link-text" title={row.promotionTitle + '(' + row[column.field] + ')'}>
                 <span style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">{row[column.field]}</span>
               </div>
               <div style="position:absolute;right:0;">

+ 2 - 2
src/views/salesManagement/salesQueryNew/comps/updateActiveModal.vue

@@ -24,7 +24,7 @@
               v-for="(item,sindex) in noStackActiveList"
               :key="item.id"
               :value="item.salesPromoSn">
-              {{ sindex+1 }}、{{ item.description }}
+              {{ sindex+1 }}、{{ item.promotionRule.promotionRuleTypeDictValue }} — {{ item.promotion.title }}({{ item.description }}
             </aRadio>
           </aRadioGroup>
         </div>
@@ -39,7 +39,7 @@
               v-for="(item,sindex) in stackActiveList"
               :value="item.salesPromoSn"
               :key="item.id">
-              {{ sindex+1 }}、{{ item.description }}
+              {{ sindex+1 }}、{{ item.promotionRule.promotionRuleTypeDictValue }} — {{ item.promotion.title }}({{ item.description }}
             </a-checkbox>
           </a-checkbox-group>
         </div>

+ 4 - 1
src/views/salesManagement/salesQueryNew/newPromoModal.vue

@@ -16,7 +16,10 @@
         <div style="text-align:left;color:#00aaff;">
           <a-checkbox-group v-model="newPromoSnList">
             <a-row v-for="item in newActiveList" :key="item.promotionSn">
-              <a-col :span="24"><a-checkbox :value="item.promotionSn">{{ item.description }}</a-checkbox></a-col>
+              <a-col :span="24">
+                <a-checkbox :value="item.promotionSn">
+                  {{ item.description }}
+                </a-checkbox></a-col>
             </a-row>
           </a-checkbox-group>
         </div>