Selaa lähdekoodia

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

lilei 11 kuukautta sitten
vanhempi
commit
a5e1c7573d

+ 3 - 3
src/api/promotion.js

@@ -155,9 +155,9 @@ export const promotionDateModify = (params) => {
 // 中止
 export const promotionIsOver = (params) => {
   return axios({
-    url: `/promotion/isOver/${params.sn}`,
-    data: {},
-    method: 'get',
+    url: '/promotion/isOver',
+    data: params,
+    method: 'post',
     headers: {
       'module': encodeURIComponent('终止')
     }

+ 1 - 1
src/views/promotionRulesManagement/dealerPromotions/detail.vue

@@ -23,7 +23,7 @@
           <a-descriptions-item label="参与客户" v-else>全部客户</a-descriptions-item>
           <a-descriptions-item label="活动订单起订金额(元)">{{ detailData.minOrderFlag ==='0'?'不限':detailData.minOrderAmount?toThousands(detailData.minOrderAmount):'--' }}</a-descriptions-item>
           <a-descriptions-item label="活动经费上限(元)">{{ detailData.upperLimitFlag ==='0'?'不限':detailData.upperLimitAmount? toThousands(detailData.upperLimitAmount):'--' }}</a-descriptions-item>
-          <a-descriptions-item label="终止说明">{{ detailData.desc||'--' }}</a-descriptions-item>
+          <a-descriptions-item label="终止说明">{{ detailData.overInfo||'--' }}</a-descriptions-item>
           <a-descriptions-item label="促销描述" :span="3">
             <div class="descItem">{{ detailData.content || '--' }}</div>
           </a-descriptions-item>

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

@@ -72,9 +72,10 @@ export default {
     handleSave () {
       const _this = this
       _this.spinning = true
-      promotionIsOver({ sn: this.form.sn }).then(res => {
+      promotionIsOver({ promotionSn: this.form.sn, overInfo: this.form.desc }).then(res => {
         if (res.status == 200) {
           _this.$message.success(res.message)
+          _this.$emit('ok')
           _this.isShow = false
         }
         _this.spinning = false

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

@@ -151,10 +151,11 @@
               @click="handleEnd(record)"
               class="button-info"
               id="promotionList-edit-btn">终止</a-button>
+            <!-- canDelFlag  1显示删除按钮 0不显示删除按钮 (权限:发布状态  关闭 活动状态 进行中||已结束 并且从没有销售单参与过该活动) -->
             <a-button
               size="small"
               type="link"
-              v-if="$hasPermissions('B_dealerPromotionDel')&&(record.state == 'WAIT_SUBMIT'||record.state == 'AUDIT_REJECT')"
+              v-if="$hasPermissions('B_dealerPromotionDel')&&record.canDelFlag == 1"
               @click="handleDel(record)"
               class="button-error"
               id="promotionList-del-btn">删除</a-button>
@@ -473,7 +474,7 @@ export default {
       this.endObj = {
         sn: row.promotionSn,
         name: row.title,
-        desc: row.desc || undefined
+        desc: row.overInfo || undefined
       }
       this.openEndActivityModal = true
     },