2024.05.09

— 分佣配置页增加关联活动名称字段订单显示及传参；

src/views/commissionAllocation/gradeCommission/components/DetailModal.vue

@@ -18,6 +18,9 @@
       <el-form-item label="活动ID" prop="activityId">
         {{ formData.activityId || '--' }}
       </el-form-item>
+      <el-form-item label="关联活动" prop="activityName">
+        {{ formData.activityName || '--' }}
+      </el-form-item>
       <el-form-item label="活动类型" prop="activityType">
         <span v-if="formData.activityType === 1">499</span>
         <span v-else-if="formData.activityType === 2">商圈</span>
@@ -74,6 +77,7 @@ export default {
       formData: {
         ruleId: '',
         activityId: '',
+        activityName: '',
         activityType: '',
         leadersRule: '',
         leadersMoney: '',
@@ -105,6 +109,7 @@ export default {
         this.formData = Object.assign(this.$options.data().formData, res.data, {
           ruleId: res.data.ruleId || '',
           activityId: res.data.activityId || '',
+          activityName: res.data.activityName || '',
           activityType: res.data.activityType || '',
           leadersRule: res.data.leadersRule || '',
           leadersMoney: res.data.leadersMoney,

src/views/commissionAllocation/gradeCommission/components/EditModal.vue

@@ -1,19 +1,15 @@
 <template>
-  <el-dialog
-    :visible.sync="visible"
-    v-bind="modalOptions"
-  >
-    <el-form
-      ref="formData"
-      :model="formData"
-      :rules="formRules"
-      size="mini"
-      label-suffix=":"
-      label-width="150px"
-    >
+  <el-dialog :visible.sync="visible" v-bind="modalOptions">
+    <el-form ref="formData" :model="formData" :rules="formRules" size="mini" label-suffix=":" label-width="150px">
       <el-form-item label="关联活动" prop="activityId">
-        <el-select v-model="formData.activityId" size="mini" placeholder="请选择关联活动" filterable>
-          <el-option v-for="(item, index) in activityList" :key="item.currencyId" :label="`${item.currencyName}（${item.currencyId}）`" :value="item.currencyId" />
+        <el-select
+          v-model="formData.activityId" size="mini" placeholder="请选择关联活动" filterable
+          @change="(e) => formData.activityName = activityList.find(i => i.currencyId === e).currencyName"
+        >
+          <el-option
+            v-for="(item, index) in activityList" :key="item.currencyId"
+            :label="`${item.currencyName}（${item.currencyId}）`" :value="item.currencyId"
+          />
         </el-select>
       </el-form-item>
       <el-form-item label="活动类型" prop="activityType">
@@ -173,6 +169,7 @@ export default {
         this.formData = Object.assign(this.$options.data().formData, res.data, {
           ruleId: res.data.ruleId || '',
           activityId: res.data.activityId || '',
+          activityName: res.data.activityName || '',
           activityType: res.data.activityType || '',
           leadersRule: res.data.leadersRule || '',
           leadersMoney: (res.data.leadersRule === 1) && (typeof res.data.leadersMoney === 'number') ? res.data.leadersMoney * 100 : res.data.leadersMoney,
@@ -221,4 +218,3 @@ export default {
   }
 }
 </script>
-

src/views/commissionAllocation/gradeCommission/index.vue

@@ -34,7 +34,8 @@
         v-bind="{ stripe: true, size: 'small', border: true, fit: true, highlightCurrentRow: true }"
       >
         <el-table-column align="center" width="100" label="规则ID" prop="ruleId" fixed="left" />
-        <el-table-column align="center" width="150" label="活动ID" prop="activityId" fixed="left" show-overflow-tooltip />
+        <el-table-column align="center" width="80" label="活动ID" prop="activityId" fixed="left" show-overflow-tooltip />
+        <el-table-column align="center" width="100" label="关联活动" prop="activityName" fixed="left" show-overflow-tooltip />
         <el-table-column align="center" label="活动类型" prop="activityType">
           <template slot-scope="{ row }">
             <el-tag v-if="row.activityType === 1" effect="plain">499</el-tag>