fix: 1.付款单审核表单移除实际付款日期,添加生产科总价合计

chenhang4442024
1 parent 84b6d6da
Showing 2 changed files with 22 additions and 12 deletions
src/views/project/approve/PayPanel.vue
src/views/project/approve/ReceivePanel.vue
@@ -79,21 +79,23 @@
         >
         <tr>
           <td style="border: 1px solid black; width: 14%">生产科对账单号</td>
+          <td style="border: 1px solid black; width: 14%">生产科总价合计</td>
           <td style="border: 1px solid black; width: 14%">实际应付金额</td>
           <td style="border: 1px solid black; width: 14%">扣款金额</td>
           <td style="border: 1px solid black; width: 14%">实际付款金额</td>
           <td style="border: 1px solid black; width: 14%">未付金额</td>
           <td style="border: 1px solid black; width: 14%">必须付款日期</td>
-          <td style="border: 1px solid black; width: 14%">实际付款日期</td>
+          <!-- <td style="border: 1px solid black; width: 14%">实际付款日期</td> -->
         </tr>
         <tr>
           <td style="border: 1px solid black; width: 14%">{{ checkNo }}</td>
+          <td style="border: 1px solid black; width: 14%">¥{{ totalProductionAmount != null && totalProductionAmount !== '' ?  totalProductionAmount : '-' }}</td>
           <td style="border: 1px solid black; width: 14%">¥{{ actualPayedAmount }}</td>
           <td style="border: 1px solid black; width: 14%">¥{{ deductAmount }}</td>
           <td style="border: 1px solid black; width: 14%">¥{{ totalActualPayedAmount }}</td>
           <td style="border: 1px solid black; width: 14%">¥{{ unPayedAmount }}</td>
           <td style="border: 1px solid black; width: 14%">{{ payedDate }}</td>
-          <td style="border: 1px solid black; width: 14%">{{ actualPayedDate }}</td>
+          <!-- <td style="border: 1px solid black; width: 14%">{{ actualPayedDate }}</td> -->
         </tr>
       </tbody>
     </table>
@@ -186,9 +188,10 @@
       const itemArray = ref<Item[]>([]);
       const actualPayCalculate = ref(0);
       const checkNo = ref();
+      const totalProductionAmount = ref(); //生产科总价合计
       const actualPayedAmount = ref(); // 生产科实际应付金额汇总
       const payedDate = ref(); // 生产科付款日期
-      const actualPayedDate = ref(); // 实际付款日期
+      // const actualPayedDate = ref(); // 实际付款日期
       const unPayedAmount = ref(); // 未付金额
       const totalActualPayedAmount = ref(); // 实际付款金额汇总
       const deductAmount = ref(); // 生产科扣款金额汇总
@@ -198,6 +201,10 @@
       const financePerson = ref('');
       const trackerUser = ref('');
       const schema = [
+      {
+          field: 'totalProductionAmount',
+          label: '生产科总价合计',
+        },
         {
           field: 'actualPayedAmount',
           label: '生产科实际应付金额汇总',
@@ -206,10 +213,10 @@
           field: 'payedDate',
           label: '生产科付款日期',
         },
-        {
-          field: 'actualPayedDate',
-          label: '实际付款日期',
-        },
+        // {
+        //   field: 'actualPayedDate',
+        //   label: '实际付款日期',
+        // },
         {
           field: 'unPayedAmount',
           label: '未付金额',
@@ -375,6 +382,7 @@
         openModal(true, { data });
         id.value = data.id;
         itemArray.value = [];
+        totalProductionAmount.value=mockData.value?.totalProductionAmount?.toFixed(2); // 生产科总价合计
         actualPayCalculate.value = mockData.value?.actualPayCalculate?.toFixed(2); // 实际付款金额计算
         checkNo.value = mockData.value?.checkNo; // 对账单号
         projectNo.value = mockData.value?.projectNo; // 对账单号
@@ -383,7 +391,7 @@
         actualPayedAmount.value = mockData.value?.actualPayedAmount?.toFixed(2); // 实际应付金额
         payedDate.value = mockData.value?.payedDate; // 付款日期
         // actualPayedDate.value = mockData.value?.actualPayedDate; // 实际付款日期
-        actualPayedDate.value = ''; // 实际付款日期
+        // actualPayedDate.value = ''; // 实际付款日期
         unPayedAmount.value = mockData.value?.unPayedAmount?.toFixed(2); // 未付金额
         totalActualPayedAmount.value = mockData.value?.totalActualPayedAmount?.toFixed(2); // 实际付款金额汇总
         deductAmount.value = mockData.value?.deductAmount?.toFixed(2); // 扣款金额
@@ -417,12 +425,13 @@
             '/basic-api/order/erp/check_bill/exportReceipt',
             {
               checkNo: checkNo.value,
+              totalProductionAmount:totalProductionAmount.value,
               actualPayedAmount: actualPayedAmount.value,
               deductAmount: deductAmount.value,
               totalActualPayedAmount: totalActualPayedAmount.value,
               unPayedAmount: unPayedAmount.value,
               payedDate: payedDate.value,
-              actualPayedDate: actualPayedDate.value,
+              // actualPayedDate: actualPayedDate.value,
               financePerson: financePerson.value,
               trackerUser: trackerUser.value,
               projectNo: projectNo.value,
@@ -546,9 +555,10 @@
         handleShow,
         actualPayCalculate,
         checkNo,
+        totalProductionAmount,
         actualPayedAmount,
         payedDate,
-        actualPayedDate,
+        // actualPayedDate,
         unPayedAmount,
         totalActualPayedAmount,
         deductAmount,
@@ -76,8 +76,8 @@
         >
         <tr>
           <td style="border: 1px solid black; width: 14%">Invoice编号</td>
-          <td style="border: 1px solid black; width: 14%">实际收款金额汇总</td>
           <td style="border: 1px solid black; width: 14%">客户总价金额汇总</td>
+          <td style="border: 1px solid black; width: 14%">实际收款金额汇总</td>
           <td style="border: 1px solid black; width: 14%">发生扣款金额汇总</td>
           <td style="border: 1px solid black; width: 14%">其他费用汇总</td>
           <td style="border: 1px solid black; width: 14%">必须回款日期</td>
@@ -85,8 +85,8 @@
         </tr>
         <tr>
           <td style="border: 1px solid black; width: 14%">{{ invoiceNo }}</td>
-          <td style="border: 1px solid black; width: 14%">${{ totalPayAmount }}</td>
           <td style="border: 1px solid black; width: 14%">${{ totalCustomerAmount }}</td>
+          <td style="border: 1px solid black; width: 14%">${{ totalPayAmount }}</td>
           <td style="border: 1px solid black; width: 14%">${{ deductAmount }}</td>
           <td style="border: 1px solid black; width: 14%">${{ otherAmount }}</td>
           <td style="border: 1px solid black; width: 14%">{{ backRefundDate }}</td>