Merge branch 'master' of http://47.108.172.52:3000/dayou/item-management-web

src/api/modules/financeFine.js

@@ -16,6 +16,10 @@ export default {
     cancel(params) {
         return request.put(`financeFine/cancel/${params}`)
     },
+    // 取消确认罚款金额
+    confirm(params){
+        return request.put(`financeFine/confirm/${params}`)
+    },
     // 批量取消确认罚款金额
     batchCancel(params) {
         return request.put(`financeFine/cancel/batch`, params)

src/views/finance/fine.vue

@@ -12,7 +12,7 @@
             <el-input v-model="queryDTO.clientManagerName" placeholder="客户经理" clearable style="margin-left: 20px;width: 150px;float: left;"></el-input>
             <el-select v-model="queryDTO.status" filterable placeholder="是否确认" clearable style="margin-left: 20px;width: 150px;float: left;">
               <el-option label="已确认" value="true"></el-option>
-              <el-option label="未确认" value="false"></el-option>
+              <el-option label="已取消" value="false"></el-option>
             </el-select>
             <el-date-picker
               v-model="findDate"
@@ -75,7 +75,7 @@
             </el-table-column>
             <el-table-column label="是否确认" align="center">
               <template slot-scope="{row}">
-                <span>{{ row.status ? '已确认' : '待确认' }}</span>
+                <span :style="row.status===true?'color:red':'color:#13ce66'">{{ row.status ? '已确认' : '已取消' }}</span>
               </template>
             </el-table-column>
             <el-table-column label="罚款日期" align="center" width="130">
@@ -132,7 +132,9 @@
               <template slot-scope="{row}">
                 <PermissionButton menu-code="_views_finance_fine_explain" class-name="filter-item" name type="text" @click="openExplain(row)" />
                 <!-- 已产生退款记录的将不可取消罚款 -->
-                <PermissionButton menu-code="_views_finance_fine_cancel" class-name="filter-item" name :disabled="row.refundId !== null" type="text" @click="cancelFineAmount(row.id)" />
+                <PermissionButton v-if="row.status" menu-code="_views_finance_fine_cancel" class-name="filter-item" name :disabled="row.refundId !== null" type="text" @click="cancelFineAmount(row.id)" />
+                <!-- 已产生退款记录的将不可取消罚款 -->
+                <PermissionButton v-if="!row.status" menu-code="_views_finance_fine_confirm" class-name="filter-item" name :disabled="row.refundId !== null" type="text" @click="confirmFineAmount(row.id)" />
                 <!-- 已产生退款记录的将不可更改罚款金额 -->
                 <PermissionButton menu-code="_views_finance_fine_edit_amount" class-name="filter-item" name :disabled="row.refundId !== null" type="text" @click="openEditFineAmount(row)" />
               </template>
@@ -148,7 +150,7 @@
             <el-input v-model="queryDTO.clientManagerName" placeholder="客户经理" clearable style="margin-left: 20px;width: 150px;float: left;"></el-input>
             <el-select v-model="queryDTO.status" filterable placeholder="是否确认" clearable style="margin-left: 20px;width: 150px;float: left;">
               <el-option label="已确认" value="true"></el-option>
-              <el-option label="未确认" value="false"></el-option>
+              <el-option label="已取消" value="false"></el-option>
             </el-select>
             <el-date-picker
               v-model="findDate"
@@ -196,7 +198,7 @@
             </el-table-column>
             <el-table-column label="罚款金额" align="center">
               <template slot-scope="{row}">
-                <span style="color: #dca550; font-weight: bold;">{{ row.fineAmount }}</span>
+                <span style="color: red; font-weight: bold;">{{ row.fineAmount }}</span>
               </template>
             </el-table-column>
             <!-- <el-table-column label="实际罚款金额" align="center" width="120">
@@ -211,7 +213,7 @@
             </el-table-column>
             <el-table-column label="是否确认" align="center">
               <template slot-scope="{row}">
-                <span>{{ row.status ? '已确认' : '待确认' }}</span>
+                <span :style="row.status===true?'color:red':'color:#13ce66'">{{ row.status ? '已确认' : '已取消' }}</span>
               </template>
             </el-table-column>
             <el-table-column label="罚款日期" align="center" width="130">
@@ -268,7 +270,9 @@
               <template slot-scope="{row}">
                 <PermissionButton menu-code="_views_finance_fine_explain" class-name="filter-item" name type="text" @click="openExplain(row)" />
                 <!-- 已产生退款记录的将不可取消罚款 -->
-                <PermissionButton menu-code="_views_finance_fine_cancel" class-name="filter-item" name :disabled="row.refundId !== null" type="text" @click="cancelFineAmount(row.id)" />
+                <PermissionButton v-if="row.status" menu-code="_views_finance_fine_cancel" class-name="filter-item" name :disabled="row.refundId !== null" type="text" @click="cancelFineAmount(row.id)" />
+                <!-- 已产生退款记录的将不可取消罚款 -->
+                <PermissionButton v-if="!row.status" menu-code="_views_finance_fine_confirm" class-name="filter-item" name :disabled="row.refundId !== null" type="text" @click="confirmFineAmount(row.id)" />
                 <!-- 已产生退款记录的将不可更改罚款金额 -->
                 <PermissionButton menu-code="_views_finance_fine_edit_amount" class-name="filter-item" name :disabled="row.refundId !== null" type="text" @click="openEditFineAmount(row)" />
               </template>
@@ -284,7 +288,7 @@
             <el-input v-model="queryDTO.clientManagerName" placeholder="客户经理" clearable style="margin-left: 20px;width: 150px;float: left;"></el-input>
             <el-select v-model="queryDTO.status" filterable placeholder="是否确认" clearable style="margin-left: 20px;width: 150px;float: left;">
               <el-option label="已确认" value="true"></el-option>
-              <el-option label="未确认" value="false"></el-option>
+              <el-option label="已取消" value="false"></el-option>
             </el-select>
             <el-date-picker
               v-model="findDate"
@@ -337,7 +341,7 @@
             </el-table-column>
             <el-table-column label="罚款金额" align="center">
               <template slot-scope="{row}">
-                <span style="color: #dca550; font-weight: bold;">{{ row.fineAmount }}</span>
+                <span style="color: red; font-weight: bold;">{{ row.fineAmount }}</span>
               </template>
             </el-table-column>
             <!-- <el-table-column label="实际罚款金额" align="center" width="120">
@@ -352,7 +356,7 @@
             </el-table-column>
             <el-table-column label="是否确认" align="center">
               <template slot-scope="{row}">
-                <span>{{ row.status ? '已确认' : '待确认' }}</span>
+                <span :style="row.status===true?'color:red':'color:#13ce66'">{{ row.status ? '已确认' : '已取消' }}</span>
               </template>
             </el-table-column>
             <el-table-column label="罚款日期" align="center" width="130">
@@ -394,7 +398,9 @@
               <template slot-scope="{row}">
                 <PermissionButton menu-code="_views_finance_fine_explain" class-name="filter-item" name type="text" @click="openExplain(row)" />
                 <!-- 已产生退款记录的将不可取消罚款 -->
-                <PermissionButton menu-code="_views_finance_fine_cancel" class-name="filter-item" name :disabled="row.refundId !== null" type="text" @click="cancelFineAmount(row.id)" />
+                <PermissionButton v-if="row.status" menu-code="_views_finance_fine_cancel" class-name="filter-item" name :disabled="row.refundId !== null" type="text" @click="cancelFineAmount(row.id)" />
+                <!-- 已产生退款记录的将不可取消罚款 -->
+                <PermissionButton v-if="!row.status" menu-code="_views_finance_fine_confirm" class-name="filter-item" name :disabled="row.refundId !== null" type="text" @click="confirmFineAmount(row.id)" />
                 <!-- 已产生退款记录的将不可更改罚款金额 -->
                 <PermissionButton menu-code="_views_finance_fine_edit_amount" class-name="filter-item" name :disabled="row.refundId !== null" type="text" @click="openEditFineAmount(row)" />
               </template>
@@ -609,7 +615,7 @@ export default {
     },
     // 取消确认罚款金额
     cancelFineAmount(id) {
-      this.$confirm('取消确认罚款后无法更改, 是否继续?', '警告', {
+      this.$confirm('请确认是否取消罚款?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
@@ -627,6 +633,26 @@ export default {
         });
       });
     },
+    // 确认罚款金额
+    confirmFineAmount(id){
+      this.$confirm('请确认是否罚款?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        this.$api.financeFine.confirm(id).then((res) => {
+          if (res.code === 200 && res.data) {
+            this.$notify({
+              title: '成功',
+              message: '请求成功！',
+              type: 'success',
+              duration: 3000,
+            });
+            this.page();
+          }
+        });
+      });
+    },
     // 多选触发
     handleSelectionChange(selection) {
       this.batchCancelFineIds = selection.map((item) => item.id);