From 3ce161bcbe9316eb8cd1760204ccfafcc2117a0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98huanghaiixia=E2=80=99?= <980486410@.com> Date: Mon, 2 Feb 2026 10:43:46 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/contract/ContractFact/index.ts | 4 +- src/api/dayPlan/PngAppro/index.ts | 2 +- src/api/dayPlan/PngApproGd/index.ts | 2 +- src/api/mdm/PipeGasDownloadPoint/index.ts | 2 +- src/views/approve/Appro/index.vue | 5 +- .../ContractFact/components/config.ts | 18 ++++ src/views/contract/ContractFact/index.vue | 6 +- .../ContractPurPng/components/config.ts | 37 +++++++++ src/views/contract/ContractPurPng/index.vue | 11 +-- .../ContractSales/components/config.ts | 25 +++++- src/views/contract/ContractSales/index.vue | 3 +- src/views/dayPlan/Demand/components/config.ts | 19 +++-- src/views/dayPlan/Demand/index.vue | 83 +++++++++++++++---- .../dayPlan/PngAppro/components/config.ts | 22 +++-- src/views/dayPlan/PngAppro/index.vue | 36 ++++---- src/views/dayPlan/PngApproGd/index.vue | 3 +- src/views/dayPlan/PngApproJsz/index.vue | 33 ++++++-- .../components/searchForm.vue | 36 +++++--- .../dayPlan/PngMeasureSalesPur/index.vue | 5 +- src/views/sales/Customer/index.vue | 3 +- .../sales/CustomerGroup/components/config.ts | 2 +- src/views/sales/CustomerGroup/index.vue | 3 +- src/views/sales/GradeSystem/index.vue | 3 +- src/views/sales/ScoreCustomer/index.vue | 3 +- src/views/supplier/ScoreSupplier/index.vue | 3 +- src/views/supplier/Supplier/index.vue | 3 +- 26 files changed, 282 insertions(+), 90 deletions(-) diff --git a/src/api/contract/ContractFact/index.ts b/src/api/contract/ContractFact/index.ts index c850027..88b39c0 100644 --- a/src/api/contract/ContractFact/index.ts +++ b/src/api/contract/ContractFact/index.ts @@ -3,8 +3,8 @@ import { defHttp } from '/@/utils/http/axios'; import { ErrorMessageMode } from '/#/axios'; enum Api { - Page = '/contract/contractFact/page', - // Page = '/magic-api/contract/lngContractFact/page', + // Page = '/contract/contractFact/page', + Page = '/magic-api/contract/lngContractFact/page', List = '/contract/contractFact/list', Info = '/contract/contractFact/info', LngContractFact = '/contract/contractFact', diff --git a/src/api/dayPlan/PngAppro/index.ts b/src/api/dayPlan/PngAppro/index.ts index cfc8b1e..66c390b 100644 --- a/src/api/dayPlan/PngAppro/index.ts +++ b/src/api/dayPlan/PngAppro/index.ts @@ -6,7 +6,7 @@ enum Api { // Page = '/dayPlan/pngAppro/page', Page = '/magic-api/dayPlan/pngApproXs/page', PageJsz = '/magic-api/dayPlan/pngApproJsz/page', - PageGd = '/magic-api//dayPlan/pngApproGd/page', + PageGd = '/magic-api/dayPlan/pngApproGd/page', List = '/dayPlan/pngAppro/list', Info = '/dayPlan/pngAppro/info', LngPngAppro = '/dayPlan/pngAppro', diff --git a/src/api/dayPlan/PngApproGd/index.ts b/src/api/dayPlan/PngApproGd/index.ts index 556640c..41fdec1 100644 --- a/src/api/dayPlan/PngApproGd/index.ts +++ b/src/api/dayPlan/PngApproGd/index.ts @@ -4,7 +4,7 @@ import { ErrorMessageMode } from '/#/axios'; enum Api { // Page = '/dayPlan/pngApproGd/page', - Page = '/magic-api//dayPlan/pngApproGd/page', + Page = '/magic-api/dayPlan/pngApproGd/page', List = '/dayPlan/pngApproGd/list', Info = '/dayPlan/pngApproGd/info', LngPngAppro = '/dayPlan/pngApproGd', diff --git a/src/api/mdm/PipeGasDownloadPoint/index.ts b/src/api/mdm/PipeGasDownloadPoint/index.ts index 9a96d20..8557e08 100644 --- a/src/api/mdm/PipeGasDownloadPoint/index.ts +++ b/src/api/mdm/PipeGasDownloadPoint/index.ts @@ -4,7 +4,7 @@ import { ErrorMessageMode } from '/#/axios'; enum Api { Page = '/mdm/pipeGasDownloadPoint/page', - List = '/mdm/pipeGasDownloadPoint/list', + List = '/mdm/pipeGasDownloadPoint/list', //不分页 Info = '/mdm/pipeGasDownloadPoint/info', LngBStationPng = '/mdm/pipeGasDownloadPoint', diff --git a/src/views/approve/Appro/index.vue b/src/views/approve/Appro/index.vue index 9e1dda5..1607fad 100644 --- a/src/views/approve/Appro/index.vue +++ b/src/views/approve/Appro/index.vue @@ -113,7 +113,8 @@ const taskIdRef = ref(''); const visibleFlowRecordModal = ref(false); const [registerModal, { openModal }] = useModal(); - const formName='签报'; + // const formName='签报'; + const formName=currentRoute.value.meta?.title; const defaultDate = ref([dayjs().subtract(6, 'day').format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD')]); const [registerTable, { reload, getForm }] = useTable({ title: '' || (formName + '列表'), @@ -168,7 +169,7 @@ }, } ], - fieldMapToTime: [['dateAppro', ['startDate', 'endDate'], 'YYYY-MM-DD ', true],], + fieldMapToTime: [['dateAppro', ['startDate', 'endDate'], 'YYYY-MM-DD '],], showResetButton: true, }, immediate: false, diff --git a/src/views/contract/ContractFact/components/config.ts b/src/views/contract/ContractFact/components/config.ts index 253add3..49917f5 100644 --- a/src/views/contract/ContractFact/components/config.ts +++ b/src/views/contract/ContractFact/components/config.ts @@ -21,6 +21,24 @@ export const searchFormSchema: FormSchema[] = [ labelField: 'name', valueField: 'value', + getPopupContainer: () => document.body, + }, + }, + { + field: 'comId', + label: '合同主体', + component: 'Input', + }, + { + field: 'approCode', + label: '审批状态', + component: 'XjrSelect', + componentProps: { + datasourceType: 'dic', + params: { itemId: '1990669393069129729' }, + labelField: 'name', + valueField: 'value', + getPopupContainer: () => document.body, }, }, diff --git a/src/views/contract/ContractFact/index.vue b/src/views/contract/ContractFact/index.vue index e659c20..15b43a7 100644 --- a/src/views/contract/ContractFact/index.vue +++ b/src/views/contract/ContractFact/index.vue @@ -112,7 +112,8 @@ const taskIdRef = ref(''); const visibleFlowRecordModal = ref(false); const [registerModal, { openModal }] = useModal(); - const formName='合同要素'; + // const formName='合同要素'; + const formName=currentRoute.value.meta?.title; const [registerTable, { reload, }] = useTable({ title: '' || (formName + '列表'), api: getLngContractFactPage, @@ -127,7 +128,7 @@ 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(); @@ -396,7 +397,6 @@ if (record.approCode == 'YSP') { actionsList = actionsList.concat(updateBtn); } - // if (record.workflowData?.enabled) { // //与工作流有关联的表单 // if (record.workflowData.status) { diff --git a/src/views/contract/ContractPurPng/components/config.ts b/src/views/contract/ContractPurPng/components/config.ts index 135e4d3..d9aeffa 100644 --- a/src/views/contract/ContractPurPng/components/config.ts +++ b/src/views/contract/ContractPurPng/components/config.ts @@ -17,6 +17,43 @@ export const searchFormSchema: FormSchema[] = [ label: '供应商', component: 'Input', }, + { + field: 'comId', + label: '合同主体', + component: 'Input', + }, + { + field: 'pointUpName', + label: '上载点', + component: 'Input', + // componentProps: { + // showSearch: true, + // optionFilterProp: 'label', + // filterOption: (input: string, option: any) => { + // return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0; + // }, + // options: [ + // // { label: '全部', value: '' }, + // ], + // placeholder: '请选择', + // allowClear: true, + + // getPopupContainer: () => document.body, + // }, + }, + { + field: 'approCode', + label: '审批状态', + component: 'XjrSelect', + componentProps: { + datasourceType: 'dic', + params: { itemId: '1990669393069129729' }, + labelField: 'name', + valueField: 'value', + + getPopupContainer: () => document.body, + }, + }, ]; export const columns: BasicColumn[] = [ diff --git a/src/views/contract/ContractPurPng/index.vue b/src/views/contract/ContractPurPng/index.vue index 52bdeba..746bc72 100644 --- a/src/views/contract/ContractPurPng/index.vue +++ b/src/views/contract/ContractPurPng/index.vue @@ -112,7 +112,8 @@ const taskIdRef = ref(''); const visibleFlowRecordModal = ref(false); const [registerModal, { openModal }] = useModal(); - const formName='国内管道气采购'; + // const formName='国内管道气采购'; + const formName=currentRoute.value.meta?.title; const [registerTable, { reload, }] = useTable({ title: '' || (formName + '列表'), api: getLngContractPage, @@ -496,13 +497,7 @@ :deep(.ant-table-selection-col) { width: 50px; } - :deep(.ant-col-8:nth-child(1) .ant-form-item-label) { - width: 100px !important; - } - :deep(.ant-col-8:nth-child(1)) { - max-width: 300px !important; - width: 300px !important; - } + .show{ display: flex; } diff --git a/src/views/contract/ContractSales/components/config.ts b/src/views/contract/ContractSales/components/config.ts index e575e07..87cf5e3 100644 --- a/src/views/contract/ContractSales/components/config.ts +++ b/src/views/contract/ContractSales/components/config.ts @@ -15,7 +15,30 @@ export const searchFormSchema: FormSchema[] = [ field: 'cpName', label: '客户', component: 'Input', - } + }, + { + field: 'comId', + label: '合同主体', + component: 'Input', + }, + { + field: 'pointUpName', + label: '交割点', + component: 'Input', + }, + { + field: 'approCode', + label: '审批状态', + component: 'XjrSelect', + componentProps: { + datasourceType: 'dic', + params: { itemId: '1990669393069129729' }, + labelField: 'name', + valueField: 'value', + + getPopupContainer: () => document.body, + }, + }, ]; export const columns: BasicColumn[] = [ diff --git a/src/views/contract/ContractSales/index.vue b/src/views/contract/ContractSales/index.vue index eccdf60..1892097 100644 --- a/src/views/contract/ContractSales/index.vue +++ b/src/views/contract/ContractSales/index.vue @@ -112,7 +112,8 @@ const taskIdRef = ref(''); const visibleFlowRecordModal = ref(false); const [registerModal, { openModal }] = useModal(); - const formName='国内管道气销售'; + // const formName='国内管道气销售'; + const formName=currentRoute.value.meta?.title; const [registerTable, { reload, }] = useTable({ title: '' || (formName + '列表'), api: getLngContractPage, diff --git a/src/views/dayPlan/Demand/components/config.ts b/src/views/dayPlan/Demand/components/config.ts index 7aca503..f906236 100644 --- a/src/views/dayPlan/Demand/components/config.ts +++ b/src/views/dayPlan/Demand/components/config.ts @@ -6,6 +6,16 @@ export const formConfig = { }; export const searchFormSchema: FormSchema[] = [ + { + field: 'datePlan', + label: '计划日期', + component: 'RangePicker', + componentProps: { + format: 'YYYY-MM-DD', + style: { width: '100%' }, + getPopupContainer: () => document.body, + }, + }, { field: 'pointDelyName', @@ -118,15 +128,6 @@ export const columns: BasicColumn[] = [ sorter: true, }, - { - dataIndex: 'note', - title: '备注', - componentType: 'input', - align: 'left', - - sorter: true, - }, - { dataIndex: 'reply', title: '批复意见', diff --git a/src/views/dayPlan/Demand/index.vue b/src/views/dayPlan/Demand/index.vue index ca413a8..f45c019 100644 --- a/src/views/dayPlan/Demand/index.vue +++ b/src/views/dayPlan/Demand/index.vue @@ -68,7 +68,8 @@ import useEventBus from '/@/hooks/event/useEventBus'; import { cloneDeep } from 'lodash-es'; import NP from 'number-precision'; - + 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 { notification } = useMessage(); @@ -124,7 +125,8 @@ const [registerModal, { openModal }] = useModal(); const [registerImportModal, { openModal: openImportModal }] = useModal(); - const formName='日计划-客户需求'; + // const formName='管道气日计划'; + const formName=currentRoute.value.meta?.title; const [registerTable, { reload, clearSelectedRowKeys }] = useTable({ title: '' || (formName + '列表'), api: getLngPngDemandPage, @@ -134,8 +136,44 @@ rowProps: { gutter: 16, }, - schemas: customSearchFormSchema, - fieldMapToTime: [], + schemas: [ + { + field: 'datePlan', + label: '计划日期', + component: 'RangePicker', + defaultValue: defaultDate.value, + componentProps: { + format: 'YYYY-MM-DD', + style: { width: '100%' }, + getPopupContainer: () => document.body, + }, + }, + + { + field: 'pointDelyName', + label: '下载点', + component: 'Input', + }, + { + field: 'kName', + label: '销售合同名称/编码', + component: 'Input', + }, + { + field: 'approCode', + label: '审批状态', + component: 'XjrSelect', + componentProps: { + datasourceType: 'dic', + params: { itemId: '1990669393069129729' }, + labelField: 'name', + valueField: 'value', + + getPopupContainer: () => document.body, + }, + }, + ], + fieldMapToTime: [['datePlan', ['startDate', 'endDate'], 'YYYY-MM-DD']], showResetButton: true, submitButtonOptions: { text: '搜索', @@ -150,6 +188,7 @@ }, }, }, + immediate: false, beforeFetch: (params) => { return { ...params, FormId: formIdComputedRef.value, PK: 'id',page:params.limit }; }, @@ -209,7 +248,7 @@ path: '/dayPlan/Demand/createForm', query: { formPath: 'dayPlan/Demand', - formName: formName, + formName: "查看"+formName, formId:currentRoute.value.meta.formId, id: record.id, type:'view' @@ -237,7 +276,7 @@ path: '/dayPlan/Demand/createForm', query: { formPath: 'dayPlan/Demand', - formName: formName, + formName: "新建"+formName, formId:currentRoute.value.meta.formId } }); @@ -249,7 +288,7 @@ path: '/dayPlan/Demand/createForm', query: { formPath: 'dayPlan/Demand', - formName: formName, + formName: "编辑"+formName, formId:currentRoute.value.meta.formId, id: record.id, type: 'edit' @@ -262,7 +301,7 @@ path: '/dayPlan/Demand/createForm', query: { formPath: 'dayPlan/Demand', - formName: formName, + formName: "对比"+formName, formId:currentRoute.value.meta.formId, id: record.id, type: 'compare' @@ -394,6 +433,7 @@ reload() } onMounted(() => { + reload({ searchInfo: { startDate: defaultDate.value[0], endDate: defaultDate.value[1] }}); if (schemaIdComputedRef.value) { bus.on(FLOW_PROCESSED, handleRefresh); @@ -557,7 +597,10 @@ }; \ No newline at end of file diff --git a/src/views/dayPlan/PngAppro/components/config.ts b/src/views/dayPlan/PngAppro/components/config.ts index 4622b68..8b3fc1d 100644 --- a/src/views/dayPlan/PngAppro/components/config.ts +++ b/src/views/dayPlan/PngAppro/components/config.ts @@ -6,7 +6,21 @@ export const formConfig = { }; export const searchFormSchema: FormSchema[] = [ - + { + field: 'cuCode', + label: '客户名称', + component: 'Input', + }, + { + field: 'kName', + label: '合同名称', + component: 'Input', + }, + { + field: 'pointDelyName', + label: '下载点', + component: 'Input', + }, { field: 'datePlan', label: '计划日期', @@ -17,12 +31,8 @@ export const searchFormSchema: FormSchema[] = [ getPopupContainer: () => document.body, }, }, + { - field: 'cuCode', - label: '客户名称/简称/编码', - component: 'Input', - }, - { field: 'approCode', label: '审批状态', component: 'XjrSelect', diff --git a/src/views/dayPlan/PngAppro/index.vue b/src/views/dayPlan/PngAppro/index.vue index 72c1f06..25b83e0 100644 --- a/src/views/dayPlan/PngAppro/index.vue +++ b/src/views/dayPlan/PngAppro/index.vue @@ -115,7 +115,8 @@ const [registerModal, { openModal}] = useModal(); const [registerApproStatus, { openModal: openModalApproStatus}] = useModal(); - let formName='管道气销售审批'; + // let formName='管道气销售审批'; + const formName=currentRoute.value.meta?.title; let curPath = 'dayPlan/PngAppro/index' const [registerTable, { reload, clearSelectedRowKeys, setTableData }] = useTable({ title: '' || (formName + '列表'), @@ -204,7 +205,7 @@ path: '/dayPlan/PngAppro/createForm', query: { formPath: curPath, - formName: formName, + formName: "查看"+formName, formId:currentRoute.value.meta.formId, id: record.id, type: 'view' @@ -247,7 +248,7 @@ path: '/dayPlan/PngAppro/createForm', query: { formPath: curPath, - formName: formName, + formName: "审批"+formName, formId:currentRoute.value.meta.formId, id: record.id } @@ -258,7 +259,7 @@ path: '/dayPlan/PngAppro/createForm', query: { formPath: curPath, - formName: formName+'对比', + formName: '对比'+formName, formId:currentRoute.value.meta.formId, id: record.demandOrgId, type: 'compare' @@ -444,24 +445,31 @@ :deep(.ant-table-selection-col) { width: 50px; } - :deep( .ant-col-8:nth-child(1)) { + :deep( .ant-col-8:nth-child(4)) { width: 320px !important; max-width: 320px !important;; } - :deep(.ant-col-8:nth-child(1) .ant-form-item-label) { + :deep(.ant-col-8:nth-child(4) .ant-form-item-label) { width: 80px !important; } - :deep( .ant-col-8:nth-child(2)) { - width: 360px !important; + :deep( .w-full .ant-col-8:nth-child(1)) { + width: 320px !important; max-width: 320px !important;; } - :deep(.ant-col-8:nth-child(2) .ant-form-item-label) { - width: 160px !important; - } - :deep(.ant-col-8:nth-child(2) .ant-form-item-label .ant-form-item-no-colon) { - width: 160px !important; - max-width: 160px !important; + :deep(.w-full .ant-col-8:nth-child(1) .ant-form-item-label) { + width: 80px !important; } + // :deep( .ant-col-8:nth-child(2)) { + // width: 360px !important; + // max-width: 320px !important;; + // } + // :deep(.ant-col-8:nth-child(2) .ant-form-item-label) { + // width: 160px !important; + // } + // :deep(.ant-col-8:nth-child(2) .ant-form-item-label .ant-form-item-no-colon) { + // width: 160px !important; + // max-width: 160px !important; + // } .show{ display: flex; } diff --git a/src/views/dayPlan/PngApproGd/index.vue b/src/views/dayPlan/PngApproGd/index.vue index 4d876d2..32000f2 100644 --- a/src/views/dayPlan/PngApproGd/index.vue +++ b/src/views/dayPlan/PngApproGd/index.vue @@ -95,7 +95,8 @@ const schemaIdComputedRef = ref(); schemaIdComputedRef.value = currentRoute.value.meta.schemaId const [registerModal, { openModal }] = useModal(); - const formName='管道气管道审批'; + // const formName='管道气管道审批'; + const formName=currentRoute.value.meta?.title; const [registerTable, { reload, clearSelectedRowKeys }] = useTable({ title: '' || (formName + '列表'), api: getLngPngApproPage, diff --git a/src/views/dayPlan/PngApproJsz/index.vue b/src/views/dayPlan/PngApproJsz/index.vue index a391ed6..e5d23c3 100644 --- a/src/views/dayPlan/PngApproJsz/index.vue +++ b/src/views/dayPlan/PngApproJsz/index.vue @@ -51,9 +51,9 @@ import useEventBus from '/@/hooks/event/useEventBus'; import { cloneDeep } from 'lodash-es'; import rejectReplyModal from '/@/components/common/rejectReplyModal.vue'; - + import dayjs from 'dayjs'; const { bus, CREATE_FLOW, FLOW_PROCESSED, FORM_LIST_MODIFIED } = useEventBus(); - + const defaultDate = ref([dayjs().format('YYYY-MM-DD'),dayjs().add(1, 'day').format('YYYY-MM-DD')]); const { notification } = useMessage(); const { t } = useI18n(); defineEmits(['register']); @@ -96,7 +96,8 @@ const schemaIdComputedRef = ref(); schemaIdComputedRef.value = currentRoute.value.meta.schemaId const [registerModal, { openModal }] = useModal(); - const formName='管道气接收站审批'; + // const formName='管道气接收站审批'; + const formName=currentRoute.value.meta?.title; const [registerTable, { reload, clearSelectedRowKeys }] = useTable({ title: '' || (formName + '列表'), api: getLngPngApproPage, @@ -106,10 +107,23 @@ rowProps: { gutter: 16, }, - schemas: customSearchFormSchema, - fieldMapToTime: [['datePlan', ['startDate', 'endDate'], 'YYYY-MM-DD HH:mm:ss ', true],], + schemas: [ + { + field: 'datePlan', + label: '计划日期', + component: 'RangePicker', + defaultValue: defaultDate.value, + componentProps: { + format: 'YYYY-MM-DD', + style: { width: '100%' }, + getPopupContainer: () => document.body, + }, + }, + ], + fieldMapToTime: [['datePlan', ['startDate', 'endDate'], 'YYYY-MM-DD'],], showResetButton: true, }, + immediate: false, beforeFetch: (params) => { return { ...params, FormId: formIdComputedRef.value, PK: 'id',page: params.limit }; }, @@ -308,7 +322,7 @@ } onMounted(() => { - + reload({ searchInfo: { startDate: defaultDate.value[0], endDate: defaultDate.value[1] }}); if (schemaIdComputedRef.value) { bus.on(FLOW_PROCESSED, handleRefresh); bus.on(CREATE_FLOW, handleRefresh); @@ -390,4 +404,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/dayPlan/PngMeasureSalesPur/components/searchForm.vue b/src/views/dayPlan/PngMeasureSalesPur/components/searchForm.vue index 4f3485f..29d949e 100644 --- a/src/views/dayPlan/PngMeasureSalesPur/components/searchForm.vue +++ b/src/views/dayPlan/PngMeasureSalesPur/components/searchForm.vue @@ -26,19 +26,31 @@ - + + - + + - + + + + + + + + + {{ item.label }} + + + @@ -80,6 +92,12 @@ wrapperCol: { span: 15 }, } const isAdvanced = ref(false) + const statusList = [ + {label: '计量中', value: 'JLZ'}, + {label: '结算中', value: 'JSZ'}, + {label: '已结算', value: 'YJS'}, + {label: '计量完成', value: 'JLWC'}, + ] onMounted(() => { @@ -105,15 +123,13 @@ const onSearch = () => { let obj = { ...formState.value, - startDate: formState.value.datePlan ? dayjs(formState.value.datePlan[0]).format('YYYY-MM-DD') : '', - endDate: formState.value.datePlan ? dayjs(formState.value.datePlan[1]).format('YYYY-MM-DD') : '', + // startDate: formState.value.datePlan ? dayjs(formState.value.datePlan[0]).format('YYYY-MM-DD') : '', + // endDate: formState.value.datePlan ? dayjs(formState.value.datePlan[1]).format('YYYY-MM-DD') : '', dateMeaStart: formState.value.dateMea ? dayjs(formState.value.dateMea[0]).format('YYYY-MM-DD') : '', dateMeaEnd: formState.value.dateMea ? dayjs(formState.value.dateMea[1]).format('YYYY-MM-DD') : '', } - delete obj.datePlan + // delete obj.datePlan delete obj.dateMea - delete obj.pointUpName - delete obj.pointDelyName emit('search', obj) } const onReset = () => { diff --git a/src/views/dayPlan/PngMeasureSalesPur/index.vue b/src/views/dayPlan/PngMeasureSalesPur/index.vue index fda5f3e..7c8e6ad 100644 --- a/src/views/dayPlan/PngMeasureSalesPur/index.vue +++ b/src/views/dayPlan/PngMeasureSalesPur/index.vue @@ -156,7 +156,8 @@ const tableName = 'PngMeasureSalesPur'; const columnName = 'PngMeasureSalesPur'; - const formName='管道气采购计量'; + // const formName='管道气采购计量'; + const formName=currentRoute.value.meta?.title; const loadData = async () => { loading.value = true; @@ -218,7 +219,7 @@ path: '/dayPlan/PngMeasureSalesPur/createForm', query: { formPath: 'dayPlan/PngMeasureSalesPur', - formName: formName, + formName: "新建"+formName, formId:currentRoute.value.meta.formId, type:'add' } diff --git a/src/views/sales/Customer/index.vue b/src/views/sales/Customer/index.vue index 228c150..7ed3457 100644 --- a/src/views/sales/Customer/index.vue +++ b/src/views/sales/Customer/index.vue @@ -112,7 +112,8 @@ const taskIdRef = ref(''); const visibleFlowRecordModal = ref(false); const [registerModal, { openModal }] = useModal(); - const formName='客户'; + // const formName='客户'; + const formName=currentRoute.value.meta?.title; const [registerTable, { reload, clearSelectedRowKeys }] = useTable({ title: '' || (formName + '列表'), api: getLngCustomerPage, diff --git a/src/views/sales/CustomerGroup/components/config.ts b/src/views/sales/CustomerGroup/components/config.ts index 027f2bf..82f4f82 100644 --- a/src/views/sales/CustomerGroup/components/config.ts +++ b/src/views/sales/CustomerGroup/components/config.ts @@ -58,7 +58,7 @@ export const columns: BasicColumn[] = [ { dataIndex: 'dateFrom', - title: '超始日期', + title: '起始日期', componentType: 'date', align: 'left', diff --git a/src/views/sales/CustomerGroup/index.vue b/src/views/sales/CustomerGroup/index.vue index 7fca38c..dbb6548 100644 --- a/src/views/sales/CustomerGroup/index.vue +++ b/src/views/sales/CustomerGroup/index.vue @@ -88,7 +88,8 @@ const schemaIdComputedRef = ref(); schemaIdComputedRef.value = currentRoute.value.meta.schemaId const [registerModal, { openModal }] = useModal(); - const formName='客户组'; + // const formName='客户组'; + const formName=currentRoute.value.meta?.title; const [registerTable, { reload, clearSelectedRowKeys }] = useTable({ title: '' || (formName + '列表'), api: getLngCustomerGroupPage, diff --git a/src/views/sales/GradeSystem/index.vue b/src/views/sales/GradeSystem/index.vue index cc8c167..4063e35 100644 --- a/src/views/sales/GradeSystem/index.vue +++ b/src/views/sales/GradeSystem/index.vue @@ -90,7 +90,8 @@ const schemaIdComputedRef = ref(); schemaIdComputedRef.value = currentRoute.value.meta.schemaId const [registerModal, { openModal }] = useModal(); - const formName='评价体系'; + // const formName='评价体系'; + const formName=currentRoute.value.meta?.title; const [registerTable, { reload, clearSelectedRowKeys }] = useTable({ title: '' || (formName + '列表'), api: getLngGradeSystemPage, diff --git a/src/views/sales/ScoreCustomer/index.vue b/src/views/sales/ScoreCustomer/index.vue index 9a18268..fde321d 100644 --- a/src/views/sales/ScoreCustomer/index.vue +++ b/src/views/sales/ScoreCustomer/index.vue @@ -115,7 +115,8 @@ const taskIdRef = ref(''); const visibleFlowRecordModal = ref(false); const [registerModal, { openModal }] = useModal(); - const formName='客户评价'; + // const formName='客户评价'; + const formName=currentRoute.value.meta?.title; const [registerTable, { reload, clearSelectedRowKeys }] = useTable({ title: '' || (formName + '列表'), api: getLngScorePage, diff --git a/src/views/supplier/ScoreSupplier/index.vue b/src/views/supplier/ScoreSupplier/index.vue index 33c2c48..f1532ef 100644 --- a/src/views/supplier/ScoreSupplier/index.vue +++ b/src/views/supplier/ScoreSupplier/index.vue @@ -112,7 +112,8 @@ const taskIdRef = ref(''); const visibleFlowRecordModal = ref(false); const [registerModal, { openModal }] = useModal(); - const formName='供应商评价'; + // const formName='供应商评价'; + const formName=currentRoute.value.meta?.title; const [registerTable, { reload, clearSelectedRowKeys }] = useTable({ title: '' || (formName + '列表'), api: getLngScorePage, diff --git a/src/views/supplier/Supplier/index.vue b/src/views/supplier/Supplier/index.vue index 5c4bf09..3b26be5 100644 --- a/src/views/supplier/Supplier/index.vue +++ b/src/views/supplier/Supplier/index.vue @@ -110,7 +110,8 @@ const taskIdRef = ref(''); const visibleFlowRecordModal = ref(false); const [registerModal, { openModal }] = useModal(); - const formName='供应商'; + // const formName='供应商'; + const formName=currentRoute.value.meta?.title; const [registerTable, { reload, clearSelectedRowKeys }] = useTable({ title: '' || (formName + '列表'), api: getLngSupplierPage, From 58d7079f1d1ae5fa6312ce68e2407d11bc77bc67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98huanghaiixia=E2=80=99?= <980486410@.com> Date: Mon, 2 Feb 2026 13:50:57 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/web/useCommon.ts | 10 ---------- src/views/dayPlan/Demand/components/config.ts | 2 +- src/views/dayPlan/PngAppro/components/config.ts | 2 +- .../dayPlan/PngMeasureSalesPur/components/config.ts | 2 +- 4 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 src/hooks/web/useCommon.ts diff --git a/src/hooks/web/useCommon.ts b/src/hooks/web/useCommon.ts deleted file mode 100644 index b34e48a..0000000 --- a/src/hooks/web/useCommon.ts +++ /dev/null @@ -1,10 +0,0 @@ - - -export function numToThousands(number) { - if (number === null || number === undefined || number === '') return '' - let arr = number.toString().split('.') - let num = arr[0] - let float = arr[1] - let str = num.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") - return float ? (str + '.'+ float) : str; -} diff --git a/src/views/dayPlan/Demand/components/config.ts b/src/views/dayPlan/Demand/components/config.ts index f906236..688b4ac 100644 --- a/src/views/dayPlan/Demand/components/config.ts +++ b/src/views/dayPlan/Demand/components/config.ts @@ -61,7 +61,7 @@ export const columns: BasicColumn[] = [ title: '版本号', componentType: 'input', align: 'left', - width: 100, + width: 80, sorter: true, }, diff --git a/src/views/dayPlan/PngAppro/components/config.ts b/src/views/dayPlan/PngAppro/components/config.ts index 8b3fc1d..28c994f 100644 --- a/src/views/dayPlan/PngAppro/components/config.ts +++ b/src/views/dayPlan/PngAppro/components/config.ts @@ -225,7 +225,7 @@ export const columns: BasicColumn[] = [ }, { - dataIndex: 'poinDelyName', + dataIndex: 'pointDelyName', title: '下载点', componentType: 'input', align: 'left', diff --git a/src/views/dayPlan/PngMeasureSalesPur/components/config.ts b/src/views/dayPlan/PngMeasureSalesPur/components/config.ts index 41bd0da..fecdc51 100644 --- a/src/views/dayPlan/PngMeasureSalesPur/components/config.ts +++ b/src/views/dayPlan/PngMeasureSalesPur/components/config.ts @@ -171,7 +171,7 @@ export const columns: BasicColumn[] = [ sorter: true, }, { - dataIndex: 'ksNmae', + dataIndex: 'ksName', title: '销售合同', componentType: 'input', align: 'left', 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 3/3] =?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 @@ + + @@ -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 @@ -