Prechádzať zdrojové kódy

fix: 优化还款展示

LaveyD 1 deň pred
rodič
commit
6203bca529

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "ticket",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "private": true,
   "description": "多巴胺科技",
   "author": "",

+ 50 - 3
src/pages/checkerManage/TeamAccountFlow.vue

@@ -158,6 +158,19 @@
             <span v-else>-</span>
           </template>
         </el-table-column>
+        <el-table-column
+          label="操作"
+          width="120">
+          <template slot-scope="scope">
+            <el-link
+              v-if="scope.row.teamAccountRepaymentFlows && scope.row.teamAccountRepaymentFlows.length"
+              type="primary"
+              @click="showRepaymentDetail(scope.row)"
+            >
+              还款明细
+            </el-link>
+          </template>
+        </el-table-column>
       </el-table>
       <el-pagination
         background
@@ -173,6 +186,31 @@
     </div>
 
     <OrderDetail ref="orderDetail"></OrderDetail>
+
+    <!-- 还款明细弹框 -->
+    <el-dialog
+      title="还款明细"
+      width="1100px"
+      :visible.sync="repaymentDetailVisible"
+      :close-on-click-modal="false"
+    >
+      <el-table
+        border
+        :data="repaymentDetailList"
+        size="small"
+        v-loading="repaymentDetailLoading"
+      >
+        <el-table-column type="index" label="序号" width="50" />
+        <!-- <el-table-column prop="createTime" label="创建时间" width="140" /> -->
+        <el-table-column prop="amount" label="还款金额" width="100" />
+        <el-table-column prop="remainingDebt" label="剩余欠款" width="100" />
+        <el-table-column prop="balanceBefore" label="还款前余额" width="100" />
+        <el-table-column prop="balanceAfter" label="还款后余额" width="100" />
+        <el-table-column prop="operatorName" label="操作员" width="90" />
+        <el-table-column prop="operateTime" label="操作时间" width="140" />
+        <el-table-column prop="remark" label="备注" min-width="120" show-overflow-tooltip />
+      </el-table>
+    </el-dialog>
   </div>
 </template>
 
@@ -213,15 +251,20 @@ export default {
       loading: false,
       tableData: [],
       total: 0,
+      repaymentDetailVisible: false,
+      repaymentDetailList: [],
+      repaymentDetailLoading: false,
       transactionTypeMap: {
         RECHARGE: '充值',
         DEDUCT: '扣款',
+        CONSUME: '消费',
+        REFUND: '退款',
+        ADJUST: '调整授信额度',
+        REPAYMENT: '还款',
         PREPAY_PAY: '预付款支付',
         PREPAY_REFUND: '预付款退款',
         CREDIT_PAY: '授信支付',
-        CREDIT_REFUND: '授信退款',
-        REPAYMENT: '还款',
-        ADJUST: '调整授信额度'
+        CREDIT_REFUND: '授信退款'
       }
     }
   },
@@ -267,6 +310,10 @@ export default {
       const { getSingleOrder } = await import('@/api/order')
       const res = await getSingleOrder(orderId)
       this.$refs.orderDetail.show(res.data)
+    },
+    showRepaymentDetail (row) {
+      this.repaymentDetailList = (row.teamAccountRepaymentFlows || []).filter(item => item.id)
+      this.repaymentDetailVisible = true
     }
   }
 }

+ 32 - 4
src/pages/checkerManage/teamManage.vue

@@ -352,7 +352,7 @@
                 size="small"
               >
                 <el-table-column type="selection" width="40" />
-                <el-table-column prop="createTime" label="创建时间" width="140" />
+                <el-table-column prop="operateTime" label="操作时间" width="140" />
                 <el-table-column prop="teamName" label="团队名称" width="110" show-overflow-tooltip />
                 <el-table-column label="交易类型" width="120">
                   <template slot-scope="scope">
@@ -372,8 +372,18 @@
                 <el-table-column prop="ticketCancelCheckNum" label="退票人数" width="80" />
                 <el-table-column prop="cancelPrice" label="退票总额" width="100" />
                 <el-table-column prop="operatorName" label="操作员" width="90" />
-                <el-table-column prop="operateTime" label="操作时间" width="140" />
-                <el-table-column prop="linkOrderId" label="关联订单" width="80" />
+                <el-table-column prop="linkOrderId" label="关联订单" width="80">
+                  <template slot-scope="scope">
+                    <el-link
+                      v-if="scope.row.linkOrderId"
+                      type="primary"
+                      @click="showOrderDetail(scope.row.linkOrderId)"
+                    >
+                      查看
+                    </el-link>
+                    <span v-else>-</span>
+                  </template>
+                </el-table-column>
                 <el-table-column prop="remark" label="备注" min-width="120" show-overflow-tooltip />
               </el-table>
             <el-pagination
@@ -427,7 +437,18 @@
                 <el-table-column prop="cancelPrice" label="退票总额" width="100" />
                 <el-table-column prop="operatorName" label="操作员" width="90" />
                 <el-table-column prop="operateTime" label="操作时间" width="140" />
-                <el-table-column prop="linkOrderId" label="关联订单" width="80" />
+                <el-table-column prop="linkOrderId" label="关联订单" width="80">
+                  <template slot-scope="scope">
+                    <el-link
+                      v-if="scope.row.linkOrderId"
+                      type="primary"
+                      @click="showOrderDetail(scope.row.linkOrderId)"
+                    >
+                      查看
+                    </el-link>
+                    <span v-else>-</span>
+                  </template>
+                </el-table-column>
                 <el-table-column prop="remark" label="备注" min-width="120" show-overflow-tooltip />
                 <el-table-column label="操作" width="60" fixed="right">
                   <template slot-scope="scope">
@@ -453,6 +474,8 @@
         <el-button type="primary" :disabled="!rightSelectedList.length" @click="confirmRepayment">确定还款</el-button>
       </div>
     </ElDialog>
+
+    <OrderDetail ref="orderDetail"></OrderDetail>
   </div>
 </template>
 
@@ -716,6 +739,11 @@ export default {
       this.$refs.debtTableRef && this.$refs.debtTableRef.clearSelection()
       this.leftCheckedList = []
     },
+    async showOrderDetail (orderId) {
+      const { getSingleOrder } = await import('@/api/order')
+      const res = await getSingleOrder(orderId)
+      this.$refs.orderDetail.show(res.data)
+    },
     confirmRepayment () {
       if (!this.rightSelectedList.length) {
         this.$message.warning('请先选择欠款记录')

+ 1 - 1
src/pages/queryReport/checkStatistic.vue

@@ -33,7 +33,7 @@
         <el-select
           v-model="form.ticketTypeIdList"
           multiple
-          clearable>
+          filterable>
           <el-option
             v-for="item in ticketTypeList"
             :key="item.id"