From 57d260f049dd408f89e16e75676ebc5c3d79823c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98huanghaiixia=E2=80=99?= <980486410@.com>
Date: Tue, 31 Mar 2026 17:37:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E6=B7=BB=E5=8A=A0=E9=95=BF?=
=?UTF-8?q?=E5=8D=8F=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ContractPurPng/components/createForm.vue | 26 ++++++++----
.../ContractSales/components/createForm.vue | 26 ++++++++----
.../components/createForm.vue | 41 ++++++++++++-------
.../dayPlan/Demand/components/basicForm.vue | 11 ++++-
src/views/dayPlan/Demand/components/config.ts | 20 ++++-----
5 files changed, 81 insertions(+), 43 deletions(-)
diff --git a/src/views/contract/ContractPurPng/components/createForm.vue b/src/views/contract/ContractPurPng/components/createForm.vue
index 3deb1af..6756f57 100644
--- a/src/views/contract/ContractPurPng/components/createForm.vue
+++ b/src/views/contract/ContractPurPng/components/createForm.vue
@@ -68,6 +68,15 @@
+
+
+
+
+ {{ item.name }}
+
+
+
+
@@ -78,18 +87,18 @@
-
-
-
+
+
+
{{ item.name }}
-
-
-
+
+
+
{{ item.name }}
@@ -286,7 +295,8 @@
periodTypeCodeList: [],
transSignList: [],
baseIncList: [],
- zfbyTypeCodeList: []
+ zfbyTypeCodeList: [],
+ longSpotCodeList: []
});
watch(
() => props.id,
@@ -375,7 +385,7 @@
optionSelect.transSignList = await getDictionary('LNG_YN')
optionSelect.baseIncList = await getDictionary('LNG_BASE')
optionSelect.zfbyTypeCodeList = await getDictionary('LNG_ZFBY')
-
+ optionSelect.longSpotCodeList = await getDictionary('LNG_LONG_D')
if (!pageId.value) {
getCompDeptInfo(userInfo.id)
diff --git a/src/views/contract/ContractSales/components/createForm.vue b/src/views/contract/ContractSales/components/createForm.vue
index fd51697..c447f17 100644
--- a/src/views/contract/ContractSales/components/createForm.vue
+++ b/src/views/contract/ContractSales/components/createForm.vue
@@ -68,6 +68,15 @@
+
+
+
+
+ {{ item.name }}
+
+
+
+
@@ -78,18 +87,18 @@
-
-
-
+
+
+
{{ item.name }}
-
-
-
+
+
+
{{ item.name }}
@@ -307,7 +316,8 @@
periodTypeCodeList: [],
transSignList: [],
baseIncList: [],
- zfbyTypeCodeList: []
+ zfbyTypeCodeList: [],
+ longSpotCodeList: []
});
watch(
() => props.id,
@@ -406,7 +416,7 @@
optionSelect.transSignList = await getDictionary('LNG_YN')
optionSelect.baseIncList = await getDictionary('LNG_BASE')
optionSelect.zfbyTypeCodeList = await getDictionary('LNG_ZFBY')
-
+ optionSelect.longSpotCodeList = await getDictionary('LNG_LONG_D')
if (!pageId.value) {
getCompDeptInfo(userInfo.id)
diff --git a/src/views/contract/ContractSalesLng/components/createForm.vue b/src/views/contract/ContractSalesLng/components/createForm.vue
index 498657c..79b748d 100644
--- a/src/views/contract/ContractSalesLng/components/createForm.vue
+++ b/src/views/contract/ContractSalesLng/components/createForm.vue
@@ -9,8 +9,8 @@
关联合同
-
-
+
+
@@ -54,18 +54,12 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ {{ item.name }}
+
+
@@ -77,6 +71,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -260,7 +269,8 @@
onlineSignList: [],
discTypeCodeList: [],
baseIncList: [],
- zfbyTypeCodeList: []
+ zfbyTypeCodeList: [],
+ longSpotCodeList: []
});
watch(
() => props.id,
@@ -343,6 +353,7 @@
optionSelect.discTypeCodeList = await getDictionary('LNG_DISC')
optionSelect.baseIncList = await getDictionary('LNG_BASE')
optionSelect.zfbyTypeCodeList = await getDictionary('LNG_ZFBY')
+ optionSelect.longSpotCodeList = await getDictionary('LNG_LONG_D')
if (!pageId.value) {
diff --git a/src/views/dayPlan/Demand/components/basicForm.vue b/src/views/dayPlan/Demand/components/basicForm.vue
index 87fed87..e25b02c 100644
--- a/src/views/dayPlan/Demand/components/basicForm.vue
+++ b/src/views/dayPlan/Demand/components/basicForm.vue
@@ -74,13 +74,15 @@
{{ formState.rateM3Gj }}
- {{ formState.name }}
+ {{ formState.comName }}
{{ formState.verNo }}
- {{ formState.approName }}
+
+ {{ (optionSelect.approCodeList.find(v=>v.code == formState.approCode)||{}).name }}
+
@@ -166,6 +168,7 @@
import { useUserStore } from '/@/store/modules/user';
import { getLngPngDemandContractList, getLngPngDemandPointDely, getLngPngDemandContractQty, getLngPngDemandPurList, getLngPngDemandRate } from '/@/api/dayPlan/Demand';
import NP from 'number-precision';
+ import { getDictionary } from '/@/api/sales/Customer';
const numFormat = "###,###,###,###,###,###.000"
const userStore = useUserStore();
@@ -184,6 +187,9 @@
labelCol: { span: 9 },
wrapperCol: { span: 18 },
}
+ let optionSelect= reactive({
+ approCodeList: [],
+ });
const { t } = useI18n();
const [registerContract, { openModal:openModalContractSales}] = useModal();
const [registerUpLoad, { openModal:openModalUpLoad}] = useModal();
@@ -209,6 +215,7 @@
const contractList = ref([])
const pointDelyList = ref([])
onMounted(async () =>{
+ optionSelect.approCodeList = await getDictionary('LNG_APPRO')
if (!pageType.value) {
formState.value.lastVerSign = 'Y'
formState.value.validSign = 'N'
diff --git a/src/views/dayPlan/Demand/components/config.ts b/src/views/dayPlan/Demand/components/config.ts
index 688b4ac..1f9966b 100644
--- a/src/views/dayPlan/Demand/components/config.ts
+++ b/src/views/dayPlan/Demand/components/config.ts
@@ -79,43 +79,43 @@ export const columns: BasicColumn[] = [
title: '下载点',
componentType: 'input',
align: 'left',
-
+ width: 120,
sorter: true,
},
{
dataIndex: 'qtyDemandGj',
- title: '指定量 (吉焦)',
+ title: '指定量(吉焦)',
componentType: 'input',
align: 'left',
-
+ width: 120,
sorter: true,
},
{
dataIndex: 'qtyDemandM3',
- title: '指定量 (万方)',
+ title: '指定量(万方)',
componentType: 'input',
align: 'left',
-
+ width: 120,
sorter: true,
},
{
dataIndex: 'qtySalesGj',
- title: '批复量 (吉焦)',
+ title: '批复量(吉焦)',
componentType: 'input',
align: 'left',
-
+ width: 120,
sorter: true,
},
{
dataIndex: 'qtySalesM3',
- title: '批复量 (万方)',
+ title: '批复量(万方)',
componentType: 'input',
align: 'left',
-
+ width: 120,
sorter: true,
},
@@ -141,7 +141,7 @@ export const columns: BasicColumn[] = [
title: '审批状态',
componentType: 'input',
align: 'left',
- width: 100,
+ width: 80,
sorter: true,
},
];