Merge branch 'master' of http://git.keao.tech/SupplyChain/front

front-vue/src/api/service/rel/companyRel.js

@@ -83,6 +83,19 @@ export function updateRel(launchScrId,state) {
   })
 }
 
+// 重邀拒绝的链属
+export function againRel(launchScrId,state) {
+  const data = {
+    launchScrId,
+    state
+  }
+  return request({
+    url: '/sc-service/rel/againRel',
+    method: 'put',
+    data: data
+  })
+}
+
 // 重邀
 export function againInvite(row) {
   return request({

front-vue/src/router/index.js

@@ -279,7 +279,7 @@ export const constantRoutes = [
         meta: { title: '修改授信信息',noCache: true }
       },
       {
-        path: 'detailCreditLine/:zfpcrId/:zfiAmount/:usableAmount',
+        path: 'detailCreditLine/:zfpcrId/:zfiAmount/:usableAmount/:companyType',
         component: (resolve) => require(['@/views/service/creditLine/detailCreditLine'], resolve),
         name: 'detailCreditLine',
         meta: { title: '授信信息详情',noCache: true }

front-vue/src/views/approval/approval/deal.vue

@@ -21,7 +21,7 @@ export default {
         const nodeId = this.$route.query && this.$route.query.nodeId;
         const taskId = this.$route.query && this.$route.query.taskId;
         const instId = this.$route.query && this.$route.query.instId;
-        this.wordUrl = window.location.protocol+'//'+window.location.host+':8080/flowablePc/#/openDeal?instId='+ instId + '&processId=' + processId + '&nodeId=' + nodeId + '&taskId=' + taskId + '&token=' + getToken();
+        this.wordUrl = window.location.protocol+'//'+window.location.host+'/flowablePc/#/openDeal?instId='+ instId + '&processId=' + processId + '&nodeId=' + nodeId + '&taskId=' + taskId + '&token=' + getToken();
         // this.wordUrl = 'http://localhost:8080/flowablePc/#/openDeal?instId='+ instId + '&processId=' + processId + '&nodeId=' + nodeId + '&taskId=' + taskId + '&token' + getToken();
         this.iframeShow = true
     },

front-vue/src/views/home.vue

@@ -148,6 +148,26 @@
                             @pagination="getNoticeList"
                             />
                         </el-tab-pane>
+                        <el-tab-pane label="已办记录" name="third" style="height:400px">
+                            <el-table :data="oldWorkList" :show-header="false">
+                                <el-table-column label="标题" align="center" prop="noticeTitle" :show-overflow-tooltip="true"/>
+                                <el-table-column label="时间" align="center" prop="createTime" :show-overflow-tooltip="true">
+                                    <template slot-scope="scope">
+                                        <span>{{ parseTime(new Date(scope.row.createTime)) }}</span>
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+                            
+                            <pagination
+                            v-show="oldWorkTotal>0"
+                            :total="oldWorkTotal"
+                            :page.sync="queryParamsOldWork.pageNum"
+                            :limit.sync="queryParamsOldWork.pageSize"
+                            :pager-count="5"
+                            :page-sizes="[5]"
+                            @pagination="getOldWorkList"
+                            />
+                        </el-tab-pane>
                     </el-tabs>
                 </div>
             </el-row>
@@ -989,6 +1009,8 @@ export default {
                     this.getWorkList()
                     //查询消息
                     this.getNoticeList()
+                    //查询已办
+                    this.getOldWorkList()
                 //核心企业
                 }else if(this.company.scyType == '01'){
                     //授信总额度

front-vue/src/views/service/bill/addBill.vue

@@ -1284,6 +1284,11 @@ export default {
             .catch(() => {
               loading.close();
             });
+        }else{
+            this.$message({
+                message: "账款基本信息未完善，请检查确认",
+                type: "warning",
+            });
         }
       });
     },

front-vue/src/views/service/bill/billAdd.vue

@@ -1021,6 +1021,11 @@ export default {
                         .catch(() => {
                             loading.close();
                         });
+                } else {
+                    this.$message({
+                        message: "账款基本信息未完善，请检查确认",
+                        type: "warning",
+                    });
                 }
             });
         },
@@ -1183,7 +1188,6 @@ export default {
     border: none;
 }
 
-
 ::v-deep .el-icon-upload {
     font-size: 32px;
     color: #02c464;

front-vue/src/views/service/bill/billEdit.vue

@@ -1073,6 +1073,11 @@ export default {
                         .catch(() => {
                             loading.close();
                         });
+                } else {
+                    this.$message({
+                        message: "账款基本信息未完善，请检查确认",
+                        type: "warning",
+                    });
                 }
             });
         },

front-vue/src/views/service/bill/editBill.vue

@@ -1342,6 +1342,11 @@ export default {
             .catch(() => {
               loading.close();
             });
+        }else{
+            this.$message({
+                message: "账款基本信息未完善，请检查确认",
+                type: "warning",
+            });
         }
       });
     },

front-vue/src/views/service/credit/addCredit.vue

@@ -46,8 +46,8 @@
             <el-row class="zap-form">
                 <el-row type="flex" align="middle" justify="space-between" style="padding-top: 8px;padding-bottom:20px;">
                     <el-col>
-                        <el-button type="success" @click="addPay">新增应付账款</el-button>
-                        <el-button type="primary" @click="openTicket">选择</el-button>
+                        <el-button type="success" @click="openTicket">选择</el-button>
+                        <el-button type="primary" @click="addPay">新增应付账款</el-button>
                         <el-button @click="deleteTicekt">清空全部</el-button>
                     </el-col>
                     <el-col>
@@ -513,6 +513,7 @@ export default {
         },
         // 确认选择
         closeTicket() {
+            debugger
             if (this.chooseTicket.length > 0) {
                 var flag = true;
                 //获取选中第一个的应收企业
@@ -543,6 +544,9 @@ export default {
                     this.ticketList = this.chooseTicket;
                     //更新附件信息
                     this.getFile(this.ticketList);
+                    if(new Date(this.ticketList[0].zbiPayDate) >= new Date()){
+                        this.form.zfiExpireDate = this.ticketList[0].zbiPayDate
+                    }
                     this.open = false;
                 }
 

front-vue/src/views/service/credit/addInformation.vue

@@ -101,8 +101,8 @@
                 </el-row>  
                 <el-divider content-position="left" >应收账款</el-divider>
                 <el-form-item  style="margin-left: 100px">
-                    <el-button size="mini" type="success" @click="addPay">新增应收账款</el-button>
-                    <el-button size="mini" type="primary" @click="openTicket">选择</el-button>
+                    <el-button type="success" @click="openTicket">选择</el-button>
+                    <el-button type="primary" @click="addPay">新增应付账款</el-button>
                     <el-button size="mini" @click="deleteTicekt">清空全部</el-button>
                     <el-form-item label="合计金额:"> 
                             <span>{{checkTotalAmt}}</span>
@@ -126,6 +126,7 @@
                                 @click="handleDelete(scope.$index, ticketList)"
                             >删除</el-button>
                             </template>
+                            <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.$index, ticketList)">修改</el-button>
                         </el-table-column>
                     </el-table>
                 </el-form-item>
@@ -276,6 +277,10 @@
             <el-dialog title="新增往来账款" :visible.sync="openAddBill" width="1120px" append-to-body>
                 <add-bill :companyId="form.zfiCoreId" companyType="01" :payDate="payDate" @addClick="emitAddClick" v-if="openAddBill"></add-bill>
             </el-dialog>
+            <!-- 修改往来账款 -->
+            <el-dialog title="修改往来账款" :visible.sync="openEditBill" width="1120px" append-to-body>
+                <edit-bill :zbiId="this.zbiId" @editClick="emitEditClick" v-if="openEditBill"></edit-bill>
+            </el-dialog>
 
             <!--预览-->
             <el-dialog  :visible.sync="openFile" width="1000px" append-to-body>
@@ -329,13 +334,16 @@ import {addInfor,getCreditSealFile,creditRefuse,getContractFile} from "@/api/ser
 import {accAdd} from "@/utils/calculation";
 import {getToken} from "@/utils/auth";
 import AddBill from "@/views/service/bill/addBill";
+import EditBill from "@/views/service/bill/editBill";
 import {isOpenApproval} from "@/api/service/credit/approvalRelatedCredit";
 import pdfShow from "./pdfShow";
 export default {
     name: "addCredit",
-    components: {AddBill,pdfShow},
+    components: {AddBill,pdfShow,EditBill},
     data() {
         return {
+            //往来账款id
+            zbiId: '',
             // 总条数
             total: 0,
             // 表单参数read
@@ -349,6 +357,7 @@ export default {
             // 是否显示弹出层
             open: false,
             openAddBill: false,
+            openEditBill: false,
            //选择的应收账款
            payList:[],
            //现有的应收账款
@@ -424,7 +433,7 @@ export default {
     /* watch:{
         'form.zfiCoreQuotaId':'change'
     }, */
-    created() {
+    activated() {
          const zfiId = this.$route.params && this.$route.params.zfiId;
          getCreditDetail(zfiId).then((response) => {
              if(response.data){
@@ -587,6 +596,11 @@ export default {
             }
             this.selectChecked();
         },
+        /* 修改按钮 */
+        handleUpdate(index, rows) {
+            this.zbiId = rows[index].zbiId;
+            this.openEditBill = true
+        },
         /* 多选框跨页 */
         rowkey(row) {
             return row.zbiId;
@@ -960,6 +974,26 @@ export default {
         })
         self.openAddBill = false
     },
+    //修改账款回调
+        emitEditClick(val) {
+            var self = this
+            this.getAccountsCollection().then((response) => {
+                //修改付款返回id直接选中
+                if (val) {
+                    // self.payList.forEach(element => {
+                    //     if (element.zbiId == val) {
+                    //         // 将当前点击项选中
+                    //         // self.chooseTicket.push(element)
+                    //         //self.closeTicket()
+                    //     }
+                    // });
+                    console.log(self.chooseTicket)
+                    self.ticketList = self.chooseTicket
+                    self.closeTicket()
+                }
+            })
+            self.openEditBill = false
+        },
     //判断有无补充资料内部审批
     isOpenApproval(){
         debugger

front-vue/src/views/service/credit/applyCreditEdit.vue

@@ -22,8 +22,8 @@
                 <el-row>
                     <el-divider content-position="left" >应收账款</el-divider>
                 <el-form-item  style="margin-left: 100px">
-                    <el-button size="mini" type="success" @click="addPay">新增应收账款</el-button>
-                    <el-button size="mini" type="primary" @click="openTicket">选择</el-button>
+                    <el-button type="success" @click="openTicket">选择</el-button>
+                    <el-button type="primary" @click="addPay">新增应付账款</el-button>
                     <el-button size="mini" @click="deleteTicekt">清空全部</el-button>
                     <el-form-item label="合计金额:"> 
                             <span>{{checkTotalAmt}}</span>
@@ -46,6 +46,7 @@
                                 icon="el-icon-delete"
                                 @click="handleDelete(scope.$index, ticketList)"
                             >删除</el-button>
+                            <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.$index, ticketList)">修改</el-button>
                             </template>
                         </el-table-column>
                     </el-table>
@@ -266,7 +267,10 @@
         <el-dialog title="新增往来账款" :visible.sync="openAddBill" width="1120px" append-to-body>
             <add-bill :companyId="form.zfiCoreId" companyType="01" :payDate="payDate" @addClick="emitAddClick" v-if="openAddBill"></add-bill>
         </el-dialog>
-
+        <!-- 修改往来账款 -->
+            <el-dialog title="修改往来账款" :visible.sync="openEditBill" width="1120px" append-to-body>
+                <edit-bill :zbiId="this.zbiId" @editClick="emitEditClick" v-if="openEditBill"></edit-bill>
+            </el-dialog>
         <!--预览-->
         <el-dialog  :visible.sync="openFile" width="1000px" append-to-body>
             <img :src="wordUrl" v-if="show" width='450px' height='500px'/>
@@ -279,11 +283,14 @@ import {getFile,getCreditDetail,getAccountsCollection,updateCredit} from "@/api/
 import {accAdd} from "@/utils/calculation";
 import {getToken} from "@/utils/auth";
 import AddBill from "@/views/service/bill/addBill";
+import EditBill from "@/views/service/bill/editBill";
 export default {
     name: "addCredit",
-    components: {AddBill},
+    components: {AddBill,EditBill},
     data() {
         return {
+            //往来账款id
+            zbiId: '',
             // 总条数
             total: 0,
             // 查询参数
@@ -359,6 +366,7 @@ export default {
             // 是否显示弹出层
             open: false,
             openAddBill: false,
+            openEditBill: false,
            //授信
            creditLineList:[],
            //接收方
@@ -605,6 +613,11 @@ export default {
         }
         this.selectChecked();
     },
+    /* 修改按钮 */
+    handleUpdate(index, rows) {
+        this.zbiId = rows[index].zbiId;
+        this.openEditBill = true
+    },
     onSelectAll() {
         if(this.$refs.tablePay){
             this.$refs.tablePay.clearSelection();
@@ -865,7 +878,27 @@ export default {
             }
         })
         self.openAddBill = false
-    }
+    },
+    //修改账款回调
+        emitEditClick(val) {
+            var self = this
+            this.getAccountsCollection().then((response) => {
+                //修改付款返回id直接选中
+                if (val) {
+                    // self.payList.forEach(element => {
+                    //     if (element.zbiId == val) {
+                    //         // 将当前点击项选中
+                    //         // self.chooseTicket.push(element)
+                    //         //self.closeTicket()
+                    //     }
+                    // });
+                    console.log(self.chooseTicket)
+                    self.ticketList = self.chooseTicket
+                    self.closeTicket()
+                }
+            })
+            self.openEditBill = false
+        },
     }
 };
 </script>

front-vue/src/views/service/credit/confirmationAudit.vue

@@ -277,6 +277,14 @@
                 <pdf-show :pdfFileList="pdfFileList" :zfiId="this.form.zfiId" :parent="parent">
                 </pdf-show>
             </el-dialog>
+             <!--去融资-->
+            <el-dialog  :visible.sync="goShow" width="300px"  append-to-body :before-close = "cancelGo" center>
+                    <p>恭喜您成功签收一笔融信</p>
+                    <div slot="footer" class="dialog-footer">
+                        <el-button type="primary" @click="goFinance">去融资</el-button>
+                        <el-button @click="cancelGo">取 消</el-button>
+                    </div>    
+            </el-dialog>
            
         </el-tab-pane>
         <!-- 签署合同-->
@@ -319,6 +327,7 @@ import {accAdd} from "@/utils/calculation";
 import {isOpenApproval} from "@/api/service/credit/approvalRelatedCredit";
 import {getToken} from "@/utils/auth";
 import pdfShow from "./pdfShow";
+import Cookies from 'js-cookie';
 export default {
     name: "addCredit",
     components: {pdfShow},
@@ -448,6 +457,8 @@ export default {
             pdfFileList : [],
             pdfShowDialog : false,
             parent : this,
+            //显示去融资框
+            goShow:false
         };
     },
     watch:{
@@ -1131,16 +1142,42 @@ export default {
                     });
             contractSigning(this.form).then((response) => {
                 loading.close();
-                this.msgSuccess("确权成功,融信已提交"+this.form.receiveName+"签收");
-                this.$store.dispatch(
-                    "tagsView/delView",
-                    this.$route
-                );
-                this.$router.go(-1);
+                //融资申请
+                if(this.zfiCreateType == '0'){
+                    this.msgSuccess("确权成功,融信已提交"+this.form.receiveName+"签收");
+                    this.$store.dispatch(
+                        "tagsView/delView",
+                        this.$route
+                    );
+                    this.$router.go(-1);
+                }else if(this.zfiCreateType == '2'){//供应商开立，盖章后改为已生效
+                        this.goShow = true;
+                }
             }).catch((response) => {
                 loading.close();
             });
     },
+    //回到父页
+    cancelGo(){
+        this.goShow = false;
+        this.$store.dispatch(
+            "tagsView/delView",
+            this.$route
+        );
+        this.$router.go(-1);
+    },
+    //去融资
+    goFinance(){
+        //关闭当前页
+         this.$store.dispatch(
+            "tagsView/delView",
+            this.$route
+        );
+        //关闭弹框
+        this.goShow = false;
+        Cookies.set("/credit/goFinance/"+this.zfiId + "/", this.$route.fullPath)
+        this.$router.push({ path: "/credit/goFinance/"+this.zfiId + "/" });
+    }
        
     }
 };

front-vue/src/views/service/credit/creditApply.vue

@@ -5,8 +5,8 @@
         <el-row class="zap-form">
             <el-row type="flex" justify="end" align="middle">
                 <el-col :span="12" style="margin-bottom: 22px;">
-                    <el-button type="success" @click="addPay">新增应收账款</el-button>
-                    <el-button type="primary" @click="openTicket">选择</el-button>
+                    <el-button type="success" @click="openTicket">选择</el-button>
+                    <el-button type="primary" @click="addPay">新增应付账款</el-button>
                     <el-button @click="deleteTicekt">清空全部</el-button>
                 </el-col>
                 <el-col :span="12">
@@ -741,7 +741,7 @@ export default {
         //修改账款回调
         emitEditClick(val) {
             var self = this
-            this.getAccountsPay().then((response) => {
+            this.getAccountsCollection().then((response) => {
                 //修改付款返回id直接选中
                 if (val) {
                     // self.payList.forEach(element => {

front-vue/src/views/service/credit/creditDetail.vue

@@ -343,7 +343,7 @@ export default {
             //企业类型
             companyType: null,
             //授信状态
-            financeStatus: null,
+            financeStatus: '',
             //融资id
             zfrId: null,
             //往来账款id
@@ -526,7 +526,7 @@ export default {
     //详情按钮
     handleDetail(index, rows){
         debugger
-        this.zbiId = rows[0].zbiId
+        this.zbiId = rows[index].zbiId
         this.openDetailBill = true
     },  
     //格式化金额 

front-vue/src/views/service/credit/creditSeal.vue

@@ -811,6 +811,8 @@ export default {
                     });
             contractSigning(this.form).then((response) => {
                 loading.close();
+                //关闭弹窗，回到父页
+                this.goParent();
                 //核心开立盖章
                 if(this.form.zfiCreateType == '1' && this.form.zfiCoreStatus == '01' && !this.form.zfiStatus){
                     this.msgSuccess("开立成功，融信已提交"+this.form.receiveName+"签收");
@@ -818,12 +820,6 @@ export default {
                     //融资开立盖章
                     this.msgSuccess("开立成功,待:"+this.form.openName+"确权；确权结果请留意待办事项与站内消息");
                 }
-
-                this.$store.dispatch(
-                    "tagsView/delView",
-                    this.$route
-                );
-                this.$router.go(-1);
             }).catch((response) => {
                 loading.close();
             });
@@ -960,6 +956,16 @@ export default {
     closePdfShow(){
         this.pdfShowDialog = false;
     },
+    //返回到列表页
+     goParent(){
+        this.pdfShowDialog = false;
+        this.$store.dispatch(
+            "tagsView/delView",
+            this.$route
+            );
+        this.$router.go(-1);
+    },
+
     
     }
 };

front-vue/src/views/service/credit/creditUpdate.vue

@@ -96,9 +96,9 @@
             </el-row>  
             <el-divider content-position="left" >应付账款</el-divider>
             <el-form-item  style="margin-left: 100px">
-                <el-button size="mini" type="success" @click="addPay">新增应付账款</el-button>
-                 <el-button size="mini" type="primary" @click="openTicket">选择</el-button>
-                 <el-button size="mini" @click="deleteTicekt">清空全部</el-button>
+                <el-button type="success" @click="openTicket">选择</el-button>
+                <el-button type="primary" @click="addPay">新增应付账款</el-button>
+                <el-button size="mini" @click="deleteTicekt">清空全部</el-button>
                 <el-form-item label="合计金额:"> 
                         <span>{{checkTotalAmt}}</span>
                 </el-form-item>
@@ -120,6 +120,7 @@
                             icon="el-icon-delete"
                             @click="handleDelete(scope.$index, ticketList)"
                         >删除</el-button>
+                        <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.$index, ticketList)">修改</el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -277,7 +278,10 @@
         <el-dialog title="新增往来账款" :visible.sync="openAddBill" width="1120px" append-to-body>
             <add-bill :companyId="form.zfiSupplierId" companyType="00" :payDate="payDate" @addClick="emitAddClick" v-if="openAddBill"></add-bill>
         </el-dialog>
-
+        <!-- 修改往来账款 -->
+        <el-dialog title="修改往来账款" :visible.sync="openEditBill" width="1120px" append-to-body>
+            <edit-bill :zbiId="this.zbiId" @editClick="emitEditClick" v-if="openEditBill"></edit-bill>
+        </el-dialog>
         <!--预览-->
         <el-dialog  :visible.sync="openFile" width="900px" append-to-body>
             <img :src="wordUrl" v-if="show" width='800px' height='500px'/>
@@ -290,11 +294,14 @@ import {getCreditDetail,getReceiverList,listCreditLine,getAvailableBalance,getAc
 import {accAdd} from "@/utils/calculation";
 import {getToken} from "@/utils/auth";
 import AddBill from "@/views/service/bill/addBill";
+import EditBill from "@/views/service/bill/editBill";
 export default {
     name: "addCredit",
-    components: {AddBill},
+    components: {AddBill,EditBill},
     data() {
         return {
+            //往来账款id
+            zbiId: '',
             // 总条数
             total: 0,
             // 表单参数read
@@ -353,6 +360,7 @@ export default {
             // 是否显示弹出层
             open: false,
             openAddBill: false,
+            openEditBill: false,
            //选择的应付账款
            payList:[],
            //现有的应付账款
@@ -644,6 +652,11 @@ export default {
         }
         this.selectChecked();
     },
+    /* 修改按钮 */
+    handleUpdate(index, rows) {
+        this.zbiId = rows[index].zbiId;
+        this.openEditBill = true
+    },
     onSelectAll() {
         if(this.$refs.tablePay){
             this.$refs.tablePay.clearSelection();
@@ -969,7 +982,27 @@ export default {
             }
         })
         self.openAddBill = false
-    }
+    },
+    //修改账款回调
+    emitEditClick(val) {
+        var self = this
+        this.getAccountsPay().then((response) => {
+            //修改付款返回id直接选中
+            if (val) {
+                // self.payList.forEach(element => {
+                //     if (element.zbiId == val) {
+                //         // 将当前点击项选中
+                //         // self.chooseTicket.push(element)
+                //         //self.closeTicket()
+                //     }
+                // });
+                console.log(self.chooseTicket)
+                self.ticketList = self.chooseTicket
+                self.closeTicket()
+            }
+        })
+        self.openEditBill = false
+    },
     
   }
 };

front-vue/src/views/service/credit/financeOpen.vue

@@ -6,8 +6,8 @@
             <el-row>
                 <el-row>
                     <el-col :span="12" style="margin-bottom: 22px;">
-                        <el-button type="success" @click="addPay">新增应收账款</el-button>
-                        <el-button type="primary" @click="openTicket">选择</el-button>
+                        <el-button type="success" @click="openTicket">选择</el-button>
+                        <el-button type="primary" @click="addPay">新增应付账款</el-button>
                         <el-button @click="deleteTicekt">清空全部</el-button>
                     </el-col>
                     <el-col :span="12">
@@ -452,6 +452,9 @@ export default {
                     this.getFile(this.ticketList);
                     //开立方赋值
                     this.$set(this.form, "openName", this.chooseTicket[0].payName);
+                    if(new Date(this.ticketList[0].zbiPayDate) >= new Date()){
+                        this.form.zfiExpireDate = this.ticketList[0].zbiPayDate
+                    }
                     this.open = false;
                 }
 
@@ -997,7 +1000,7 @@ export default {
         //修改账款回调
         emitEditClick(val) {
             var self = this
-            this.getAccountsPay().then((response) => {
+            this.getAccountsCollection().then((response) => {
                 //修改付款返回id直接选中
                 if (val) {
                     // self.payList.forEach(element => {

front-vue/src/views/service/credit/financeOpenUpdate.vue

@@ -22,8 +22,8 @@
                 <el-row>
                     <el-divider content-position="left" >应收账款</el-divider>
                 <el-form-item  style="margin-left: 100px">
-                    <el-button size="mini" type="success" @click="addPay">新增应收账款</el-button>
-                    <el-button size="mini" type="primary" @click="openTicket">选择</el-button>
+                    <el-button type="success" @click="openTicket">选择</el-button>
+                    <el-button type="primary" @click="addPay">新增应付账款</el-button>
                     <el-button size="mini" @click="deleteTicekt">清空全部</el-button>
                     <el-form-item label="合计金额:"> 
                             <span>{{checkTotalAmt}}</span>
@@ -46,6 +46,7 @@
                                 icon="el-icon-delete"
                                 @click="handleDelete(scope.$index, ticketList)"
                             >删除</el-button>
+                            <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.$index, ticketList)">修改</el-button>
                             </template>
                         </el-table-column>
                     </el-table>
@@ -270,7 +271,10 @@
         <el-dialog title="新增往来账款" :visible.sync="openAddBill" width="1120px" append-to-body>
             <add-bill :companyId="form.zfiCoreId" companyType="01" :payDate="payDate" @addClick="emitAddClick" v-if="openAddBill"></add-bill>
         </el-dialog>
-
+        <!-- 修改往来账款 -->
+        <el-dialog title="修改往来账款" :visible.sync="openEditBill" width="1120px" append-to-body>
+            <edit-bill :zbiId="this.zbiId" @editClick="emitEditClick" v-if="openEditBill"></edit-bill>
+        </el-dialog>
         <!--预览-->
         <el-dialog  :visible.sync="openFile" width="1000px" append-to-body>
             <img :src="wordUrl" v-if="show" width='450px' height='500px'/>
@@ -283,11 +287,14 @@ import {listSupplierCreditLine,getCreditDetail,getAccountsCollection,getSupplier
 import {accAdd} from "@/utils/calculation";
 import {getToken} from "@/utils/auth";
 import AddBill from "@/views/service/bill/addBill";
+import EditBill from "@/views/service/bill/editBill";
 export default {
     name: "addCredit",
-    components: {AddBill},
+    components: {AddBill,EditBill},
     data() {
         return {
+            //往来账款id
+            zbiId: '',
             // 总条数
             total: 0,
             // 查询参数
@@ -363,6 +370,7 @@ export default {
             // 是否显示弹出层
             open: false,
             openAddBill: false,
+            openEditBill: false,
            //授信
            creditLineList:[],
            //接收方
@@ -642,6 +650,11 @@ export default {
         }
         this.selectChecked();
     },
+    /* 修改按钮 */
+    handleUpdate(index, rows) {
+        this.zbiId = rows[index].zbiId;
+        this.openEditBill = true
+    },
     onSelectAll() {
         if(this.$refs.tablePay){
             this.$refs.tablePay.clearSelection();
@@ -999,8 +1012,27 @@ export default {
             }
         })
         self.openAddBill = false
-    }
-       
+    },
+    //修改账款回调
+    emitEditClick(val) {
+        var self = this
+        this.getAccountsCollection().then((response) => {
+            //修改付款返回id直接选中
+            if (val) {
+                // self.payList.forEach(element => {
+                //     if (element.zbiId == val) {
+                //         // 将当前点击项选中
+                //         // self.chooseTicket.push(element)
+                //         //self.closeTicket()
+                //     }
+                // });
+                console.log(self.chooseTicket)
+                self.ticketList = self.chooseTicket
+                self.closeTicket()
+            }
+        })
+        self.openEditBill = false
+    }, 
     }
 };
 </script>

front-vue/src/views/service/credit/pdfShow.vue

@@ -106,8 +106,8 @@
                 <img :src="'data:image/jpeg;base64,' + this.fileUrl" style="overflow: auto; width: 100%; height: 100%;"/>
             </el-dialog>
             <!--去融资-->
-            <el-dialog  :visible.sync="goShow" width="500px"  append-to-body :before-close = "cancelGo" center>
-                    <span>恭喜您成功签收一笔融信</span>
+            <el-dialog  :visible.sync="goShow" width="300px"  append-to-body :before-close = "cancelGo" center>
+                    <p>恭喜您成功签收一笔融信</p>
                     <div slot="footer" class="dialog-footer">
                         <el-button type="primary" @click="goFinance">去融资</el-button>
                         <el-button @click="cancelGo">取 消</el-button>
@@ -525,29 +525,21 @@ export default {
                 this.closePdfShow();
                 //确权：状态为待确权
                 if(this.zfiStatus == '00'){
-                     this.msgSuccess("确权成功，融信已提交,"+this.receiveName+"签收");
-                     this.$store.dispatch(
-                        "tagsView/delView",
-                        this.$route
-                        );
-                     this.$router.go(-1);
+                    if(this.zfiCreateType == '0'){//申请
+                         this.msgSuccess("确权成功，融信已提交,"+this.receiveName+"签收");
+                         this.goParent();
+                    }else if(this.zfiCreateType == '2'){//供应商开立
+                          this.goShow = true;
+                    }
                 }else if(this.zfiStatus == '01' && this.zfiCreateType == '0'){//签收
                      this.goShow = true;
                 }else if(this.zfiCreateType == '1' && this.zfiCoreStatus == '01' && !this.zfiStatus){//核心开立
                     this.msgSuccess("开立成功，融信已提交"+this.receiveName+"签收");
-                    this.$store.dispatch(
-                        "tagsView/delView",
-                        this.$route
-                        );
-                    this.$router.go(-1);
+                    this.goParent();
                 }else if(this.zfiCreateType == '2' && this.zfiPlatformStatus == '01' && this.zfiSupplierStatus == '01' && !this.zfiStatus){
                     //融资开立盖章
                     this.msgSuccess("开立成功,待:"+this.openName+"确权；确权结果请留意待办事项与站内消息");
-                    this.$store.dispatch(
-                        "tagsView/delView",
-                        this.$route
-                        );
-                     this.$router.go(-1);
+                    this.goParent();
                 }else if(scope.row.zfiCreateType == '1' && this.zfiSupplierStatus == '01' && this.zfiPlatformStatus == '01'){//补充资料
                      this.goShow = true;
                 }
@@ -611,6 +603,10 @@ export default {
     closePdfShow(){
         this.parent.closePdfShow();
     },
+    //返回到列表页
+    goParent(){
+       this.parent.goParent();
+    },
     //去融资
     goFinance(){
         //关闭当前页
@@ -620,6 +616,8 @@ export default {
             );
         //关闭弹框
         this.goShow = false;
+        //关闭文件弹框
+        this.closePdfShow();
         Cookies.set("/credit/goFinance/"+this.zfiId + "/", this.$route.fullPath)
         this.$router.push({ path: "/credit/goFinance/"+this.zfiId + "/" });
     }

front-vue/src/views/service/credit/signFor.vue

@@ -42,8 +42,8 @@
                     </tr>           
                 </table>    
                 <el-form-item  style="margin-left: 100px">
-                    <el-button size="mini" type="success" :disabled="isClick" @click="addPay">新增应收账款</el-button>
-                    <el-button size="mini" type="primary" :disabled="isClick" @click="openTicket">选择</el-button>
+                    <el-button size="mini" type="success" :disabled="isClick" @click="openTicket">选择</el-button>
+                    <el-button size="mini" type="primary" :disabled="isClick" @click="addPay">新增应收账款</el-button>
                     <el-button size="mini" @click="deleteTicekt" :disabled="isClick" >清空全部</el-button>
                     <el-form-item label="合计金额:"> 
                             <span>{{checkTotalAmt}}</span>
@@ -73,6 +73,7 @@
                                 icon="el-icon-view"
                                 @click="handleDetail(scope.$index, ticketList)"
                             >详情</el-button>
+                            <!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.$index, ticketList)">修改</el-button> -->
                             </template>
                         </el-table-column>
                     </el-table>
@@ -226,6 +227,10 @@
             <el-dialog title="详情" :visible.sync="openDetailBill" width="1120px" append-to-body>
                 <detail-bill :zbiId="this.zbiId"   v-if="openDetailBill"></detail-bill>
             </el-dialog>
+            <!-- 修改往来账款 -->
+            <el-dialog title="修改往来账款" :visible.sync="openEditBill" width="1120px" append-to-body>
+                <edit-bill :zbiId="this.zbiId" @editClick="emitEditClick" v-if="openEditBill"></edit-bill>
+            </el-dialog>
             <!--预览-->
             <el-dialog  :visible.sync="openFile" width="1000px" append-to-body>
                 <img :src="wordUrl" v-if="show" width='450px' height='500px'/>
@@ -240,8 +245,8 @@
                 </pdf-show>
             </el-dialog>
             <!--去融资-->
-            <el-dialog  :visible.sync="goShow" width="500px"  append-to-body :before-close = "cancelGo" center>
-                    <span>恭喜您成功签收一笔融信</span>
+            <el-dialog  :visible.sync="goShow" width="300px"  append-to-body :before-close = "cancelGo" center>
+                    <p>恭喜您成功签收一笔融信</p>
                     <div slot="footer" class="dialog-footer">
                         <el-button type="primary" @click="goFinance">去融资</el-button>
                         <el-button @click="cancelGo">取 消</el-button>
@@ -286,6 +291,7 @@ import {signFor,getCreditSealFile,getContractFile} from "@/api/service/credit/cr
 import {accAdd} from "@/utils/calculation";
 import {getToken} from "@/utils/auth";
 import AddBill from "@/views/service/bill/addBill";
+import EditBill from "@/views/service/bill/editBill";
 import {isOpenApproval} from "@/api/service/credit/approvalRelatedCredit";
 import pdfShow from "./pdfShow";
 import DetailBill from "@/views/service/credit/billDetail";
@@ -293,7 +299,7 @@ import {contractSigning} from "@/api/service/credit/message";
 import Cookies from 'js-cookie';
 export default {
     name: "addCredit",
-    components: {AddBill,DetailBill,pdfShow},
+    components: {AddBill,DetailBill,pdfShow,EditBill},
     data() {
         return {
             //往来账款id
@@ -312,6 +318,7 @@ export default {
             open: false,
             openAddBill: false,
             openDetailBill: false,
+            openEditBill: false,
            //选择的应收账款
            payList:[],
            //现有的应收账款
@@ -561,9 +568,14 @@ export default {
         },
         //详情按钮
         handleDetail(index, rows){
-            this.zbiId = rows[0].zbiId
+            this.zbiId = rows[index].zbiId
             this.openDetailBill = true
         },
+        /* 修改按钮 */
+        handleUpdate(index, rows) {
+            this.zbiId = rows[index].zbiId;
+            this.openEditBill = true
+        },
         /* 多选框跨页 */
         rowkey(row) {
             return row.zbiId;
@@ -966,6 +978,26 @@ export default {
         })
         self.openAddBill = false
     },
+    //修改账款回调
+    emitEditClick(val) {
+        var self = this
+        this.getAccountsCollection().then((response) => {
+            //修改付款返回id直接选中
+            if (val) {
+                // self.payList.forEach(element => {
+                //     if (element.zbiId == val) {
+                //         // 将当前点击项选中
+                //         // self.chooseTicket.push(element)
+                //         //self.closeTicket()
+                //     }
+                // });
+                console.log(self.chooseTicket)
+                self.ticketList = self.chooseTicket
+                self.closeTicket()
+            }
+        })
+        self.openEditBill = false
+    }, 
     //查询有无签收内部审批
     isOpenApproval(){
          var confirmParam = {};

front-vue/src/views/service/creditLine/creditLine.vue

@@ -539,9 +539,10 @@ export default {
       const zfpcrId = row.zfpcrId || this.ids;
       const zfiAmount = row.zfiAmount;
       const usableAmount = row.usableAmount;
+      const companyType = this.companyType;
       this.resetQuery();
-      Cookies.set("/creditLine/detailCreditLine/" + zfpcrId + '/' + zfiAmount + '/' + usableAmount + '/', this.$route.fullPath)
-      this.$router.push("/creditLine/detailCreditLine/" + zfpcrId + '/' + zfiAmount + '/' + usableAmount + '/',);
+      Cookies.set("/creditLine/detailCreditLine/" + zfpcrId + '/' + zfiAmount + '/' + usableAmount + '/' + companyType + '/', this.$route.fullPath)
+      this.$router.push("/creditLine/detailCreditLine/" + zfpcrId + '/' + zfiAmount + '/' + usableAmount + '/' + companyType + '/',);
     },
     /** 冻结/解冻按钮操作 */
     handleUpdate(row) {
@@ -615,15 +616,16 @@ export default {
     },
     /* 金额格式化 */
     moneyFormat(row, column, cellValue) {
-      if(cellValue){
-        cellValue += "";
-        if (!cellValue.includes(".")) cellValue += ".";
-        return cellValue
-          .replace(/(\d)(?=(\d{3})+\.)/g, function($0, $1) {
-            return $1 + ",";
-          })
-          .replace(/\.$/, "");
-      }
+        if(cellValue == null || cellValue== undefined || cellValue == ''){
+            cellValue = '0.00'
+        }
+        cellValue += '';
+        if (!cellValue.includes('.')) {
+            cellValue += '.00';
+        }
+        return cellValue.replace(/(\d)(?=(\d{3})+\.)/g, function ($0, $1) {
+            return $1 + ',';
+          }).replace(/\.$/, '');
     },
     /* 修改表格样式 */
     changeCellStyle(row, column, rowIndex, columnIndex) {

front-vue/src/views/service/creditLine/detailCreditLine.vue

@@ -16,25 +16,25 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="融资产品:" prop="zfpcrProductId">
-            <el-select v-model="form.zfpcrProductId" style="width : 284px" clearable disabled>
+          <el-form-item label="授信企业名称:" prop="zfpcrCompanyId">
+            <el-select v-model="form.zfpcrCompanyId" style="width : 284px" clearable disabled>
               <el-option
-                v-for="(item,index) in financeProductList"
+                v-for="(item,index) in hxCompanyList"
                 :key="index"
-                :label="item.zfpName"
-                :value="item.zfpId"
+                :label="item.scyName"
+                :value="item.scyId"
               ></el-option>
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="授信企业名称:" prop="zfpcrCompanyId">
-            <el-select v-model="form.zfpcrCompanyId" style="width : 284px" clearable disabled>
+          <el-form-item label="融资产品:" prop="zfpcrProductId">
+            <el-select v-model="form.zfpcrProductId" style="width : 284px" clearable disabled>
               <el-option
-                v-for="(item,index) in hxCompanyList"
+                v-for="(item,index) in financeProductList"
                 :key="index"
-                :label="item.scyName"
-                :value="item.scyId"
+                :label="item.zfpName"
+                :value="item.zfpId"
               ></el-option>
             </el-select>
           </el-form-item>
@@ -111,7 +111,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="是否收取手续费:" prop="zfpcrCharge" label-width="113px">
+          <el-form-item label="是否收取手续费:" prop="zfpcrCharge" label-width="113px" v-if="this.companyType == '00'">
             <el-radio-group v-model="form.zfpcrCharge" size="medium" disabled>
               <el-radio-button  v-for="(dict,index) in chargeOptions" :key="index" :label="dict.dictValue" border>{{dict.dictLabel}}</el-radio-button>
             </el-radio-group>
@@ -120,14 +120,14 @@
       </el-row>
       <el-row>
         <el-col :span="8">
-          <el-form-item label="平台服务费收取费率:" prop="zfpcrChargeRate" label-width="139px" v-if="this.form.zfpcrCharge == '1'">
+          <el-form-item label="平台服务费收取费率:" prop="zfpcrChargeRate" label-width="139px" v-if="this.form.zfpcrCharge == '1' && this.companyType == '00'">
           <el-input v-model="form.zfpcrChargeRate" placeholder="请输入平台服务费收取费率" style="width:284px" readonly>
             <template slot="append">%</template>
           </el-input>
         </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="核心企业还款账户账号:" prop="zfpcrAccount" label-width="142px">
+          <el-form-item label="核心企业还款账户账号:" prop="zfpcrAccount" label-width="142px" v-if="this.companyType == '00'">
             <el-autocomplete
               readonly
               style="width:286px"
@@ -139,7 +139,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="核心企业还款账户开户行:" prop="zfpcrAccountBank" label-width="142px">
+          <el-form-item label="核心企业还款账户开户行:" prop="zfpcrAccountBank" label-width="142px" v-if="this.companyType == '00'">
             <el-input v-model="form.zfpcrAccountBank" placeholder="请输入核心企业还款账户开户行" style="width:284px" maxlength="30" readonly>
             </el-input>
           </el-form-item>
@@ -147,7 +147,7 @@
       </el-row>
       <el-row>
         <el-col :span="8">
-          <el-form-item label="融资放款方式:" prop="zfpcrLoanType">
+          <el-form-item label="融资放款方式:" prop="zfpcrLoanType" v-if="this.companyType == '00'">
             <el-select v-model="form.zfpcrLoanType" placeholder="请选择状态" clearable style="width : 284px" clearable disabled>
               <el-option
                 v-for="dict in loanTypeOptions"
@@ -159,7 +159,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="记账簿托管方式:" prop="zfpcrBookkeepingType" label-width="113px">
+          <el-form-item label="记账簿托管方式:" prop="zfpcrBookkeepingType" label-width="113px" v-if="this.companyType == '00'">
             <el-select v-model="form.zfpcrBookkeepingType" placeholder="请选择状态" clearable style="width : 284px" clearable disabled>
               <el-option
                 v-for="dict in bookkeepingTypeOptions"
@@ -171,11 +171,11 @@
         </el-form-item>
         </el-col>
       </el-row>
-      <el-divider content-position="left">关联合同</el-divider>
+      <el-divider content-position="left" v-if="this.companyType == '00'">关联合同</el-divider >
       <el-form-item prop="zfqcrContractId" style="margin-left: 100px" >
         <!-- <el-button size="mini" type="primary" @click="openTicket">选择合同</el-button>
         <el-button size="mini" @click="deleteTicekt">清空全部</el-button> -->
-        <el-table :data="ticketList" style="width: 1100px">
+        <el-table :data="ticketList" style="width: 1100px" v-if="this.companyType == '00'">
           <el-table-column label="序号" type="index" width="50" align="center">
             <template slot-scope="scope">
               <span>{{ (queryParamsContract.pageNum - 1) * queryParamsContract.pageSize + scope.$index + 1}}</span>
@@ -283,6 +283,8 @@ export default {
   components: {},
   data() {
     return {
+      //企业类型
+      companyType: null,
       wordUrl: '',
       openWord: false,
       //金额展示
@@ -387,8 +389,8 @@ export default {
         zfpcrAmount: [
           { required: true, message: "授信额度不能为空", trigger: ["blur", "change"] },
           {
-             pattern: /^([0-9]{1,2}$)|(^[0-9]{1,2}\.[0-9]{1,2}$)|100$/,
-            message: "请输入正确的平台服务费收取费率",
+            pattern: /^[0-9][0-9]{0,8}$|^[1-9][0-9]{0,8}[.]\d{1,2}$/,
+            message: "请输入正确的额度",
             trigger: ["blur","change"],
           },
         ],
@@ -430,6 +432,7 @@ export default {
     const zfpcrId = this.$route.params && this.$route.params.zfpcrId;
     const zfiAmount = this.$route.params && this.$route.params.zfiAmount;
     const usableAmount = this.$route.params && this.$route.params.usableAmount;
+    this.companyType = this.$route.params && this.$route.params.companyType;
     var self =this;
     getCreditLine(zfpcrId).then((response) => {
       debugger

front-vue/src/views/service/creditLine/supplierCreditLine.vue

@@ -526,15 +526,16 @@ export default {
     },
     /* 金额格式化 */
     moneyFormat(row, column, cellValue) {
-      if(cellValue){
-        cellValue += "";
-        if (!cellValue.includes(".")) cellValue += ".";
-        return cellValue
-          .replace(/(\d)(?=(\d{3})+\.)/g, function($0, $1) {
-            return $1 + ",";
-          })
-          .replace(/\.$/, "");
-      }
+        if(cellValue == null || cellValue== undefined || cellValue == ''){
+            cellValue = '0.00'
+        }
+        cellValue += '';
+        if (!cellValue.includes('.')) {
+            cellValue += '.00';
+        }
+        return cellValue.replace(/(\d)(?=(\d{3})+\.)/g, function ($0, $1) {
+            return $1 + ',';
+          }).replace(/\.$/, '');
     },
   }
 };

front-vue/src/views/service/financeRecord/financeRecord.vue

@@ -718,25 +718,46 @@ export default {
             getUserProfile().then((response) => {
                 if ("00" == response.data.companyType) {
                     this.queryParams.zfrQuery = '02';
-                    this.queryParamsIng.zfrQuery = '02';
-                    this.queryParamsEnd.zfrQuery = '02';
-                    this.queryParamsLose.zfrQuery = '02';
                 } else if ("01" == response.data.companyType) {
                     this.queryParams.zfrQuery = '04';
-                    this.queryParamsIng.zfrQuery = '04';
-                    this.queryParamsEnd.zfrQuery = '04';
-                    this.queryParamsLose.zfrQuery = '04';
                 } else if ("02" == response.data.companyType) {
                     this.queryParams.zfrQuery = '00';
+                }
+            })
+        });
+        this.getIngList().then(() => {
+            getUserProfile().then((response) => {
+                if ("00" == response.data.companyType) {
+                    this.queryParamsIng.zfrQuery = '02';
+                } else if ("01" == response.data.companyType) {
+                    this.queryParamsIng.zfrQuery = '04';
+                } else if ("02" == response.data.companyType) {
                     this.queryParamsIng.zfrQuery = '00';
+                }
+            })
+        });
+        this.getEndList().then(() =>{
+            getUserProfile().then((response) => {
+                if ("00" == response.data.companyType) {
+                    this.queryParamsEnd.zfrQuery = '02';
+                } else if ("01" == response.data.companyType) {
+                    this.queryParamsEnd.zfrQuery = '04';
+                } else if ("02" == response.data.companyType) {
                     this.queryParamsEnd.zfrQuery = '00';
+                }
+            })
+        });
+        this.getLoseList().then(() => {
+            getUserProfile().then((response) => {
+                if ("00" == response.data.companyType) {
+                    this.queryParamsLose.zfrQuery = '02';
+                } else if ("01" == response.data.companyType) {
+                    this.queryParamsLose.zfrQuery = '04';
+                } else if ("02" == response.data.companyType) {
                     this.queryParamsLose.zfrQuery = '00';
                 }
             })
         });
-        this.getIngList();
-        this.getEndList();
-        this.getLoseList();
 
     },
     activated() {
@@ -759,25 +780,46 @@ export default {
             getUserProfile().then((response) => {
                 if ("00" == response.data.companyType) {
                     this.queryParams.zfrQuery = '02';
-                    this.queryParamsIng.zfrQuery = '02';
-                    this.queryParamsEnd.zfrQuery = '02';
-                    this.queryParamsLose.zfrQuery = '02';
                 } else if ("01" == response.data.companyType) {
                     this.queryParams.zfrQuery = '04';
-                    this.queryParamsIng.zfrQuery = '04';
-                    this.queryParamsEnd.zfrQuery = '04';
-                    this.queryParamsLose.zfrQuery = '04';
                 } else if ("02" == response.data.companyType) {
                     this.queryParams.zfrQuery = '00';
+                }
+            })
+        });
+        this.getIngList().then(() => {
+            getUserProfile().then((response) => {
+                if ("00" == response.data.companyType) {
+                    this.queryParamsIng.zfrQuery = '02';
+                } else if ("01" == response.data.companyType) {
+                    this.queryParamsIng.zfrQuery = '04';
+                } else if ("02" == response.data.companyType) {
                     this.queryParamsIng.zfrQuery = '00';
+                }
+            })
+        });
+        this.getEndList().then(() =>{
+            getUserProfile().then((response) => {
+                if ("00" == response.data.companyType) {
+                    this.queryParamsEnd.zfrQuery = '02';
+                } else if ("01" == response.data.companyType) {
+                    this.queryParamsEnd.zfrQuery = '04';
+                } else if ("02" == response.data.companyType) {
                     this.queryParamsEnd.zfrQuery = '00';
+                }
+            })
+        });
+        this.getLoseList().then(() => {
+            getUserProfile().then((response) => {
+                if ("00" == response.data.companyType) {
+                    this.queryParamsLose.zfrQuery = '02';
+                } else if ("01" == response.data.companyType) {
+                    this.queryParamsLose.zfrQuery = '04';
+                } else if ("02" == response.data.companyType) {
                     this.queryParamsLose.zfrQuery = '00';
                 }
             })
         });
-        this.getIngList();
-        this.getEndList();
-        this.getLoseList();
     },
     mounted() {
         this.columnQuery();
@@ -804,30 +846,42 @@ export default {
         getIngList() {
             this.loadingIng = true;
             this.queryParamsIng.zfrStatus = "00";
-            listRecord(this.queryParamsIng).then((response) => {
+            return listRecord(this.queryParamsIng).then((response) => {
                 this.recordIngList = response.data.records;
                 this.totalIng = response.data.total;
                 this.loadingIng = false;
+                return Promise.resolve(response)
+            }).catch((response) => {
+                this.loading = false;
+                return Promise.reject('error')
             });
         },
         /** 查询已放款融资记录列表 */
         getEndList() {
             this.loadingEnd = true;
             this.queryParamsEnd.zfrStatus = "01";
-            listRecord(this.queryParamsEnd).then((response) => {
+            return listRecord(this.queryParamsEnd).then((response) => {
                 this.recordEndList = response.data.records;
                 this.totalIng = response.data.total;
                 this.loadingEnd = false;
+                return Promise.resolve(response)
+            }).catch((response) => {
+                this.loading = false;
+                return Promise.reject('error')
             });
         },
         /** 查询融资失败融资记录列表 */
         getLoseList() {
             this.loadingLose = true;
             this.queryParamsLose.zfrStatus = "02";
-            listRecord(this.queryParamsLose).then((response) => {
+            return listRecord(this.queryParamsLose).then((response) => {
                 this.recordLoseList = response.data.records;
                 this.totalEnd = response.data.total;
                 this.loadingLose = false;
+                return Promise.resolve(response)
+            }).catch((response) => {
+                this.loading = false;
+                return Promise.reject('error')
             });
         },
         // 取消按钮
@@ -1009,6 +1063,9 @@ export default {
                         this.msgSuccess("放款登记成功");
                         this.open = false;
                         this.getList();
+                        this.getIngList();
+                        this.getEndList();
+                        this.getLoseList();
                     }).catch((response) => {
                         loading.close();
                     });
@@ -1107,16 +1164,17 @@ export default {
         },
         /* 金额格式化 */
         moneyFormat(row, column, cellValue) {
-            if (cellValue) {
-                cellValue += "";
-                if (!cellValue.includes(".")) cellValue += ".";
-                return cellValue
-                    .replace(/(\d)(?=(\d{3})+\.)/g, function ($0, $1) {
-                        return $1 + ",";
-                    })
-                    .replace(/\.$/, "");
-            }
-        },
+        if(cellValue == null || cellValue== undefined || cellValue == ''){
+            cellValue = '0.00'
+        }
+        cellValue += '';
+        if (!cellValue.includes('.')) {
+            cellValue += '.00';
+        }
+        return cellValue.replace(/(\d)(?=(\d{3})+\.)/g, function ($0, $1) {
+            return $1 + ',';
+          }).replace(/\.$/, '');
+    },
         //获取当前客户是否之前设置过列展示隐藏
         columnQuery() {
             //获取页面路径

front-vue/src/views/service/financeRecord/recordSeal.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="app-container">
-        <span style="float: right; margin-right: 125px;">创建人{{ user }}</span>
+        <span style="float: right; margin-right: 125px;">创建人:{{ user }}</span>
         <span style="float: right; margin-right: 125px;">创建时间:{{ time }}</span>
         <span style="float: right; margin-right: 125px;">融资编号:{{ number }}</span>
         <el-form ref="form" label-position="top" :model="form" :rules="rules" label-width="80px">

front-vue/src/views/service/rel/companyRel.vue

@@ -150,7 +150,7 @@
             size="mini"
             type="text"
             @click="handleRelInvite(scope.row)"
-            v-hasPermi="['service:rel:update']"
+            v-hasPermi="['service:rel:again']"
           >重邀</el-button>
           <el-button
             v-if="handleRel && scope.row.launchScrStatus == '01'"
@@ -433,7 +433,7 @@
 
 <script>
 import {
-  listRel, sparelist, listCompany, addRel, updateRel, listAllCompany, 
+  listRel, sparelist, listCompany, addRel, updateRel, listAllCompany, againRel,
   delRel, removeSpare, listCompanyQuery, getUser, againInvite, getListRel
 } from "@/api/service/rel/companyRel";
 import { uploadFileNew } from "@/api/common/file";
@@ -1036,7 +1036,7 @@ submitForm() {
           type: "info"
         }).then(function() {
           const state = "00";
-          return updateRel(launchScrId,state);
+          return againRel(launchScrId,state);
         }).then(() => {
           this.msgSuccess("邀请成功");
           this.getUser();

front-vue/src/views/service/rel/detailCompany.vue

@@ -15,24 +15,12 @@
                 <el-form-item label="注册地址" prop="scyAddress">
                     <el-input v-model="form.scyAddress" disabled />
                 </el-form-item>
-                <el-form-item label="证件到期日" prop="scyEndTime">
-                    <el-input v-model="form.scyEndTime" disabled />
-                </el-form-item>
                 <el-form-item label="注册资本" prop="scyRegisteredCapital">
                     <el-input v-model="form.scyRegisteredCapital" disabled />
                 </el-form-item>
-                <el-form-item label="法人姓名" prop="scyLegal">
-                    <el-input v-model="form.scyLegal" disabled />
-                </el-form-item>
-                <el-form-item label="证件类型" prop="scyLegal">
-                    <el-input value="身份证" disabled />
-                </el-form-item>
                 <el-form-item label="联系方式" prop="scyPhone">
                     <el-input v-model="form.scyPhone" disabled />
                 </el-form-item>
-                <el-form-item label="证件号码" prop="scyLegalId">
-                    <el-input v-model="form.scyLegalId" disabled />
-                </el-form-item>
             </el-form>
             <div style="margin-top: 100px; margin-left:45%">
                 <el-button type="info" @click="cancel">取消</el-button>

front-vue/src/views/system/company/certification.vue

@@ -49,7 +49,7 @@
               营业执照及身份证请上传最新证件原件的彩色扫描件，如使用复印件请加盖公章上传；
             </p>
             <p>
-              2. 图片支持格式：jpg /jpeg /png /bmp格式，图片大小不超过3M；
+              2. 图片支持格式：jpg /jpeg /png 格式，图片大小不超过3M；
             </p>
             <p>
               3.上传图片后，系统将自动识别并填写相关信息，请核对系统识别结果是否准确;
@@ -1414,12 +1414,11 @@ export default {
     beforeAvatarUpload(file) {
       const isJPG =
         file.type === "image/jpeg" ||
-        file.type === "image/png" ||
-        file.type === "image/bmp";
+        file.type === "image/png";
       const isLt2M = file.size / 1024 / 1024 < 3;
 
       if (!isJPG) {
-        this.$message.error("上传图片只能是 JPG/PNG/BMP 格式");
+        this.$message.error("上传图片只能是 JPG/PNG/ 格式");
       }
       if (!isLt2M) {
         this.$message.error("上传图片大小不能超过 3MB");
@@ -1852,7 +1851,7 @@ export default {
         if(!this.form.pbaiBankName){
            this.$message.error("对公账户开户银行不能为空!");
         }else if(!this.form.pbaiBankaccountId){
-           this.$message.error("对公账户银行账户不能为空!");
+           this.$message.error("对公账户银行账号不能为空!");
         }else{
         const loading = this.$loading({
           lock: true,

front-vue/src/views/system/fundSide/fundSide.vue

@@ -658,12 +658,11 @@ export default {
     beforeAvatarUpload(file) {
       const isJPG =
         file.type === "image/jpeg" ||
-        file.type === "image/png" ||
-        file.type === "image/bmp";
+        file.type === "image/png" ;
       const isLt2M = file.size / 1024 / 1024 < 3;
 
       if (!isJPG) {
-        this.$message.error("上传图片只能是 JPG/JPEG/PNG/BMP 格式");
+        this.$message.error("上传图片只能是 JPG/JPEG/PNG 格式");
       }
       if (!isLt2M) {
         this.$message.error("上传图片大小不能超过 3MB");

front-vue/src/views/system/user/index.vue

@@ -236,7 +236,7 @@
           <el-table-column
             label="操作"
             align="center"
-            width="600"
+            width="500"
             class-name="small-padding fixed-width"
           >
             <template slot-scope="scope">
@@ -256,7 +256,7 @@
                 v-hasPermi="['system:ownUser:adminChange']"
                 v-if="
                   scope.row.scyType == '03' &&
-                  scope.row.company != '000000' &&
+                  company.scyId != '000000' &&
                   scope.row.sucrHandler == '0'
                 "
                 >变更管理员</el-button
@@ -269,10 +269,10 @@
                 v-hasPermi="['system:ownUser:handlerChange']"
                 v-if="
                   scope.row.scyType != '03' &&
-                  scope.row.qperator == '1' &&
+                  qperator == '1' &&
                   scope.row.sucrHandler == '0' &&
-                  scope.row.handleCompany == '01' &&
-                  scope.row.company != '000000'
+                  handleCompany == '01' &&
+                  company.scyId != '000000'
                 "
                 >申请变更经办人</el-button
               >
@@ -284,9 +284,9 @@
                 v-hasPermi="['system:ownUser:confirmChange']"
                 v-if="
                   scope.row.scyType != '03' &&
-                  scope.row.qperator == '1' &&
+                  qperator == '1' &&
                   scope.row.handleChange == '00' &&
-                  scope.row.company == '000000'
+                  company.scyId == '000000'
                 "
                 >确认变更经办人</el-button
               >
@@ -436,7 +436,7 @@
             class="upload-demo"
             :class="{ uoloadSty: showBtnImg, disUoloadSty: noneBtnImg }"
             action=""
-            accept=".jpg, .jpeg, .png, .JPG, .JPEG, .PNG"
+            accept=".jpg, .jpeg, .png"
             :http-request="sfzRequest"
             :on-preview="handlePictureCardPreview"
             :before-upload="beforeAvatarUpload"
@@ -467,13 +467,13 @@
           <el-upload
             ref="upload"
             class="upload-demo"
-            :class="{ uoloadSty: showsBtnImg, disUoloadSty: nonesBtnImg }"
+            :class="{ uoloadAxq: showsBtnImg, disUoloadAxq: nonesBtnImg }"
             action=""
-            accept=".jpg, .jpeg, .png, .JPG, .JPEG, .PNG"
+            accept=".jpg, .jpeg, .png"
             :http-request="sqsRequest"
             :on-preview="sqsPictureCardPreview"
             :before-upload="beforeAvatarUpload"
-            :on-remove="beforeRemove"
+            :on-remove="sqsRemove"
             :on-change="dealImgChange"
             multiple
             :limit="1"
@@ -626,6 +626,9 @@ export default {
       sqsList: [],
 
       limitCountImg: 1,
+      handleCompany: null,
+      company: null,
+      qperator:null,
       //当前登录用户企业id
       signCompanyId: "",
       //姓名
@@ -944,30 +947,26 @@ export default {
       this.loading = true;
       listUser(this.addDateRange(this.queryParams, this.dateRange)).then(
         (response) => {
-          this.userList = response.rows;
-          getOwnCompany().then((response) => {
-            this.company = response.data;
-            console.log(this.company.scyId);
-          });
-          qperatorQuery().then((response) => {
-            for (let i = 0; i < this.userList.length; i++) {
-              this.userList[i].qperator = response.data[0].sucrHandler;
-              this.userList[i].company = this.company.scyId;
-              console.log(this.userList[i].userId);
-              handlerDo(this.userList[i]).then((response) => {
-                this.userList[i].handleChange = response.data.handleChange;
-                console.log(response.data.handleChange);
-              });
-              handleUser().then((response) => {
-                this.userList[i].handleCompany = response.data.handleCompany;
-              });
-            }
-            console.log(this.userList);
-          });
+          let userList = response.rows;
+          for (let i = 0; i < userList.length; i++) {
+            handlerDo(userList[i]).then((response) => {
+              userList[i].handleChange = response.data.handleChange;
+            });
+          }
+          this.userList = userList;
           this.total = response.total;
           this.loading = false;
         }
       );
+      handleUser().then((response) => {
+        this.handleCompany = response.data.handleCompany;
+      });
+      getOwnCompany().then((response) => {
+        this.company = response.data;
+      });
+      qperatorQuery().then((response) => {
+        this.qperator = response.data[0].sucrHandler;
+      });
     },
     /** 查询部门下拉树结构 */
     getTreeselect() {

front-vue/src/views/workDeal.vue

@@ -185,7 +185,8 @@ export default {
         submit() {
             this.$refs["form"].validate(valid => {
                 if (valid) {
-                    if (this.form.noticeId != null) {
+                    if (this.noticeId != null) {
+                        this.form.noticeId = this.noticeId;
                         dealWork(this.form).then(response => {
                             this.$emit("cancelOpen");
                             this.msgSuccess("处理成功");