From fb23a516d5dc35fa31e70edf9bf59e8d1bce3993 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98huanghaiixia=E2=80=99?= <980486410@.com> Date: Thu, 12 Mar 2026 16:08:31 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A1=E9=87=8F?= =?UTF-8?q?=E5=AE=A2=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dayPlan/PngAppro/index.vue | 2 +- src/views/dayPlan/PngApproGd/index.vue | 9 +- src/views/dayPlan/PngApproJsz/index.vue | 9 +- .../PngMeasureSalesPur/components/config.ts | 78 ++- .../components/createForm.vue | 240 ++++++++- .../dayPlan/PngMeasureSalesPur/index.vue | 457 ++++++++++-------- .../dayPlan/PngMeasureSalesPur/indexOld.vue | 244 +++++----- 7 files changed, 634 insertions(+), 405 deletions(-) diff --git a/src/views/dayPlan/PngAppro/index.vue b/src/views/dayPlan/PngAppro/index.vue index 1ba9ef7..48143f3 100644 --- a/src/views/dayPlan/PngAppro/index.vue +++ b/src/views/dayPlan/PngAppro/index.vue @@ -142,7 +142,7 @@ gutter: 16, }, schemas: customSearchFormSchema, - fieldMapToTime: [['datePlan', ['startDate', 'endDate'], 'YYYY-MM-DD HH:mm:ss ', true]], + fieldMapToTime: [['datePlan', ['startDate', 'endDate'], 'YYYY-MM-DD']], showResetButton: true, submitButtonOptions: { text: '搜索', diff --git a/src/views/dayPlan/PngApproGd/index.vue b/src/views/dayPlan/PngApproGd/index.vue index 59db5ea..e396964 100644 --- a/src/views/dayPlan/PngApproGd/index.vue +++ b/src/views/dayPlan/PngApproGd/index.vue @@ -86,7 +86,7 @@ const tableButtonConfig = computed(() => { // return buttonConfigs.value?.filter((x) => !actionButtons.value.includes(x.code)); - return [{"isUse":true,"name":"审批通过","code":"approveGD","icon":"ant-design:check-outlined","isDefault":true}] + return [{"isUse":true,"name":"审批通过","code":"approveGD","icon":"ant-design:check-outlined","isDefault":true},{"name":"刷新","code":"refresh","icon":"ant-design:reload-outlined","isDefault":true,"isUse":true}] }); const actionButtonConfig = computed(() => { @@ -245,8 +245,11 @@ } function buttonClick(code) { - // btnEvent[code](); - handleBatchApprove() + if (code== 'refresh') { + btnEvent[code](); + } else { + handleBatchApprove() + } } function handleDatalog (record: Recordable) { modalVisible.value = true diff --git a/src/views/dayPlan/PngApproJsz/index.vue b/src/views/dayPlan/PngApproJsz/index.vue index 5e2fa90..922717b 100644 --- a/src/views/dayPlan/PngApproJsz/index.vue +++ b/src/views/dayPlan/PngApproJsz/index.vue @@ -86,7 +86,7 @@ }) const tableButtonConfig = computed(() => { - return [{"isUse":true,"name":"审批通过","code":"approveGD","icon":"ant-design:check-outlined","isDefault":true}] + return [{"isUse":true,"name":"审批通过","code":"approveGD","icon":"ant-design:check-outlined","isDefault":true},{"name":"刷新","code":"refresh","icon":"ant-design:reload-outlined","isDefault":true,"isUse":true}] // return buttonConfigs.value?.filter((x) => !actionButtons.value.includes(x.code)); }); @@ -259,8 +259,11 @@ } function buttonClick(code) { - handleBatchApprove() - // btnEvent[code](); + if (code== 'refresh') { + btnEvent[code](); + } else { + handleBatchApprove() + } } function handleDatalog (record: Recordable) { modalVisible.value = true diff --git a/src/views/dayPlan/PngMeasureSalesPur/components/config.ts b/src/views/dayPlan/PngMeasureSalesPur/components/config.ts index a09d9b6..be602fd 100644 --- a/src/views/dayPlan/PngMeasureSalesPur/components/config.ts +++ b/src/views/dayPlan/PngMeasureSalesPur/components/config.ts @@ -7,8 +7,8 @@ export const formConfig = { export const searchFormSchema: FormSchema[] = [ { - field: 'datePlan', - label: '计划日期', + field: 'dateMea', + label: '计量日期', component: 'RangePicker', componentProps: { format: 'YYYY-MM-DD', @@ -22,13 +22,13 @@ export const searchFormSchema: FormSchema[] = [ component: 'Input', }, { - field: 'pointUpName', - label: '上载点', + field: 'pointDelyName', + label: '下载点', component: 'Input', }, { - field: 'pointUpName', - label: '上载点', + field: 'pointDelyName', + label: '下载点', component: 'Input', }, ]; @@ -52,15 +52,15 @@ export const columns: BasicColumn[] = [ width: 120, sorter: true, }, - { - dataIndex: 'cuSname', - title: '客户', - componentType: 'input', - align: 'left', - ellipsis: true, - width: 200, - sorter: true, - }, + // { + // dataIndex: 'cuSname', + // title: '客户', + // componentType: 'input', + // align: 'left', + // ellipsis: true, + // width: 200, + // sorter: true, + // }, { dataIndex: 'pointDelyName', title: '下载点', @@ -101,7 +101,7 @@ export const columns: BasicColumn[] = [ { dataIndex: 'qtySalesM3', - title: '批复量(万方)', + title: '批复量(方)', componentType: 'input', align: 'left', width: 120, @@ -110,7 +110,7 @@ export const columns: BasicColumn[] = [ { dataIndex: 'qtyMeaGj', - title: '完成量(吉焦)', + title: '提气量(吉焦)', componentType: 'input', align: 'left', width: 120, @@ -119,13 +119,20 @@ export const columns: BasicColumn[] = [ { dataIndex: 'qtyMeaM3', - title: '完成量(万方)', + title: '提气量(方)', componentType: 'input', align: 'left', width: 120, sorter: true, }, - + { + dataIndex: 'lngFileUploadList', + title: '附件', + componentType: 'input', + align: 'left', + width: 200, + sorter: true, + }, { dataIndex: 'rateM3Gj', title: '比值(方/吉焦)', @@ -137,7 +144,7 @@ export const columns: BasicColumn[] = [ { dataIndex: 'cfmCuUserName', - title: '客户确认人', + title: '确认人', componentType: 'input', align: 'left', width: 110, @@ -146,7 +153,7 @@ export const columns: BasicColumn[] = [ { dataIndex: 'cfmCuUserTime', - title: '客户确认时间', + title: '确认时间', componentType: 'input', align: 'left', width: 180, @@ -155,7 +162,7 @@ export const columns: BasicColumn[] = [ { dataIndex: 'cfmEmpName', - title: '内部确认人', + title: '业务确认人', componentType: 'input', align: 'left', width: 110, @@ -164,7 +171,7 @@ export const columns: BasicColumn[] = [ { dataIndex: 'cfmEmpTime', - title: '内部确认时间', + title: '业务确认时间', componentType: 'input', align: 'left', width: 150, @@ -172,32 +179,13 @@ export const columns: BasicColumn[] = [ }, { dataIndex: 'ksName', - title: '销售合同', + title: '合同', componentType: 'input', align: 'left', ellipsis: true, width: 200, sorter: true, }, - { - dataIndex: 'kpName', - title: '采购合同', - componentType: 'input', - align: 'left', - ellipsis: true, - width: 200, - sorter: true, - }, - - { - dataIndex: 'lngFileUploadList', - title: '附件', - componentType: 'input', - align: 'left', - width: 200, - sorter: true, - }, - { dataIndex: 'statusName', title: '状态', @@ -208,8 +196,8 @@ export const columns: BasicColumn[] = [ }, { - dataIndex: 'note', - title: '备注', + dataIndex: 'rejNote', + title: '驳回意见', componentType: 'input', align: 'left', ellipsis: true, diff --git a/src/views/dayPlan/PngMeasureSalesPur/components/createForm.vue b/src/views/dayPlan/PngMeasureSalesPur/components/createForm.vue index 48e2567..d19c94e 100644 --- a/src/views/dayPlan/PngMeasureSalesPur/components/createForm.vue +++ b/src/views/dayPlan/PngMeasureSalesPur/components/createForm.vue @@ -1,7 +1,7 @@ \ No newline at end of file diff --git a/src/views/dayPlan/PngMeasureSalesPur/indexOld.vue b/src/views/dayPlan/PngMeasureSalesPur/indexOld.vue index e4b981b..d0fc3fa 100644 --- a/src/views/dayPlan/PngMeasureSalesPur/indexOld.vue +++ b/src/views/dayPlan/PngMeasureSalesPur/indexOld.vue @@ -17,27 +17,25 @@ - + - - + + @@ -94,9 +93,11 @@ import { downloadByUrl } from '/@/utils/file/download'; import { DeleteOutlined } from '@ant-design/icons-vue'; import searchForm from './components/searchForm.vue' + import NP from 'number-precision'; + import createFormModal from './components/createForm.vue' const { bus, CREATE_FLOW, FLOW_PROCESSED, FORM_LIST_MODIFIED } = useEventBus(); - + const numFormat = "###,###,###,###,###,###.000" const { notification } = useMessage(); const { t } = useI18n(); defineEmits(['register']); @@ -108,6 +109,29 @@ const customSearchFormSchema =ref(searchFormSchema); const tableRef = ref(); + const tableData = ref([]) + const total = ref(0); + const currentPage = ref(1); + const pageSize = ref(10); + const loading = ref(false) + // 分页配置 + const pagination = computed(() => ({ + total: total.value, + current: currentPage.value, + pageSize: pageSize.value, + showQuickJumper: true, + showSizeChanger: true, + showTotal: (total: number) => `共 ${total}条数据`, + pageSizeOptions: ["10", "20", "50", "80", "100"], + onShowSizeChange: (current, pageSize) => { + pageSize.value = pageSize; + loadData() + }, + onChange: (current, size) => { + pageSize.value = size; + loadData() + }, + })); //所有按钮 const buttons = ref([{"isUse":true,"name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"type":"primary"},{"isUse":true,"name":"保存","code":"save","icon":"ant-design:save-outlined","isDefault":true},{"isUse":true,"name":"保存并确认","code":"submit","icon":"ant-design:check-outlined","isDefault":true},{"isUse":true,"name":"取消确认","code":"cancel","icon":"ant-design:rollback-outlined","isDefault":true},{"isUse":true,"name":"驳回","code":"reject","icon":"ant-design:stop-outlined","isDefault":true},{"isUse":true,"name":"导出","code":"export","icon":"ant-design:export-outlined","isDefault":true},{"isUse":true,"name":"导入","code":"import","icon":"ant-design:import-outlined","isDefault":true},{"isUse":true,"name":"删除","code":"batchdelete","icon":"ant-design:delete-outlined","isDefault":true},{"isUse":true,"name":"刷新","code":"refresh","icon":"ant-design:reload-outlined","isDefault":true}]); //展示在列表内的按钮 @@ -138,44 +162,36 @@ const curIdx = ref() const [registerModal, { openModal }] = useModal(); + const [registerModalForm, { openModal: openModalForm }] = useModal(); const [registerImportModal, { openModal: openImportModal }] = useModal(); const tableId = ''; const tableName = 'PngMeasureSalesPur'; const columnName = 'PngMeasureSalesPur'; - const formName='管道气采购计量'; - const [registerTable, { reload, clearSelectedRowKeys, getDataSource, updateTableDataRecord }] = useTable({ - title: '' || (formName + '列表'), - api: getLngPngMeasureSalesPurPage, - rowKey: 'id', - immediate: false, - columns: customConfigColums, - formConfig: { - schemas: [], - showResetButton: false, - showSubmitButton: false - }, - beforeFetch: (params) => { - return { ...params, FormId: formIdComputedRef.value, PK: 'id',page: params.limit, ...formState.value}; - }, - afterFetch: (res) => { - tableRef.value.setToolBarWidth(); - - }, - useSearchForm: true, - showTableSetting: true, - - striped: false, - rowSelection: { - type: 'checkbox', - onChange: onSelectChange - }, - tableSetting: { - size: false, - setting: false, - }, - customRow, - }); + // const formName='管道气采购计量'; + const formName=currentRoute.value.meta?.title; + + const loadData = async () => { + loading.value = true; + try { + const res = await getLngPngMeasureSalesPurPage({ + limit: currentPage.value, + size: pageSize.value, + page: currentPage.value, + ...formState.value, + }); + tableData.value = res.list || []; + tableData.value.forEach(v=> { + v.qtySalesM3 = NP.divide(Number(v.qtySalesM3), 10000) + v.qtyMeaM3 = NP.divide(Number(v.qtyMeaM3), 10000) + }) + total.value = res.total || res.length || 0; + } catch (error) { + console.error('获取列表失败:', error); + } finally { + loading.value = false; + } + }; const isExpend = ref(false) const formState = ref({}) const toggle = (val)=> { @@ -183,52 +199,52 @@ } const onSearch = (val)=> { formState.value = val - reload() + handleSuccess() } const onReset = (val)=> { formState.value ={ page: 1,size: 10} - reload() + handleSuccess() } const onUpload = (index) => { curIdx.value = index } const uploadChange = (val) => { - let data = getDataSource() - let record = data[curIdx.value] - record.lngFileUploadList = val - updateTableDataRecord(record.id, record) + tableData.value[curIdx.value].lngFileUploadList = val } - const deleteFile = (record, idx) => { + const deleteFile = (record, idx, index) => { record.lngFileUploadList.splice(idx, 1) - updateTableDataRecord(record.id, record) + tableData.value[index] = record } const handleDownload = (info) => { const url = parseDownloadUrl(info.response ? info.response.data.fileUrl : info.fileUrl); const fileName = info.response ? info.response.data.fileOrg : info.fileOrg; downloadByUrl({ url, fileName: fileName}); }; - const numChange = (record) => { - record.rateM3Gj = Number(record.qtyMeaGj) ? (Number(record.qtyMeaM3) || 0 ) / Number(record.qtyMeaGj) : '0' - record.rateM3Gj = record.rateM3Gj.toFixed(6) - updateTableDataRecord(record.id, record) + const numChange = (record, index) => { + record.rateM3Gj = Number(record.qtyMeaGj) ? (Number(record.qtyMeaM3) || 0 ) / Number(record.qtyMeaGj) : 0 + record.rateM3Gj = record.rateM3Gj ? Number(record.rateM3Gj).toFixed(6) : 0 + tableData.value[index] = record + } + const handleSuccessForm = (val) => { + handleSuccess() } function handleAdd() { - - router.push({ - path: '/dayPlan/PngMeasureSalesPur/createForm', - query: { - formPath: 'dayPlan/PngMeasureSalesPur', - formName: formName, - formId:currentRoute.value.meta.formId, - type:'add' - } - }); + openModalForm(true,{isUpdate: false}); + // router.push({ + // path: '/dayPlan/PngMeasureSalesPur/createForm', + // query: { + // formPath: 'dayPlan/PngMeasureSalesPur', + // formName: "新建"+formName, + // formId:currentRoute.value.meta.formId, + // type:'add' + // } + // }); } async function handleReject() { if (!selectedRowsData.value.length) { notification.warning({ - message: 'Tip', + message: '提示', description: t('请选择需要驳回的数据'), }); return; @@ -236,16 +252,15 @@ await rejectLngPngMeasureSalesPur(selectedRowsData.value) handleSuccess(); notification.success({ - message: 'Tip', + message: '提示', description: t('已驳回！'), }); - clearSelectedRowKeys() } async function handleCancel() { if (!selectedRowsData.value.length) { notification.warning({ - message: 'Tip', + message: '提示', description: t('请选择需要取消的数据'), }); return; @@ -253,42 +268,47 @@ await cancelLngPngMeasureSalesPur(selectedRowsData.value) handleSuccess(); notification.success({ - message: 'Tip', + message: '提示', description: t('取消成功！'), }); - clearSelectedRowKeys() } async function handleSubmit() { if (!selectedRowsData.value.length) { notification.warning({ - message: 'Tip', + message: '提示', description: t('请选择需要确认的数据'), }); return; } + selectedRowsData.value.forEach(v => { + v.qtyMeaM3 = NP.times(Number(v.qtyMeaM3), 10000) + v.qtySalesM3 = NP.times(Number(v.qtySalesM3), 10000) + }) await updateLngPngMeasureSalesPur(selectedRowsData.value) handleSuccess(); notification.success({ - message: 'Tip', + message: '提示', description: t('确认成功！'), }); - clearSelectedRowKeys() } async function handleSave() { if (!selectedRowsData.value.length) { notification.warning({ - message: 'Tip', + message: '提示', description: t('请选择需要保存的数据'), }); return; } + selectedRowsData.value.forEach(v => { + v.qtyMeaM3 = NP.times(Number(v.qtyMeaM3), 10000) + v.qtySalesM3 = NP.times(Number(v.qtySalesM3), 10000) + }) await addLngPngMeasureSalesPur(selectedRowsData.value) handleSuccess(); notification.success({ - message: 'Tip', + message: '提示', description: t('保存成功！'), }); - clearSelectedRowKeys() } function dbClickRow(record) { @@ -337,7 +357,7 @@ function handleBatchdelete() { if (!selectedKeys.value.length) { notification.warning({ - message: 'Tip', + message: '提示', description: t('请选择需要删除的数据'), }); return; @@ -351,7 +371,7 @@ }); if (cantDelete.length) { notification.warning({ - message: 'Tip', + message: '提示', description: t('含有不能删除的数据'), }); return; @@ -369,7 +389,7 @@ deleteLngPngMeasureSalesPur(ids).then((_) => { handleSuccess(); notification.success({ - message: 'Tip', + message: '提示', description: t('删除成功！'), }); }); @@ -382,28 +402,13 @@ selectedRowsData.value = selectedRows; } - function customRow(record: Recordable) { - return { - onClick: () => { - let selectedRowKeys = [...selectedKeys.value]; - if (selectedRowKeys.indexOf(record.id) >= 0) { - let index = selectedRowKeys.indexOf(record.id); - selectedRowKeys.splice(index, 1); - } else { - selectedRowKeys.push(record.id); - } - selectedKeys.value = selectedRowKeys; - }, - }; - } function handleRefresh() { - reload(); + loadData(); } function handleSuccess() { - - selectedKeys.value = []; - selectedRowsData.value = []; - reload(); + selectedKeys.value = []; + selectedRowsData.value = []; + loadData(); } async function handleExport() { const res = await exportLngPngMeasureSalesPur({ isTemplate: false }); @@ -421,7 +426,7 @@ }); } function handleImportSuccess(){ - reload() + loadData() } onMounted(() => { @@ -431,9 +436,8 @@ } else { bus.on(FORM_LIST_MODIFIED, handleRefresh); } - - // 合并渲染覆盖配置中的列表配置，包括展示字段配置、搜索字段配置、按钮配置 - mergeCustomListRenderConfig(); + loadData() + }); onUnmounted(() => { if (schemaIdComputedRef.value) { @@ -467,20 +471,8 @@ }); return actionsList; } - async function mergeCustomListRenderConfig(){ - if (formConfig.useCustomConfig) { - let formId=currentRoute.value.meta.formId; - //1.合并展示字段配置 - let cols= await mergeColumns(customConfigColums.value,formId); - customConfigColums.value=cols; - //2.合并搜索字段配置 - let sFormSchema= await mergeSearchFormSchema(customSearchFormSchema.value,formId); - customSearchFormSchema.value=sFormSchema; - //3.合并按钮配置 - let btns= await mergeButtons(buttons.value,formId); - buttons.value=btns; - } - }; + + + \ No newline at end of file diff --git a/src/views/dayPlan/PngMeasureSalesPur/components/config.ts b/src/views/dayPlan/PngMeasureSalesPur/components/config.ts index be602fd..d7ae498 100644 --- a/src/views/dayPlan/PngMeasureSalesPur/components/config.ts +++ b/src/views/dayPlan/PngMeasureSalesPur/components/config.ts @@ -17,7 +17,7 @@ export const searchFormSchema: FormSchema[] = [ }, }, { - field: 'suCode', + field: 'suName', label: '供应商名称/简称/编码', component: 'Input', }, From 05261ff3a33662ddf38274bc6f774bcf7ac85304 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98huanghaiixia=E2=80=99?= <980486410@.com> Date: Thu, 12 Mar 2026 17:40:51 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/input-number/input-number.model.ts | 4 ++-- .../dayPlan/PngMeasureSalesPur/components/createForm.vue | 8 ++++---- src/views/dayPlan/PngMeasureSalesPur/index.vue | 2 -- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/components/input-number/input-number.model.ts b/src/components/input-number/input-number.model.ts index 1e89972..0733d7e 100644 --- a/src/components/input-number/input-number.model.ts +++ b/src/components/input-number/input-number.model.ts @@ -11,9 +11,9 @@ export class InputNumberModel { ref: any; get numberFormat() { - if(this._fmt==undefined){ + // if(this._fmt==undefined){ this._fmt = this.createNumberFmt(this.digits); - } + // } return this._fmt; } diff --git a/src/views/dayPlan/PngMeasureSalesPur/components/createForm.vue b/src/views/dayPlan/PngMeasureSalesPur/components/createForm.vue index d19c94e..fa075ff 100644 --- a/src/views/dayPlan/PngMeasureSalesPur/components/createForm.vue +++ b/src/views/dayPlan/PngMeasureSalesPur/components/createForm.vue @@ -11,10 +11,10 @@ {{ Number.format(Number.parse(record.qtyMeaGj || 0),numFormat) }} @@ -134,7 +134,7 @@ { dataIndex: 'qtySalesM3', - title: '批复量(万方)', + title: '批复量(方)', componentType: 'input', align: 'left', width: 120, @@ -152,7 +152,7 @@ { dataIndex: 'qtyMeaM3', - title: '完成量(万方)', + title: '完成量(方)', componentType: 'input', align: 'left', width: 120, diff --git a/src/views/dayPlan/PngMeasureSalesPur/index.vue b/src/views/dayPlan/PngMeasureSalesPur/index.vue index 0e4feeb..0d03f3b 100644 --- a/src/views/dayPlan/PngMeasureSalesPur/index.vue +++ b/src/views/dayPlan/PngMeasureSalesPur/index.vue @@ -192,8 +192,6 @@ let arr = DataFormat.format(val, [ FormatOption.createQty('qtySalesGj'), FormatOption.createQty('qtySalesM3'), - FormatOption.createQty('qtyMeaGj'), - FormatOption.createQty('qtyMeaM3'), FormatOption.createQty('rateM3Gj', 6), ]); if (arr.length) { From 63e32499870383b7e741587f989ce94f6d35f5e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98huanghaiixia=E2=80=99?= <980486410@.com> Date: Thu, 12 Mar 2026 17:53:49 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=AE=A1=E9=87=8F=E5=BC=B9=E6=A1=86?= =?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 --- .../components/createForm.vue | 142 +++--------------- 1 file changed, 19 insertions(+), 123 deletions(-) diff --git a/src/views/dayPlan/PngMeasureSalesPur/components/createForm.vue b/src/views/dayPlan/PngMeasureSalesPur/components/createForm.vue index fa075ff..f2f1225 100644 --- a/src/views/dayPlan/PngMeasureSalesPur/components/createForm.vue +++ b/src/views/dayPlan/PngMeasureSalesPur/components/createForm.vue @@ -2,20 +2,14 @@ - + @@ -59,21 +53,16 @@ getPopupContainer: () => document.body, }, }, - { - field: 'suCode', - label: '供应商名称/简称/编码', - component: 'Input', - }, - { - field: 'pointUpName', - label: '上载点', - component: 'Input', - }, { field: 'pointDelyName', label: '下载点', component: 'Input', }, + { + field: 'suCode', + label: '供应商名称/简称/编码', + component: 'Input', + }, ]; const columns: BasicColumn[] = [ { @@ -83,16 +72,7 @@ align: 'left', width: 120, ellipsis: true, - sorter: true, - }, - - { - dataIndex: 'dateMea', - title: '计量日期', - componentType: 'input', - align: 'left', - width: 120, - sorter: true, + }, { dataIndex: 'pointDelyName', @@ -101,7 +81,6 @@ align: 'left', ellipsis: true, width: 120, - sorter: true, }, { dataIndex: 'suSname', @@ -110,9 +89,7 @@ align: 'left', ellipsis: true, width: 150, - sorter: true, }, - { dataIndex: 'pointUpName', title: '上载点', @@ -120,88 +97,20 @@ align: 'left', ellipsis: true, width: 120, - sorter: true, }, - { dataIndex: 'qtySalesGj', title: '批复量(吉焦)', componentType: 'input', align: 'left', width: 120, - sorter: true, }, - { dataIndex: 'qtySalesM3', title: '批复量(方)', componentType: 'input', align: 'left', width: 120, - sorter: true, - }, - - { - dataIndex: 'qtyMeaGj', - title: '完成量(吉焦)', - componentType: 'input', - align: 'left', - width: 120, - sorter: true, - }, - - { - dataIndex: 'qtyMeaM3', - title: '完成量(方)', - componentType: 'input', - align: 'left', - width: 120, - sorter: true, - }, - - { - dataIndex: 'rateM3Gj', - title: '比值(方/吉焦)', - componentType: 'input', - align: 'left', - width: 120, - sorter: true, - }, - - { - dataIndex: 'cfmCuUserName', - title: '确认人', - componentType: 'input', - align: 'left', - width: 110, - sorter: true, - }, - - { - dataIndex: 'cfmCuUserTime', - title: '确认时间', - componentType: 'input', - align: 'left', - width: 180, - sorter: true, - }, - - { - dataIndex: 'cfmEmpName', - title: '业务确认人', - componentType: 'input', - align: 'left', - width: 110, - sorter: true, - }, - - { - dataIndex: 'cfmEmpTime', - title: '业务确认时间', - componentType: 'input', - align: 'left', - width: 150, - sorter: true, }, { dataIndex: 'ksName', @@ -210,25 +119,13 @@ align: 'left', ellipsis: true, width: 150, - sorter: true, }, - { - dataIndex: 'kpName', - title: '采购合同', - componentType: 'input', - align: 'left', - ellipsis: true, - width: 150, - sorter: true, - }, - { dataIndex: 'comName', title: '交易主体', componentType: 'input', align: 'left', - width: 120, - sorter: true, + width: 120, }, ]; const spinning = ref(false); @@ -256,7 +153,7 @@ formConfig: { labelCol:{span: 9}, schemas: codeFormSchema, - fieldMapToTime: [['dateFrom', ['startDate', 'endDate'], 'YYYY-MM-DD']], + fieldMapToTime: [['datePlan', ['startDate', 'endDate'], 'YYYY-MM-DD']], showResetButton: true, }, immediate: false, @@ -309,7 +206,13 @@ } - +