活动修改

src/locale/lang/zh-CN.js

@@ -593,6 +593,11 @@ export const columns = {
   wxTradeNo:'微信交易单号',
   kgName:'知识库名称',
   kgUrl:'知识库链接',
+  packagePrice:'打包价格',
+  webPrice:'PC端价格',
+  wxPrice:'手机端价格',
+  activityItem:'活动明细',
+  activity:'活动总单',
 }
 
 /**

src/view/mst/activity/index.vue

@@ -41,6 +41,7 @@
           <DkTableColumn field="activityStatusName"/>
           <DkTableColumn field="beginDate" :dataType="$config.columnType.date"></DkTableColumn>
           <DkTableColumn field="endDate" :dataType="$config.columnType.date"></DkTableColumn>
+          <DkTableColumn field="gradeName"/>
           <DkTableColumn field="flgValid" type="switch"/>
           <DkTableColumn field="remarks"></DkTableColumn>
         </DkTable>
@@ -51,8 +52,9 @@
                  :height="this.tableHeight * (1-split)" primaryKey="itemId" name="table">
           <DkTableColumn field="activityItemName"></DkTableColumn>
           <DkTableColumn field="activityItemDescribe"></DkTableColumn>
-          <DkTableColumn field="stdPrice"  data-type="number" :digits="2"></DkTableColumn>
-          <DkTableColumn field="salePrice" data-type="number" :digits="2"></DkTableColumn>
+          <DkTableColumn field="stdPrice"  data-type="number" :digits="2" :title="$t('packagePrice')"></DkTableColumn>
+          <DkTableColumn field="webPrice" data-type="number" :digits="2"></DkTableColumn>
+          <DkTableColumn field="wxPrice" data-type="number" :digits="2"></DkTableColumn>
           <DkTableColumn field="validLong"></DkTableColumn>
           <DkTableColumn field="extraLong"></DkTableColumn>
         </DkTable>
@@ -107,8 +109,13 @@
         <DkFormItem prop="funId" :label="$t('activityFunId')" :required="true" v-if="funFlag">
           <SelectMagnifier v-model="formData.funId" :display-text="formData.funName"
                            :type="this.$config.MagnifierType.activityFunId"
-                           :multiple="false"
-                           @ok="funIdOk"/>
+                           :multiple="false"/>
+        </DkFormItem>
+        <!--活动功能包-->
+        <DkFormItem prop="funIds" :label="$t('activityFunId')" :required="true" v-if="funIdsFlag" :data-type="$config.dataType.array">
+          <SelectMagnifier v-model="formData.funIds" :display-text="formData.funName"
+                           :type="this.$config.MagnifierType.activityFunId"
+                           :multiple="true"/>
         </DkFormItem>
         <!--图片路径-->
         <DkFormItem prop="annexPaths" :label="$t('activityBanner')" v-if="bannerFlag">
@@ -155,7 +162,7 @@
              @modalCancel="cancelMeasure"
              :saveFlag="true">
       <DkCollapse ref="collapse">
-        <DkPanel prop="活动总单">
+        <DkPanel prop="activity">
           <DkForm slot="content" ref="formMeasure" style="width:100%;" name="dk-form" v-model="totalForm" :col-count="3">
             <!--活动名称-->
             <DkFormItem prop="activityName">
@@ -192,11 +199,14 @@
               <DkFormItem prop="activityItemDescribe"  :required="true">
                 <InputPop v-model="item.activityItemDescribe"/>
               </DkFormItem>
-              <DkFormItem prop="stdPrice"  :required="true" data-type="number">
+              <DkFormItem prop="stdPrice" :label="$t('packagePrice')" :required="true" data-type="number">
                 <InputNumberPop v-model="item.stdPrice"/>
               </DkFormItem>
-              <DkFormItem prop="salePrice"  :required="true" data-type="number">
-                <InputNumberPop v-model="item.salePrice"/>
+              <DkFormItem prop="webPrice"  :required="true" data-type="number" v-if="totalForm.gradeCode == 'PRO' || (totalForm.activityType != '活动分类-功能' && totalForm.activityType != '活动分类-功能包')">
+                <InputNumberPop v-model="item.webPrice"/>
+              </DkFormItem>
+              <DkFormItem prop="wxPrice"  :required="true" data-type="number" v-if="totalForm.gradeCode == 'PRO' || (totalForm.activityType != '活动分类-功能' && totalForm.activityType != '活动分类-功能包')">
+                <InputNumberPop v-model="item.wxPrice"/>
               </DkFormItem>
               <DkFormItem prop="validLong"  :required="true" data-type="number">
                 <InputNumberPop v-model="item.validLong" :unit="'月'"/>
@@ -232,6 +242,7 @@ export default {
       gradeFlag:false,//活动版本显示标识
       funFlag:false,//活动功能显示标识
       bannerFlag:false,//活动广告显示标识
+      funIdsFlag:false,//功能包多选标识
       itemModal:false,
       tableData: [],
       tableDataDetail_activityItem: [],
@@ -254,6 +265,7 @@ export default {
         funName:null,
         appCode:null,
         cpIds:null,
+        funIds:null,
       },
       //总单
       totalForm:{
@@ -281,7 +293,8 @@ export default {
           activityItemName:null,
           activityItemDescribe:null,
           stdPrice:null,
-          salePrice:null,
+          webPrice:null,
+          wxPrice:null,
           validLong:null,
           extraLong:null,
         }]
@@ -303,7 +316,7 @@ export default {
     * @date   : 2024/4/16 8:57
     */
     addNewItem() {
-      this.itemForm.itemList.push({"itemId":null,"activityItemName": null,"activityItemDescribe": null, "stdPrice": null, "salePrice": null,"validLong":null,"extraLong":null})
+      this.itemForm.itemList.push({"itemId":null,"activityItemName": null,"activityItemDescribe": null, "stdPrice": null, "webPrice": null,"wxPrice":null,"validLong":null,"extraLong":null})
     },
     /**
     * @desc   : 取消
@@ -318,7 +331,8 @@ export default {
         activityItemName:null,
         activityItemDescribe:null,
         stdPrice:null,
-        salePrice:null,
+        webPrice:null,
+        wxPrice:null,
         validLong:null,
         extraLong:null,
       }]
@@ -342,6 +356,7 @@ export default {
           this.loading = false
           if (res.code === 200) {
             this.$Message.success(res.message)
+            this.searchData()
             //关闭
             this.cancelMeasure()
           } else {
@@ -470,22 +485,32 @@ export default {
         if(row.kindCode === '活动分类-版本'){
           this.gradeFlag = true
           this.funFlag = false
+          this.funIdsFlag = false
           this.bannerFlag = false
         }
         if(row.kindCode === '活动分类-功能'){
           this.gradeFlag = false
           this.funFlag = true
+          this.funIdsFlag = false
+          this.bannerFlag = false
+        }
+        if(row.kindCode === '活动分类-功能包'){
+          this.gradeFlag = false
+          this.funFlag = false
+          this.funIdsFlag = true
           this.bannerFlag = false
         }
         if(row.kindCode === '活动分类-广告'){
           this.gradeFlag = false
           this.funFlag = false
+          this.funIdsFlag = false
           this.bannerFlag = true
           this.formData.flgBanner = true
         }
         if(row.kindCode === '活动分类-充值'){
           this.gradeFlag = false
           this.funFlag = false
+          this.funIdsFlag = false
           this.bannerFlag = false
         }
       }
@@ -591,7 +616,12 @@ export default {
       if(params.endDate){
         params.endDate = params.endDate.format('yyyy-MM-dd')
       }
+      params.activityStatus = '活动状态-未发布'
+      if(params.activityType === '活动分类-功能包'){
+        params.gradeCode = 'STD'
+      }
       console.log('this.params', this.params)
+      this.loading = false
       if (this.modalParams.button === this.$config.formMode.add) {
         delete this.params.activityId // 解决提示主键重复的问题，删除主键代码
         return this.excute(this.$service.activityService, this.$service.activityService.insert, params)
@@ -629,6 +659,7 @@ export default {
       this.gradeFlag = false//活动版本显示标识
       this.funFlag = false//活动功能显示标识
       this.bannerFlag= false//活动广告显示标识
+      this.funIdsFlag = false//功能包显示标识
     },
     /**
      * @desc   : 通过id查询
@@ -642,22 +673,32 @@ export default {
             if(activityType === '活动分类-版本'){
               this.gradeFlag = true
               this.funFlag = false
+              this.funIdsFlag = false
               this.bannerFlag = false
             }
             if(activityType === '活动分类-功能'){
               this.gradeFlag = false
               this.funFlag = true
+              this.funIdsFlag = false
+              this.bannerFlag = false
+            }
+            if(activityType === '活动分类-功能包'){
+              this.gradeFlag = false
+              this.funFlag = false
+              this.funIdsFlag = true
               this.bannerFlag = false
             }
             if(activityType === '活动分类-广告'){
               this.gradeFlag = false
               this.funFlag = false
+              this.funIdsFlag = false
               this.bannerFlag = true
               this.formData.flgBanner = true
             }
             if(activityType === '活动分类-充值'){
               this.gradeFlag = false
               this.funFlag = false
+              this.funIdsFlag = false
               this.bannerFlag = false
             }
             this.formData = res.data

src/view/mst/company-trade/index.vue

@@ -34,7 +34,7 @@
           <DkTableColumn field="buyLong"></DkTableColumn>
           <DkTableColumn field="buyBeginDate"></DkTableColumn>
           <DkTableColumn field="buyEndDate"></DkTableColumn>
-          <DkTableColumn field="buyGradeCode"></DkTableColumn>
+          <DkTableColumn field="gradeName" :title="$t('buyGradeCode')"></DkTableColumn>
           <DkTableColumn field="wxTradeNo"></DkTableColumn>
           <DkTableColumn field="extendDays"></DkTableColumn>
           <DkTableColumn field="dkUserId"></DkTableColumn>