chenrui 10 місяців тому
батько
коміт
633d94a9cd

+ 41 - 33
src/views/promotionRulesManagement/promotionManagement/detailModal.vue

@@ -15,45 +15,63 @@
         :model="form"
         :label-col="formItemLayout.labelCol"
         :wrapper-col="formItemLayout.wrapperCol" >
-        <a-form-model-item label="标题" v-if="form.description">
+        <a-form-model-item label="标题">
           {{ form.title }}
         </a-form-model-item>
-        <a-form-model-item label="排序" v-if="form.gateFlag">
+        <a-form-model-item label="排序">
           {{ form.sort }}
         </a-form-model-item>
         <!-- 买产品送产品 -->
         <a-form-model-item label="封面图片" prop="regularSameFlag" v-if="form.promotionRuleType ==='BUY_PROD_GIVE_PROD'">
-          {{ form.regularPromotionSameFlag }}
+          <img
+            :src="con"
+            alt="图片走丢了"
+            width="80"
+            height="80"
+            v-for="(con,i) in form.imageSet"
+            style="margin-right:10px;"
+            :key="i"/>
+          <div class="upload-desc">说明:单张大小小于10Mb,最多10张;建议尺寸:宽(420px)*高(230px)</div>
         </a-form-model-item>
         <!-- 买产品送采购额 -->
         <a-form-model-item label="内容类型" prop="regularSameFlag" v-if="form.promotionRuleType ==='BUY_PROD_GIVE_MONEY'">
-          {{ form.regularPromotionSameFlag }}
+          {{ form.contentType }}
         </a-form-model-item>
         <!-- 特价产品 -->
         <a-form-model-item label="基本规则" prop="regularSameFlag" v-if="form.promotionRuleType ==='PROMO_PROD'">
-          {{ form.regularPromotionSameFlag }}
+          {{ form.promoRule&&form.promoRule.ruleType?form.promoRule.ruleType==='ticket'?'指定产品返代金券':'--':'--' }}
         </a-form-model-item>
         <a-form-model-item label="券名称" prop="accrualFlag" v-if="form.promotionRuleType ==='BUY_PROD_GIVE_PROD'&&form.accrualFlag">
-          {{ form.regularPromotionSameFlag }}
+          {{ form.promoRule&&form.promoRule.ruleName?form.promoRule.ruleName:'--' }}
         </a-form-model-item>
         <a-form-model-item label="券副标题" prop="regularPromotionSameFlag">
-          {{ form.regularPromotionSameFlag }}
+          {{ form.promoRule&&form.promoRule.ruleTitle?form.promoRule.ruleTitle:'--' }}
         </a-form-model-item>
         <a-form-model-item label="生成方式" prop="regularPromotionSameFlag">
-          {{ form.regularPromotionSameFlag }}
+          {{ form.promoRule&&form.promoRule.ruleBaseType?form.promoRule.ruleBaseType==='bill'?'按订单生成券':'按订单产品款数生成券':'--' }}
         </a-form-model-item>
         <a-form-model-item label="券有效期" prop="scopeFlag" >
-          {{ form.scopeFlag==='1'?'全部产品':'部分产品' }}
+          <span>
+            {{ form.promoRule&&form.promoRule.validType?form.promoRule.validType==='FIXED'?'固定日期':'期限时间':'--' }}
+          </span>
+          <span class="timeBox" v-if="form.promoRule.validType==='FIXED'">{{ form.promoRule.validStartDate }}~{{ form.promoRule.validEndDate }}</span>
+          <span class="timeBox" v-else>领取后,立即生效,有效期{{ form.promoRule.validDays }}天</span>
         </a-form-model-item>
         <a-form-model-item label="券适用范围" prop="scopeFlag" >
-          {{ form.scopeFlag==='1'?'全部产品':'部分产品' }}
+          全部产品
         </a-form-model-item>
         <a-form-model-item label="使用说明" prop="scopeFlag" >
-          {{ form.scopeFlag==='1'?'全部产品':'部分产品' }}
+          {{ form.promoRule&&form.promoRule.ruleExplain?form.promoRule.ruleExplain:'--' }}
+        </a-form-model-item>
+        <a-form-model-item label="加盟商编辑" prop="scopeFlag" >
+          {{ form.dealerEditFlag?form.dealerEditFlag==='1'?'是':'否':'--' }}
+        </a-form-model-item>
+        <a-form-model-item label="是否发布" prop="scopeFlag" >
+          {{ form.publishFlag?form.publishFlag==='1'?'是':'否':'--' }}
         </a-form-model-item>
         <a-form-model-item label="产品范围" prop="scopeFlag" >
           <a-tree-select
-            v-model="form.productRangeList"
+            v-model="form.promoRule.productRangeList"
             :maxTagCount="12"
             :tree-data="productTypeList"
             tree-checkable
@@ -62,18 +80,9 @@
             :replaceFields="{children:'children',title: 'productTypeName',key: 'productTypeSn',value: 'productTypeSn'}"
             placeholder="请选择产品范围" />
         </a-form-model-item>
-        <a-form-model-item label="加盟商编辑" prop="scopeFlag" >
-          {{ form.scopeFlag==='1'?'全部产品':'部分产品' }}
-        </a-form-model-item>
-        <a-form-model-item label="是否发布" prop="scopeFlag" >
-          {{ form.scopeFlag==='1'?'全部产品':'部分产品' }}
-        </a-form-model-item>
-        <a-form-model-item label="返券产品" prop="scopeFlag" >
-          {{ form.scopeFlag==='1'?'全部产品':'部分产品' }}
-        </a-form-model-item>
       </a-form-model>
       <a-card size="small" :bordered="false" class="pages-wrap">
-        <div>
+        <div class="productTable">
           <s-table
             class="sTable"
             ref="table"
@@ -82,6 +91,8 @@
             :columns="columns"
             :data="loadData"
             :defaultLoadData="false"
+            :style="{ maxHeight: 300+'px' }"
+            :scroll="{ y:230 }"
             bordered>
           </s-table>
         </div>
@@ -118,7 +129,7 @@ export default {
       spinning: false,
       formItemLayout: {
         labelCol: { span: 4 },
-        wrapperCol: { span: 20 }
+        wrapperCol: { span: 18 }
       },
       productTypeList: [],
       form: {
@@ -142,15 +153,13 @@ export default {
         { title: '原厂编码', dataIndex: 'origCode', width: '12%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '活动价', dataIndex: 'price', width: '12%', align: 'center', customRender: text => { return ((text || text == 0) ? this.toThousands(text) : '--') } },
         { title: '返券金额', dataIndex: 'ruleValue', width: '12%', align: 'center', customRender: text => { return ((text || text == 0) ? this.toThousands(text) : '--') } },
-        { title: '参考终端价', dataIndex: 'terminalPrice', width: '12%', align: 'center', customRender: text => { return ((text || text == 0) ? this.toThousands(text) : '--') } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: '12%', align: 'center' }
+        { title: '参考终端价', dataIndex: 'terminalPrice', width: '12%', align: 'center', customRender: text => { return ((text || text == 0) ? this.toThousands(text) : '--') } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
         const params = Object.assign(parameter, this.queryParam)
-        console.log('11111111111111', this.itemSn)
         params.promoActiveSn = this.itemSn
         return promoRuleProductList(params).then(res => {
           let data
@@ -279,18 +288,17 @@ export default {
      padding:0 16px;
    }
    .ant-radio-button-wrapper-disabled.ant-radio-button-wrapper-checked{
-   background-color: #ed1c24 !important;
-   color:#ffffff;
-    padding:0 16px;
+       background-color: #ed1c24 !important;
+       color:#ffffff;
+       padding:0 16px;
    }
    /deep/.ant-select-disabled .ant-select-selection, .ant-cascader-picker-disabled{
       color:#333 !important;
       background:#fff;
    }
-   .flex{
-     display:flex;
-     align-items:center;
-     justify-content:space-between;
+   .productTable{
+     width:85%;
+     margin:0 auto;
    }
   }
 

+ 0 - 2
src/views/promotionRulesManagement/promotionManagement/edit.vue

@@ -549,7 +549,6 @@ export default {
           if (valid) {
             // 验证设置参数必填项
             _this.testAndVerify(function (res) {
-              console.log('2222222:', res)
               if (res) {
                 _this.savePartInfo(type)
               }
@@ -591,7 +590,6 @@ export default {
     //     if (valid) {
     //       // 验证设置参数必填项
     //       _this.testAndVerify(function (res) {
-    //         console.log('2222222:', res)
     //         if (res) {
     //           _this.savePartInfo()
     //         }

+ 1 - 1
src/views/promotionRulesManagement/promotionManagement/list.vue

@@ -153,7 +153,7 @@
       <!-- 新增 -->
       <addModal :openModal="openAddModal" :itemId="itemId" @close="closeAddModal" @ok="$refs.table.refresh()"></addModal>
       <!-- 查看 -->
-      <detail-Modal :openModal="openDetailModal" :itemId="itemId" @close="closeDetailModal" @ok="$refs.table.refresh()" />
+      <detail-Modal :openModal="openDetailModal" :itemSn="itemId" @close="closeDetailModal" @ok="$refs.table.refresh()" />
 
     </a-card>
   </div>

+ 2 - 0
src/views/promotionRulesManagement/promotionManagement/productTable.vue

@@ -11,6 +11,8 @@
         :row-selection="{ columnWidth: 40 }"
         @rowSelection="rowSelectionFun"
         :defaultLoadData="false"
+        :style="{ maxHeight: 300+'px' }"
+        :scroll="{ y:230 }"
         bordered>
         <template slot="price" slot-scope="text,record">
           <a-input-number