付款确认显示

src/views/away/component/examineAway.vue

@@ -28,6 +28,7 @@
           </div>
           <div class="xy-table-item-content xy-table-item-price">
             <el-input
+              :readonly="type === 'detail'"
               clearable
               placeholder="请填写付款金额"
               v-model="paymentRegistrationForm.applyMoney"
@@ -205,6 +206,7 @@
             <el-table-column label="使用金额（元）" header-align="center">
               <template slot-scope="scope">
                 <Input
+                  :readonly="type === 'detail'"
                   :value="scope.row.useMoney"
                   @input="(e) => (scope.row.useMoney = e)"
                 />
@@ -223,7 +225,7 @@
 
 <script>
 import {getparameter, getparameterTree} from "@/api/system/dictionary";
-import { getFundLog, addFundLog } from "@/api/paymentRegistration/fundLog";
+import { getFundLog, addFundLog, detailFundLog } from "@/api/paymentRegistration/fundLog";
 import { getBudget } from "@/api/budget/budget";
 import { detailContract, editorContract } from "@/api/contract/contract";
 import { Message } from "element-ui";
@@ -235,6 +237,7 @@ import { save } from "@/api/away";
 export default {
   data() {
     return {
+      type: "add",
       departments: [],
       plansSelect: {
         page: 1,
@@ -313,6 +316,7 @@ export default {
       },
       planTable: [
         {
+          selectable: () => this.type !== 'detail',
           sortable: false,
           width: 46,
           type: "selection",
@@ -375,7 +379,7 @@ export default {
 
     //翻页
     pageChange(e) {
-      this.pageIndex = e;
+      this.plansSelect.page = e;
       this.getBudgets();
     },
 
@@ -483,9 +487,7 @@ export default {
       this.plans = res.list.data;
       this.planTotal = res.list.total;
 
-      // this.toggleSelection(this.paymentRegistrationForm.plan.map(item => {
-      //   return item.plan_id
-      // }))
+      this.toggleSelection(this.paymentRegistrationForm.plan)
       setTimeout(() => {
         this.$nextTick(() => this.$refs["planTable"].doLayout())
       },500)
@@ -512,14 +514,15 @@ export default {
         return;
       }
       let plans = this.paymentRegistrationForm.plan.map((item) => {
-        return item.plan_id;
+        return item.id;
       });
+      console.log(plans)
       if (plans) {
         this.plans
           .filter((plan) => {
             return plans.includes(plan.id);
           })
-          .map((row) => {
+          .forEach((row) => {
             this.$nextTick(() => {
               this.$refs["planTable"].toggleRowSelection(row);
             });
@@ -534,6 +537,25 @@ export default {
         this.departments = res;
       });
     },
+
+    async getDetail () {
+      const res = await detailFundLog({
+        id: this.contract.id
+      })
+      res.plan_link.forEach(item => {
+        let temp = this.plans.find(j => j.id === item.plan.id)
+        if (temp) {
+          this.$refs["planTable"].toggleRowSelection(temp)
+          temp.useMoney = item.use_money
+        }
+      })
+      this.paymentRegistrationForm = {
+        applyMoney: res.apply_money,
+        plan: res.plan_link.map(item => item.plan),
+        remark: res.remark,
+        files: []
+      }
+    }
   },
   computed: {
     priceFormat() {
@@ -560,6 +582,12 @@ export default {
     isShowPaymentRegistration(newVal) {
       if (newVal) {
         this.getBudgets();
+
+        if (this.type === "detail") {
+          this.getDetail()
+        }
+      } else {
+        this.type = "add";
       }
     },
   },

src/views/away/index.vue

@@ -360,7 +360,9 @@ export default {
               width: 100,
               label: "财务审核",
               customFn:row => {
-                return (row.FLOWSTATUS.financial.getStatus() === 2) ? (<span style="color: green;">已确认</span>) : (<span style="color: #666;">待审核</span>)
+                return (row.FLOWSTATUS.financial.getStatus() === 2) ?
+                  (<span style="color: green;">已确认</span>) :
+                  (<span style="color: #666;">待审核</span>)
               }
             }
           ]

src/views/finance/components/examineRegistration.vue

@@ -6,16 +6,16 @@
       <template v-slot:extraFormTop>
         <div class="payment-registration-row">
           <div class="payment-registration-row-title">受款单位</div>
-          <div class="payment-registration-row-content">{{contract.supply}}</div>
+          <div class="payment-registration-row-content">{{contract ? contract.supply : ''}}</div>
         </div>
         <div class="payment-registration-row">
           <div class="payment-registration-row-title">合同名称</div>
-          <div class="payment-registration-row-content">{{contract.name}}</div>
+          <div class="payment-registration-row-content">{{contract ? contract.name : ''}}</div>
         </div>
 
         <div class="payment-registration-row">
           <div class="payment-registration-row-title">合同金额</div>
-          <div class="payment-registration-row-content">{{moneyFormat(contract.money)}} （元）</div>
+          <div class="payment-registration-row-content">{{contract ? moneyFormat(contract.money) : 0}} （元）</div>
         </div>
         <div style="display: flex">
           <div class="payment-registration-row">
@@ -534,7 +534,7 @@ import {listdeptNoAuth} from "@/api/system/department";
         this.payment.map(item => {
           total += Number(item.act_money)
         })
-        return ((total / this.contract.money) * 100).toFixed(2) || 0
+        return ((total / this.contract?.money??0) * 100).toFixed(2) || 0
       },
 
       async getRegistration(id) {
@@ -542,6 +542,7 @@ import {listdeptNoAuth} from "@/api/system/department";
         const res = await detailFundLog({
           id
         })
+        console.log(res)
         this.fileList = res.files_detail?.map(i => {
           return {
             url: i?.url,

src/views/finance/paymentRegistrationList.vue

@@ -488,6 +488,7 @@ export default {
         date: this.selectDate,
         status: this.status,
         act_plan_link_id: this.select.plan_id,
+        show_type: 1
       }).then((res) => {
         let tokens = getToken();
         if (is_export) {