Переглянути джерело

融信 往来账款优化

ch 3 роки тому
батько
коміт
737af7120c

+ 3 - 2
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>
@@ -543,6 +543,7 @@ export default {
                     this.ticketList = this.chooseTicket;
                     //更新附件信息
                     this.getFile(this.ticketList);
+                    this.form.zfiExpireDate = this.ticketList[0].zbiPayDate
                     this.open = false;
                 }
 

+ 37 - 3
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:[],
            //现有的应收账款
@@ -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.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
+        },
     //判断有无补充资料内部审批
     isOpenApproval(){
         debugger

+ 38 - 5
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.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
+        },
     }
 };
 </script>

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

+ 39 - 6
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
+    },
     
   }
 };

+ 3 - 2
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,7 @@ export default {
                     this.getFile(this.ticketList);
                     //开立方赋值
                     this.$set(this.form, "openName", this.chooseTicket[0].payName);
+                    this.form.zfiExpireDate = this.ticketList[0].zbiPayDate
                     this.open = false;
                 }
 

+ 38 - 6
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.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
+    }, 
     }
 };
 </script>

+ 35 - 3
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'/>
@@ -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:[],
            //现有的应收账款
@@ -564,6 +571,11 @@ export default {
             this.zbiId = rows[0].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.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
+    }, 
     //查询有无签收内部审批
     isOpenApproval(){
          var confirmParam = {};