From c17af80e5240c046905e00639a6c0dab1fda3388 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98huanghaiixia=E2=80=99?= <980486410@.com>
Date: Wed, 11 Feb 2026 16:58:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E7=BB=93=E7=AE=97=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/measureListModal.vue    | 22 ++++++++----
 .../common/priceComposeListModal.vue          |  2 +-
 .../PngSettleHdr/components/createForm.vue    | 34 +++++++++++++------
 3 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/src/components/common/measureListModal.vue b/src/components/common/measureListModal.vue
index 4237bb9..76aa896 100644
--- a/src/components/common/measureListModal.vue
+++ b/src/components/common/measureListModal.vue
@@ -9,11 +9,11 @@
             <template v-if="column.dataIndex === 'settledSign'">
               {{ Number(record.settledSign) == 1 ? '已结算': '未结算' }}
             </template>
-          </template>
-          <template v-if="column.dataIndex === 'file'">
-            <div v-for="item in (record.lngFileUploadList )" class="fileCSS">
-              <a @click="handleDownload(item)">{{item.fileOrg}}</a>
-            </div>
+            <template v-if="column.dataIndex === 'file'">
+              <div v-for="item in (record.lngFileUploadList )" class="fileCSS">
+                <a @click="handleDownload(item)">{{item.fileOrg}}</a>
+              </div>
+            </template>
           </template>
         </BasicTable>
       </div>
@@ -57,7 +57,7 @@
       { dataIndex: 'qtyMeaM3', title: '完成量(方)', align: 'left',width: 120},
       { dataIndex: 'rateM3Gj', title: '比值(方/吉焦)', align: 'left',width: 120},
       { dataIndex: 'ksName', title: '销售合同', align: 'left',},
-      { dataIndex: 'file', title: '附件', align: 'left',},
+      { dataIndex: 'file', title: '附件', align: 'left',width: 200},
       { dataIndex: 'settledSign', title: '已结算', align: 'left',width: 100},
     ];
 
@@ -102,6 +102,16 @@
         },
         afterFetch: (res) => {
           tableData.value = res || [] 
+            tableData.value.forEach(v => {
+            let a = v.attachList ? v.attachList.split(',') : []
+            v.lngFileUploadList = []
+            a.forEach(k => {
+              v.lngFileUploadList.push({
+                fileOrg: k.split('@')[0],
+                fileUrl: k.split('@')[1]
+              })
+            })
+          })
         },
         rowSelection: {
           type: props.selectType,
diff --git a/src/components/common/priceComposeListModal.vue b/src/components/common/priceComposeListModal.vue
index 214927d..e007309 100644
--- a/src/components/common/priceComposeListModal.vue
+++ b/src/components/common/priceComposeListModal.vue
@@ -43,8 +43,8 @@
       { title: t('价格描述'), dataIndex: 'priceDesc',  width:130},
       { title: t('数量(吉焦)'), dataIndex: 'qtySettleGj', width: 120},
       { title: t('数量(方)'), dataIndex: 'qtySettleM3', width: 120},
-      { title: t('价格(元/方)'), dataIndex: 'priceM3', width: 120},
       { title: t('价格(元/吉焦)'), dataIndex: 'priceGj', width: 120},
+      { title: t('价格(元/方)'), dataIndex: 'priceM3', width: 120},
       { title: t('金额(元)'), dataIndex: 'amount', width: 120},
     ];
 
diff --git a/src/views/dayPlan/PngSettleHdr/components/createForm.vue b/src/views/dayPlan/PngSettleHdr/components/createForm.vue
index e960a4a..eaeb652 100644
--- a/src/views/dayPlan/PngSettleHdr/components/createForm.vue
+++ b/src/views/dayPlan/PngSettleHdr/components/createForm.vue
@@ -79,11 +79,15 @@
           </a-row>
         </Card>
         <Card>
-          <div>
+          <div class="btnBox">
             <a-button v-if="!isDisable" type="primary" style="margin-bottom: 10px;margin-right: 10px;" @click="handleBtn('add')">新增</a-button>
             <a-button v-if="!isDisable" @click="handleBtn('del')">删除</a-button>
+            <span>一次结算量吉焦：</span>
+            <span>二次结算量吉焦：</span>
+            <span>结算总量(吉焦)：</span>
+            <span>结算总金额：</span>
           </div>
-          <a-table :columns="columns" :data-source="dataList" :scroll="{x: 1500}" rowKey="salesId" :pagination="false" :row-selection="{ selectedRowKeys: selectedKeys, onChange: onSelectChange }">
+          <a-table :columns="columns" :data-source="dataList" :scroll="{x: 1800}" rowKey="salesId" :pagination="false" :row-selection="{ selectedRowKeys: selectedKeys, onChange: onSelectChange }">
             <template #bodyCell="{ column, record, index }">
               <template v-if="column.dataIndex === 'operation'">
                 <a v-if="!isDisable" @click="btnCheck(record, index, 'delete')">删除</a>
@@ -194,20 +198,20 @@
     const selectedKeys = ref([])
     const columns = ref([
       { title: t('序号'), dataIndex: 'index', key: 'index',  customRender: (column) => `${column.index + 1}` ,width: 80},
-      { title: t('计划日期'), dataIndex: 'datePlan',  width:130},
-      { title: t('提气日期'), dataIndex: 'dateMea',  width: 130},
-      { title: t('客户'), dataIndex: 'cuName',  width: 200},
+      { title: t('计划日期'), dataIndex: 'datePlan',  width:120},
+      { title: t('提气日期'), dataIndex: 'dateMea',  width: 120},
+      { title: t('合同名称'), dataIndex: 'ksName', width: 200},
       { title: t('下载点'), dataIndex: 'pointDelyName',width: 150 },
       { title: t('完成量(吉焦)'), dataIndex: 'qtyMeaGj', width: 150},
       { title: t('完成量(方)'), dataIndex: 'qtyMeaM3', width: 120},
       { title: t('结算量(吉焦)'), dataIndex: 'qtySettleGj', width: 140},
       { title: t('结算量(方)'), dataIndex: 'qtySettleM3', width: 130},
-      { title: t('结算价格(元/吉焦)'), dataIndex: 'priceGj', width: 190},
+      { title: t('结算价格(元/吉焦)'), dataIndex: 'priceGj', width: 180},
       { title: t('结算价格(元/方)'), dataIndex: 'priceM3', width: 170},
       { title: t('结算金额(元)'), dataIndex: 'amount', width: 140},
-      { title: t('价格组成'), dataIndex: 'priceDesc', width: 120},
-      { title: t('合同名称'), dataIndex: 'ksName', width: 170},
-      { title: t('操作'), dataIndex: 'operation', width: 100},
+      { title: t('价格组成'), dataIndex: 'priceDesc', width: 180},
+      { title: t('结算次数'), dataIndex: 'settleTimes', width: 100},
+      { title: t('操作'), dataIndex: 'operation', width: 80},
     ]);
     watch(
       () => props.id,
@@ -299,7 +303,7 @@
       if (!pageId.value && formState.cpCode && formState.comId && !formState.dateFrom) {
         let data = await getLngPngSettleHdrDate(obj) || []
         if (data.length) {
-          formState.dateFrom = data[0]
+          formState.dateFrom = data[0]?.dateTo ? dayjs(data[0]?.dateTo) : null
           formState.dateTo = null
         }
       }
@@ -358,6 +362,9 @@
       }
     }
     const handleSuccessMeasure = (val) => {
+      val.forEach(i =>{
+        delete i.lngFileUploadList
+      })
       if (!dataList.value.length) {
         dataList.value = val
         return
@@ -509,5 +516,10 @@
         min-height: 44px;
         margin-bottom: 12px;
         border-bottom: 1px solid #eee;
-    } 
+    }
+    .btnBox {
+      span {
+        margin: 0 30px;
+      }
+    }
 </style>