lilei 1 month ago
parent
commit
79f96b9041

+ 1 - 1
src/views/salesManagement/salesQueryNew/detail.vue

@@ -528,7 +528,7 @@ export default {
         { label: '总金额', value: '10' },
         { label: '总金额', value: '10' },
         { label: '优惠金额', value: '11' }
         { label: '优惠金额', value: '11' }
       ]
       ]
-      this.colsValue = this.colsOptions.map(item => item.value)
+      this.colsValue = this.colsOptions.filter(item => item.value > 0 && item.value < 8).map(item => item.value)
     },
     },
     // 确定选择经销商库存转单
     // 确定选择经销商库存转单
     openDealerStockOk (val, data) {
     openDealerStockOk (val, data) {

+ 15 - 6
src/views/salesManagement/salesQueryNew/edit.vue

@@ -33,8 +33,13 @@
       </a-card>
       </a-card>
       <!-- 正常产品 -->
       <!-- 正常产品 -->
       <a-card size="small" :bordered="false" class="salesEdit-cont" v-if="salesBillSn">
       <a-card size="small" :bordered="false" class="salesEdit-cont" v-if="salesBillSn">
-        <div style="padding: 10px 10px 0;">
+        <div slot="title" style="display: flex;justify-content: space-between;align-items: center;">
+          <strong>产品列表</strong>
+          <a-button size="small" @click="showNormalList=!showNormalList" type="link" class="button-info"><a-icon :type="showNormalList?'up':'down'"/> {{ showNormalList?'收起':'展开' }}</a-button>
+        </div>
+        <div style="padding: 10px 10px 0;position: relative;">
           <productNormalList
           <productNormalList
+            v-show="showNormalList"
             ref="productNormalList"
             ref="productNormalList"
             @refash="refashTableData"
             @refash="refashTableData"
             @spinning="e=>spinning=e"
             @spinning="e=>spinning=e"
@@ -89,6 +94,7 @@
           :warehouseSn="warehouseSn"
           :warehouseSn="warehouseSn"
           :salesBillSn="salesBillSn"
           :salesBillSn="salesBillSn"
         ></activeStatisticsList>
         ></activeStatisticsList>
+        <div v-if="!showActiveList" style="height:10px"></div>
         <div style="padding:0 10px 10px 10px;">
         <div style="padding:0 10px 10px 10px;">
           <productActiveList
           <productActiveList
             ref="productActiveList"
             ref="productActiveList"
@@ -121,10 +127,10 @@
                 <div v-if="yhDetail">
                 <div v-if="yhDetail">
                   <div
                   <div
                     class="yhdetail"
                     class="yhdetail"
-                    style="min-width:300px;margin-bottom: 5px;"
+                    style="min-width:300px;margin-bottom: 10px;"
                     v-for="(item,index) in yhDetail.promoMapList"
                     v-for="(item,index) in yhDetail.promoMapList"
                     :key="index">
                     :key="index">
-                    <div class="yhdetail-h" style="font-weight: bold;font-size:14px;">{{ item.description }}</div>
+                    <div class="yhdetail-h" style="font-size:14px;">{{ item.description }}</div>
                     <div
                     <div
                       style="padding-left:10px;"
                       style="padding-left:10px;"
                       v-for="(sitem,sindex) in item.promoRuleMapList"
                       v-for="(sitem,sindex) in item.promoRuleMapList"
@@ -132,10 +138,12 @@
                       v-if="sitem.lossAmount"
                       v-if="sitem.lossAmount"
                     >
                     >
                       <div style="display: flex;justify-content: space-between;">
                       <div style="display: flex;justify-content: space-between;">
-                        <span>{{ sitem.promotionRuleTypeDictValue }}:</span>
+                        <div>
+                          <span>{{ sitem.promotionRuleTypeDictValue }}:</span>
+                          <span style="color:#999;">{{ sitem.description }}</span>
+                        </div>
                         <strong>¥{{ toThousands(sitem.lossAmount) }}</strong>
                         <strong>¥{{ toThousands(sitem.lossAmount) }}</strong>
                       </div>
                       </div>
-                      <div class="yhdetail-d" style="color:#999;">{{ sitem.description }}</div>
                     </div>
                     </div>
                   </div>
                   </div>
                   <div class="yhdetail" style="display: flex;justify-content: space-between;">
                   <div class="yhdetail" style="display: flex;justify-content: space-between;">
@@ -230,6 +238,7 @@ export default {
       activeList: [], // 活动列表
       activeList: [], // 活动列表
       newActiveList: [], // 新活动列表
       newActiveList: [], // 新活动列表
       showActiveList: true,
       showActiveList: true,
+      showNormalList: true,
       salesBillSn: null, // 销售单sn
       salesBillSn: null, // 销售单sn
       detailData: { discountAmount: 0, id: null, salesBillSn: '' }, // 订单基础数据
       detailData: { discountAmount: 0, id: null, salesBillSn: '' }, // 订单基础数据
       warehouseSn: undefined, // 仓库sn
       warehouseSn: undefined, // 仓库sn
@@ -291,7 +300,7 @@ export default {
         { label: '总金额', value: '10' },
         { label: '总金额', value: '10' },
         { label: '优惠金额', value: '11' }
         { label: '优惠金额', value: '11' }
       ]
       ]
-      this.colsValue = this.colsOptions.map(item => item.value)
+      this.colsValue = this.colsOptions.filter(item => item.value > 0 && item.value < 8).map(item => item.value)
     },
     },
     // 查看参与规则明细
     // 查看参与规则明细
     showRuleDetail (sn) {
     showRuleDetail (sn) {