From fae05a13420573b89e7b60ce487eaa4834dfb2cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98huanghaiixia=E2=80=99?= <980486410@.com>
Date: Mon, 2 Feb 2026 17:52:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=83=E5=88=86=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/contractQtyList.vue     | 31 +++++--
 .../ContractFact/components/config.ts         | 22 ++---
 src/views/contract/ContractFact/index.vue     |  5 +-
 .../ContractSales/components/config.ts        |  2 +-
 .../dayPlan/Demand/components/basicForm.vue   | 91 +++++++++++++------
 src/views/dayPlan/Demand/index.vue            | 13 ++-
 .../dayPlan/PngAppro/components/basicForm.vue | 65 +++++++++----
 src/views/dayPlan/PngAppro/index.vue          | 16 +++-
 .../dayPlan/PngApproGd/components/config.ts   | 28 +++++-
 src/views/dayPlan/PngApproGd/index.vue        | 14 ++-
 src/views/dayPlan/PngApproJsz/index.vue       | 14 ++-
 .../PngMeasureSalesPur/components/config.ts   |  4 +-
 .../components/createForm.vue                 | 12 ++-
 .../dayPlan/PngMeasureSalesPur/index.vue      | 19 +++-
 14 files changed, 250 insertions(+), 86 deletions(-)

diff --git a/src/components/common/contractQtyList.vue b/src/components/common/contractQtyList.vue
index 32706e5..bedf70e 100644
--- a/src/components/common/contractQtyList.vue
+++ b/src/components/common/contractQtyList.vue
@@ -40,13 +40,22 @@
           </a-select>
         </template>
         <template v-if="column.dataIndex === 'rateM3Gj'">
-          <a-input-number v-model:value="record.rateM3Gj" :disabled="disabled" :min="0" @change="numChange('rateM3Gj', record, index)" style="width: 100%" />
+          <a-input-number v-model:value="record.rateM3Gj" v-if="!disabled"
+          :formatter="value => `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')" 
+           :disabled="disabled" :min="0" @change="numChange('rateM3Gj', record, index)" style="width: 100%" />
+           <div v-else>{{ Number.format(Number.parse(record.rateM3Gj || 0),numFormat) }}</div>
         </template>
         <template v-if="column.dataIndex === 'qtyGjMonth'">
-          <a-input-number v-model:value="record.qtyGjMonth" :disabled="disabled" :min="0" @change="numChange('qtyGjMonth', record, index)" style="width: 100%" />
+          <a-input-number v-model:value="record.qtyGjMonth" v-if="!disabled"
+          :precision="3" :formatter="value => `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')"
+          :disabled="disabled" :min="0" @change="numChange('qtyGjMonth', record, index)" style="width: 100%" />
+          <div v-else>{{ Number.format(Number.parse(record.qtyGjMonth || 0),numFormat) }}</div>
         </template>
         <template v-if="column.dataIndex === 'qtyM3Month'">
-          <a-input-number v-model:value="record.qtyM3Month" :disabled="disabled" :min="0" @change="numChange('qtyM3Month', record, index)" style="width: 100%" />
+          <a-input-number v-model:value="record.qtyM3Month" v-if="!disabled"
+          :precision="3" :formatter="value => `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')" 
+          :disabled="disabled" :min="0" @change="numChange('qtyM3Month', record, index)" style="width: 100%" />
+           <div v-else>{{ Number.format(Number.parse(record.qtyM3Month || 0),numFormat) }}</div>
         </template>
         <template v-if="column.dataIndex === 'zfbyTypeCode'">
           <a-select v-model:value="record.zfbyTypeCode" :disabled="disabled" style="width: 100%" allow-clear>
@@ -55,6 +64,12 @@
             </a-select-option>
           </a-select>
         </template>
+        <template v-if="column.dataIndex === 'qtyGjDay'">
+          {{ Number.format(Number.parse(record.qtyGjDay || 0),numFormat) }}
+        </template>
+        <template v-if="column.dataIndex === 'qtyM3Day'">
+          {{ Number.format(Number.parse(record.qtyM3Day || 0),numFormat) }}
+        </template>
         <template v-if="column.dataIndex === 'zfbyValue'">
           <a-input-number v-model:value="record.zfbyValue" :disabled="disabled" :min="0" style="width: 100%" />
         </template>
@@ -79,6 +94,7 @@
   import dayjs from 'dayjs';
 
   const router = useRouter();
+  const numFormat = "###,###,###,###,###,###.000"
   const { t } = useI18n();
   const dataListContractAgree = ref([])
   const columns= ref([
@@ -155,21 +171,22 @@
     const numCount1 = (record) => {
       // 月气量(吉焦) =月气量(方)qty_m3_month*rate_m3_gj (比值(方/吉焦)
       record.qtyGjMonth = (Number(record.qtyM3Month) || 0) * (Number(record.rateM3Gj) || 0)
-      record.qtyGjMonth = record.qtyGjMonth ? record.qtyGjMonth.toFixed(4) : '0'
+      record.qtyGjMonth = record.qtyGjMonth ? record.qtyGjMonth.toFixed(3) : '0'
     }
     const numCount2 = (record) => {
       // 月气量(方) =  月气量(吉焦) qty_gj_month/rate_m3_gj/10000   显示时字段值/10000；保存时页面值*10000
       record.qtyM3Month = Number(record.rateM3Gj) ?  (Number(record.qtyGjMonth) || 0) /Number(record.rateM3Gj) : 0
-      record.qtyM3Month = record.qtyM3Month ? record.qtyM3Month.toFixed(4) : '0'
+      record.qtyM3Month = record.qtyM3Month ? record.qtyM3Month.toFixed(3) : '0'
     }
     const dayCount = (record) => {
       // 日气量(吉焦) = 月气量(吉焦)qty_gj_month/开始日期到结束日期的天数；计算结果保留整数
       const days = dayjs(record.dateTo).diff(dayjs(record.dateFrom), 'day');
       record.qtyGjDay = days ? (Number(record.qtyGjMonth) || 0) /days : 0
-      record.qtyGjDay = parseInt(record.qtyGjDay)
+      // record.qtyGjDay = parseInt(record.qtyGjDay)
+      record.qtyGjDay = record.qtyGjDay ? record.qtyGjDay.toFixed(3) : '0'
       // 日气量(方) = 月气量(万方)/开始日期到结束日期的天数；计算结果保留4位小数；显示时字段值/10000；保存时页面值*10000
       record.qtyM3Day = days ? (Number(record.qtyM3Month) || 0) /days : 0
-      record.qtyM3Day = record.qtyM3Day ? record.qtyM3Day.toFixed(4) : '0'
+      record.qtyM3Day = record.qtyM3Day ? record.qtyM3Day.toFixed(3) : '0'
     }
   const btnCheck = (record, index) => {
     dataListContractAgree.value.splice(index, 1)
diff --git a/src/views/contract/ContractFact/components/config.ts b/src/views/contract/ContractFact/components/config.ts
index 49917f5..e05416e 100644
--- a/src/views/contract/ContractFact/components/config.ts
+++ b/src/views/contract/ContractFact/components/config.ts
@@ -67,7 +67,7 @@ export const columns: BasicColumn[] = [
     title: '关联类别',
     componentType: 'input',
     align: 'left',
-
+    width: 120,
     sorter: true,
   },
   {
@@ -75,7 +75,7 @@ export const columns: BasicColumn[] = [
     title: '合同类别',
     componentType: 'input',
     align: 'left',
-
+    width: 120,
     sorter: true,
   },
 
@@ -84,7 +84,7 @@ export const columns: BasicColumn[] = [
     title: '二级类别',
     componentType: 'input',
     align: 'left',
-
+    width: 120,
     sorter: true,
   },
 
@@ -93,7 +93,7 @@ export const columns: BasicColumn[] = [
     title: '相对方数量',
     componentType: 'input',
     align: 'left',
-
+    width: 120,
     sorter: true,
   },
 
@@ -111,7 +111,7 @@ export const columns: BasicColumn[] = [
     title: '合同期限',
     componentType: 'input',
     align: 'left',
-
+    width: 120,
     sorter: true,
   },
 
@@ -120,7 +120,7 @@ export const columns: BasicColumn[] = [
     title: '有效期开始',
     componentType: 'date',
     align: 'left',
-
+    width: 120,
     sorter: true,
   },
 
@@ -129,7 +129,7 @@ export const columns: BasicColumn[] = [
     title: '有效期结束',
     componentType: 'date',
     align: 'left',
-
+    width: 120,
     sorter: true,
   },
 
@@ -138,7 +138,7 @@ export const columns: BasicColumn[] = [
     title: '币种',
     componentType: 'select',
     align: 'left',
-
+    width: 100,
     sorter: true,
   },
   {
@@ -164,7 +164,7 @@ export const columns: BasicColumn[] = [
     title: '业务联系人',
     componentType: 'input',
     align: 'left',
-
+    width: 120,
     sorter: true,
   },
 
@@ -173,7 +173,7 @@ export const columns: BasicColumn[] = [
     title: '业务部门',
     componentType: 'input',
     align: 'left',
-
+    width: 120,
     sorter: true,
   },
 
@@ -182,7 +182,7 @@ export const columns: BasicColumn[] = [
     title: '状态',
     componentType: 'input',
     align: 'left',
-
+    width: 100,
     sorter: true,
   },
 
diff --git a/src/views/contract/ContractFact/index.vue b/src/views/contract/ContractFact/index.vue
index 15b43a7..196b3b2 100644
--- a/src/views/contract/ContractFact/index.vue
+++ b/src/views/contract/ContractFact/index.vue
@@ -15,6 +15,9 @@
           </template>
         </template>
         <template #bodyCell="{ column, record }">
+          <template v-if="column.dataIndex === 'amount'">
+            {{ Number.format(Number.parse(record.amount),numFormat) }}
+          </template>
           <template v-if="column.dataIndex === 'action'">
             <TableAction :actions="getActions(record)" />
           </template>
@@ -58,7 +61,7 @@
   import useEventBus from '/@/hooks/event/useEventBus';
   import { cloneDeep } from 'lodash-es';
   import { useUserStore } from '/@/store/modules/user';
-
+  const numFormat = "###,###,###,###,###,###.00"
   const userStore = useUserStore();
   const userInfo = userStore.getUserInfo;
   
diff --git a/src/views/contract/ContractSales/components/config.ts b/src/views/contract/ContractSales/components/config.ts
index 87cf5e3..cf5392c 100644
--- a/src/views/contract/ContractSales/components/config.ts
+++ b/src/views/contract/ContractSales/components/config.ts
@@ -111,7 +111,7 @@ export const columns: BasicColumn[] = [
     title: '是否托运',
     componentType: 'input',
     align: 'left',
-    width: 120,
+    width: 100,
     sorter: true,
   },
 
diff --git a/src/views/dayPlan/Demand/components/basicForm.vue b/src/views/dayPlan/Demand/components/basicForm.vue
index 3387099..2d7c6b7 100644
--- a/src/views/dayPlan/Demand/components/basicForm.vue
+++ b/src/views/dayPlan/Demand/components/basicForm.vue
@@ -22,37 +22,53 @@
           </a-form-item>
         </a-col>
         <a-col :span="8">
-          <a-form-item label="合同量(吉焦)" name="qtyContractGj" :class="diffResultList.includes('qtyContractGj')?'changeStyle':''">{{ formState.qtyContractGj }}</a-form-item>
+          <a-form-item label="合同量(吉焦)" name="qtyContractGj" :class="diffResultList.includes('qtyContractGj')?'changeStyle':''">
+            {{ Number.format(Number.parse(formState.qtyContractGj||0 ),numFormat)}}
+          </a-form-item>
         </a-col>
         <a-col :span="8">
-          <a-form-item label="合同量(万方)" name="qtyContractM3" :class="diffResultList.includes('qtyContractM3')?'changeStyle':''">{{ formState.qtyContractM3 }}</a-form-item>
+          <a-form-item label="合同量(万方)" name="qtyContractM3" :class="diffResultList.includes('qtyContractM3')?'changeStyle':''">
+            {{ Number.format(Number.parse(formState.qtyContractM3||0 ),numFormat)}}
+          </a-form-item>
         </a-col>
-        <a-col :span="8">
+        <!-- <a-col :span="8">
           <a-form-item label="月合同量执行进度%" name="rateK" :class="diffResultList.includes('rateK')?'changeStyle':''">{{ formState.rateK }}</a-form-item>
-        </a-col>
-          <a-col :span="8">
-          <a-form-item label="计划量(吉焦)" name="qtyPlanGj" :class="diffResultList.includes('qtyPlanGj')?'changeStyle':''">{{ formState.qtyPlanGj }}</a-form-item>
-        </a-col>
-          <a-col :span="8">
-          <a-form-item label="计划量(万方)" name="qtyPlanM3" :class="diffResultList.includes('qtyPlanM3')?'changeStyle':''">{{ formState.qtyPlanM3 }}</a-form-item>
-        </a-col>
+        </a-col> -->
         <a-col :span="8">
+          <a-form-item label="计划量(吉焦)" name="qtyPlanGj" :class="diffResultList.includes('qtyPlanGj')?'changeStyle':''">
+            {{ Number.format(Number.parse(formState.qtyPlanGj||0 ),numFormat)}}
+          </a-form-item>
+        </a-col>
+          <a-col :span="8">
+          <a-form-item label="计划量(万方)" name="qtyPlanM3" :class="diffResultList.includes('qtyPlanM3')?'changeStyle':''">
+            {{ Number.format(Number.parse(formState.qtyPlanM3||0 ),numFormat)}}
+          </a-form-item>
+        </a-col>
+        <!-- <a-col :span="8">
           <a-form-item label="月计划量执行进度%" name="rateMp" :class="diffResultList.includes('rateMp')?'changeStyle':''">{{ formState.rateMp }}</a-form-item>
+        </a-col> -->
+        <a-col :span="8">
+          <a-form-item label="指定量(吉焦)" name="qtyDemandGj" :class="diffResultList.includes('qtyDemandGj')?'changeStyle':''">
+            {{ Number.format(Number.parse(formState.qtyDemandGj||0 ),numFormat)}}
+          </a-form-item>
         </a-col>
         <a-col :span="8">
-          <a-form-item label="指定量(吉焦)" name="qtyDemandGj" :class="diffResultList.includes('qtyDemandGj')?'changeStyle':''">{{ formState.qtyDemandGj }}</a-form-item>
+          <a-form-item label="指定量(万方)" name="qtyDemandM3" :class="diffResultList.includes('qtyDemandM3')?'changeStyle':''">
+            {{ Number.format(Number.parse(formState.qtyDemandM3||0 ),numFormat)}}
+          </a-form-item>
         </a-col>
-        <a-col :span="8">
-          <a-form-item label="指定量(万方)" name="qtyDemandM3" :class="diffResultList.includes('qtyDemandM3')?'changeStyle':''">{{ formState.qtyDemandM3 }}</a-form-item>
-        </a-col>
-        <a-col :span="8">
+        <!-- <a-col :span="8">
           <a-form-item label="月时间进度%" name="rateS" :class="diffResultList.includes('rateS')?'changeStyle':''">{{ formState.rateS }}</a-form-item>
+        </a-col> -->
+        <a-col :span="8">
+          <a-form-item label="批复量(吉焦)" name="qtySalesGj" :class="diffResultList.includes('qtySalesGj')?'changeStyle':''">
+            {{ Number.format(Number.parse(formState.qtySalesGj||0 ),numFormat)}}
+          </a-form-item>
         </a-col>
         <a-col :span="8">
-          <a-form-item label="批复量(吉焦)" name="qtySalesGj" :class="diffResultList.includes('qtySalesGj')?'changeStyle':''">{{ formState.qtySalesGj }}</a-form-item>
-        </a-col>
-        <a-col :span="8">
-          <a-form-item label="批复量(万方)" name="qtySalesM3" :class="diffResultList.includes('qtySalesM3')?'changeStyle':''">{{ formState.qtySalesM3 }}</a-form-item>
+          <a-form-item label="批复量(万方)" name="qtySalesM3" :class="diffResultList.includes('qtySalesM3')?'changeStyle':''">
+            {{ Number.format(Number.parse(formState.qtySalesM3||0 ),numFormat)}}
+          </a-form-item>
         </a-col>
         <a-col :span="8">
           <a-form-item label="比值(方/吉焦)" name="rateM3Gj" :class="diffResultList.includes('rateM3Gj')?'changeStyle':''">{{ formState.rateM3Gj }}</a-form-item>
@@ -102,16 +118,28 @@
         <div :class="diffResultList.includes('lngPngDemandPurList[' + index + '].kpName') ? 'changeStyle': ''">{{ record.kpName }}</div>
       </template>
       <template v-if="column.dataIndex === 'qtySalesGj'">
-        <div :class="diffResultList.includes('lngPngDemandPurList[' + index + '].qtySalesGj') ? 'changeStyle': ''">{{ record.qtySalesGj }}</div>
+        <div :class="diffResultList.includes('lngPngDemandPurList[' + index + '].qtySalesGj') ? 'changeStyle': ''">
+          {{ Number.format(Number.parse(record.qtySalesGj ),numFormat)}}
+        </div>
       </template>
       <template v-if="column.dataIndex === 'qtySalesM3'">
-        <div :class="diffResultList.includes('lngPngDemandPurList[' + index + '].qtySalesM3') ? 'changeStyle': ''">{{ record.qtySalesM3 }}</div>
+        <div :class="diffResultList.includes('lngPngDemandPurList[' + index + '].qtySalesM3') ? 'changeStyle': ''">
+          {{ Number.format(Number.parse(record.qtySalesM3 ),numFormat)}}
+        </div>
       </template>
       <template v-if="column.dataIndex === 'qtyDemandGj'">
-        <a-input-number v-model:value="record.qtyDemandGj" :class="diffResultList.includes('lngPngDemandPurList[' + index + '].qtyDemandGj')?'changeStyle':''" :disabled="disable" :min="0" @change="numChange('qtyDemandGj', record)" style="width: 100%" />
+        <a-input-number v-model:value="record.qtyDemandGj" v-if="!disable"
+         :formatter="value => `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')" :class="diffResultList.includes('lngPngDemandPurList[' + index + '].qtyDemandGj')?'changeStyle':''" :disabled="disable" :min="0" @blur="numBlur(record)" @change="numChange('qtyDemandGj', record)" style="width: 100%" />
+        <div v-else :class="diffResultList.includes('lngPngDemandPurList[' + index + '].qtyDemandGj')?'changeStyle':''">
+          {{ Number.format(Number.parse(record.qtyDemandGj ),numFormat)}}
+        </div>
       </template>
-        <template v-if="column.dataIndex === 'qtyDemandM3'">
-        <a-input-number v-model:value="record.qtyDemandM3" :class="diffResultList.includes('lngPngDemandPurList[' + index + '].qtyDemandM3')?'changeStyle':''" :disabled="disable" :min="0" @change="numChange('qtyDemandM3', record)" style="width: 100%" />
+      <template v-if="column.dataIndex === 'qtyDemandM3'">
+        <a-input-number v-model:value="record.qtyDemandM3" v-if="!disable"
+        :formatter="value => `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')" :class="diffResultList.includes('lngPngDemandPurList[' + index + '].qtyDemandM3')?'changeStyle':''" :disabled="disable" :min="0" @blur="numBlur(record)" @change="numChange('qtyDemandM3', record)" style="width: 100%" />
+        <div v-else :class="diffResultList.includes('lngPngDemandPurList[' + index + '].qtyDemandM3')?'changeStyle':''">
+          {{ Number.format(Number.parse(record.qtyDemandM3 ),numFormat)}}
+        </div>
       </template>
       <template v-if="column.dataIndex === 'note'">
         <div v-if="pageType=='compare'" :class="diffResultList.includes('lngPngDemandPurList[' + index + '].note')?'changeStyle':''">
@@ -139,6 +167,7 @@
     import { getLngPngDemandContractList, getLngPngDemandPointDely, getLngPngDemandContractQty, getLngPngDemandPurList, getLngPngDemandRate } from '/@/api/dayPlan/Demand';
     import NP from 'number-precision';
     
+    const numFormat = "###,###,###,###,###,###.000"
     const userStore = useUserStore();
     const userInfo = userStore.getUserInfo;
     const router = useRouter();
@@ -189,27 +218,31 @@
         formState.value.cuCode = res?.comp?.code
         formState.value.comId = res?.comp?.id
         const res1 = await getLngPngDemandRate({}) || []
-        formState.value.rateM3Gj = res1[0].rateM3Gj
+        formState.value.rateM3Gj = res1[0]?.rateM3Gj
       }
   
       
     })
+    function numBlur(record) {
+      record.qtyDemandM3 = record.qtyDemandM3 ? record.qtyDemandM3.toFixed(3) : ''
+      record.qtyDemandGj = record.qtyDemandGj ? record.qtyDemandGj.toFixed(3) : ''
+    }
     async function numChange (k, record) {
       if (k == 'qtyDemandGj') {
         record.qtyDemandM3 = Number(formState.value.rateM3Gj) ? Number(record.qtyDemandGj)/Number(formState.value.rateM3Gj) : ''
       } else {
         record.qtyDemandGj = Number(record.qtyDemandM3)*Number(formState.value.rateM3Gj) || ''
       }
-      record.qtyDemandM3 = record.qtyDemandM3 ? record.qtyDemandM3.toFixed(5) : ''
-      record.qtyDemandGj = record.qtyDemandGj ? record.qtyDemandGj.toFixed(5) : ''
+      // record.qtyDemandM3 = record.qtyDemandM3 ? record.qtyDemandM3.toFixed(3) : ''
+      // record.qtyDemandGj = record.qtyDemandGj ? record.qtyDemandGj.toFixed(3) : ''
       let num = 0;
       let num1 = 0;
       dataList.value.forEach(v => {
         num=NP.plus(num, (Number(v.qtyDemandM3) || 0))
         num1=NP.plus(num1, (Number(v.qtyDemandGj) || 0))
       })
-      formState.value.qtyDemandM3 = num
-      formState.value.qtyDemandGj = num1
+      formState.value.qtyDemandM3 = num.toFixed(3)
+      formState.value.qtyDemandGj = num1.toFixed(3)
     }
     const datePlanChange = async (val) => {
       if (!val) {
diff --git a/src/views/dayPlan/Demand/index.vue b/src/views/dayPlan/Demand/index.vue
index f45c019..b147b12 100644
--- a/src/views/dayPlan/Demand/index.vue
+++ b/src/views/dayPlan/Demand/index.vue
@@ -18,11 +18,18 @@
           <template v-if="column.dataIndex === 'action'">
             <TableAction :actions="getActions(record)" />
           </template>
+          <template v-if="column.dataIndex === 'qtyDemandGj'">
+            {{ Number.format(Number.parse(record.qtyDemandGj),numFormat) }}
+          </template>
+      
+          <template v-if="column.dataIndex === 'qtySalesGj'">
+            {{ Number.format(Number.parse(record.qtySalesGj),numFormat) }}
+          </template>
           <template v-if="column.dataIndex === 'qtySalesM3'">
-            {{ NP.divide(Number(record.qtySalesM3), 10000) }}
+            {{ Number.format(Number.parse( NP.divide(Number(record.qtySalesM3), 10000)),numFormat) }}
           </template>
           <template v-if="column.dataIndex === 'qtyDemandM3'">
-            {{ NP.divide(Number(record.qtyDemandM3), 10000) }}
+            {{ Number.format(Number.parse( NP.divide(Number(record.qtyDemandM3), 10000)),numFormat) }}
           </template>
         </template>
       </BasicTable>
@@ -71,7 +78,7 @@
   import dayjs from 'dayjs';
   const defaultDate = ref([dayjs().format('YYYY-MM-DD'),dayjs().add(1, 'day').format('YYYY-MM-DD')]);
   const { bus, CREATE_FLOW, FLOW_PROCESSED, FORM_LIST_MODIFIED } = useEventBus();
-
+  const numFormat = "###,###,###,###,###,###.000"
   const { notification } = useMessage();
   const { t } = useI18n();
   defineEmits(['register']);
diff --git a/src/views/dayPlan/PngAppro/components/basicForm.vue b/src/views/dayPlan/PngAppro/components/basicForm.vue
index 275f530..874943d 100644
--- a/src/views/dayPlan/PngAppro/components/basicForm.vue
+++ b/src/views/dayPlan/PngAppro/components/basicForm.vue
@@ -10,37 +10,53 @@
       <a-form-item label="合同" name="kName" :class="diffResultList.includes('kName') ? 'changeStyle': ''">{{ formState.kName}}</a-form-item>
     </a-col> 
     <a-col :span="8">
-      <a-form-item label="合同量(吉焦)" name="qtyContractGj" :class="diffResultList.includes('qtyContractGj') ? 'changeStyle': ''">{{ formState.qtyContractGj }}</a-form-item>
+      <a-form-item label="合同量(吉焦)" name="qtyContractGj" :class="diffResultList.includes('qtyContractGj') ? 'changeStyle': ''">
+        {{ Number.format(Number.parse(formState.qtyContractGj ||0),numFormat)}}
+      </a-form-item>
     </a-col>
     <a-col :span="8">
-      <a-form-item label="合同量(万方)" name="qtyContractM3" :class="diffResultList.includes('qtyContractM3') ? 'changeStyle': ''">{{ formState.qtyContractM3 }}</a-form-item>
+      <a-form-item label="合同量(万方)" name="qtyContractM3" :class="diffResultList.includes('qtyContractM3') ? 'changeStyle': ''">
+        {{ Number.format(Number.parse(formState.qtyContractM3||0 ),numFormat)}}
+      </a-form-item>
     </a-col>
     <a-col :span="8">
       <a-form-item label="月合同量执行进度%" name="rateK" :class="diffResultList.includes('rateK') ? 'changeStyle': ''">{{ formState.rateK }}</a-form-item>
     </a-col>
       <a-col :span="8">
-      <a-form-item label="计划量(吉焦)" name="qtyPlanGj" :class="diffResultList.includes('qtyPlanGj') ? 'changeStyle': ''">{{ formState.qtyPlanGj }}</a-form-item>
+      <a-form-item label="计划量(吉焦)" name="qtyPlanGj" :class="diffResultList.includes('qtyPlanGj') ? 'changeStyle': ''">
+        {{ Number.format(Number.parse(formState.qtyPlanGj||0 ),numFormat)}}
+      </a-form-item>
     </a-col>
       <a-col :span="8">
-      <a-form-item label="计划量(万方)" name="qtyPlanM3" :class="diffResultList.includes('qtyPlanM3') ? 'changeStyle': ''">{{ formState.qtyPlanM3 }}</a-form-item>
+      <a-form-item label="计划量(万方)" name="qtyPlanM3" :class="diffResultList.includes('qtyPlanM3') ? 'changeStyle': ''">
+        {{ Number.format(Number.parse(formState.qtyPlanM3||0 ),numFormat)}}
+      </a-form-item>
     </a-col>
     <a-col :span="8">
       <a-form-item label="月计划量执行进度%" name="rateMp" :class="diffResultList.includes('rateMp') ? 'changeStyle': ''">{{ formState.rateMp }}</a-form-item>
     </a-col>
     <a-col :span="8">
-      <a-form-item label="指定量(吉焦)" name="qtyDemandGj" :class="diffResultList.includes('qtyDemandGj') ? 'changeStyle': ''">{{ formState.qtyDemandGj }}</a-form-item>
+      <a-form-item label="指定量(吉焦)" name="qtyDemandGj" :class="diffResultList.includes('qtyDemandGj') ? 'changeStyle': ''">
+        {{ Number.format(Number.parse(formState.qtyDemandGj||0 ),numFormat)}}
+      </a-form-item>
     </a-col>
     <a-col :span="8">
-      <a-form-item label="指定量(万方)" name="qtyDemandM3" :class="diffResultList.includes('qtyDemandM3') ? 'changeStyle': ''">{{ formState.qtyDemandM3 }}</a-form-item>
+      <a-form-item label="指定量(万方)" name="qtyDemandM3" :class="diffResultList.includes('qtyDemandM3') ? 'changeStyle': ''">
+        {{ Number.format(Number.parse(formState.qtyDemandM3||0 ),numFormat)}}
+      </a-form-item>
     </a-col>
     <a-col :span="8">
       <a-form-item label="月时间进度%" name="rateS" :class="diffResultList.includes('rateS') ? 'changeStyle': ''">{{ formState.rateS }}</a-form-item>
     </a-col>
     <a-col :span="8">
-      <a-form-item label="批复量(吉焦)" name="qtySalesGj" :class="diffResultList.includes('qtySalesGj') ? 'changeStyle': ''">{{ formState.qtySalesGj }}</a-form-item>
+      <a-form-item label="批复量(吉焦)" name="qtySalesGj" :class="diffResultList.includes('qtySalesGj') ? 'changeStyle': ''">
+        {{ Number.format(Number.parse(formState.qtySalesGj||0 ),numFormat)}}
+      </a-form-item>
     </a-col>
     <a-col :span="8">
-      <a-form-item label="批复量(万方)" name="qtySalesM3" :class="diffResultList.includes('qtySalesM3') ? 'changeStyle': ''">{{ formState.qtySalesM3 }}</a-form-item>
+      <a-form-item label="批复量(万方)" name="qtySalesM3" :class="diffResultList.includes('qtySalesM3') ? 'changeStyle': ''">
+        {{ Number.format(Number.parse(formState.qtySalesM3||0),numFormat)}}
+      </a-form-item>
     </a-col>
     <a-col :span="8">
       <a-form-item label="比值(方/吉焦)" name="rateM3Gj" :class="diffResultList.includes('rateM3Gj') ? 'changeStyle': ''">{{ formState.rateM3Gj }}</a-form-item>
@@ -75,7 +91,7 @@
       </a-form-item>
     </a-col>
   </a-row>
-  <a-table style="width: 100%" :columns="columns" :data-source="dataList" :pagination="false" :scroll="{x: 100}">
+  <a-table style="width: 100%" :columns="columns" :data-source="dataList" :pagination="false" :scroll="{x: 300}">
     <template #bodyCell="{ column, record, index }">
       <template v-if="column.dataIndex === 'pointUpName'">
         <div :class="diffResultList.includes('lngPngApproPurList[' + index + '].pointUpName') ? 'changeStyle': ''">{{ record.pointUpName }}</div>
@@ -87,18 +103,28 @@
         <div :class="diffResultList.includes('lngPngApproPurList[' + index + '].kpName') ? 'changeStyle': ''">{{ record.kpName }}</div>
       </template>
       <template v-if="column.dataIndex === 'qtyDemandGj'">
-        <div :class="diffResultList.includes('lngPngApproPurList[' + index + '].qtyDemandGj') ? 'changeStyle': ''">{{ record.qtyDemandGj }}</div>
+        <div :class="diffResultList.includes('lngPngApproPurList[' + index + '].qtyDemandGj') ? 'changeStyle': ''">
+          {{ Number.format(Number.parse(record.qtyDemandGj ),numFormat)}}
+        </div>
       </template>
       <template v-if="column.dataIndex === 'qtyDemandM3'">
-        <div :class="diffResultList.includes('lngPngApproPurList[' + index + '].qtyDemandM3') ? 'changeStyle': ''">{{ record.qtyDemandM3 }}</div>
+        <div :class="diffResultList.includes('lngPngApproPurList[' + index + '].qtyDemandM3') ? 'changeStyle': ''">
+          {{ Number.format(Number.parse(record.qtyDemandM3 ),numFormat)}}
+        </div>
       </template>
       <template v-if="column.dataIndex === 'qtySalesGj'">
-        <a-input-number :class="diffResultList.includes('lngPngApproPurList[' + index + '].qtySalesGj') ? 'changeStyle': ''"
-        v-model:value="record.qtySalesGj" :disabled="record.alterSign=='D' || disable" :min="0" @change="numChange" style="width: 100%" />
+        <div v-if="record.alterSign=='D' || disable" :class="diffResultList.includes('lngPngApproPurList[' + index + '].qtySalesGj') ? 'changeStyle': ''">
+          {{ Number.format(Number.parse(record.qtySalesGj || 0),numFormat) }}
+        </div>
+        <a-input-number v-else :class="diffResultList.includes('lngPngApproPurList[' + index + '].qtySalesGj') ? 'changeStyle': ''"
+        v-model:value="record.qtySalesGj" :precision="3" :formatter="value => `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')" :disabled="record.alterSign=='D' || disable" :min="0" @change="numChange" style="width: 100%" />
       </template>
       <template v-if="column.dataIndex === 'qtySalesM3'">
-        <a-input-number :class="diffResultList.includes('lngPngApproPurList[' + index + '].qtySalesM3') ? 'changeStyle': ''"
-        v-model:value="record.qtySalesM3" :disabled="record.alterSign=='D' || disable" :min="0" @change="numChange" style="width: 100%" />
+        <div v-if="record.alterSign=='D' || disable" :class="diffResultList.includes('lngPngApproPurList[' + index + '].qtySalesM3') ? 'changeStyle': ''">
+          {{ Number.format(Number.parse(record.qtySalesM3 || 0),numFormat) }}
+        </div>
+        <a-input-number v-else :class="diffResultList.includes('lngPngApproPurList[' + index + '].qtySalesM3') ? 'changeStyle': ''"
+        v-model:value="record.qtySalesM3" :precision="3" :formatter="value => `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')" :disabled="record.alterSign=='D' || disable" :min="0" @change="numChange" style="width: 100%" />
       </template>
       <template v-if="column.dataIndex === 'note'" >
         <div v-if="record.alterSign=='D' || disable" :class="diffResultList.includes('lngPngApproPurList[' + index + '].note') ? 'changeStyle': ''">{{ record.note }}</div>
@@ -120,6 +146,7 @@
       changeList: []
     
     });
+    const numFormat = "###,###,###,###,###,###.000"
     const columns= ref([
       { title: t('序号'), dataIndex: 'index', key: 'index', customRender: (column) => `${column.index + 1}` ,width: 100},
       { title: t('上载点'), dataIndex: 'pointUpName', width:400},
@@ -127,8 +154,8 @@
       { title: t('采购合同'), dataIndex: 'kpName', width: 400},
       { title: t('指定量(吉焦)'), dataIndex: 'qtyDemandGj', width: 300},
       { title: t('指定量(万方)'), dataIndex: 'qtyDemandM3', width: 200},
-      { title: t('批复量(吉焦)'), dataIndex: 'qtySalesGj', width: 200},
-      { title: t('批复量(万方)'), dataIndex: 'qtySalesM3', width: 200},
+      { title: t('批复量(吉焦)'), dataIndex: 'qtySalesGj', width: 250},
+      { title: t('批复量(万方)'), dataIndex: 'qtySalesM3', width: 250},
       { title: t('备注'), dataIndex: 'note', width: 300},
     ]);
     const formState = ref()
@@ -141,8 +168,8 @@
         num+=(Number(v.qtySalesGj) || 0)
         num1+=(Number(v.qtySalesM3) || 0)
       })
-      formState.value.qtySalesGj = num
-      formState.value.qtySalesM3 = num1
+      formState.value.qtySalesGj = num.toFixed(3)
+      formState.value.qtySalesM3 = num1.toFixed(3)
     }
     function getFormValue () {
       let obj = {
diff --git a/src/views/dayPlan/PngAppro/index.vue b/src/views/dayPlan/PngAppro/index.vue
index 25b83e0..432b403 100644
--- a/src/views/dayPlan/PngAppro/index.vue
+++ b/src/views/dayPlan/PngAppro/index.vue
@@ -15,6 +15,18 @@
           </template>
         </template>
         <template #bodyCell="{ column, record }">
+          <template v-if="column.dataIndex === 'qtyDemandGj'">
+            {{ Number.format(Number.parse(record.qtyDemandGj),numFormat) }}
+          </template>
+          <template v-if="column.dataIndex === 'qtyDemandM3'">
+            {{ Number.format(Number.parse(record.qtyDemandM3),numFormat) }}
+          </template>
+          <template v-if="column.dataIndex === 'qtySalesGj'">
+            {{ Number.format(Number.parse(record.qtySalesGj),numFormat) }}
+          </template>
+          <template v-if="column.dataIndex === 'qtySalesM3'">
+            {{ Number.format(Number.parse(record.qtySalesM3),numFormat) }}
+          </template>
            <template v-if="column.dataIndex === 'approName'">
             <a @click="btnCheck(record)">{{ record.approName }}</a>
           </template>
@@ -61,7 +73,9 @@
     
   import useEventBus from '/@/hooks/event/useEventBus';
   import { cloneDeep } from 'lodash-es';
-
+  import { DataFormat, FormatOption, DATE_FORMAT, FormatType } from '/@/utils/dataFormat';
+   
+  const numFormat = "###,###,###,###,###,###.000"
   const { bus, CREATE_FLOW, FLOW_PROCESSED, FORM_LIST_MODIFIED } = useEventBus();
 
   const { notification } = useMessage();
diff --git a/src/views/dayPlan/PngApproGd/components/config.ts b/src/views/dayPlan/PngApproGd/components/config.ts
index 862853a..8805a95 100644
--- a/src/views/dayPlan/PngApproGd/components/config.ts
+++ b/src/views/dayPlan/PngApproGd/components/config.ts
@@ -28,12 +28,26 @@ export const columns: BasicColumn[] = [
     width: 100,
     sorter: true,
   },
+  {
+    dataIndex: 'cuSname',
+    title: '客户名称',
+    componentType: 'input',
+    align: 'left',
+    sorter: true,
+  },
+  {
+    dataIndex: 'comName,',
+    title: '交易主体',
+    componentType: 'input',
+    align: 'left',
+    sorter: true,
+  },
   {
     dataIndex: 'daysSign',
     title: '当日/次日',
     componentType: 'input',
     align: 'left',
-
+    width: 100,
     sorter: true,
   },
   {
@@ -45,11 +59,19 @@ export const columns: BasicColumn[] = [
     sorter: true,
   },
    {
+    dataIndex: 'qtyGjAll',
+    title: '全部上报量(吉焦)',
+    componentType: 'input',
+    align: 'left',
+
+    sorter: true,
+  },
+  {
     dataIndex: 'qtyGjGd',
     title: '待管道审批量(吉焦)',
     componentType: 'input',
     align: 'left',
-
+    width: 170,
     sorter: true,
   },
 
@@ -67,7 +89,7 @@ export const columns: BasicColumn[] = [
     title: '管道已审批量(吉焦)',
     componentType: 'input',
     align: 'left',
-
+    width: 170,
     sorter: true,
   },
 
diff --git a/src/views/dayPlan/PngApproGd/index.vue b/src/views/dayPlan/PngApproGd/index.vue
index 32000f2..a03c341 100644
--- a/src/views/dayPlan/PngApproGd/index.vue
+++ b/src/views/dayPlan/PngApproGd/index.vue
@@ -15,6 +15,18 @@
           </template>
         </template>
         <template #bodyCell="{ column, record }">
+          <template v-if="column.dataIndex === 'qtyGjAll'">
+            {{ Number.format(Number.parse(record.qtyGjAll),numFormat) }}
+          </template>
+          <template v-if="column.dataIndex === 'qtyGjGd'">
+            {{ Number.format(Number.parse(record.qtyGjGd),numFormat) }}
+          </template>
+          <template v-if="column.dataIndex === 'qtyGjXs'">
+            {{ Number.format(Number.parse(record.qtyGjXs),numFormat) }}
+          </template>
+          <template v-if="column.dataIndex === 'qtyGjYsp'">
+            {{ Number.format(Number.parse(record.qtyGjYsp),numFormat) }}
+          </template>
           <template v-if="column.dataIndex === 'action'">
             <TableAction :actions="getActions(record)" />
           </template>
@@ -52,7 +64,7 @@
   import rejectReplyModal from '/@/components/common/rejectReplyModal.vue';
   
   const { bus, CREATE_FLOW, FLOW_PROCESSED, FORM_LIST_MODIFIED } = useEventBus();
-
+  const numFormat = "###,###,###,###,###,###.000"
   const { notification } = useMessage();
   const { t } = useI18n();
   defineEmits(['register']);
diff --git a/src/views/dayPlan/PngApproJsz/index.vue b/src/views/dayPlan/PngApproJsz/index.vue
index e5d23c3..2dbbaa8 100644
--- a/src/views/dayPlan/PngApproJsz/index.vue
+++ b/src/views/dayPlan/PngApproJsz/index.vue
@@ -15,6 +15,18 @@
           </template>
         </template>
         <template #bodyCell="{ column, record }">
+          <template v-if="column.dataIndex === 'qtyGjAll'">
+            {{ Number.format(Number.parse(record.qtyGjAll),numFormat) }}
+          </template>
+          <template v-if="column.dataIndex === 'qtyGjJsz'">
+            {{ Number.format(Number.parse(record.qtyGjJsz),numFormat) }}
+          </template>
+          <template v-if="column.dataIndex === 'qtyGjXs'">
+            {{ Number.format(Number.parse(record.qtyGjXs),numFormat) }}
+          </template>
+          <template v-if="column.dataIndex === 'qtyGjYsp'">
+            {{ Number.format(Number.parse(record.qtyGjYsp),numFormat) }}
+          </template>
           <template v-if="column.dataIndex === 'action'">
             <TableAction :actions="getActions(record)" />
           </template>
@@ -63,7 +75,7 @@
   const filterColumns = cloneDeep(filterColumnAuth(columns));
   const customConfigColums =ref(filterColumns);
   const customSearchFormSchema =ref(searchFormSchema);
-  
+  const numFormat = "###,###,###,###,###,###.000"
   const tableRef = ref();
   //所有按钮
   const buttons = ref([
diff --git a/src/views/dayPlan/PngMeasureSalesPur/components/config.ts b/src/views/dayPlan/PngMeasureSalesPur/components/config.ts
index fecdc51..a09d9b6 100644
--- a/src/views/dayPlan/PngMeasureSalesPur/components/config.ts
+++ b/src/views/dayPlan/PngMeasureSalesPur/components/config.ts
@@ -67,7 +67,7 @@ export const columns: BasicColumn[] = [
     componentType: 'input',
     align: 'left',
     ellipsis: true,
-    width: 200,
+    width: 150,
     sorter: true,
   },
   {
@@ -86,7 +86,7 @@ export const columns: BasicColumn[] = [
     componentType: 'input',
     align: 'left',
     ellipsis: true,
-    width: 200,
+    width: 150,
     sorter: true,
   },
 
diff --git a/src/views/dayPlan/PngMeasureSalesPur/components/createForm.vue b/src/views/dayPlan/PngMeasureSalesPur/components/createForm.vue
index 54629d0..a8d9a9a 100644
--- a/src/views/dayPlan/PngMeasureSalesPur/components/createForm.vue
+++ b/src/views/dayPlan/PngMeasureSalesPur/components/createForm.vue
@@ -12,11 +12,17 @@
       <searchForm @search="onSearch" @reset="onReset" ></searchForm>
       <BasicTable @register="registerTable">
         <template #bodyCell="{ column, record }">
+          <template v-if="column.dataIndex === 'qtySalesGj'">
+            {{ Number.format(Number.parse(record.qtySalesGj),numFormat) }}
+          </template>
+          <template v-if="column.dataIndex === 'qtyMeaGj'">
+            {{ Number.format(Number.parse(record.qtyMeaGj || 0),numFormat) }}
+          </template>
           <template v-if="column.dataIndex === 'qtySalesM3'">
-            {{ NP.divide(Number(record.qtySalesM3), 10000) }}
+            {{ Number.format(Number.parse(NP.divide(Number(record.qtySalesM3), 10000)),numFormat) }}
           </template>
           <template v-if="column.dataIndex === 'qtyMeaM3'">
-            {{ NP.divide(Number(record.qtyMeaM3), 10000) }}
+            {{ Number.format(Number.parse(NP.divide(Number(record.qtyMeaM3), 10000)),numFormat) }}
           </template>
         </template>
       </BasicTable>
@@ -43,7 +49,7 @@
     import NP from 'number-precision';
 
     const userStore = useUserStore();
-
+    const numFormat = "###,###,###,###,###,###.000"
     const { bus, FORM_LIST_MODIFIED } = useEventBus();
 
     const router = useRouter();
diff --git a/src/views/dayPlan/PngMeasureSalesPur/index.vue b/src/views/dayPlan/PngMeasureSalesPur/index.vue
index 7c8e6ad..d4cb003 100644
--- a/src/views/dayPlan/PngMeasureSalesPur/index.vue
+++ b/src/views/dayPlan/PngMeasureSalesPur/index.vue
@@ -21,12 +21,23 @@
     rowKey="id" :pagination="pagination" @row-dbClick="dbClickRow" :scroll="{x: 2000}">
       
       <template #bodyCell="{ column, record, index }">
+        <template v-if="column.dataIndex === 'qtySalesGj'">
+          {{ Number.format(Number.parse(record.qtySalesGj),numFormat) }}
+        </template>
+        <template v-if="column.dataIndex === 'qtySalesM3'">
+          {{ Number.format(Number.parse(record.qtySalesM3),numFormat) }}
+        </template>
         <template v-if="column.dataIndex === 'qtyMeaGj'">
-          <a-input-number v-model:value="record.qtyMeaGj" v-if="record.statusCode==='N'|| record.statusCode==='JLZ'" @change="numChange(record, index)" :min="0" style="width: 100%" />
-          <div v-else>{{ record.qtyMeaGj }}</div>
+          <a-input-number v-model:value="record.qtyMeaGj"
+          :precision="3" :formatter="value => `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')"
+           v-if="record.statusCode==='N'|| record.statusCode==='JLZ'" @change="numChange(record, index)" :min="0" style="width: 100%" />
+          <div v-else>{{ Number.format(Number.parse(record.qtyMeaGj),numFormat) }}</div>
         </template>
         <template v-if="column.dataIndex === 'qtyMeaM3'">
-          <a-input-number v-model:value="record.qtyMeaM3" v-if="record.statusCode==='N'|| record.statusCode==='JLZ'" @change="numChange(record, index)" :min="0" style="width: 100%" />
+          <a-input-number v-model:value="record.qtyMeaM3" 
+          :precision="3" :formatter="value => `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')"
+          v-if="record.statusCode==='N'|| record.statusCode==='JLZ'" @change="numChange(record, index)" :min="0" style="width: 100%" />
+          <div v-else>{{ Number.format(Number.parse(record.qtyMeaM3),numFormat) }}</div>
         </template>
         <template v-if="column.dataIndex === 'lngFileUploadList'">
           <div>
@@ -86,7 +97,7 @@
   import NP from 'number-precision';
 
   const { bus, CREATE_FLOW, FLOW_PROCESSED, FORM_LIST_MODIFIED } = useEventBus();
-
+  const numFormat = "###,###,###,###,###,###.000"
   const { notification } = useMessage();
   const { t } = useI18n();
   defineEmits(['register']);