1.退回流程资产/大中型发起限制改为标记送达,个贷改为出了产品

2.产品退回流程审核详情中-如有开发票显示发票号
3.财务标记已退不退时添加确认框,且标记了不能再次修改
4.产品退回发票状态新增-未开发票

src/views/assets/myOrderList.vue

@@ -599,8 +599,9 @@
                     <el-col :xs="24" :sm="12" :lg="12" :span="6">
                         <el-form-item label="是否退发票：" prop="returnInvoice" label-width="140px" class="postInfo-container-item">
                             <el-select v-model="productionReturnForm.returnInvoice" style="width: 100%">
-                                <el-option label="退发票" value="true"></el-option>
-                                <el-option label="不退发票" value="false"></el-option>
+                                <el-option label="不退发票" value="0"></el-option>
+                                <el-option label="退发票" value="1"></el-option>
+                                <el-option label="未开发票" value="2"></el-option>
                             </el-select>
                         </el-form-item>
                     </el-col>
@@ -1390,7 +1391,7 @@ export default {
         },
         openProductionReturnDialog(row) {
             // 判断产品是否已经出库了
-            if (row.reportRepertoryState) {
+            if (row.reportDelivery) {
                 // 赋值基础信息
                 this.productionReturnForm.businessType = 'ASSET_BUSINESS';
                 this.productionReturnForm.businessId = row.assetsId;
@@ -1407,7 +1408,7 @@ export default {
             } else {
                 this.$notify({
                     title: '警告',
-                    message: '产品未出库，无需发起产品退回流程！',
+                    message: '产品未标记送达，无法发起产品退回流程！',
                     type: 'warning',
                     duration: 2000,
                 });

src/views/finance/fine.vue

@@ -123,7 +123,7 @@
               <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_confirm" class-name="filter-item" name type="text" @click="confirmFineAmount(row.id)" />
-                <PermissionButton menu-code="_views_finance_fine_edit_amount" class-name="filter-item" name type="text" @click="openEditFineAmount(row)" />
+                <PermissionButton menu-code="_views_finance_fine_edit_amount" class-name="filter-item" name type="text" :disabled="row.status" @click="openEditFineAmount(row)" />
               </template>
             </el-table-column>
           </parentTable>
@@ -247,7 +247,7 @@
               <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_confirm" class-name="filter-item" name type="text" @click="confirmFineAmount(row.id)" />
-                <PermissionButton menu-code="_views_finance_fine_edit_amount" class-name="filter-item" name type="text" @click="openEditFineAmount(row)" />
+                <PermissionButton menu-code="_views_finance_fine_edit_amount" class-name="filter-item" name type="text" :disabled="row.status" @click="openEditFineAmount(row)" />
               </template>
             </el-table-column>
           </parentTable>
@@ -361,7 +361,8 @@
               <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_confirm" class-name="filter-item" name type="text" @click="confirmFineAmount(row.id)" />
-                <PermissionButton menu-code="_views_finance_fine_edit_amount" class-name="filter-item" name type="text" @click="openEditFineAmount(row)" />
+                <!-- 已确认罚款的将不可更改罚款金额 -->
+                <PermissionButton menu-code="_views_finance_fine_edit_amount" class-name="filter-item" name type="text" :disabled="row.status" @click="openEditFineAmount(row)" />
               </template>
             </el-table-column>
           </parentTable>
@@ -408,36 +409,33 @@ export default {
   },
 
   computed: {
-    ...mapGetters([
-      'userInfo'
-    ]),
+    ...mapGetters(['userInfo']),
   },
-  watch:{
-      userInfo: {
+  watch: {
+    userInfo: {
       immediate: true, // immediate选项可以开启首次赋值监听
       deep: true,
       handler(newv) {
         if (newv) {
-          const postList = newv.postList.map(item => item.name)
-          const marketPosts = ['部门经理']
-          postList.forEach(element => {
+          const postList = newv.postList.map((item) => item.name);
+          const marketPosts = ['部门经理'];
+          postList.forEach((element) => {
             if (marketPosts.includes(element)) {
-                this.personalLeader = true;
-                this.activeName = 'PERSONAL_BUSINESS'
+              this.personalLeader = true;
+              this.activeName = 'PERSONAL_BUSINESS';
             }
           });
         }
-
-      }
       },
     },
+  },
   data() {
     return {
       activeName: 'ASSET_BUSINESS',
       listLoading: false,
       explainVisible: false,
       editFineAmountVisible: false,
-      personalLeader:false,
+      personalLeader: false,
       findDate: null,
       // 分页查询条件
       queryDTO: {
@@ -576,16 +574,22 @@ export default {
     },
     // 确认罚款金额
     confirmFineAmount(id) {
-      this.$api.financeFine.confirm(id).then((res) => {
-        if (res.code === 200 && res.data) {
-          this.$notify({
-            title: '成功',
-            message: '请求成功！',
-            type: 'success',
-            duration: 3000,
-          });
-          this.page();
-        }
+      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();
+          }
+        });
       });
     },
     // 多选触发
@@ -595,7 +599,7 @@ export default {
     // 批量确认罚款金额
     batchConfirmFineAmount() {
       if (this.batchConfirmFineIds && this.batchConfirmFineIds.length > 0) {
-        this.$confirm('请仔细确认要进行批量操作的数据, 是否继续?', '警告', {
+        this.$confirm('请仔细确认要进行批量操作记录的罚款金额, 确认后无法更改, 是否继续?', '警告', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning',

src/views/finance/fineRefund.vue

@@ -37,11 +37,11 @@
             <el-button class="filter-item" style="margin-left:10px;float: left;" type="primary" @click="page()" round>搜索</el-button>
             <el-button class="filter-item" style="float: left;" round type="success" @click="resetSearch()">重置</el-button>
             <el-button class="filter-item" style="float: left;" round type="warning" @click="fineRefundListExport()">导出</el-button>
-              <PermissionButton menu-code="_views_finance_fine_refund_returned_batch" class="filter-item" style="float: left;" round type="danger" @click="batchUpdateStatus('RETURNED')" />
-              <PermissionButton menu-code="_views_finance_fine_refund_ignore_batch" class="filter-item" style="float: left;" round type="danger" @click="batchUpdateStatus('IGNORE')" />
+            <PermissionButton menu-code="_views_finance_fine_refund_returned_batch" class="filter-item" style="float: left;" round type="danger" @click="batchUpdateStatus('RETURNED')" />
+            <PermissionButton menu-code="_views_finance_fine_refund_ignore_batch" class="filter-item" style="float: left;" round type="danger" @click="batchUpdateStatus('IGNORE')" />
           </template>
           <parentTable ref="table" v-loading="listLoading" :data="pageData.records" :selectionChange="handleSelectionChange" slot="table" style="width: 100%;">
-            <el-table-column type="selection" align="center" width="40"></el-table-column>
+            <el-table-column type="selection" :selectable="checkSelectable" align="center" width="40"></el-table-column>
             <el-table-column label="项⽬编号" align="center" width="150">
               <template slot-scope="{row}">
                 <span>{{ row.orderId }}</span>
@@ -99,7 +99,7 @@
             </el-table-column>
             <el-table-column label="退款原因" align="center" width="150">
               <template slot-scope="{row}">
-                <span>{{ row.refundReason === 'RETURN_PRODUCTION' ? '退产品' : row.refundReason === 'RETURN_MONEY' ? '退款' : row.refundReason === 'RETURN_PRODUCTION_INVOICE' ? '退产品并退发票' : '-' }}</span>
+                <span>{{ row.refundReason === 'RETURN_PRODUCTION' ? '退产品' : row.refundReason === 'RETURN_MONEY' ? '产品回款' : row.refundReason === 'RETURN_PRODUCTION_INVOICE' ? '退产品并退发票' : '-' }}</span>
               </template>
             </el-table-column>
             <el-table-column label="退款状态" align="center" width="150">
@@ -119,8 +119,8 @@
             </el-table-column>
             <el-table-column label="操作" align="center" width="100" fixed="right">
               <template slot-scope="{row}">
-                <PermissionButton menu-code="_views_finance_fine_refund_returned" @click="updateStatus(row.id, 'RETURNED')" class-name="filter-item" name type="text" />
-                <PermissionButton menu-code="_views_finance_fine_refund_ignore" @click="updateStatus(row.id, 'IGNORE')" class-name="filter-item" name type="text" />
+                <PermissionButton menu-code="_views_finance_fine_refund_returned" @click="updateStatus(row.id, 'RETURNED')" :disabled="row.status !== 'NOT_RETURNED'" class-name="filter-item" name type="text" />
+                <PermissionButton menu-code="_views_finance_fine_refund_ignore" @click="updateStatus(row.id, 'IGNORE')" :disabled="row.status !== 'NOT_RETURNED'" class-name="filter-item" name type="text" />
               </template>
             </el-table-column>
           </parentTable>
@@ -163,7 +163,7 @@
             <PermissionButton menu-code="_views_finance_fine_refund_ignore_batch" class="filter-item" style="float: left;" round type="danger" @click="batchUpdateStatus('IGNORE')" />
           </template>
           <parentTable ref="table" v-loading="listLoading" :data="pageData.records" :selectionChange="handleSelectionChange" slot="table" style="width: 100%;">
-            <el-table-column type="selection" align="center" width="40"></el-table-column>
+            <el-table-column type="selection" :selectable="checkSelectable" align="center" width="40"></el-table-column>
             <el-table-column label="项⽬编号" align="center" width="120">
               <template slot-scope="{row}">
                 <span>{{ row.orderId }}</span>
@@ -206,7 +206,7 @@
             </el-table-column>
             <el-table-column label="退款原因" align="center" width="150" show-overflow-tooltip>
               <template slot-scope="{row}">
-                <span>{{ row.refundReason === 'RETURN_PRODUCTION' ? '退产品' : row.refundReason === 'RETURN_MONEY' ? '退款' : row.refundReason === 'RETURN_PRODUCTION_INVOICE' ? '退产品并退发票' : '-' }}</span>
+                <span>{{ row.refundReason === 'RETURN_PRODUCTION' ? '退产品' : row.refundReason === 'RETURN_MONEY' ? '产品回款' : row.refundReason === 'RETURN_PRODUCTION_INVOICE' ? '退产品并退发票' : '-' }}</span>
               </template>
             </el-table-column>
             <el-table-column label="退款状态" align="center">
@@ -241,8 +241,8 @@
             </el-table-column>
             <el-table-column label="操作" align="center" width="160" fixed="right">
               <template slot-scope="{row}">
-                <PermissionButton menu-code="_views_finance_fine_refund_returned" @click="updateStatus(row.id, 'RETURNED')" class-name="filter-item" name type="text" />
-                <PermissionButton menu-code="_views_finance_fine_refund_ignore" @click="updateStatus(row.id, 'IGNORE')" class-name="filter-item" name type="text" />
+                <PermissionButton menu-code="_views_finance_fine_refund_returned" :disabled="row.status !== 'NOT_RETURNED'" @click="updateStatus(row.id, 'RETURNED')" class-name="filter-item" name type="text" />
+                <PermissionButton menu-code="_views_finance_fine_refund_ignore" :disabled="row.status !== 'NOT_RETURNED'" @click="updateStatus(row.id, 'IGNORE')" class-name="filter-item" name type="text" />
               </template>
             </el-table-column>
           </parentTable>
@@ -285,7 +285,7 @@
             <PermissionButton menu-code="_views_finance_fine_refund_ignore_batch" class="filter-item" style="float: left;" round type="danger" @click="batchUpdateStatus('IGNORE')" />
           </template>
           <parentTable ref="table" v-loading="listLoading" :data="pageData.records" :selectionChange="handleSelectionChange" slot="table" style="width: 100%;">
-            <el-table-column type="selection" align="center" width="40"></el-table-column>
+            <el-table-column type="selection" :selectable="checkSelectable" align="center" width="40"></el-table-column>
             <el-table-column label="项⽬编号" align="center" width="120">
               <template slot-scope="{row}">
                 <span>{{ row.orderId }}</span>
@@ -323,7 +323,7 @@
             </el-table-column>
             <el-table-column label="退款原因" align="center" width="150" show-overflow-tooltip>
               <template slot-scope="{row}">
-                <span>{{ row.refundReason === 'RETURN_PRODUCTION' ? '退产品' : row.refundReason === 'RETURN_MONEY' ? '退款' : row.refundReason === 'RETURN_PRODUCTION_INVOICE' ? '退产品并退发票' : '-' }}</span>
+                <span>{{ row.refundReason === 'RETURN_PRODUCTION' ? '退产品' : row.refundReason === 'RETURN_MONEY' ? '产品回款' : row.refundReason === 'RETURN_PRODUCTION_INVOICE' ? '退产品并退发票' : '-' }}</span>
               </template>
             </el-table-column>
             <el-table-column label="退款状态" align="center">
@@ -358,8 +358,8 @@
             </el-table-column>
             <el-table-column label="操作" align="center" width="160" fixed="right">
               <template slot-scope="{row}">
-                <PermissionButton menu-code="_views_finance_fine_refund_returned" @click="updateStatus(row.id, 'RETURNED')" class-name="filter-item" name type="text" />
-                <PermissionButton menu-code="_views_finance_fine_refund_ignore" @click="updateStatus(row.id, 'IGNORE')" class-name="filter-item" name type="text" />
+                <PermissionButton menu-code="_views_finance_fine_refund_returned" :disabled="row.status !== 'NOT_RETURNED'" @click="updateStatus(row.id, 'RETURNED')" class-name="filter-item" name type="text" />
+                <PermissionButton menu-code="_views_finance_fine_refund_ignore" :disabled="row.status !== 'NOT_RETURNED'" @click="updateStatus(row.id, 'IGNORE')" class-name="filter-item" name type="text" />
               </template>
             </el-table-column>
           </parentTable>
@@ -502,20 +502,30 @@ export default {
     },
     // 更新退款状态
     updateStatus(id, status) {
-      this.updateForm = {
-        id: id,
-        status: status,
-      };
-      this.$api.financeFineRefund.update(this.updateForm).then((res) => {
-        this.$notify({
-          title: '成功',
-          message: '请求成功！',
-          type: 'success',
-          duration: 3000,
+      this.$confirm('标记退款状态后无法更改, 是否继续?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        this.updateForm = {
+          id: id,
+          status: status,
+        };
+        this.$api.financeFineRefund.update(this.updateForm).then((res) => {
+          this.$notify({
+            title: '成功',
+            message: '请求成功！',
+            type: 'success',
+            duration: 3000,
+          });
+          this.page();
         });
-        this.page();
       });
     },
+    checkSelectable(row) {
+      // 根据行数据的 status 字段判断是否可选择
+      return row.status === 'NOT_RETURNED';
+    },
     // 多选触发
     handleSelectionChange(selection) {
       this.batchUpdateIds = selection.map((item) => item.id);
@@ -523,7 +533,7 @@ export default {
     // 批量更新退款状态
     batchUpdateStatus(status) {
       if (this.batchUpdateIds && this.batchUpdateIds.length > 0) {
-        this.$confirm('请仔细确认要进行批量操作的数据, 是否继续?', '警告', {
+        this.$confirm('请仔细确认要进行批量操作的数据, 标记退款状态后无法更改, 是否继续?', '警告', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning',

src/views/finance/productionReturn.vue

@@ -70,9 +70,9 @@
                                 <span>{{ row.returnReason }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column label="是否包含退发票" align="center" width="150">
+                        <el-table-column label="是否退发票" align="center" width="150">
                             <template slot-scope="{row}">
-                                <span>{{ row.returnInvoice === true ? '是' : '否' }}</span>
+                                <span>{{ row.returnInvoice === 0 ? '不退发票' : row.returnInvoice === 1 ? '退发票' : row.returnInvoice === 2 ? '未开发票' : '-'  }}</span>
                             </template>
                         </el-table-column>
                         <el-table-column label="审核状态" align="center" width="150">
@@ -156,9 +156,9 @@
                                 <span>{{ row.returnReason }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column label="是否包含退发票" align="center" width="150">
+                        <el-table-column label="是否退发票" align="center" width="150">
                             <template slot-scope="{row}">
-                                <span>{{ row.returnInvoice === true ? '是' : '否' }}</span>
+                                <span>{{ row.returnInvoice === 0 ? '不退发票' : row.returnInvoice === 1 ? '退发票' : row.returnInvoice === 2 ? '未开发票' : '-'  }}</span>
                             </template>
                         </el-table-column>
                         <el-table-column label="审核状态" align="center" width="150">

src/views/finance/productionReturnDetail.vue

@@ -65,6 +65,11 @@
                             <el-input v-model.trim="productionReturnForm.bailor" class="filter-item" disabled />
                         </el-form-item>
                     </el-col>
+                    <el-col :xs="24" :sm="12" :lg="12" :span="6">
+                        <el-form-item label="发票号：" prop="invoiceNo" label-width="140px" class="postInfo-container-item">
+                            <el-input v-model.trim="productionReturnForm.invoiceNo" class="filter-item" disabled />
+                        </el-form-item>
+                    </el-col>
                 </el-row>
                 <el-row>
                     <el-col :xs="24" :sm="12" :lg="12" :span="6">

src/views/major/myOrder.vue

@@ -664,8 +664,9 @@
                 <el-col :xs="24" :sm="12" :lg="12" :span="6">
                     <el-form-item label="是否退发票：" prop="returnInvoice" label-width="140px" class="postInfo-container-item">
                         <el-select v-model="productionReturnForm.returnInvoice" style="width: 100%">
-                            <el-option label="退发票" value="true"></el-option>
-                            <el-option label="不退发票" value="false"></el-option>
+                            <el-option label="不退发票" value="0"></el-option>
+                            <el-option label="退发票" value="1"></el-option>
+                            <el-option label="未开发票" value="2"></el-option>
                         </el-select>
                     </el-form-item>
                 </el-col>
@@ -1522,7 +1523,7 @@ export default {
     },
     openProductionReturnDialog(row) {
         // 判断产品是否已经出库了
-        if (row.repertoryState === '已出库') {
+        if (row.delivery) {
             // 赋值基础信息
             this.productionReturnForm.businessType = 'MAJOR_BUSINESS';
             this.productionReturnForm.businessId = row.businessId;
@@ -1539,7 +1540,7 @@ export default {
         } else {
             this.$notify({
                 title: '警告',
-                message: '产品未出库，无需发起产品退回流程！',
+                message: '产品未标记送达，无法发起产品退回流程！',
                 type: 'warning',
                 duration: 2000,
             });

src/views/personal/myOrder.vue

@@ -638,8 +638,9 @@
                 <el-col :xs="24" :sm="12" :lg="12" :span="6">
                     <el-form-item label="是否退发票：" prop="returnInvoice" label-width="140px" class="postInfo-container-item">
                         <el-select v-model="productionReturnForm.returnInvoice" style="width: 100%">
-                            <el-option label="退发票" value="true"></el-option>
-                            <el-option label="不退发票" value="false"></el-option>
+                            <el-option label="不退发票" value="0"></el-option>
+                            <el-option label="退发票" value="1"></el-option>
+                            <el-option label="未开发票" value="2"></el-option>
                         </el-select>
                     </el-form-item>
                 </el-col>
@@ -1181,7 +1182,7 @@ export default {
     },
     openProductionReturnDialog(row) {
         // 判断产品是否已经出库了
-        if (row.repertoryState) {
+        if (row.harReport) {
             // 赋值基础信息
             this.productionReturnForm.businessType = 'PERSONAL_BUSINESS';
             this.productionReturnForm.businessId = row.id;
@@ -1199,7 +1200,7 @@ export default {
         } else {
             this.$notify({
                 title: '警告',
-                message: '产品未出库，无需发起产品退回流程！',
+                message: '还未出具任何产品，无法发起产品退回流程！',
                 type: 'warning',
                 duration: 2000,
             });