Преглед на файлове

fix: 优化还款展示

LaveyD преди 3 дни
родител
ревизия
a2f2c7cfdb
променени са 4 файла, в които са добавени 35 реда и са изтрити 7 реда
  1. 1 1
      package.json
  2. 1 1
      src/pages/checkerManage/TeamAccountFlow.vue
  3. 32 4
      src/pages/checkerManage/teamManage.vue
  4. 1 1
      src/pages/queryReport/checkStatistic.vue

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "ticket",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "private": true,
   "description": "售检票系统",
   "author": "",

+ 1 - 1
src/pages/checkerManage/TeamAccountFlow.vue

@@ -201,7 +201,7 @@
         v-loading="repaymentDetailLoading"
       >
         <el-table-column type="index" label="序号" width="50" />
-        <el-table-column prop="createTime" label="创建时间" width="140" />
+        <!-- <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" />

+ 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"