From bbdca4406f1e262f7c82a9dea191cd6fe433bc1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98huanghaiixia=E2=80=99?= <980486410@.com> Date: Tue, 10 Mar 2026 17:39:02 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=ADlng?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/contract/ContractPurLng/index.ts | 3 +- .../common/contractPurPngtListModal.vue | 2 +- .../common/correlationContractFactList.vue | 4 +-- src/components/common/priceInfoList.vue | 12 ++++---- .../ContractPurLng/components/config.ts | 4 +-- .../ContractPurLng/components/createForm.vue | 28 +++++++++++-------- src/views/contract/ContractPurLng/index.vue | 4 +-- .../price/PricePurPngApp/components/config.ts | 22 +++++++-------- .../PriceSalesPngApp/components/config.ts | 22 +++++++-------- src/views/secondDev/customFormConfig.ts | 3 +- .../ship/OpsPurInt/components/createForm.vue | 13 +++++---- .../OpsSalesInt/components/createForm.vue | 13 +++++---- src/views/ship/ShipSchedule/index.vue | 10 ++++--- 13 files changed, 78 insertions(+), 62 deletions(-) diff --git a/src/api/contract/ContractPurLng/index.ts b/src/api/contract/ContractPurLng/index.ts index 14d8af1..647426a 100644 --- a/src/api/contract/ContractPurLng/index.ts +++ b/src/api/contract/ContractPurLng/index.ts @@ -3,7 +3,8 @@ import { defHttp } from '/@/utils/http/axios'; import { ErrorMessageMode } from '/#/axios'; enum Api { - Page = '/contract/contractPurLng/page', + // Page = '/contract/contractPurLng/page', + Page = '/magic-api/contract/contractPurLng/page', List = '/contract/contractPurLng/list', Info = '/contract/contractPurLng/info', LngContract = '/contract/contractPurLng', diff --git a/src/components/common/contractPurPngtListModal.vue b/src/components/common/contractPurPngtListModal.vue index 8d74c44..0c28c91 100644 --- a/src/components/common/contractPurPngtListModal.vue +++ b/src/components/common/contractPurPngtListModal.vue @@ -109,7 +109,7 @@ selectedKeys.value = rowKeys; selectedValues.value = e } - const getTitle = computed(() => (!unref(isUpdate) ? t(props.pageType == 'pur'?'管道气采购合同列表': '管道气销售合同列表') : t(''))); + const getTitle = computed(() => (t(props.pageType == 'pur'?'管道气采购合同列表': '管道气销售合同列表'))); async function handleSubmit() { if (!selectedValues.value.length) { diff --git a/src/components/common/correlationContractFactList.vue b/src/components/common/correlationContractFactList.vue index 9d0c22b..ac19a69 100644 --- a/src/components/common/correlationContractFactList.vue +++ b/src/components/common/correlationContractFactList.vue @@ -38,10 +38,10 @@ { title: t('合同名称'), dataIndex: 'kName', width: 300}, { title: t('关联类别'), dataIndex: 'relTypeName', width: 100}, { title: t('合同类别'), dataIndex: 'kTypeName1', width: 100}, - { title: t('合同主体'), dataIndex: 'comName', width: 250}, + { title: t('合同主体'), dataIndex: 'comName', width: 120}, { title: t('我方联系人'), dataIndex: 'empName', width: 140}, { title: t('联系电话'), dataIndex: 'tel', width: 140}, - { title: t('业务部门'), dataIndex: 'bDeptName', width: 140}, + { title: t('业务部门'), dataIndex: 'bDeptName', width: 120}, { title: t('附件'), dataIndex: 'file', width: 140}, { title: t('操作'), dataIndex: 'operation', width: 120, fixed: 'right',align: 'center'}, ]); diff --git a/src/components/common/priceInfoList.vue b/src/components/common/priceInfoList.vue index e5a0940..0127b03 100644 --- a/src/components/common/priceInfoList.vue +++ b/src/components/common/priceInfoList.vue @@ -7,7 +7,7 @@
- 删除 + @@ -114,6 +114,7 @@ import { useModal } from '/@/components/Modal'; import { message } from 'ant-design-vue'; import contractPurPngtListModal from '/@/components/common/contractPurPngtListModal.vue'; + import { DeleteOutlined} from '@ant-design/icons-vue'; const props = defineProps({ isDisable: Boolean, list: Array, @@ -273,9 +274,10 @@ }); diff --git a/src/views/contract/ContractPurLng/components/config.ts b/src/views/contract/ContractPurLng/components/config.ts index f74d087..319aba7 100644 --- a/src/views/contract/ContractPurLng/components/config.ts +++ b/src/views/contract/ContractPurLng/components/config.ts @@ -107,7 +107,7 @@ export const columns: BasicColumn[] = [ }, { - dataIndex: 'comId', + dataIndex: 'comName', title: '合同主体', componentType: 'input', align: 'left', @@ -116,7 +116,7 @@ export const columns: BasicColumn[] = [ }, { - dataIndex: 'approCode', + dataIndex: 'approName', title: '状态', componentType: 'select', align: 'left', diff --git a/src/views/contract/ContractPurLng/components/createForm.vue b/src/views/contract/ContractPurLng/components/createForm.vue index 1e63c35..fd47668 100644 --- a/src/views/contract/ContractPurLng/components/createForm.vue +++ b/src/views/contract/ContractPurLng/components/createForm.vue @@ -33,11 +33,6 @@ - - - - - @@ -60,7 +55,7 @@ - + {{ item.name }} @@ -131,7 +126,7 @@ import type { Rule } from 'ant-design-vue/es/form'; import { getDictionary } from '/@/api/sales/Customer'; import { useModal } from '/@/components/Modal'; - import { addLngContract,updateLngContract, getLngContract, getAllPriceTerm} from '/@/api/contract/ContractPurLng'; + import { addLngContract,updateLngContract, getLngContract} from '/@/api/contract/ContractPurLng'; import { getLngContractFact } from '/@/api/contract/ContractFact'; import { getAllCurrency } from '/@/api/contract/ContractFact'; import { getLngAppro,getCompDept } from '/@/api/approve/Appro'; @@ -288,10 +283,6 @@ } } - async function getOptionParams() { - - optionSelect.prcTermCodeList = await getAllPriceTerm({eid: formState.prcTermCode}) - } const getCompDeptInfo = async (id, deptId)=> { const res = await getCompDept(id, deptId) formState.bDeptName = res?.dept?.name @@ -338,7 +329,20 @@ } return endValue.valueOf() <= startValue.valueOf(); } - + const disabledDateCfmStart = (startValue) => { + const endValue = formState?.dateCfmTo; + if (!startValue || !endValue) { + return false + } + return startValue.valueOf() >= endValue.valueOf(); + } + const disabledDateCfmEnd = (endValue) => { + const startValue = formState?.dateCfmFrom; + if (!endValue || !startValue) { + return false + } + return endValue.valueOf() <= startValue.valueOf(); + } const onSearchSupplier = () => { openModalSupplier(true,{isUpdate: false}) } diff --git a/src/views/contract/ContractPurLng/index.vue b/src/views/contract/ContractPurLng/index.vue index 0febf19..30905a0 100644 --- a/src/views/contract/ContractPurLng/index.vue +++ b/src/views/contract/ContractPurLng/index.vue @@ -127,7 +127,7 @@ showResetButton: false, }, beforeFetch: (params) => { - return { ...params, FormId: formIdComputedRef.value, PK: 'id' }; + return { ...params, FormId: formIdComputedRef.value, PK: 'id',page: params.limit}; }, afterFetch: (res) => { tableRef.value.setToolBarWidth(); @@ -299,7 +299,7 @@ deleteLngContract(ids).then((_) => { handleSuccess(); notification.success({ - message: 'Tip', + message: '提示', description: t('删除成功！'), }); }); diff --git a/src/views/price/PricePurPngApp/components/config.ts b/src/views/price/PricePurPngApp/components/config.ts index 4a6b7b2..0f4ead1 100644 --- a/src/views/price/PricePurPngApp/components/config.ts +++ b/src/views/price/PricePurPngApp/components/config.ts @@ -7,17 +7,17 @@ export const formConfig = { export const searchFormSchema: FormSchema[] = [ - { - field: 'dateFrom', - label: '申请日期', - component: 'RangePicker', - componentProps: { - format: 'YYYY-MM-DD', - style: { width: '100%' }, - allowClear: true, - getPopupContainer: () => document.body, - }, - }, + // { + // field: 'dateFrom', + // label: '申请日期', + // component: 'RangePicker', + // componentProps: { + // format: 'YYYY-MM-DD', + // style: { width: '100%' }, + // allowClear: true, + // getPopupContainer: () => document.body, + // }, + // }, { field: 'priceDesc', label: '申请说明', diff --git a/src/views/price/PriceSalesPngApp/components/config.ts b/src/views/price/PriceSalesPngApp/components/config.ts index 802956c..fa8f6a1 100644 --- a/src/views/price/PriceSalesPngApp/components/config.ts +++ b/src/views/price/PriceSalesPngApp/components/config.ts @@ -6,17 +6,17 @@ export const formConfig = { }; export const searchFormSchema: FormSchema[] = [ - { - field: 'dateFrom', - label: '申请日期', - component: 'RangePicker', - componentProps: { - format: 'YYYY-MM-DD', - style: { width: '100%' }, - allowClear: true, - getPopupContainer: () => document.body, - }, - }, + // { + // field: 'dateFrom', + // label: '申请日期', + // component: 'RangePicker', + // componentProps: { + // format: 'YYYY-MM-DD', + // style: { width: '100%' }, + // allowClear: true, + // getPopupContainer: () => document.body, + // }, + // }, { field: 'priceDesc', label: '申请说明', diff --git a/src/views/secondDev/customFormConfig.ts b/src/views/secondDev/customFormConfig.ts index 6c8c5c9..b8cd91f 100644 --- a/src/views/secondDev/customFormConfig.ts +++ b/src/views/secondDev/customFormConfig.ts @@ -16,6 +16,7 @@ export const customFormConfig = { 'ContractTransPng', 'ContractProc', 'PricePurPngApp', - 'PriceSalesPngApp' + 'PriceSalesPngApp', + 'ContractPurLng' ], }; \ 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 be731e8..ffa1b8a 100644 --- a/src/views/ship/OpsPurInt/components/createForm.vue +++ b/src/views/ship/OpsPurInt/components/createForm.vue @@ -400,8 +400,8 @@ const userStore = useUserStore(); const userInfo = userStore.getUserInfo; - const tableName = 'ShipSchedule'; - const columnName = 'ShipSchedule' + const tableName = 'OpsPurInt'; + const columnName = 'OpsPurInt' const formType = ref('2'); // 0 新建 1 修改 2 查看 const formRef = ref(); @@ -423,13 +423,14 @@ const formId = ref(currentRoute.value?.params?.id); const pageType = ref(currentRoute.value.query?.type); const pageId = ref(currentRoute.value.query?.id) - + const pageSource = ref(currentRoute.value.query?.pageSource) const spinning = ref(false); const { notification } = useMessage(); const { t } = useI18n() const formState = reactive({ - approCode: 'WTJ' + approCode: 'WTJ', + frtSign: 'N' }); const [register, { openModal:openModal}] = useModal(); const [registerContractPurInt, { openModal:openModalContractPurInt}] = useModal(); @@ -486,7 +487,7 @@ isDisable.value = pageType.value == 'view' getOption() if (pageId.value) { - getInfo(pageId.value) + pageSource.value ? getLngShipInfo(pageId.value) :getInfo(pageId.value) } else { formState.empName = userInfo.name formState.empId = userInfo.id @@ -663,6 +664,8 @@ spinning.value = true let data = await getLngShipSchedule(id) spinning.value = false + formState.ssNo = data.ssNo + formState.ssId = data.id formState.comId = data.comId formState.kId = data.kId formState.kName = data.kName diff --git a/src/views/ship/OpsSalesInt/components/createForm.vue b/src/views/ship/OpsSalesInt/components/createForm.vue index 35236d9..237c009 100644 --- a/src/views/ship/OpsSalesInt/components/createForm.vue +++ b/src/views/ship/OpsSalesInt/components/createForm.vue @@ -369,8 +369,8 @@ const userStore = useUserStore(); const userInfo = userStore.getUserInfo; - const tableName = 'ShipSchedule'; - const columnName = 'ShipSchedule' + const tableName = 'OpsSalesInt'; + const columnName = 'OpsSalesInt' const formType = ref('2'); // 0 新建 1 修改 2 查看 const formRef = ref(); @@ -392,13 +392,14 @@ const formId = ref(currentRoute.value?.params?.id); const pageType = ref(currentRoute.value.query?.type); const pageId = ref(currentRoute.value.query?.id) - + const pageSource = ref(currentRoute.value.query?.pageSource) const spinning = ref(false); const { notification } = useMessage(); const { t } = useI18n() const formState = reactive({ - approCode: 'WTJ' + approCode: 'WTJ', + frtSign: 'N' }); const [register, { openModal:openModal}] = useModal(); const [registerContractPurInt, { openModal:openModalContractPurInt}] = useModal(); @@ -456,7 +457,7 @@ isDisable.value = pageType.value == 'view' getOption() if (pageId.value) { - getInfo(pageId.value) + pageSource.value ? getLngShipInfo(pageId.value) :getInfo(pageId.value) } else { formState.empName = userInfo.name formState.empId = userInfo.id @@ -627,6 +628,8 @@ spinning.value = true let data = await getLngShipSchedule(id) spinning.value = false + formState.ssNo = data.ssNo + formState.ssId = data.id formState.comId = data.comId formState.kId = data.kId formState.kName = data.kName diff --git a/src/views/ship/ShipSchedule/index.vue b/src/views/ship/ShipSchedule/index.vue index 78314bf..b1d131c 100644 --- a/src/views/ship/ShipSchedule/index.vue +++ b/src/views/ship/ShipSchedule/index.vue @@ -255,8 +255,9 @@ formPath: 'ship/OpsPurInt', formName: record.opsPurId ? '编辑采购执行' : '新建采购执行', formId:currentRoute.value.meta.formId, - id: record.opsPurId, - type: record.opsPurId ? 'edit' : '' + id: record.opsPurId ? record.opsPurId : record.id, + type: record.opsPurId ? 'edit' : '', + pageSource: record.opsPurId ? null : 'ship' } }); @@ -268,8 +269,9 @@ formPath: 'ship/OpsSalesInt', formName: record.opsSalesId ? '编辑销售执行' : '新建销售执行', formId:currentRoute.value.meta.formId, - id: record.opsSalesId, - type: record.opsSalesId ? 'edit' : '' + id: record.opsSalesId? record.opsSalesId : record.id, + type: record.opsSalesId ? 'edit' : '', + pageSource: record.opsSalesId ? null : 'ship' } }); }