chenrui 1 gadu atpakaļ
vecāks
revīzija
e0d56004b1

+ 2 - 1
src/views/promotionRulesManagement/dealerPromotions/list.vue

@@ -96,7 +96,7 @@
           <template slot="joinCustomers" slot-scope="text, record">
             <span class="joinCustomer" v-if="record.dealerScope ==='ALL_DEALER'" @click="handleCustomers(record)">全部客户</span>
             <span class="joinCustomer" v-else @click="handleCustomers(record)">共有<span style="color:#39f;vertical-align:top;">{{ record.dealerSnList?record.dealerSnList.length:0 }}</span>个客户</span>
-            <a-badge count="审" v-show="record.dealerAuditFlag == 1" :number-style="{ backgroundColor: '#f30', zoom:'80%' }" />
+            <a-badge count="审" v-show="record.dealerAuditFlag == 1 &&(record.state==='NOT_START'||record.state==='RUNNING') " :number-style="{ backgroundColor: '#f30', zoom:'80%' }" />
             <!-- dealerAuditFlag  1 是 0否 -->
           </template>
           <!-- 发布状态 -->
@@ -110,6 +110,7 @@
             <span v-else>--</span>
           </template>
           <!-- 操作 -->
+          <!--  state 待提交:WAIT_SUBMIT 待审核:WAIT_AUDIT 未开始:NOT_START 进行中:RUNNING 审核不通过:AUDIT_REJECT 已结束:IS_OVER -->
           <template slot="action" slot-scope="text, record">
             <a-button
               size="small"

+ 2 - 9
src/views/promotionRulesManagement/dealerPromotions/specialOfferModal.vue

@@ -481,13 +481,6 @@ export default {
     hanldeOk (arr) {
       // 门槛产品导入
       const resultArr = []
-      arr.forEach(item => {
-        const obj = {
-          productCode: item.productCode,
-          productSn: item.product.productSn
-        }
-        resultArr.push(obj)
-      })
       if (this.chooseVal == 'a') {
         const name = this.chooseVal == 'a' ? 'cill' : this.chooseVal == 'b' ? 'normalPrice' : 'offer'
         this.$refs[name + 'Product'].importRow(arr)
@@ -592,8 +585,8 @@ export default {
             provinceDiscountPrice: item.provinceDiscountPriceText,
             cityDiscountPrice: item.cityDiscountPriceText,
             specialDiscountPrice: item.specialDiscountPriceText,
-            unitType: 'SL',
-            unitQty: 1,
+            unitType: item.unitType,
+            unitQty: item.unitQty,
             provinceDiscountRate: item.provinceDiscountRate ? item.provinceDiscountRate : undefined,
             cityDiscountRate: item.cityDiscountRate ? item.cityDiscountRate : undefined,
             specialDiscountRate: item.specialDiscountRate ? item.specialDiscountRate : undefined