From 6b6678a11582e1851a527fe674d3aae55f5fecbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98huanghaiixia=E2=80=99?= <980486410@.com>
Date: Thu, 12 Feb 2026 17:11:58 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E7=BB=93=E7=AE=97=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Form/src/components/UploadList.vue |  2 +-
 src/components/common/priceComposeListModal.vue   |  4 ++++
 src/components/common/settleSalesPurList.vue      | 10 ++++++++++
 src/views/dayPlan/PngSettleHdrPur/index.vue       |  2 +-
 src/views/secondDev/customFormConfig.ts           |  4 +++-
 5 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/components/Form/src/components/UploadList.vue b/src/components/Form/src/components/UploadList.vue
index 8b20c2c..e9dc53a 100644
--- a/src/components/Form/src/components/UploadList.vue
+++ b/src/components/Form/src/components/UploadList.vue
@@ -4,7 +4,7 @@
       v-model:value="tableId" v-model:tableName="tableName" v-model:columnName="columnName"
       :btnTip="btnTip" @change="changeUpload" :multiple="true" :dataDelete="true"
       :showDownloadIcon="false"/>
-    <a-table :columns="columns" :data-source="dataFile" >
+    <a-table :columns="columns" :data-source="dataFile" :pagination="false">
       <template #bodyCell="{ column,record,index, text }">
         <template v-if="column.dataIndex === 'fileOrg'">
           <a @click="handleDownload(record)">{{record.fileOrg}}</a>
diff --git a/src/components/common/priceComposeListModal.vue b/src/components/common/priceComposeListModal.vue
index de08b5d..9a85e16 100644
--- a/src/components/common/priceComposeListModal.vue
+++ b/src/components/common/priceComposeListModal.vue
@@ -107,6 +107,10 @@
       }
       let res = await request(obj)
       tableData.value = res || []
+      tableData.value.forEach(v =>{
+        v.qtySettleGj = v.qtyGj
+        v.qtySettleM3 = v.qtyM3
+      })
     }
     async function handleSubmit() {
       closeModal();
diff --git a/src/components/common/settleSalesPurList.vue b/src/components/common/settleSalesPurList.vue
index 048e5c2..f9a6f92 100644
--- a/src/components/common/settleSalesPurList.vue
+++ b/src/components/common/settleSalesPurList.vue
@@ -121,6 +121,7 @@
       let qtySettleM3 = 0
       let amount = 0
       let idx = dataList.value.findIndex(v =>v[rowKey] == curRecord[rowKey])
+      let priceDesc = ''
       arr.forEach(v=> {
         qtySettleGj+=Number(v.qtySettleGj) || 0
         qtySettleM3+=Number(v.qtySettleM3) || 0
@@ -128,6 +129,14 @@
         if (idx>-1&&!dataList.value[idx].id) {
           v.id = ''
         }
+        let a = v.uomName
+        if (v.uomCode == 'M3' && v.qtySettleM3 && v.priceM3) {
+          a= a+':'+Number(v.qtySettleM3)+'*'+Number(v.priceM3)+'='+Number(v.amount)+'；'
+        }
+        if (v.uomCode == 'GJ' && v.qtySettleGj && v.priceGj) {
+          a= a+':'+Number(v.qtySettleGj)+'*'+Number(v.priceGj)+'='+Number(v.amount)+'；'
+        }
+        priceDesc=priceDesc+a
       })
       // price_gj=amount/qty_settle_gj，保留4位小数
       // price_m3=amount/qty_settle_m3，保留4位小数
@@ -140,6 +149,7 @@
         dataList.value[idx].amount = amount.toFixed(2)
         dataList.value[idx].priceGj = priceGj.toFixed(4)
         dataList.value[idx].priceM3 = priceM3.toFixed(4)
+        dataList.value[idx].priceDesc = priceDesc
         if (props.pageType == 'supplier') {
           dataList.value[idx].lngPngSettlePurDtlList = arr
         } else {
diff --git a/src/views/dayPlan/PngSettleHdrPur/index.vue b/src/views/dayPlan/PngSettleHdrPur/index.vue
index cb0f4bf..831391f 100644
--- a/src/views/dayPlan/PngSettleHdrPur/index.vue
+++ b/src/views/dayPlan/PngSettleHdrPur/index.vue
@@ -123,7 +123,7 @@
       },
       schemas: customSearchFormSchema,
       fieldMapToTime: [['datePlan', ['startDate', 'endDate'], 'YYYY-MM']],
-      showResetButton: false,
+      showResetButton: true,
     },
     beforeFetch: (params) => {
       return { ...params, FormId: formIdComputedRef.value, PK: 'id',page:params.limit };
diff --git a/src/views/secondDev/customFormConfig.ts b/src/views/secondDev/customFormConfig.ts
index 3fe5ad0..7971e1c 100644
--- a/src/views/secondDev/customFormConfig.ts
+++ b/src/views/secondDev/customFormConfig.ts
@@ -12,6 +12,8 @@ export const customFormConfig = {
     'ContractPurInt',
     'ContractSalesInt',
     'addDayPlanPngSettleSales',
-    'addDayPlanPngSettlePur'
+    'addDayPlanPngSettlePur',
+    'ContractTransPng',
+    'ContractProc'
   ],
 };
\ No newline at end of file