lilei 3 weeks ago
parent
commit
01413961e2

+ 3 - 3
src/views/salesManagement/pushOrderManagement/detail.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="pushOrder-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
-      <a-page-header :ghost="false" :backIcon="false" class="salesDetail-cont" :style="{marginBottom:!outBizSubSn&&!bizSn?'6px':'0px'}">
-        <template slot="subTitle" v-if="!outBizSubSn&&!bizSn">
-          <a href="javascript:;" @click="handleBack"><a-icon type="left"></a-icon> 返回列表</a>
+      <a-page-header :ghost="false" :backIcon="false" class="salesDetail-cont" :style="{marginBottom:!outBizSubSn&&!bizSn?'6px':'6px'}">
+        <template slot="subTitle">
+          <a href="javascript:;" v-if="!outBizSubSn&&!bizSn" @click="handleBack"><a-icon type="left"></a-icon> 返回列表</a>
           <span style="margin: 0 5px 0 15px;color: #666;font-weight: bold;">单号:{{ detailData&&detailData.dispatchBillNo }}</span>
           <a-badge count="新" v-if="detailData&&detailData.newCustFlag==1" :number-style="{ backgroundColor: '#52c41a', zoom:0.8 }"></a-badge>
           <span style="margin: 0 10px;color: #666;">客户名称:{{ detailData&&detailData.buyerName }}</span>

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

@@ -190,9 +190,9 @@ export default {
           align: 'center',
           fixed: 'left',
           renderBodyCell: ({ row, column, rowIndex }, h) => {
-            const isTejia = row && row.promotionRule && row.promotionRule.promotionRuleType == 'PROMO_PROD' && _this.type == 'edit' // 是否特价
-            const tejiaLen = _this.tableData.filter(item => item.promotionRule && item.promotionRule.promotionRuleType == 'PROMO_PROD').length // 特价活动数量
-            const tjStart = _this.tableData.findIndex(item => item.promotionRule && item.promotionRule.promotionRuleType == 'PROMO_PROD') // 特价活动开始索引
+            const isTejia = row && row.promotionRule && row.promotionRule.promotionRuleType == 'PROMO_PROD' && row.promotion.stackFlag == 1 && _this.type == 'edit' // 是否特价叠加
+            const tejiaLen = _this.tableData.filter(item => item.promotionRule && item.promotionRule.promotionRuleType == 'PROMO_PROD' && item.promotion.stackFlag == 1).length // 特价叠加活动数量
+            const tjStart = _this.tableData.findIndex(item => item.promotionRule && item.promotionRule.promotionRuleType == 'PROMO_PROD' && item.promotion.stackFlag == 1) // 特价叠加活动开始索引
             // 特价活动上移下移排序
             const equalWord = <div class="table-arrow-box">
               {rowIndex > tjStart ? <span class="up" onClick={() => _this.moveTjRow(row, rowIndex, 1)} title="上移">⇡</span> : ''}

+ 5 - 0
src/views/salesManagement/salesQueryNew/comps/productNormalList.vue

@@ -55,6 +55,9 @@
               <a-menu-item key="1" id="salesEdit-pl-1">
                 删除已选项
               </a-menu-item>
+              <a-menu-item key="4" id="salesEdit-pl-4" v-if="hasActive">
+                批量匹配促销
+              </a-menu-item>
               <!-- <a-menu-divider />
               <a-menu-item key="3" id="salesEdit-pl-3">
                 全部仓库设置
@@ -550,6 +553,8 @@ export default {
         this.rowSelectionInfo = null
         _this.warehouseTit = '全部仓库设置'
         _this.openWarehouseModal = true
+      } else if (e.key == 4) { // 批量匹配活动
+
       } else {
         this.handleBatchDelAll()
       }