From 1b24d0284e51914d9b6acb0f1e5d63921b6ce8f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98huanghaiixia=E2=80=99?= <980486410@.com> Date: Thu, 5 Mar 2026 17:46:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E7=94=B3=E8=AF=B7=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/price/PricePurPngApp/index.ts | 3 +- src/api/price/PriceSalesPngApp/index.ts | 3 +- .../price/PricePurPngApp/components/config.ts | 50 +++++-------- src/views/price/PricePurPngApp/index.vue | 22 ++++-- .../PriceSalesPngApp/components/config.ts | 47 ++++-------- src/views/price/PriceSalesPngApp/index.vue | 15 ++-- src/views/secondDev/customFormConfig.ts | 4 +- .../ship/OpsPurInt/components/createForm.vue | 71 ++++++++++--------- .../ship/OpsSalesInt/components/config.ts | 2 +- .../OpsSalesInt/components/createForm.vue | 71 ++++++++++--------- 10 files changed, 141 insertions(+), 147 deletions(-) diff --git a/src/api/price/PricePurPngApp/index.ts b/src/api/price/PricePurPngApp/index.ts index e58a790..81d6e45 100644 --- a/src/api/price/PricePurPngApp/index.ts +++ b/src/api/price/PricePurPngApp/index.ts @@ -3,7 +3,8 @@ import { defHttp } from '/@/utils/http/axios'; import { ErrorMessageMode } from '/#/axios'; enum Api { - Page = '/price/pricePurPngApp/page', + // Page = '/price/pricePurPngApp/page', + Page = '/magic-api/price/pricePurPngApp/page', List = '/price/pricePurPngApp/list', Info = '/price/pricePurPngApp/info', LngPricePurPngApp = '/price/pricePurPngApp', diff --git a/src/api/price/PriceSalesPngApp/index.ts b/src/api/price/PriceSalesPngApp/index.ts index 270f941..f431d4a 100644 --- a/src/api/price/PriceSalesPngApp/index.ts +++ b/src/api/price/PriceSalesPngApp/index.ts @@ -3,7 +3,8 @@ import { defHttp } from '/@/utils/http/axios'; import { ErrorMessageMode } from '/#/axios'; enum Api { - Page = '/price/priceSalesPngApp/page', + // Page = '/price/priceSalesPngApp/page', + Page = '/magic-api/price/priceSalesPngApp/page', List = '/price/priceSalesPngApp/list', Info = '/price/priceSalesPngApp/info', LngPriceSalesPngApp = '/price/priceSalesPngApp', diff --git a/src/views/price/PricePurPngApp/components/config.ts b/src/views/price/PricePurPngApp/components/config.ts index c84c5e2..4a6b7b2 100644 --- a/src/views/price/PricePurPngApp/components/config.ts +++ b/src/views/price/PricePurPngApp/components/config.ts @@ -6,29 +6,21 @@ export const formConfig = { }; export const searchFormSchema: FormSchema[] = [ + { - field: 'id', - label: 'Id', - component: 'Input', - }, - { - field: 'appName', - label: '申请说明', - component: 'Input', - }, - { - field: 'priceTypeCode', - label: '定价类型', - component: 'Input', - }, - { - field: 'comId', - label: '交易主体', - component: 'Input', + field: 'dateFrom', + label: '申请日期', + component: 'RangePicker', + componentProps: { + format: 'YYYY-MM-DD', + style: { width: '100%' }, + allowClear: true, + getPopupContainer: () => document.body, + }, }, { field: 'priceDesc', - label: '说明', + label: '申请说明', component: 'Input', }, { @@ -47,14 +39,6 @@ export const searchFormSchema: FormSchema[] = [ ]; export const columns: BasicColumn[] = [ - { - dataIndex: 'id', - title: 'Id', - componentType: 'input', - align: 'left', - - sorter: true, - }, { dataIndex: 'appName', @@ -66,20 +50,20 @@ export const columns: BasicColumn[] = [ }, { - dataIndex: 'priceTypeCode', + dataIndex: 'priceTypeName', title: '定价类型', componentType: 'input', align: 'left', - + width: 100, sorter: true, }, { - dataIndex: 'comId', + dataIndex: 'comName', title: '交易主体', componentType: 'input', align: 'left', - + width: 120, sorter: true, }, @@ -93,11 +77,11 @@ export const columns: BasicColumn[] = [ }, { - dataIndex: 'approCode', + dataIndex: 'approName', title: '审批状态', componentType: 'select', align: 'left', - + width: 100, sorter: true, }, ]; diff --git a/src/views/price/PricePurPngApp/index.vue b/src/views/price/PricePurPngApp/index.vue index c05be48..ec6be82 100644 --- a/src/views/price/PricePurPngApp/index.vue +++ b/src/views/price/PricePurPngApp/index.vue @@ -74,9 +74,9 @@ const tableRef = ref(); //所有按钮 - const buttons = ref([{"isUse":true,"name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"type":"primary"},{"isUse":true,"name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true},{"isUse":true,"name":"刷新","code":"refresh","icon":"ant-design:reload-outlined","isDefault":true},{"isUse":true,"name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true},{"isUse":true,"name":"数据日志","code":"datalog","icon":"ant-design:profile-outlined","isDefault":true},{"isUse":true,"name":"发起审批","code":"startwork","icon":"ant-design:form-outlined","isDefault":true},{"isUse":true,"name":"查看流转记录","code":"flowRecord","icon":"ant-design:form-outlined","isDefault":true},{"isUse":true,"name":"审批","code":"approve","icon":"ant-design:check-outlined","isDefault":true},{"isUse":true,"name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true}]); + const buttons = ref([{"isUse":true,"name":"创建申请单","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"type":"primary"},{"isUse":true,"name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true},{"isUse":true,"name":"刷新","code":"refresh","icon":"ant-design:reload-outlined","isDefault":true},{"isUse":true,"name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true},{"isUse":true,"name":"数据日志","code":"datalog","icon":"ant-design:profile-outlined","isDefault":true},{"isUse":true,"name":"发起审批","code":"startwork","icon":"ant-design:form-outlined","isDefault":true},{"isUse":true,"name":"查看流转记录","code":"flowRecord","icon":"ant-design:form-outlined","isDefault":true},{"isUse":true,"name":"审批","code":"approve","icon":"ant-design:check-outlined","isDefault":true},{"isUse":true,"name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true}]); //展示在列表内的按钮 - const actionButtons = ref(['view', 'edit','datalog', 'copyData', 'delete', 'startwork','flowRecord']); + const actionButtons = ref(['view', 'edit','datalog','approve', 'copyData', 'delete', 'startwork','flowRecord']); const buttonConfigs = computed(()=>{ return filterButtonAuth(buttons.value); }) @@ -110,7 +110,7 @@ const taskIdRef = ref(''); const visibleFlowRecordModal = ref(false); const [registerModal, { openModal }] = useModal(); - const formName='管道气采购价格申请单'; + const formName=currentRoute.value.meta?.title; const [registerTable, { reload, }] = useTable({ title: '' || (formName + '列表'), api: getLngPricePurPngAppPage, @@ -121,11 +121,11 @@ gutter: 16, }, schemas: customSearchFormSchema, - fieldMapToTime: [], - showResetButton: false, + fieldMapToTime: [['dateFrom', ['startDate', 'endDate'], 'YYYY-MM-DD']], + showResetButton: true, }, beforeFetch: (params) => { - return { ...params, FormId: formIdComputedRef.value, PK: 'id' }; + return { ...params, FormId: formIdComputedRef.value, PK: 'id',page:params.limit }; }, afterFetch: (res) => { tableRef.value.setToolBarWidth(); @@ -220,6 +220,9 @@ formId:currentRoute.value.meta.formId } }); + } + function handleApprove(record: Recordable) { + } function handleDelete(record: Recordable) { deleteList([record.id]); @@ -402,4 +405,11 @@ .hide{ display: none !important; } + :deep( .ant-col-8:nth-child(1)) { + width: 320px !important; + max-width: 320px !important;; + } + :deep(.ant-col-8:nth-child(1) .ant-form-item-label) { + width: 80px !important; + } \ No newline at end of file diff --git a/src/views/price/PriceSalesPngApp/components/config.ts b/src/views/price/PriceSalesPngApp/components/config.ts index 172b20f..ca40b17 100644 --- a/src/views/price/PriceSalesPngApp/components/config.ts +++ b/src/views/price/PriceSalesPngApp/components/config.ts @@ -7,28 +7,19 @@ export const formConfig = { export const searchFormSchema: FormSchema[] = [ { - field: 'id', - label: 'id', - component: 'Input', - }, - { - field: 'appName', - label: '申请说明', - component: 'Input', - }, - { - field: 'priceTypeCode', - label: '定价类型', - component: 'Input', + field: 'dateFrom', + label: '申请日期', + component: 'RangePicker', + componentProps: { + format: 'YYYY-MM-DD', + style: { width: '100%' }, + allowClear: true, + getPopupContainer: () => document.body, + }, }, { field: 'priceDesc', - label: '说明', - component: 'Input', - }, - { - field: 'comId', - label: '交易主体', + label: '申请说明', component: 'Input', }, { @@ -39,14 +30,6 @@ export const searchFormSchema: FormSchema[] = [ ]; export const columns: BasicColumn[] = [ - { - dataIndex: 'id', - title: 'id', - componentType: 'input', - align: 'left', - - sorter: true, - }, { dataIndex: 'appName', @@ -62,7 +45,7 @@ export const columns: BasicColumn[] = [ title: '定价类型', componentType: 'input', align: 'left', - + width: 100, sorter: true, }, @@ -76,20 +59,20 @@ export const columns: BasicColumn[] = [ }, { - dataIndex: 'comId', + dataIndex: 'comName', title: '交易主体', componentType: 'input', align: 'left', - + width: 120, sorter: true, }, { - dataIndex: 'approCode', + dataIndex: 'approName', title: '审批状态', componentType: 'input', align: 'left', - + width: 100, sorter: true, }, ]; diff --git a/src/views/price/PriceSalesPngApp/index.vue b/src/views/price/PriceSalesPngApp/index.vue index ef9db47..891066c 100644 --- a/src/views/price/PriceSalesPngApp/index.vue +++ b/src/views/price/PriceSalesPngApp/index.vue @@ -74,9 +74,9 @@ const tableRef = ref(); //所有按钮 - const buttons = ref([{"isUse":true,"name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"type":"primary"},{"isUse":true,"name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true},{"isUse":true,"name":"刷新","code":"refresh","icon":"ant-design:reload-outlined","isDefault":true},{"isUse":true,"name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true},{"isUse":true,"name":"数据日志","code":"datalog","icon":"ant-design:profile-outlined","isDefault":true},{"isUse":true,"name":"发起审批","code":"startwork","icon":"ant-design:form-outlined","isDefault":true},{"isUse":true,"name":"查看流转记录","code":"flowRecord","icon":"ant-design:form-outlined","isDefault":true},{"isUse":true,"name":"审批","code":"approve","icon":"ant-design:check-outlined","isDefault":true},{"isUse":true,"name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true}]); + const buttons = ref([{"isUse":true,"name":"创建申请单","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"type":"primary"},{"isUse":true,"name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true},{"isUse":true,"name":"刷新","code":"refresh","icon":"ant-design:reload-outlined","isDefault":true},{"isUse":true,"name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true},{"isUse":true,"name":"数据日志","code":"datalog","icon":"ant-design:profile-outlined","isDefault":true},{"isUse":true,"name":"发起审批","code":"startwork","icon":"ant-design:form-outlined","isDefault":true},{"isUse":true,"name":"查看流转记录","code":"flowRecord","icon":"ant-design:form-outlined","isDefault":true},{"isUse":true,"name":"审批","code":"approve","icon":"ant-design:check-outlined","isDefault":true},{"isUse":true,"name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true}]); //展示在列表内的按钮 - const actionButtons = ref(['view', 'edit','datalog', 'copyData', 'delete', 'startwork','flowRecord']); + const actionButtons = ref(['view', 'edit','datalog','approve', 'copyData', 'delete', 'startwork','flowRecord']); const buttonConfigs = computed(()=>{ return filterButtonAuth(buttons.value); }) @@ -110,7 +110,7 @@ const taskIdRef = ref(''); const visibleFlowRecordModal = ref(false); const [registerModal, { openModal }] = useModal(); - const formName='管道气销售价格申请'; + const formName=currentRoute.value.meta?.title; const [registerTable, { reload, }] = useTable({ title: '' || (formName + '列表'), api: getLngPriceSalesPngAppPage, @@ -121,11 +121,11 @@ gutter: 16, }, schemas: customSearchFormSchema, - fieldMapToTime: [], - showResetButton: false, + fieldMapToTime: [['dateFrom', ['startDate', 'endDate'], 'YYYY-MM-DD']], + showResetButton: true, }, beforeFetch: (params) => { - return { ...params, FormId: formIdComputedRef.value, PK: 'id' }; + return { ...params, FormId: formIdComputedRef.value, PK: 'id',page:params.limit }; }, afterFetch: (res) => { tableRef.value.setToolBarWidth(); @@ -220,6 +220,9 @@ formId:currentRoute.value.meta.formId } }); + } + function handleApprove (record: Recordable) { + } function handleDelete(record: Recordable) { deleteList([record.id]); diff --git a/src/views/secondDev/customFormConfig.ts b/src/views/secondDev/customFormConfig.ts index 7971e1c..6c8c5c9 100644 --- a/src/views/secondDev/customFormConfig.ts +++ b/src/views/secondDev/customFormConfig.ts @@ -14,6 +14,8 @@ export const customFormConfig = { 'addDayPlanPngSettleSales', 'addDayPlanPngSettlePur', 'ContractTransPng', - 'ContractProc' + 'ContractProc', + 'PricePurPngApp', + 'PriceSalesPngApp' ], }; \ No newline at end of file diff --git a/src/views/ship/OpsPurInt/components/createForm.vue b/src/views/ship/OpsPurInt/components/createForm.vue index 85f7a32..f11a328 100644 --- a/src/views/ship/OpsPurInt/components/createForm.vue +++ b/src/views/ship/OpsPurInt/components/createForm.vue @@ -574,7 +574,6 @@ } } catch (error) { - console.log(error,'533') spinning.value = false } } @@ -654,43 +653,49 @@ formState.staName = val[0].fullName } const handleSuccessShip = (val) => { + formState.ssNo = val[0].ssNo formState.ssId = val[0].id getLngShipInfo(val[0].id) } const getLngShipInfo = async (id) => { - let data = await getLngShipSchedule(id) - formState.comId = data.comId - formState.kId = data.kId - formState.kName = data.kName - formState.longSpotCode = data.longSpotCode - formState.suCode = data.suCode - formState.suName = data.suName - formState.staCode = data.staCode - formState.staName = data.staName - formState.sourceName = data.sourceName - formState.empId = data.empId - formState.empName = data.empName - formState.empTel = data.empTel - formState.prcTermCode = data.prcTermCode - formState.shipCode = data.shipCode - formState.shipName = data.shipName - formState.dateNor = data.dateNor ? dayjs(data.dateNor) : null - formState.portUnloading1Code = data.portUnloading1Code - formState.portUnloading1Name = data.portUnloading1Name - formState.dateEta = data.dateEta ? dayjs(data.dateEta) : null - formState.dateEtb = data.dateEtb ? dayjs(data.dateEtb) : null - formState.dateEtc = data.dateEtc ? dayjs(data.dateEtc) : null - formState.dateEtd = data.dateEtd ? dayjs(data.dateEtd) : null - formState.qtyMmbtu = data.qtyMmbtu - formState.qtyGj = data.qtyGj - formState.qtyTon = data.qtyTon - formState.qtyM3 = data.qtyM3 - formState.curCode = data.curCode - formState.rateEx = data.rateEx - formState.priceCurrEst = data.priceCurrEst - formState.amountCurrEst = data.amountCurrEst - + try { + spinning.value = true + let data = await getLngShipSchedule(id) + spinning.value = false + formState.comId = data.comId + formState.kId = data.kId + formState.kName = data.kName + formState.longSpotCode = data.longSpotCode + formState.suCode = data.suCode + formState.suName = data.suName + formState.staCode = data.staCode + formState.staName = data.staName + formState.sourceName = data.sourceName + formState.empId = data.empId + formState.empName = data.empName + formState.empTel = data.empTel + formState.prcTermCode = data.prcTermCode + formState.shipCode = data.shipCode + formState.shipName = data.shipName + formState.dateNor = data.dateNor ? dayjs(data.dateNor) : null + formState.portUnloading1Code = data.portUnloading1Code + formState.portUnloading1Name = data.portUnloading1Name + formState.dateEta = data.dateEta ? dayjs(data.dateEta) : null + formState.dateEtb = data.dateEtb ? dayjs(data.dateEtb) : null + formState.dateEtc = data.dateEtc ? dayjs(data.dateEtc) : null + formState.dateEtd = data.dateEtd ? dayjs(data.dateEtd) : null + formState.qtyMmbtu = data.qtyMmbtu + formState.qtyGj = data.qtyGj + formState.qtyTon = data.qtyTon + formState.qtyM3 = data.qtyM3 + formState.curCode = data.curCode + formState.rateEx = data.rateEx + formState.priceCurrEst = data.priceCurrEst + formState.amountCurrEst = data.amountCurrEst + } catch (error) { + spinning.value = false + } } const handleSuccessContractPurInt = (val) => { formState.kId = val[0].id diff --git a/src/views/ship/OpsSalesInt/components/config.ts b/src/views/ship/OpsSalesInt/components/config.ts index 0c63875..1a306ef 100644 --- a/src/views/ship/OpsSalesInt/components/config.ts +++ b/src/views/ship/OpsSalesInt/components/config.ts @@ -71,7 +71,7 @@ export const columns: BasicColumn[] = [ }, { - dataIndex: 'portUnloading1Code', + dataIndex: 'portUnloading1Name', title: '卸港港口', componentType: 'input', align: 'left', diff --git a/src/views/ship/OpsSalesInt/components/createForm.vue b/src/views/ship/OpsSalesInt/components/createForm.vue index 01971f2..4347456 100644 --- a/src/views/ship/OpsSalesInt/components/createForm.vue +++ b/src/views/ship/OpsSalesInt/components/createForm.vue @@ -528,7 +528,7 @@ formState.dateEnd = formState.dateEnd ? dayjs(formState.dateEnd) : null formState.datePayNtc = formState.datePayNtc ? dayjs(formState.datePayNtc) : null - formState.dateInv = formState.dateInv ? dayjs(formState.dateInv) : null + formState.dateIn = formState.dateIn ? dayjs(formState.dateIn) : null formState.dateRp = formState.dateRp ? dayjs(formState.dateRp) : null formState.dateBl = formState.dateBl ? dayjs(formState.dateBl) : null formState.datePost = formState.datePost ? dayjs(formState.datePost) : null @@ -623,38 +623,43 @@ getLngShipInfo(val[0].id) } const getLngShipInfo = async (id) => { - let data = await getLngShipSchedule(id) - formState.comId = data.comId - formState.kId = data.kId - formState.kName = data.kName - formState.longSpotCode = data.longSpotCode - formState.cuCode = data.cuCode - formState.cuName = data.cuName - formState.staCode = data.staCode - formState.staName = data.staName - formState.sourceName = data.sourceName - formState.empId = data.empId - formState.empName = data.empName - formState.empTel = data.empTel - formState.prcTermCode = data.prcTermCode - formState.shipCode = data.shipCode - formState.shipName = data.shipName - formState.dateNor = data.dateNor ? dayjs(data.dateNor) : null - formState.portUnloading1Code = data.portUnloading1Code - formState.portUnloading1Name = data.portUnloading1Name - formState.dateEta = data.dateEta ? dayjs(data.dateEta) : null - formState.dateEtb = data.dateEtb ? dayjs(data.dateEtb) : null - formState.dateEtc = data.dateEtc ? dayjs(data.dateEtc) : null - formState.dateEtd = data.dateEtd ? dayjs(data.dateEtd) : null - formState.qtyMmbtu = data.qtyMmbtu - formState.qtyGj = data.qtyGj - formState.qtyTon = data.qtyTon - formState.qtyM3 = data.qtyM3 - formState.curCode = data.curCode - formState.rateEx = data.rateEx - formState.priceCurrEst = data.priceCurrEst - formState.amountCurrEst = data.amountCurrEst - + try { + spinning.value = true + let data = await getLngShipSchedule(id) + spinning.value = false + formState.comId = data.comId + formState.kId = data.kId + formState.kName = data.kName + formState.longSpotCode = data.longSpotCode + formState.cuCode = data.cuCode + formState.cuName = data.cuName + formState.staCode = data.staCode + formState.staName = data.staName + formState.sourceName = data.sourceName + formState.empId = data.empId + formState.empName = data.empName + formState.empTel = data.empTel + formState.prcTermCode = data.prcTermCode + formState.shipCode = data.shipCode + formState.shipName = data.shipName + formState.dateNor = data.dateNor ? dayjs(data.dateNor) : null + formState.portUnloading1Code = data.portUnloading1Code + formState.portUnloading1Name = data.portUnloading1Name + formState.dateEta = data.dateEta ? dayjs(data.dateEta) : null + formState.dateEtb = data.dateEtb ? dayjs(data.dateEtb) : null + formState.dateEtc = data.dateEtc ? dayjs(data.dateEtc) : null + formState.dateEtd = data.dateEtd ? dayjs(data.dateEtd) : null + formState.qtyMmbtu = data.qtyMmbtu + formState.qtyGj = data.qtyGj + formState.qtyTon = data.qtyTon + formState.qtyM3 = data.qtyM3 + formState.curCode = data.curCode + formState.rateEx = data.rateEx + formState.priceCurrEst = data.priceCurrEst + formState.amountCurrEst = data.amountCurrEst + } catch (error) { + spinning.value = false + } } const handleSuccessContractPurInt = (val) => { formState.kId = val[0].id