From 5b91afa56a6669223f44ae6f0a97274fb279fa3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98huanghaiixia=E2=80=99?= <980486410@.com> Date: Fri, 13 Mar 2026 16:08:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=88=B9=E6=9C=9F=20=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E9=94=80=E5=94=AE=E6=89=A7=E8=A1=8C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ship/ShipSchedule/index.ts | 12 ++++++++++++ .../common/ContractPurIntListModal.vue | 18 ++++++++++-------- .../ship/OpsPurInt/components/createForm.vue | 4 ++-- .../ship/OpsSalesInt/components/createForm.vue | 2 +- .../ShipSchedule/components/createForm.vue | 4 ++-- 5 files changed, 27 insertions(+), 13 deletions(-) diff --git a/src/api/ship/ShipSchedule/index.ts b/src/api/ship/ShipSchedule/index.ts index ed708c4..58111ea 100644 --- a/src/api/ship/ShipSchedule/index.ts +++ b/src/api/ship/ShipSchedule/index.ts @@ -9,11 +9,23 @@ enum Api { Info = '/ship/shipSchedule/info', LngShipSchedule = '/ship/shipSchedule', ContractPageList = '/magic-api/ship/selectSalesContractPageList', + ContractPageListSales = '/magic-api/ship/selectSalesIntContractPageList', DataLog = '/ship/shipSchedule/datalog', } +export async function getContractPageListSales(params: LngShipSchedulePageParams, mode: ErrorMessageMode = 'modal') { + return defHttp.get( + { + url: Api.ContractPageListSales, + params, + }, + { + errorMessageMode: mode, + }, + ); +} export async function getContractPageList(params: LngShipSchedulePageParams, mode: ErrorMessageMode = 'modal') { return defHttp.get( { diff --git a/src/components/common/ContractPurIntListModal.vue b/src/components/common/ContractPurIntListModal.vue index c485c9a..45c4d19 100644 --- a/src/components/common/ContractPurIntListModal.vue +++ b/src/components/common/ContractPurIntListModal.vue @@ -13,7 +13,7 @@ import { BasicTable, useTable, FormSchema, BasicColumn, TableAction } from '/@/components/Table'; import { useMessage } from '/@/hooks/web/useMessage'; import { useI18n } from '/@/hooks/web/useI18n'; - import { getContractPageList} from '/@/api/ship/ShipSchedule'; + import { getContractPageList,getContractPageListSales} from '/@/api/ship/ShipSchedule'; const { t } = useI18n(); const codeFormSchema: FormSchema[] = [ @@ -34,12 +34,13 @@ { title: t('合同号'), dataIndex: 'kNo', }, { title: t('合同名称'), dataIndex: 'kName', }, { title: t('供应商'), dataIndex: 'suName' ,}, - { title: '有效期开始',dataIndex: 'dateFrom', width: 120,}, - { title: '有效期结束',dataIndex: 'dateTo', width: 120}, - { title: t('合同主体'), dataIndex: 'comName', }, - { title: t('长协/现货'), dataIndex: 'longSpotName'}, + { title: t('供应商简称'), dataIndex: 'suSname' ,}, + { title: '有效期开始',dataIndex: 'dateFrom', width: 100,}, + { title: '有效期结束',dataIndex: 'dateTo', width: 100}, + { title: t('合同主体'), dataIndex: 'comName', width: 100}, + { title: t('长协/现货'), dataIndex: 'longSpotName', width: 100}, { title: t('气源地'), dataIndex: 'sourceName'}, - { title: t('价格条款'), dataIndex: 'prcTermName'}, + { title: t('价格条款'), dataIndex: 'prcTermName', width: 100}, ]; @@ -52,6 +53,7 @@ const selectedValues = ref([]); const props = defineProps({ selectType: { type: String, default: 'checkbox' }, + pageType: { type: String, default: 'pur' }, }); const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => { @@ -63,7 +65,7 @@ const [registerTable, { getDataSource, setTableData, updateTableDataRecord, reload }] = useTable({ title: t('国际采购合同列表'), - api: getContractPageList, + api: props.pageType=='pur'? getContractPageList : getContractPageListSales, columns, bordered: true, @@ -95,7 +97,7 @@ selectedKeys.value = rowKeys; selectedValues.value = e } - const getTitle = computed(() => (!unref(isUpdate) ? t('国际采购合同列表') : t(''))); + const getTitle = computed(() => (!unref(isUpdate) ? (props.pageType=='pur'?t('国际采购合同列表'):'国际销售合同列表') : t(''))); async function handleSubmit() { if (!selectedValues.value.length) { diff --git a/src/views/ship/OpsPurInt/components/createForm.vue b/src/views/ship/OpsPurInt/components/createForm.vue index f307dbe..d569aab 100644 --- a/src/views/ship/OpsPurInt/components/createForm.vue +++ b/src/views/ship/OpsPurInt/components/createForm.vue @@ -357,7 +357,7 @@ - + @@ -709,7 +709,7 @@ formState.kName = val[0].kName formState.comId = val[0].comId formState.suCode = val[0].suCode - formState.suName = val[0].suName + formState.suName = val[0].suSname formState.longSpotCode = val[0].longSpotCode formState.prcTermCode = val[0].prcTermCode formState.sourceName = val[0].sourceName diff --git a/src/views/ship/OpsSalesInt/components/createForm.vue b/src/views/ship/OpsSalesInt/components/createForm.vue index 07e0966..56d4cde 100644 --- a/src/views/ship/OpsSalesInt/components/createForm.vue +++ b/src/views/ship/OpsSalesInt/components/createForm.vue @@ -326,7 +326,7 @@ - + diff --git a/src/views/ship/ShipSchedule/components/createForm.vue b/src/views/ship/ShipSchedule/components/createForm.vue index 1f5089e..473dc54 100644 --- a/src/views/ship/ShipSchedule/components/createForm.vue +++ b/src/views/ship/ShipSchedule/components/createForm.vue @@ -424,14 +424,14 @@ } const handleSuccessSupplier = (val) => { formState.suCode = val[0].suCode - formState.suName = val[0].suName + formState.suName = val[0].suSname } const handleSuccessContractPurInt = (val) => { formState.kId = val[0].id formState.kName = val[0].kName formState.comId = val[0].comId formState.suCode = val[0].suCode - formState.suName = val[0].suName + formState.suName = val[0].suSname formState.longSpotCode = val[0].longSpotCode formState.prcTermCode = val[0].prcTermCode formState.sourceName = val[0].sourceName