浏览代码

轮胎商城财务管理,收费结算/付款结算经办人bug

wangzhuo 1 年之前
父节点
当前提交
f54b2ad264

+ 9 - 1
src/api/accountingManagement/index.js

@@ -30,6 +30,14 @@ export function saveSubmit(data){
       params:data
     })
   }
+
+// 查询经办人List
+export function getFinanceList(){
+  return request({
+    url:'/api/blade-user/financeList',
+    method:'get'
+  })
+}
   export function removeItems(data){
     return request({
       url:'/api/blade-sales-part/settlementItems/remove',
@@ -44,4 +52,4 @@ export function saveSubmit(data){
       method:'post',
       params:data
     })
-  }
+  }

+ 24 - 3
src/views/tirePartsMall/financialManagement/collectionSettlement/detailsPage.vue

@@ -86,7 +86,7 @@
 
 <script>
 import billDetail from "@/components/bill/selectOrderDetailList";
-import { saveSubmit, collectionAndPayment, revokeCollectionAndPayment, detail, removeItems, remove } from '@/api/accountingManagement/index.js';
+import { saveSubmit, collectionAndPayment, revokeCollectionAndPayment, detail, removeItems, getFinanceList, remove } from '@/api/accountingManagement/index.js';
 import { getList } from "@/api/collectionSettlement/index.js";
 import {skgetKh} from "@/api/tirePartsMall/salesManagement/saleOrder";
 
@@ -104,6 +104,8 @@ export default {
 
         corpIdData:[],
 
+      // 经办人list
+      financeList: [],
       disabled: false,
       editButton: false,
       isSaveBtn: false,
@@ -169,13 +171,11 @@ export default {
             value: "name"
           },
           dicUrl: "/api/blade-user/financeList",
-          filterable: true,
           rules: [{
             required: true,
             message: " ",
             trigger: "blur"
           }],
-          value: '青岛'
         }, {
           label: '收款日期',
           prop: "settlementDate",
@@ -306,6 +306,21 @@ export default {
     var minutes = String(today.getMinutes()).padStart(2, '0');
     var seconds = String(today.getSeconds()).padStart(2, '0');
 
+    // 查询经办人
+    getFinanceList().then(res => {
+      this.financeList = res.data.data
+      const logInUser = JSON.parse(localStorage.getItem('saber-userInfo'));
+      if (logInUser.content.role_name.includes('财务')) {
+        for (let finance of res.data.data) {
+          if (finance.name === logInUser.content.nick_name) {
+            console.log(finance.name)
+            this.form.handledByName = finance.name;
+            break;
+          }
+        }
+      }
+    })
+
     // 构建今天的日期时间字符串
     var todayDateTime = year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds;
     if (this.onLoad.id) {
@@ -456,6 +471,12 @@ export default {
             spinner: 'el-icon-loading',
             background: 'rgba(255,255,255,0.7)'
           });
+          for (let finance of this.financeList) {
+            if (finance.name == data.handledByName) {
+              data.handledById = finance.id
+              break;
+            }
+          }
           saveSubmit(data).then(res => {
             console.log(res);
             this.isFinanceBtn = false

+ 24 - 4
src/views/tirePartsMall/financialManagement/paymentSettlement/detailsPage.vue

@@ -67,7 +67,7 @@
 
 <script>
 import billDetail from "@/components/bill/selectOrderDetailList";
-import { saveSubmit, collectionAndPayment, revokeCollectionAndPayment, detail, removeItems, remove } from '@/api/accountingManagement/index.js';
+import { saveSubmit, collectionAndPayment, revokeCollectionAndPayment, detail, removeItems, getFinanceList, remove } from '@/api/accountingManagement/index.js';
 import { number } from "echarts";
 
 export default {
@@ -81,7 +81,8 @@ export default {
         loadingBtn:false,
         filesList:[],
         params:{},
-
+      // 经办人list
+      financeList: [],
       billDetailDialog: false,
       isSave: 0,
       isMenu: false,
@@ -150,13 +151,11 @@ export default {
             value: "name"
           },
           dicUrl: "/api/blade-user/financeList",
-          filterable: true,
           rules: [{
             required: true,
             message: " ",
             trigger: "blur"
           }],
-          value: '青岛'
         }, {
           label: '付款日期',
           prop: "settlementDate",
@@ -260,6 +259,21 @@ export default {
       var minutes = String(today.getMinutes()).padStart(2, '0');
       var seconds = String(today.getSeconds()).padStart(2, '0');
 
+      // 查询经办人
+      getFinanceList().then(res => {
+        this.financeList = res.data.data
+        const logInUser = JSON.parse(localStorage.getItem('saber-userInfo'));
+        if (logInUser.content.role_name.includes('财务')) {
+          for (let finance of res.data.data) {
+            if (finance.name === logInUser.content.nick_name) {
+              console.log(finance.name)
+              this.form.handledByName = finance.name;
+              break;
+            }
+          }
+        }
+      })
+
       // 构建今天的日期时间字符串
       var todayDateTime = year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds;
       if (this.onLoad.id) {
@@ -383,6 +397,12 @@ export default {
             spinner: 'el-icon-loading',
             background: 'rgba(255,255,255,0.7)'
           });
+          for (let finance of this.financeList) {
+            if (finance.name == data.handledByName) {
+              data.handledById = finance.id
+              break;
+            }
+          }
           saveSubmit(data).then(res => {
             console.log(res);
             this.refresh(res.data.data.id)