Browse Source

解决费用管理打印财务主管与财务经理名字不符bug

wangzhuo 2 years ago
parent
commit
6dca5d9965
2 changed files with 39 additions and 12 deletions
  1. 0 3
      src/combination/listComponent.vue
  2. 39 9
      src/views/costManagement/index.vue

+ 0 - 3
src/combination/listComponent.vue

@@ -147,9 +147,6 @@ export default {
     },
     //合计
     listTotal(param) {
-      
-      console.log("插槽合计");
-      console.log(param);
       const { columns, data } = param
       const sums = []
       for (let item in this.tatolLabel) {

+ 39 - 9
src/views/costManagement/index.vue

@@ -265,6 +265,10 @@ export default {
   },
   data() {
     return {
+      // 财务主管
+      treasurer: '',
+      // 财务经理
+      financeManager: '',
       reverse: '报销单',
       before: '',
       lander: '',
@@ -565,7 +569,7 @@ export default {
           name: '复制新单',
           disabled: false
         },
-        
+
         {
           type: 'warning',
           size: 'mini',
@@ -657,7 +661,7 @@ export default {
           width: 300,
           labelSize: '80',
           rules: [{ required: false, message: ' ' }]
-        }, 
+        },
         {
           span: 6,
           label: 'businessType',
@@ -666,7 +670,7 @@ export default {
           width: 200,
           labelSize: '80',
           rules: [{ required: false, message: ' ' }]
-        },  
+        },
         {
           span: 6,
           label: 'expenseType',
@@ -675,7 +679,7 @@ export default {
           width: 200,
           labelSize: '80',
           rules: [{ required: false, message: ' ' }]
-        },  
+        },
         {
           span: 6,
           label: 'itemExpenseId',
@@ -684,9 +688,9 @@ export default {
           width: 200,
           labelSize: '80',
           rules: [{ required: false, message: ' ' }]
-        }, 
+        },
+
 
-        
         {
           span: 6,
           label: 'deptId',
@@ -695,8 +699,8 @@ export default {
           width: 200,
           labelSize: '80',
           rules: [{ required: false, message: ' ' }]
-        }, 
-        
+        },
+
         {
           span: 6,
           label: 'createDept',
@@ -721,7 +725,7 @@ export default {
           width: 200,
           labelSize: '80',
           rules: [{ required: false, message: ' ' }]
-        }, 
+        },
         {
           span: 6,
           label: 'itemDepartment',
@@ -1216,9 +1220,27 @@ export default {
             id: this.$refs.avatar.form.fId
           }
           getName(data).then(response => {
+            console.log("data")
             console.log(response)
             if (response.data.length != 0) {
               this.before = response.data[0].userName
+
+              let approvalList = response.data;
+
+              for (let key in approvalList) {
+                console.log("-----")
+                console.log(approvalList[key].auditStatus)
+                if (approvalList[key].auditStatus == "B") {
+                  approvalList = approvalList.splice(Number(key) + 1, approvalList.length);
+                  break;
+                }
+              }
+              this.treasurer = approvalList[1].nickName;
+              this.financeManager = approvalList[2].nickName;
+
+              // this.formList.firstLevelReviewerName = response.data[response.data.length - 2].nickName;
+              // this.formList.secondaryReviewerName = response.data[response.data.length - 1].nickName;
+
               if (this.$refs.avatar.form.fBillstatus === 6 && this.before == this.lander) {
                 // this.contentButton.forEach(item =>{
                 //   if (item.name === '审批'){
@@ -1657,11 +1679,19 @@ export default {
               this.$message.error('未保存,不允许打印')
             } else if (this.$refs.avatar.form.fBillstatus >= 4) {
               this.formList = this.$refs.avatar.form
+
+              this.formList.firstLevelReviewerName = this.treasurer
+              this.formList.secondaryReviewerName = this.financeManager
+
               let printDate = new Date();
               this.formList.printDate = printDate.toLocaleString();
               this.dialogVisible = true
             } else {
               this.formList = this.$refs.avatar.form
+
+              this.formList.firstLevelReviewerName = this.treasurer
+              this.formList.secondaryReviewerName = this.financeManager
+
               let printDate = new Date();
               this.formList.printDate = printDate.toLocaleString();
               this.submitAndSave(1)