Pārlūkot izejas kodu

Merge branch 'develop_cuxiao' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_cuxiao

lilei 1 gadu atpakaļ
vecāks
revīzija
6bc110b709

+ 3 - 6
src/views/promotionRulesManagement/dealerPromotions/detail.vue

@@ -18,10 +18,10 @@
           <a-descriptions-item label="促销时间" v-else>--</a-descriptions-item>
 
           <a-descriptions-item label="费用所属部门">{{ detailData.expenseDepartmentName || '--' }}</a-descriptions-item>
-          <a-descriptions-item label="参与客户"> 部分客户,共{{ detailData.dealerQty }}个<span class="link-bule btn-box" @click="handleSee">查看</span></a-descriptions-item>
+          <a-descriptions-item label="参与客户"><div @click="handleSee">共<span class="link-bule">{{ detailData.dealerQty }}</span>个</div></a-descriptions-item>
 
           <a-descriptions-item label="促销描述" :span="2">
-            <div>{{ detailData.description || '' }}</div>
+            <div>{{ detailData.content || '' }}</div>
           </a-descriptions-item>
           <a-descriptions-item label="附件" :span="2">
             <div class="attachmentBox" v-if="detailData.attachmentList&&detailData.attachmentList.length>0">
@@ -180,7 +180,7 @@ export default {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '6%', align: 'center' },
         { title: '促销类型', dataIndex: 'promotionRuleTypeDictValue', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '促销简称', dataIndex: 'description', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '规则简称', dataIndex: 'description', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '规则门槛', scopedSlots: { customRender: 'cillProduct' }, width: '20%', align: 'center' },
         { title: '规则', scopedSlots: { customRender: 'ruleProduct' }, width: '20%', align: 'center' },
         { title: '订单起订金额(元)', dataIndex: 'minOrderAmount', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
@@ -304,9 +304,6 @@ export default {
       display:flex;
       align-item:center;
     }
-    .btn-box{
-      margin-left:5px;
-    }
     .footer-cont{
       margin-top: 5px;
       text-align: center;

+ 4 - 1
src/views/promotionRulesManagement/dealerPromotions/detailModal.vue

@@ -19,6 +19,9 @@
           <div>{{ form.gateFlag=== '0'?'无':'有' }}</div>
           <div v-if="form.gateFlag==='1'">购买满{{ form.gateAmount }}元门槛产品,可使用{{ form.quotaAmount }}元配额,采购规则中的正价商品(配额算销售额)</div>
         </a-form-model-item>
+        <a-form-model-item label="促销简称" v-if="form.description">
+          {{ form.description }}
+        </a-form-model-item>
         <!-- 买产品送产品 -->
         <a-form-model-item label="满赠规则" prop="regularSameFlag" v-if="form.promotionRuleType ==='BUY_PROD_GIVE_PROD'">
           <span>{{ form.regularSameFlag==='1'?'同款':'不同款' }}产品购买满{{ form.regularQty }}个正价产品,送{{ form.promotionQty }}个促销产品</span>
@@ -266,7 +269,7 @@ export default {
       getRuleDetail({ sn: this.itemSn }).then(res => {
         if (res.status == 200) {
           const resultObj = res.data
-          this.chooseVal = resultObj.gateFlag == '1' ? 'a' : 'b'
+          this.chooseVal = resultObj.gateFlag == '1' ? 'a' : resultObj.promotionRuleType == 'PROMO_PROD' ? 'd' : 'b'
           this.form = { ...this.form, ...resultObj }
         }
       })

+ 4 - 4
src/views/promotionRulesManagement/dealerPromotions/sendAmountModal.vue

@@ -22,7 +22,7 @@
             id="promotionList-description"
             v-model.trim="form.description"
             allowClear
-            placeholder="请输入促销简称(最多20个字符)"
+            placeholder="请输入规则简称(最多20个字符)"
             :maxLength="20"></a-input>
         </a-form-model-item>
         <a-form-model-item label="规则门槛" prop="gateFlag">
@@ -63,7 +63,7 @@
         </a-form-model-item>
         <a-form-model-item label="满赠规则" prop="regularSameFlag">
           <div class="ruleDescList">
-            <a-select default-value="0" v-model="form.regularSameFlag" style="width: 100px" size="small">
+            <a-select default-value="1" v-model="form.regularSameFlag" style="width: 100px" size="small">
               <a-select-option value="1">
                 同款
               </a-select-option>
@@ -237,7 +237,7 @@ export default {
         gateType: undefined,
         gateAmount: undefined,
         quotaAmount: undefined,
-        regularSameFlag: '0', // 满赠规则  不同款商品
+        regularSameFlag: '1', // 满赠规则  不同款商品
         regularAmount: undefined,
         giveAmount: undefined,
         restrictCategory: '',
@@ -374,7 +374,7 @@ export default {
         gateType: undefined,
         gateAmount: undefined,
         quotaAmount: undefined,
-        regularSameFlag: '0', // 满赠规则  不同款商品
+        regularSameFlag: '1', // 满赠规则  不同款商品
         regularAmount: undefined,
         giveAmount: undefined,
         restrictCategory: '',

+ 4 - 4
src/views/promotionRulesManagement/dealerPromotions/sendProductsModal.vue

@@ -22,7 +22,7 @@
             id="promotionList-description"
             v-model.trim="form.description"
             allowClear
-            placeholder="请输入促销简称(最多20个字符)"
+            placeholder="请输入规则简称(最多20个字符)"
             :maxLength="20"></a-input>
         </a-form-model-item>
         <a-form-model-item label="规则门槛" prop="gateFlag">
@@ -63,7 +63,7 @@
         </a-form-model-item>
         <a-form-model-item label="满赠规则" prop="regularSameFlag">
           <div class="ruleDescList">
-            <a-select default-value="0" v-model="form.regularSameFlag" style="width: 100px" size="small">
+            <a-select default-value="1" v-model="form.regularSameFlag" style="width: 100px" size="small">
               <a-select-option value="1">
                 同款
               </a-select-option>
@@ -242,7 +242,7 @@ export default {
         gateType: undefined,
         gateAmount: undefined,
         quotaAmount: undefined,
-        regularSameFlag: '0', // 满赠规则  不同款商品
+        regularSameFlag: '1', // 满赠规则  不同款商品
         regularQty: undefined,
         promotionQty: undefined,
         restrictFlag: undefined, // 限制正价产品款数
@@ -380,7 +380,7 @@ export default {
         gateType: undefined,
         gateAmount: undefined,
         quotaAmount: undefined,
-        regularSameFlag: '0', // 满赠规则  不同款商品
+        regularSameFlag: '1', // 满赠规则  不同款商品
         regularQty: undefined,
         promotionQty: undefined,
         restrictFlag: undefined, // 限制正价产品款数

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

@@ -22,7 +22,7 @@
             id="promotionList-description"
             v-model.trim="form.description"
             allowClear
-            placeholder="请输入促销简称(最多20个字符)"
+            placeholder="请输入规则简称(最多20个字符)"
             :maxLength="20"></a-input>
         </a-form-model-item>
         <a-form-model-item label="规则门槛" prop="gateFlag">
@@ -442,7 +442,8 @@ export default {
             _this.$refs.specialProduct.setSourceData(chooseProductsList)
           }
         })
-      })
+      })s
+      
     }
   },
   watch: {

+ 1 - 0
src/views/promotionRulesManagement/dealerPromotions/tableType3.vue

@@ -264,6 +264,7 @@ export default {
     },
     // 新增产品 数据
     setSourceData (list) {
+      debugger
       this.dataSource = this.dataSource.concat(list)
     },
     // 新增一行

+ 2 - 6
src/views/promotionRulesManagement/promotionManagement/chooseDealer.vue

@@ -170,7 +170,7 @@ export default {
           }
           this.dealerList = data.list
           this.pagination = pagination
-          if (this.chooseInfo && !this.pageFlag) {
+          if (this.chooseInfo.length > 0 && !this.pageFlag) {
             this.pageFlag = true
             this.selectedRowKeys = this.chooseInfo
           }
@@ -223,14 +223,9 @@ export default {
         showSizeChanger: true,
         current: 1
       }
-      this.selectedRowKeys = []
       this.loadData()
       this.pageFlag = false
     },
-    clearTable () {
-      this.rowSelectionInfo = null
-      this.$refs.table.clearTable()
-    },
     // 批量添加
     async handleBatchAudit () {
       const _this = this
@@ -264,6 +259,7 @@ export default {
       this.$nextTick(() => { // 页面渲染完成后的回调
         _this.setTableH()
       })
+      this.selectedRowKeys = []
       this.chooseInfo = data || []
       this.resetSearchForm()
     },