2024.07.25

- 佣金记录页完善相关字段显示；

src/views/relationshipChainManagement/commissionLog/components/DetailModal.vue

@@ -46,7 +46,11 @@
         {{ formData.orderPrice || '--' }}
       </el-form-item>
       <el-form-item label="佣金比例/金额" prop="orderProportion">
-        {{ formData.orderProportion || '--' }}
+        <span v-if="formData.orderProportion <= 1">{{ formData.orderProportion * 100 }}%</span>
+        <span v-else-if="formData.orderProportion > 1">￥{{ formData.orderProportion }}</span>
+      </el-form-item>
+      <el-form-item label="上级身份" prop="tidentity">
+        {{ formData.tidentity || '--' }}
       </el-form-item>
       <el-form-item label="上级ID" prop="tid">
         {{ formData.tid || '--' }}
@@ -55,7 +59,10 @@
         {{ formData.tphone || '--' }}
       </el-form-item>
       <el-form-item label="用于分佣的佣金总额" prop="commissionPrice">
-        {{ formData.commissionPrice || '--' }}
+        ￥{{ typeof formData.commissionPrice === 'number' ? formData.commissionPrice : '--' }}
+      </el-form-item>
+      <el-form-item label="获得佣金" prop="userCommission">
+        ￥{{ typeof formData.userCommission === 'number' ? formData.userCommission : '--' }}
       </el-form-item>
       <el-form-item label="佣金分配详情" prop="commissionDetail">
         {{ formData.commissionDetail || '--' }}
@@ -85,9 +92,11 @@ export default {
         phone: '',
         orderPrice: '',
         orderProportion: '',
+        tidentity: '',
         tid: '',
         tphone: '',
         commissionPrice: '',
+        userCommission: '',
         commissionDetail: ''
       }
     }

src/views/relationshipChainManagement/commissionLog/index.vue

@@ -47,12 +47,19 @@
         <el-table-column align="center" width="100" label="购买用户ID" prop="buyerUserId" show-overflow-tooltip />
         <el-table-column align="center" width="150" label="下单用户号码" prop="phone" show-overflow-tooltip />
         <el-table-column align="center" width="100" label="支付金额" prop="orderPrice" show-overflow-tooltip />
-        <el-table-column align="center" width="100" label="佣金比例/金额" prop="orderProportion" show-overflow-tooltip />
+        <el-table-column align="center" width="120" prop="orderProportion" label="佣金比例/金额">
+          <template slot-scope="{ row }">
+            <span v-if="row.orderProportion <= 1">{{ row.orderProportion * 100 }}%</span>
+            <span v-else-if="row.orderProportion > 1">￥{{ row.orderProportion }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" width="120" label="上级身份" prop="tidentity" show-overflow-tooltip />
         <el-table-column align="center" width="100" label="上级ID" prop="tid" show-overflow-tooltip />
         <el-table-column align="center" width="120" label="上级手机号" prop="tphone" show-overflow-tooltip />
         <el-table-column align="center" width="100" label="用于分佣的佣金总额" prop="commissionPrice" show-overflow-tooltip />
+        <el-table-column align="center" width="100" label="获得佣金" prop="userCommission" show-overflow-tooltip />
         <!-- <el-table-column align="center" width="100" label="佣金分配详情" prop="commissionDetail" show-overflow-tooltip /> -->
-        <el-table-column align="center" label="操作" width="220" fixed="right" class-name="small-padding fixed-width">
+        <el-table-column align="center" label="操作" width="120" fixed="right" class-name="small-padding fixed-width">
           <template slot-scope="{ row }">
             <el-button type="warning" size="mini" @click="handleDetail(row)">
               详情

src/views/relationshipChainManagement/upgradeLog/index.vue

@@ -56,7 +56,7 @@
         </el-table-column>
         <el-table-column align="center" min-width="150" label="操作详情" prop="operateDetail" show-overflow-tooltip />
         <el-table-column align="center" width="150" label="操作时间" prop="operateTime" />
-        <el-table-column align="center" label="操作" width="220" fixed="right" class-name="small-padding fixed-width">
+        <el-table-column align="center" label="操作" width="120" fixed="right" class-name="small-padding fixed-width">
           <template slot-scope="{ row }">
             <el-button type="warning" size="mini" @click="handleDetail(row)">
               详情