From b0b66f4a33f997928984cb972c56f2e5a855c6fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98huanghaiixia=E2=80=99?= <980486410@.com> Date: Fri, 13 Mar 2026 14:47:53 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A1=E9=87=8F=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dayPlan/PngMeasurePur/components/config.ts | 10 +++++----- .../PngMeasureSalesPur/components/config.ts | 4 ++-- .../PngMeasureSalesPur/components/createForm.vue | 6 ++++-- src/views/dayPlan/PngMeasureSalesPur/index.vue | 16 ++++++++++++---- .../ship/OpsPurInt/components/createForm.vue | 4 ++++ .../ship/OpsSalesInt/components/createForm.vue | 4 ++++ 6 files changed, 31 insertions(+), 13 deletions(-) diff --git a/src/views/dayPlan/PngMeasurePur/components/config.ts b/src/views/dayPlan/PngMeasurePur/components/config.ts index cad29ff..beadffe 100644 --- a/src/views/dayPlan/PngMeasurePur/components/config.ts +++ b/src/views/dayPlan/PngMeasurePur/components/config.ts @@ -70,11 +70,11 @@ export const columns: BasicColumn[] = [ }, { - dataIndex: 'cuName', + dataIndex: 'cuSname', title: '客户', componentType: 'input', align: 'left', - width: 200, + width: 150, sorter: true, }, @@ -83,12 +83,12 @@ export const columns: BasicColumn[] = [ title: '下载点', componentType: 'input', align: 'left', - width: 150, + width: 130, sorter: true, }, { - dataIndex: 'suName', + dataIndex: 'suSname', title: '供应商', componentType: 'input', align: 'left', @@ -101,7 +101,7 @@ export const columns: BasicColumn[] = [ title: '上载点', componentType: 'input', align: 'left', - width: 150, + width: 130, sorter: true, }, diff --git a/src/views/dayPlan/PngMeasureSalesPur/components/config.ts b/src/views/dayPlan/PngMeasureSalesPur/components/config.ts index d7ae498..638a65a 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: 150, + width: 130, sorter: true, }, { @@ -86,7 +86,7 @@ export const columns: BasicColumn[] = [ componentType: 'input', align: 'left', ellipsis: true, - width: 150, + width: 130, sorter: true, }, diff --git a/src/views/dayPlan/PngMeasureSalesPur/components/createForm.vue b/src/views/dayPlan/PngMeasureSalesPur/components/createForm.vue index f2f1225..b5e2bac 100644 --- a/src/views/dayPlan/PngMeasureSalesPur/components/createForm.vue +++ b/src/views/dayPlan/PngMeasureSalesPur/components/createForm.vue @@ -133,8 +133,10 @@ const formState = ref({}); const isUpdate = ref(true); const showTable = ref(false) + const curCuCode = ref('') const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => { showTable.value = true + curCuCode.value = data?.cuCode setModalProps({ confirmLoading: false }); setPagination({'limit': 1,'size': 10,'page': 1}); isUpdate.value = !!data?.isUpdate; @@ -158,7 +160,7 @@ }, immediate: false, beforeFetch: (params) => { - return { ...params,...formState.value,page:params.limit}; + return { ...params,...formState.value,page:params.limit,cuCode: curCuCode.value}; }, rowSelection: { type: 'checkbox', @@ -173,7 +175,7 @@ await nextTick(); await nextTick(); nextTick(() => { - reload({searchInfo:{'limit':1,'size':10,'page':1}}); + reload({searchInfo:{'limit':1,'size':10,'page':1,cuCode: curCuCode.value}}); }); } }; diff --git a/src/views/dayPlan/PngMeasureSalesPur/index.vue b/src/views/dayPlan/PngMeasureSalesPur/index.vue index 0d03f3b..1b5d0ca 100644 --- a/src/views/dayPlan/PngMeasureSalesPur/index.vue +++ b/src/views/dayPlan/PngMeasureSalesPur/index.vue @@ -80,6 +80,11 @@ import { DeleteOutlined } from '@ant-design/icons-vue'; import createFormModal from './components/createForm.vue' import { DataFormat, FormatOption, DATE_FORMAT, FormatType } from '/@/utils/dataFormat'; + import { getCompDept } from '/@/api/approve/Appro'; + import { useUserStore } from '/@/store/modules/user'; + const userStore = useUserStore(); + const userInfo = userStore.getUserInfo; + const curCuCode = ref('') const { bus, CREATE_FLOW, FLOW_PROCESSED, FORM_LIST_MODIFIED } = useEventBus(); @@ -158,8 +163,9 @@ fieldMapToTime: [['dateMea', ['dateMeaStart', 'dateMeaEnd'], 'YYYY-MM-DD']], showResetButton: true, }, + immediate: false, beforeFetch: (params) => { - return { ...params, FormId: formIdComputedRef.value, PK: 'id',page: params.limit}; + return { ...params, FormId: formIdComputedRef.value, PK: 'id',page: params.limit,cuCode:curCuCode.value }; }, afterFetch: (res) => { tableData.value = res || [] @@ -231,7 +237,7 @@ handleSuccess() } function handleAdd() { - openModalForm(true,{isUpdate: false}); + openModalForm(true,{isUpdate: false, cuCode: curCuCode.value}); } async function handleReject() { if (!selectedRowsData.value.length) { @@ -434,8 +440,10 @@ function handleImportSuccess(){ reload() } - onMounted(() => { - + onMounted(async() => { + const res = await getCompDept(userInfo.id) + curCuCode.value = res?.comp?.cuCode + reload({searchInfo:{'limit':1,'size':10,'page':1}}); if (schemaIdComputedRef.value) { bus.on(FLOW_PROCESSED, handleRefresh); bus.on(CREATE_FLOW, handleRefresh); diff --git a/src/views/ship/OpsPurInt/components/createForm.vue b/src/views/ship/OpsPurInt/components/createForm.vue index 653da03..f307dbe 100644 --- a/src/views/ship/OpsPurInt/components/createForm.vue +++ b/src/views/ship/OpsPurInt/components/createForm.vue @@ -696,6 +696,10 @@ formState.rateEx = data.rateEx formState.priceCurrEst = data.priceCurrEst formState.amountCurrEst = data.amountCurrEst + + if (pageSource.value) { + getOptionParams() + } } catch (error) { spinning.value = false } diff --git a/src/views/ship/OpsSalesInt/components/createForm.vue b/src/views/ship/OpsSalesInt/components/createForm.vue index 3a689be..07e0966 100644 --- a/src/views/ship/OpsSalesInt/components/createForm.vue +++ b/src/views/ship/OpsSalesInt/components/createForm.vue @@ -660,6 +660,10 @@ formState.rateEx = data.rateEx formState.priceCurrEst = data.priceCurrEst formState.amountCurrEst = data.amountCurrEst + + if (pageSource.value) { + getOptionParams() + } } catch (error) { spinning.value = false }