1.逾期罚款-确认罚款改为取消罚款

2.逾期罚款-页面展示出库时间,不展示实际罚款金额
3.报告退回审核-修复是否退发票直接展示了状态码
4.其他优化

src/api/modules/financeFine.js

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

src/views/finance/fine.vue

@@ -7,7 +7,7 @@
       <el-tab-pane v-if="!personalLeader" label="资产业务" name="ASSET_BUSINESS">
         <y-page-list-layout :page-list="pageData" :page-para="queryDTO" :get-page-list="page">
           <template slot="left">
-            <el-input v-model="queryDTO.keyWord" placeholder="关键字(项⽬编号或产品号)" clearable style="width: 300px;float: left;"></el-input>
+            <el-input v-model="queryDTO.keyWord" placeholder="关键字(项目编号/产品号/客户名称/业务来源)" clearable style="width: 300px;float: left;"></el-input>
             <el-input v-model="queryDTO.invoiceNo" placeholder="发票号" clearable style="margin-left: 20px;width: 150px;float: left;"></el-input>
             <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;">
@@ -20,8 +20,8 @@
               align="center"
               unlink-panels
               range-separator="至"
-              start-placeholder="罚款⽇期（开始）"
-              end-placeholder="罚款⽇期（结束）"
+              start-placeholder="罚款日期（开始）"
+              end-placeholder="罚款日期（结束）"
               :picker-options="pickerOptions"
               value-format="yyyy-MM-dd"
               style="margin-left: 20px;width: 300px;float: left;"
@@ -29,16 +29,16 @@
             <el-button class="filter-item" style="margin-left:20px;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="fineListExport()">导出</el-button>
-            <PermissionButton menu-code="_views_finance_fine_confirm_batch" class="filter-item" style="float: left;" round type="danger" @click="batchConfirmFineAmount()" />
+            <PermissionButton menu-code="_views_finance_fine_cancel_batch" class="filter-item" style="float: left;" round type="danger" @click="batchCancelFineAmount()" />
           </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 label="项⽬编号" align="center" width="120">
+          <parentTable ref="table" v-loading="listLoading" :data="pageData.records" :selectionChange="handleSelectionChange" :clickRowToPick="false" slot="table" style="width: 100%;">
+            <el-table-column type="selection" align="center" width="40" :selectable="selectable"></el-table-column>
+            <el-table-column label="项目编号" align="center" width="120">
               <template slot-scope="{row}">
                 <span>{{ row.orderId }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="项⽬名称" align="center" width="150" show-overflow-tooltip>
+            <el-table-column label="项目名称" align="center" width="150" show-overflow-tooltip>
               <template slot-scope="{row}">
                 <span>{{ row.orderName}}</span>
               </template>
@@ -58,16 +58,16 @@
                 <span>{{ row.invoiceNo?row.invoiceNo:'未开票' }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="罚款⾦额" align="center">
+            <el-table-column label="罚款金额" align="center">
               <template slot-scope="{row}">
                 <span style="color: #dca550; font-weight: bold;">{{ row.fineAmount }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="实际罚款⾦额" align="center" width="120">
+            <!-- <el-table-column label="实际罚款金额" align="center" width="120">
               <template slot-scope="{row}">
                 <span style="color: red; font-weight: bold;">{{ row.realFineAmount !== null ? row.realFineAmount:'待确认' }}</span>
               </template>
-            </el-table-column>
+            </el-table-column>-->
             <el-table-column label="客户经理" align="center">
               <template slot-scope="{row}">
                 <span>{{ row.clientManagerName}}</span>
@@ -78,7 +78,7 @@
                 <span>{{ row.status ? '已确认' : '待确认' }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="罚款⽇期" align="center" width="130">
+            <el-table-column label="罚款日期" align="center" width="130">
               <template slot-scope="{row}">
                 <span>{{ row.punishDate }}</span>
               </template>
@@ -88,7 +88,7 @@
                 <span>{{ row.explain }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="应收⾦额" align="center">
+            <el-table-column label="应收金额" align="center">
               <template slot-scope="{row}">
                 <span>{{ row.shouldAmount }}</span>
               </template>
@@ -103,6 +103,11 @@
                 <span>{{ row.overdueDay}}</span>
               </template>
             </el-table-column>
+            <el-table-column label="出库日期" align="center" width="130">
+              <template slot-scope="{row}">
+                <span>{{ row.repertoryOutTime}}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="客户名称" align="center">
               <template slot-scope="{row}">
                 <span>{{ row.customerName }}</span>
@@ -118,12 +123,18 @@
                 <span>{{ row.bailor}}</span>
               </template>
             </el-table-column>
-
+            <el-table-column label="退款记录" align="center">
+              <template slot-scope="{row}">
+                <span>{{ row.refundId !== null ? '已产生' : '未产生'}}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="操作" align="center" width="160" fixed="right">
               <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" :disabled="row.status" @click="openEditFineAmount(row)" />
+                <!-- 已产生退款记录的将不可取消罚款 -->
+                <PermissionButton menu-code="_views_finance_fine_cancel" class-name="filter-item" name :disabled="row.refundId !== null" type="text" @click="cancelFineAmount(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>
             </el-table-column>
           </parentTable>
@@ -132,7 +143,7 @@
       <el-tab-pane v-if="!personalLeader" label="大中型业务" name="MAJOR_BUSINESS">
         <y-page-list-layout :page-list="pageData" :page-para="queryDTO" :get-page-list="page">
           <template slot="left">
-            <el-input v-model="queryDTO.keyWord" placeholder="关键字(项⽬编号或产品号)" clearable style="width: 300px;float: left;"></el-input>
+            <el-input v-model="queryDTO.keyWord" placeholder="关键字(项目编号/产品号/客户名称/业务来源)" clearable style="width: 300px;float: left;"></el-input>
             <el-input v-model="queryDTO.invoiceNo" placeholder="发票号" clearable style="margin-left: 20px;width: 150px;float: left;"></el-input>
             <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;">
@@ -145,8 +156,8 @@
               align="center"
               unlink-panels
               range-separator="至"
-              start-placeholder="罚款⽇期（开始）"
-              end-placeholder="罚款⽇期（结束）"
+              start-placeholder="罚款日期（开始）"
+              end-placeholder="罚款日期（结束）"
               :picker-options="pickerOptions"
               value-format="yyyy-MM-dd"
               style="margin-left: 20px;width: 300px;float: left;"
@@ -154,16 +165,16 @@
             <el-button class="filter-item" style="margin-left:20px;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="fineListExport()">导出</el-button>
-            <PermissionButton menu-code="_views_finance_fine_confirm_batch" class="filter-item" style="float: left;" round type="danger" @click="batchConfirmFineAmount()" />
+            <PermissionButton menu-code="_views_finance_fine_cancel_batch" class="filter-item" style="float: left;" round type="danger" @click="batchCancelFineAmount()" />
           </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 label="项⽬编号" align="center" width="120">
+          <parentTable ref="table" v-loading="listLoading" :data="pageData.records" :selectionChange="handleSelectionChange" :clickRowToPick="false" slot="table" style="width: 100%;">
+            <el-table-column type="selection" align="center" width="40" :selectable="selectable"></el-table-column>
+            <el-table-column label="项目编号" align="center" width="120">
               <template slot-scope="{row}">
                 <span>{{ row.orderId }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="项⽬名称" align="center" width="150" show-overflow-tooltip>
+            <el-table-column label="项目名称" align="center" width="150" show-overflow-tooltip>
               <template slot-scope="{row}">
                 <span>{{ row.orderName}}</span>
               </template>
@@ -183,16 +194,16 @@
                 <span>{{ row.invoiceNo?row.invoiceNo:'未开票' }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="罚款⾦额" align="center">
+            <el-table-column label="罚款金额" align="center">
               <template slot-scope="{row}">
                 <span style="color: #dca550; font-weight: bold;">{{ row.fineAmount }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="实际罚款⾦额" align="center" width="120">
+            <!-- <el-table-column label="实际罚款金额" align="center" width="120">
               <template slot-scope="{row}">
                 <span style="color: red; font-weight: bold;">{{ row.realFineAmount !== null ? row.realFineAmount:'待确认' }}</span>
               </template>
-            </el-table-column>
+            </el-table-column>-->
             <el-table-column label="客户经理" align="center">
               <template slot-scope="{row}">
                 <span>{{ row.clientManagerName}}</span>
@@ -203,7 +214,7 @@
                 <span>{{ row.status ? '已确认' : '待确认' }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="罚款⽇期" align="center" width="130">
+            <el-table-column label="罚款日期" align="center" width="130">
               <template slot-scope="{row}">
                 <span>{{ row.punishDate }}</span>
               </template>
@@ -213,7 +224,7 @@
                 <span>{{ row.explain }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="应收⾦额" align="center">
+            <el-table-column label="应收金额" align="center">
               <template slot-scope="{row}">
                 <span>{{ row.shouldAmount }}</span>
               </template>
@@ -228,6 +239,11 @@
                 <span>{{ row.overdueDay}}</span>
               </template>
             </el-table-column>
+            <el-table-column label="出库日期" align="center" width="130">
+              <template slot-scope="{row}">
+                <span>{{ row.repertoryOutTime}}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="客户名称" align="center">
               <template slot-scope="{row}">
                 <span>{{ row.customerName }}</span>
@@ -243,11 +259,18 @@
                 <span>{{ row.bailor}}</span>
               </template>
             </el-table-column>
+            <el-table-column label="退款记录" align="center">
+              <template slot-scope="{row}">
+                <span>{{ row.refundId !== null ? '已产生' : '未产生'}}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="操作" align="center" width="160" fixed="right">
               <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" :disabled="row.status" @click="openEditFineAmount(row)" />
+                <!-- 已产生退款记录的将不可取消罚款 -->
+                <PermissionButton menu-code="_views_finance_fine_cancel" class-name="filter-item" name :disabled="row.refundId !== null" type="text" @click="cancelFineAmount(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>
             </el-table-column>
           </parentTable>
@@ -256,7 +279,7 @@
       <el-tab-pane label="个贷业务" name="PERSONAL_BUSINESS">
         <y-page-list-layout :page-list="pageData" :page-para="queryDTO" :get-page-list="page">
           <template slot="left">
-            <el-input v-model="queryDTO.keyWord" placeholder="关键字(项⽬编号)" clearable style="width: 300px;float: left;"></el-input>
+            <el-input v-model="queryDTO.keyWord" placeholder="关键字(项目编号/客户名称/业务来源)" clearable style="width: 300px;float: left;"></el-input>
             <el-input v-model="queryDTO.invoiceNo" placeholder="发票号" clearable style="margin-left: 20px;width: 150px;float: left;"></el-input>
             <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;">
@@ -269,8 +292,8 @@
               align="center"
               unlink-panels
               range-separator="至"
-              start-placeholder="罚款⽇期（开始）"
-              end-placeholder="罚款⽇期（结束）"
+              start-placeholder="罚款日期（开始）"
+              end-placeholder="罚款日期（结束）"
               :picker-options="pickerOptions"
               value-format="yyyy-MM-dd"
               style="margin-left: 20px;width: 300px;float: left;"
@@ -278,16 +301,16 @@
             <el-button class="filter-item" style="margin-left:20px;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="fineListExport()">导出</el-button>
-            <PermissionButton menu-code="_views_finance_fine_confirm_batch" class="filter-item" style="float: left;" round type="danger" @click="batchConfirmFineAmount()" />
+            <PermissionButton menu-code="_views_finance_fine_cancel_batch" class="filter-item" style="float: left;" round type="danger" @click="batchCancelFineAmount()" />
           </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 label="项⽬编号" align="center" width="120">
+          <parentTable ref="table" v-loading="listLoading" :data="pageData.records" :selectionChange="handleSelectionChange" :clickRowToPick="false" slot="table" style="width: 100%;">
+            <el-table-column type="selection" align="center" width="40" :selectable="selectable"></el-table-column>
+            <el-table-column label="项目编号" align="center" width="120">
               <template slot-scope="{row}">
                 <span>{{ row.orderId }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="项⽬名称" align="center" width="450" show-overflow-tooltip>
+            <el-table-column label="项目名称" align="center" width="450" show-overflow-tooltip>
               <template slot-scope="{row}">
                 <span>{{ row.orderName}}</span>
               </template>
@@ -312,16 +335,16 @@
                 <span>{{ row.invoiceNo?row.invoiceNo:'未开票' }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="罚款⾦额" align="center">
+            <el-table-column label="罚款金额" align="center">
               <template slot-scope="{row}">
                 <span style="color: #dca550; font-weight: bold;">{{ row.fineAmount }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="实际罚款⾦额" align="center" width="120">
+            <!-- <el-table-column label="实际罚款金额" align="center" width="120">
               <template slot-scope="{row}">
                 <span style="color: red; font-weight: bold;">{{ row.realFineAmount !== null ? row.realFineAmount:'待确认' }}</span>
               </template>
-            </el-table-column>
+            </el-table-column>-->
             <el-table-column label="客户经理" align="center">
               <template slot-scope="{row}">
                 <span>{{ row.clientManagerName}}</span>
@@ -332,7 +355,7 @@
                 <span>{{ row.status ? '已确认' : '待确认' }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="罚款⽇期" align="center" width="130">
+            <el-table-column label="罚款日期" align="center" width="130">
               <template slot-scope="{row}">
                 <span>{{ row.punishDate }}</span>
               </template>
@@ -342,7 +365,7 @@
                 <span>{{ row.explain }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="应收⾦额" align="center">
+            <el-table-column label="应收金额" align="center">
               <template slot-scope="{row}">
                 <span>{{ row.shouldAmount }}</span>
               </template>
@@ -357,13 +380,23 @@
                 <span>{{ row.overdueDay}}</span>
               </template>
             </el-table-column>
-          
+            <el-table-column label="出库日期" align="center" width="130">
+              <template slot-scope="{row}">
+                <span>{{ row.repertoryOutTime}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="退款记录" align="center">
+              <template slot-scope="{row}">
+                <span>{{ row.refundId !== null ? '已产生' : '未产生'}}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="操作" align="center" width="160" fixed="right">
               <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" :disabled="row.status" @click="openEditFineAmount(row)" />
+                <!-- 已产生退款记录的将不可取消罚款 -->
+                <PermissionButton menu-code="_views_finance_fine_cancel" class-name="filter-item" name :disabled="row.refundId !== null" type="text" @click="cancelFineAmount(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>
             </el-table-column>
           </parentTable>
@@ -487,7 +520,7 @@ export default {
         explain: null,
         fineAmount: null,
       },
-      batchConfirmFineIds: [],
+      batchCancelFineIds: [],
     };
   },
   created() {
@@ -551,6 +584,7 @@ export default {
       this.updateFineForm.id = row.id;
       this.updateFineForm.explain = row.explain;
       this.updateFineForm.fineAmount = row.fineAmount;
+      this.updateFineForm.status = row.status;
     },
     // 更新罚款记录
     updateFine(financeFine) {
@@ -573,14 +607,14 @@ export default {
         }
       });
     },
-    // 确认罚款金额
-    confirmFineAmount(id) {
-      this.$confirm('请仔细确认罚款金额, 确认后无法更改, 是否继续?', '警告', {
+    // 取消确认罚款金额
+    cancelFineAmount(id) {
+      this.$confirm('取消确认罚款后无法更改, 是否继续?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        this.$api.financeFine.confirm(id).then((res) => {
+        this.$api.financeFine.cancel(id).then((res) => {
           if (res.code === 200 && res.data) {
             this.$notify({
               title: '成功',
@@ -595,17 +629,17 @@ export default {
     },
     // 多选触发
     handleSelectionChange(selection) {
-      this.batchConfirmFineIds = selection.map((item) => item.id);
+      this.batchCancelFineIds = selection.map((item) => item.id);
     },
-    // 批量确认罚款金额
-    batchConfirmFineAmount() {
-      if (this.batchConfirmFineIds && this.batchConfirmFineIds.length > 0) {
-        this.$confirm('请仔细确认要进行批量操作记录的罚款金额, 确认后无法更改, 是否继续?', '警告', {
+    // 批量取消确认罚款金额
+    batchCancelFineAmount() {
+      if (this.batchCancelFineIds && this.batchCancelFineIds.length > 0) {
+        this.$confirm('请仔细确认要进行批量操作记录的罚款金额, 取消确认罚款后无法更改, 是否继续?', '警告', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning',
         }).then(() => {
-          this.$api.financeFine.batchConfirm(this.batchConfirmFineIds).then((res) => {
+          this.$api.financeFine.batchCancel(this.batchCancelFineIds).then((res) => {
             if (res.code === 200 && res.data) {
               this.$notify({
                 title: '成功',
@@ -626,6 +660,14 @@ export default {
         });
       }
     },
+    // 判断行数据是否可选
+    selectable(row) {
+      if (row.refundId !== null) {
+        return false;
+      } else {
+        return true;
+      }
+    },
   },
 };
 </script>

src/views/finance/productionReturnDetail.vue

@@ -1,202 +1,202 @@
 <template>
-    <div class="app-container">
-        <div class="title-container">
-            <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
-        </div>
-        <el-collapse v-model="activeNames" style="margin-top: 30px;">
-            <el-collapse-item name="board">
-                <template slot="title">
-                    <span style="font-size:15px; margin-left:15px;letter-spacing:2px; color:RGB(168,168,168)">点击展开查看实时流程图</span>
-                </template>
-                <WorkflowBoard ref="board" :nodeBusinessInfo="nodeBusinessInfo" />
-            </el-collapse-item>
-        </el-collapse>
-        <div class="button-area">
-            <el-button v-if="nodeBusinessInfo.currentNodePermission.commit && doWorkflow" class="y-save" type="success" round @click="commit('PASS')">通过</el-button>
-            <el-button v-if="nodeBusinessInfo.currentNodePermission.terminable && doWorkflow" class="y-save" type="danger" round @click="commit('TERMINATE')">拒绝</el-button>
-            <el-button class="y-save" round type="info" @click="goBack">返回</el-button>
-        </div>
-        <el-card>
-            <el-divider content-position="left">产品退回申请详情</el-divider>
-            <el-form ref="productionReturnForm" :model="productionReturnForm" :rules="productionReturnFormRules">
-                <el-row>
-                    <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.businessType" style="width: 100%" disabled>
-                                <el-option label="资产业务" value="ASSET_BUSINESS"></el-option>
-                                <el-option label="大中型业务" value="MAJOR_BUSINESS"></el-option>
-                                <el-option label="个贷业务" value="PERSONAL_BUSINESS"></el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :xs="24" :sm="24" :lg="24" :span="6">
-                        <el-form-item label="项目名称：" prop="name" label-width="140px" class="postInfo-container-item">
-                            <el-input v-model.trim="productionReturnForm.name" class="filter-item" disabled />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :xs="24" :sm="12" :lg="12" :span="6">
-                        <el-form-item label="项目编号：" prop="orderId" label-width="140px" class="postInfo-container-item">
-                            <el-input v-model.trim="productionReturnForm.orderId" class="filter-item" disabled />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :xs="24" :sm="12" :lg="12" :span="6">
-                        <el-form-item label="产品编号：" prop="productionNo" label-width="140px" class="postInfo-container-item" v-if="productionReturnForm.businessType !== 'PERSONAL_BUSINESS'">
-                            <el-input v-model.trim="productionReturnForm.productionNo" class="filter-item" disabled />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :xs="24" :sm="12" :lg="12" :span="6">
-                        <el-form-item label="客户名称：" prop="clientName" label-width="140px" class="postInfo-container-item">
-                            <el-input v-model.trim="productionReturnForm.clientName" class="filter-item" disabled />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :xs="24" :sm="12" :lg="12" :span="6">
-                        <el-form-item label="业务来源：" prop="clientSubName" label-width="140px" class="postInfo-container-item">
-                            <el-input v-model.trim="productionReturnForm.clientSubName" class="filter-item" disabled />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :xs="24" :sm="12" :lg="12" :span="6">
-                        <el-form-item label="委托人：" prop="bailor" label-width="140px" class="postInfo-container-item">
-                            <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">
-                        <el-form-item label="退产品原因：" prop="returnReason" label-width="140px" class="postInfo-container-item">
-                            <el-input v-model.trim="productionReturnForm.returnReason" class="filter-item" disabled />
-                        </el-form-item>
-                    </el-col>
-                    <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="0"></el-option>
-                            <el-option label="退发票" value="1"></el-option>
-                            <el-option label="未开发票" value="2"></el-option>
-                        </el-select>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-            </el-form>
-        </el-card>
+  <div class="app-container">
+    <div class="title-container">
+      <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
     </div>
+    <el-collapse v-model="activeNames" style="margin-top: 30px;">
+      <el-collapse-item name="board">
+        <template slot="title">
+          <span style="font-size:15px; margin-left:15px;letter-spacing:2px; color:RGB(168,168,168)">点击展开查看实时流程图</span>
+        </template>
+        <WorkflowBoard ref="board" :nodeBusinessInfo="nodeBusinessInfo" />
+      </el-collapse-item>
+    </el-collapse>
+    <div class="button-area">
+      <el-button v-if="nodeBusinessInfo.currentNodePermission.commit && doWorkflow" class="y-save" type="success" round @click="commit('PASS')">通过</el-button>
+      <el-button v-if="nodeBusinessInfo.currentNodePermission.terminable && doWorkflow" class="y-save" type="danger" round @click="commit('TERMINATE')">拒绝</el-button>
+      <el-button class="y-save" round type="info" @click="goBack">返回</el-button>
+    </div>
+    <el-card>
+      <el-divider content-position="left">产品退回申请详情</el-divider>
+      <el-form ref="productionReturnForm" :model="productionReturnForm" :rules="productionReturnFormRules">
+        <el-row>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="业务类型：" prop="businessType" label-width="140px" class="postInfo-container-item">
+              <el-select v-model="productionReturnForm.businessType" style="width: 100%" disabled>
+                <el-option label="资产业务" value="ASSET_BUSINESS"></el-option>
+                <el-option label="大中型业务" value="MAJOR_BUSINESS"></el-option>
+                <el-option label="个贷业务" value="PERSONAL_BUSINESS"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :xs="24" :sm="24" :lg="24" :span="6">
+            <el-form-item label="项目名称：" prop="name" label-width="140px" class="postInfo-container-item">
+              <el-input v-model.trim="productionReturnForm.name" class="filter-item" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="项目编号：" prop="orderId" label-width="140px" class="postInfo-container-item">
+              <el-input v-model.trim="productionReturnForm.orderId" class="filter-item" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="产品编号：" prop="productionNo" label-width="140px" class="postInfo-container-item" v-if="productionReturnForm.businessType !== 'PERSONAL_BUSINESS'">
+              <el-input v-model.trim="productionReturnForm.productionNo" class="filter-item" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="客户名称：" prop="clientName" label-width="140px" class="postInfo-container-item">
+              <el-input v-model.trim="productionReturnForm.clientName" class="filter-item" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="业务来源：" prop="clientSubName" label-width="140px" class="postInfo-container-item">
+              <el-input v-model.trim="productionReturnForm.clientSubName" class="filter-item" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="12" :span="6">
+            <el-form-item label="委托人：" prop="bailor" label-width="140px" class="postInfo-container-item">
+              <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">
+            <el-form-item label="退产品原因：" prop="returnReason" label-width="140px" class="postInfo-container-item">
+              <el-input v-model.trim="productionReturnForm.returnReason" class="filter-item" disabled />
+            </el-form-item>
+          </el-col>
+          <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%" disabled>
+                <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>
+        </el-row>
+      </el-form>
+    </el-card>
+  </div>
 </template>
 <script>
 import Breadcrumb from '@/components/Breadcrumb';
 import WorkflowBoard from '@/components/workflowBoard';
 
 export default {
-    name: 'productionReturnDetail',
-    components: {
-        Breadcrumb,
-        WorkflowBoard,
+  name: 'productionReturnDetail',
+  components: {
+    Breadcrumb,
+    WorkflowBoard,
+  },
+  filters: {},
+  computed: {},
+  data() {
+    return {
+      activeNames: ['board'],
+      couldEdit: true,
+      nodeBusinessInfo: {
+        currentNodePermission: {
+          commit: true,
+          reversible: true,
+          restartable: true,
+          terminable: true,
+          skippable: true,
+        },
+        mainBusiness: null,
+        doWorkflow: null,
+        businessSubId: null,
+        businessId: null,
+        currentInstanceNodeId: null,
+        production: [],
+        nodeCode: null,
+      },
+      doWorkflow: false,
+      productionReturnForm: {},
+      currentNode: {
+        flowId: null,
+        pnodeId: null,
+        nodeId: null,
+        flowCode: null,
+        nodeName: '',
+        nodeCode: null,
+        state: '',
+        instanceId: null,
+        sequence: null,
+        restartable: null,
+        reversible: null,
+        skippable: null,
+        terminable: null,
+        tasks: [],
+      },
+    };
+  },
+  created() {
+    this.couldEdit = this.$route.query.couldEdit === 'true';
+    this.nodeBusinessInfo.businessId = this.$route.query.businessId;
+    this.nodeBusinessInfo.mainBusiness = this.$route.query.businessType;
+    this.doWorkflow = this.$route.query.doWorkflow === 'true';
+    this.getCurrentNodeInfo();
+    this.businessId = this.$route.query.businessId;
+    this.getDetail();
+  },
+  methods: {
+    getCurrentNodeInfo() {
+      if (this.nodeBusinessInfo.businessId) {
+        this.$api.workNodeInstance
+          .currentNode({
+            mainBusiness: this.nodeBusinessInfo.mainBusiness,
+            businessId: this.nodeBusinessInfo.businessId,
+          })
+          .then((res) => {
+            if (res.code === 200 && res.data != null) {
+              this.currentNode = res.data;
+              this.nodeBusinessInfo.currentInstanceNodeId = res.data.instanceId;
+              this.nodeBusinessInfo.nodeCode = res.data.nodeCode;
+            }
+            this.$refs.board.getInstanceArray(this.nodeBusinessInfo.mainBusiness, this.nodeBusinessInfo.businessId);
+          });
+      }
     },
-    filters: {},
-    computed: {},
-    data() {
-        return {
-            activeNames: ['board'],
-            couldEdit: true,
-            nodeBusinessInfo: {
-                currentNodePermission: {
-                    commit: true,
-                    reversible: true,
-                    restartable: true,
-                    terminable: true,
-                    skippable: true,
-                },
-                mainBusiness: null,
-                doWorkflow: null,
-                businessSubId: null,
-                businessId: null,
-                currentInstanceNodeId: null,
-                production: [],
-                nodeCode: null,
-            },
-            doWorkflow: false,
-            productionReturnForm: {},
-            currentNode: {
-                flowId: null,
-                pnodeId: null,
-                nodeId: null,
-                flowCode: null,
-                nodeName: '',
-                nodeCode: null,
-                state: '',
-                instanceId: null,
-                sequence: null,
-                restartable: null,
-                reversible: null,
-                skippable: null,
-                terminable: null,
-                tasks: [],
-            },
-        };
+    // 提交节点
+    commit(state) {
+      this.$refs.board.commit(state);
     },
-    created() {
-        this.couldEdit = this.$route.query.couldEdit === 'true';
-        this.nodeBusinessInfo.businessId = this.$route.query.businessId;
-        this.nodeBusinessInfo.mainBusiness = this.$route.query.businessType;
-        this.doWorkflow = this.$route.query.doWorkflow === 'true';
-        this.getCurrentNodeInfo();
-        this.businessId = this.$route.query.businessId;
-        this.getDetail();
+    // 获取退回申请详情
+    getDetail() {
+      this.$api.productionReturn.detail(this.businessId).then((res) => {
+        if (res.code === 200) {
+          this.productionReturnForm = res.data;
+        }
+      });
     },
-    methods: {
-        getCurrentNodeInfo() {
-            if (this.nodeBusinessInfo.businessId) {
-                this.$api.workNodeInstance
-                    .currentNode({
-                        mainBusiness: this.nodeBusinessInfo.mainBusiness,
-                        businessId: this.nodeBusinessInfo.businessId,
-                    })
-                    .then((res) => {
-                        if (res.code === 200 && res.data != null) {
-                            this.currentNode = res.data;
-                            this.nodeBusinessInfo.currentInstanceNodeId = res.data.instanceId;
-                            this.nodeBusinessInfo.nodeCode = res.data.nodeCode;
-                        }
-                        this.$refs.board.getInstanceArray(this.nodeBusinessInfo.mainBusiness, this.nodeBusinessInfo.businessId);
-                    });
-            }
-        },
-        // 提交节点
-        commit(state) {
-            this.$refs.board.commit(state);
-        },
-        // 获取退回申请详情
-        getDetail() {
-            this.$api.productionReturn.detail(this.businessId).then((res) => {
-                if (res.code === 200) {
-                    this.productionReturnForm = res.data;
-                }
-            });
-        },
-        goBack() {
-            const back = this.$route.query.back;
-            console.log(back);
-            if (back) {
-                this.$router.push(back);
-            }
-        },
+    goBack() {
+      const back = this.$route.query.back;
+      console.log(back);
+      if (back) {
+        this.$router.push(back);
+      }
     },
+  },
 };
 </script>
 <style lang="scss" scoped>
 .button-area {
-    position: absolute;
-    top: 70px;
-    right: 50px;
+  position: absolute;
+  top: 70px;
+  right: 50px;
 }
 </style>