From cd69290b690541fdc4bc812f65981bdcb415002e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98huanghaiixia=E2=80=99?= <980486410@.com> Date: Mon, 13 Apr 2026 13:38:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/plan/PlanYearDemandHdr/index.ts | 13 ++- src/api/plan/PlanYearDemandHdrEc/index.ts | 38 +++++++- .../PlanYearDemandHdr/components/config.ts | 4 +- .../components/createForm.vue | 11 ++- src/views/plan/PlanYearDemandHdr/index.vue | 97 +++++++------------ .../components/createForm.vue | 40 ++++++-- src/views/plan/PlanYearDemandHdrEc/index.vue | 61 ++++++++---- 7 files changed, 168 insertions(+), 96 deletions(-) diff --git a/src/api/plan/PlanYearDemandHdr/index.ts b/src/api/plan/PlanYearDemandHdr/index.ts index df8ef6b..0f35cfb 100644 --- a/src/api/plan/PlanYearDemandHdr/index.ts +++ b/src/api/plan/PlanYearDemandHdr/index.ts @@ -8,10 +8,21 @@ enum Api { List = '/plan/planYearDemandHdr/list', Info = '/plan/planYearDemandHdr/info', LngPlanYearDemandHdr = '/plan/planYearDemandHdr', + reject = '/plan/planYearDemandHdr/reject', - +} +export async function rejectLngPlanYearDemandHdr(lngPlanYearDemandHdr: Recordable, mode: ErrorMessageMode = 'modal') { + return defHttp.post( + { + url: Api.reject, + params: lngPlanYearDemandHdr, + }, + { + errorMessageMode: mode, + }, + ); } /** diff --git a/src/api/plan/PlanYearDemandHdrEc/index.ts b/src/api/plan/PlanYearDemandHdrEc/index.ts index d74a2d3..f64e6a7 100644 --- a/src/api/plan/PlanYearDemandHdrEc/index.ts +++ b/src/api/plan/PlanYearDemandHdrEc/index.ts @@ -12,11 +12,47 @@ enum Api { save = '/plan/planYearDemandHdrEc/save', saveAndSubmit = '/plan/planYearDemandHdrEc/saveAndSubmit', toChange = '/plan/planYearDemandHdrEc/toChange', - + CuPlanYear = '/magic-api/plan/planYearDemandHdrSelectCuPlanYear', + CuPlanYearVerNo = '/magic-api/plan/planYearDemandHdrSelectCuPlanYearVerNo', + CheckCuPlanState = '/magic-api/plan/planYearDemandHdrCheckCuPlanState', Export = '/plan/planYearDemandHdrEc/export', +} +export async function checkCuPlanState(cuCode: string, mode: ErrorMessageMode = 'modal') { + return defHttp.get( + { url: Api.CheckCuPlanState, params: { cuCode } }, + { errorMessageMode: mode }, + ); +} +export async function getCuMaxPlanYear(cuCode: string, mode: ErrorMessageMode = 'modal') { + return defHttp.get( + { url: Api.CuPlanYear, params: { cuCode } }, + { errorMessageMode: mode }, + ); +} +export async function getCuPlanYearVerNo(cuCode: string, planYear: string, mode: ErrorMessageMode = 'modal') { + return defHttp.get( + { + url: Api.CuPlanYearVerNo, + params: { cuCode, planYear }, + }, + { + errorMessageMode: mode, + }, + ); +} +export async function getCuPlanYear(cuCode: String, mode: ErrorMessageMode = 'modal') { + return defHttp.get( + { + url: Api.CuPlanYear, + params: { cuCode }, + }, + { + errorMessageMode: mode, + }, + ); } export async function getUpdateLngPlanYearDemandHdr(id: String, mode: ErrorMessageMode = 'modal') { return defHttp.get( diff --git a/src/views/plan/PlanYearDemandHdr/components/config.ts b/src/views/plan/PlanYearDemandHdr/components/config.ts index fb8f5c2..2c28b2c 100644 --- a/src/views/plan/PlanYearDemandHdr/components/config.ts +++ b/src/views/plan/PlanYearDemandHdr/components/config.ts @@ -18,7 +18,7 @@ export const searchFormSchema: FormSchema[] = [ }, }, { - field: 'cuName', + field: 'cuSname', label: '客户', component: 'Input', }, @@ -58,7 +58,7 @@ export const columns: BasicColumn[] = [ }, { - dataIndex: 'cuName', + dataIndex: 'cuSname', title: '客户', componentType: 'input', align: 'left', diff --git a/src/views/plan/PlanYearDemandHdr/components/createForm.vue b/src/views/plan/PlanYearDemandHdr/components/createForm.vue index bead24c..e3b6382 100644 --- a/src/views/plan/PlanYearDemandHdr/components/createForm.vue +++ b/src/views/plan/PlanYearDemandHdr/components/createForm.vue @@ -180,11 +180,16 @@ import Index from '/@/views/sys/error-log/index.vue'; dataList.value.forEach((v, idx)=> { // LNG(万方)=LNG(吨)*气化率/10000； v.lngNum = Number(v.lng || 0) * Number(rateTonM3.value || 0)/10000 - // v.lngNum = Number(v.lngNum) ? v.lngNum : '' // 小计=管道气(万方)+LNG(万方)； v.total = Number(v.qty || 0) + Number(v.lngNum || 0) - // v.total = Number(v.total) ? v.total : '' - // console.log(Number(v.total), 52354) + + let a = (v.lng==null || v.lng==undefined) + let b = (v.qty==null || v.qty==undefined) + v.lngNum = (a&&b) ? null: v.lngNum + v.total = (a&&b) ? null: v.total + v.lng = (v.lng==null || v.lng==undefined) ? null : v.lng + v.qty = (v.qty==null || v.qty==undefined) ? null: v.qty + if (idx<12) { qytTotal+=(Number(v.qty)||0) lngTotal+=(Number(v.lng)||0) diff --git a/src/views/plan/PlanYearDemandHdr/index.vue b/src/views/plan/PlanYearDemandHdr/index.vue index d902a1b..59b5ee9 100644 --- a/src/views/plan/PlanYearDemandHdr/index.vue +++ b/src/views/plan/PlanYearDemandHdr/index.vue @@ -33,7 +33,7 @@ import { ref, computed, onMounted, onUnmounted, } from 'vue'; import { BasicTable, useTable, TableAction, ActionItem } from '/@/components/Table'; - import { getLngPlanYearDemandHdrPage, deleteLngPlanYearDemandHdr} from '/@/api/plan/PlanYearDemandHdr'; + import { getLngPlanYearDemandHdrPage, deleteLngPlanYearDemandHdr, rejectLngPlanYearDemandHdr} from '/@/api/plan/PlanYearDemandHdr'; import { PageWrapper } from '/@/components/Page'; import { useMessage } from '/@/hooks/web/useMessage'; import { useI18n } from '/@/hooks/web/useI18n'; @@ -128,39 +128,16 @@ }); function dbClickRow(record) { - if (!actionButtonConfig?.value.some(element => element.code == 'view')) { - return; - } - const { processId, taskIds, schemaId } = record.workflowData || {}; - if (taskIds && taskIds.length) { - router.push({ - path: '/flow/' + schemaId + '/' + (processId || '') + '/approveFlow', - query: { - taskId: taskIds[0], - formName: formName, - formId:currentRoute.value.meta.formId - } - }); - } else if (schemaId && !taskIds && processId) { - router.push({ - path: '/flow/' + schemaId + '/' + processId + '/approveFlow', - query: { - readonly: 1, - taskId: '', - formName: formName, - formId:currentRoute.value.meta.formId - } - }); - } else { - router.push({ - path: '/form/PlanYearDemandHdr/' + record.id + '/viewForm', - query: { - formPath: 'plan/PlanYearDemandHdr', - formName: formName, - formId:currentRoute.value.meta.formId - } - }); - } + router.push({ + path: '/plan/PlanYearDemandHdr/createForm', + query: { + formPath: 'plan/PlanYearDemandHdr', + formName: '查看' + formName, + formId: currentRoute.value.meta.formId, + id: record.id, + type: 'view', + }, + }); } function buttonClick(code) { @@ -180,16 +157,7 @@ } function handleView(record: Recordable) { - router.push({ - path: '/plan/PlanYearDemandHdr/createForm', - query: { - formPath: 'plan/PlanYearDemandHdr', - formName: '查看' + formName, - formId: currentRoute.value.meta.formId, - id: record.id, - type: 'view', - }, - }); + dbClickRow(record); } function handleReject (record: Recordable) { curData.value = record @@ -200,11 +168,10 @@ } const handleRejectReply = async (val) => { let obj = { - "result": "R", - "remark": val.reply, - "data": [{datePlan: curData.value.datePlan}] + "reply": val.reply, + "id": curData.value.id } - await approveLngPngAppro(obj) + await rejectLngPlanYearDemandHdr(obj) isOpen.value = false handleSuccess(); notification.success({ @@ -233,27 +200,29 @@ } }); function getActions(record: Recordable):ActionItem[] { - - const actionsList: ActionItem[] = actionButtonConfig.value?.map((button) => { - if (!record.workflowData?.processId) { - return { + let actionsList: ActionItem[] = [] + let rejectBtn: ActionItem[] = [] + let viewBtn: ActionItem[] = []; + actionButtonConfig.value?.map((button) => { + if (['view', 'copyData','compare', 'datalog', 'export'].includes(button.code)) { + viewBtn.push({ icon: button?.icon, tooltip: button?.name, - color: button.code === 'delete' ? 'error' : undefined, onClick: btnEvent[button.code].bind(null, record), - }; - } else { - if (button.code === 'view') { - return { - icon: button?.icon, - tooltip: button?.name, - onClick: btnEvent[button.code].bind(null, record), - }; - } else { - return {}; - } + }); + } + if (['reject'].includes(button.code)) { + rejectBtn.push({ + icon: button?.icon, + tooltip: button?.name, + onClick: btnEvent[button.code].bind(null, record), + }); } }); + if (record.approCode == 'YTJ' && record.maxPlanYear == record.planYear && record.lastSign=='Y') { + actionsList = actionsList.concat(rejectBtn); + } + actionsList = actionsList.concat(viewBtn); return actionsList; } async function mergeCustomListRenderConfig(){ diff --git a/src/views/plan/PlanYearDemandHdrEc/components/createForm.vue b/src/views/plan/PlanYearDemandHdrEc/components/createForm.vue index e618a71..da8c302 100644 --- a/src/views/plan/PlanYearDemandHdrEc/components/createForm.vue +++ b/src/views/plan/PlanYearDemandHdrEc/components/createForm.vue @@ -20,7 +20,7 @@ - +
{{ formState.planYear }}
 @@ -34,9 +34,9 @@ {{ (optionSelect.approCodeList.find(v=>v.code == formState.approCode) || {}).name }} - - - {{ formState.note }} + + + @@ -86,7 +86,7 @@ import { getDictionary } from '/@/api/sales/Customer'; import { useModal } from '/@/components/Modal'; import ImportModal from '/@/components/Import/src/ImportModal.vue'; - import { saveLngPlanYearDemandHdr,saveAndSubmitLngPlanYearDemandHdr,getUpdateLngPlanYearDemandHdr, getLngPlanYearDemandHdr, exportLngPlanYearDemandHdr} from '/@/api/plan/PlanYearDemandHdrEc'; + import { saveLngPlanYearDemandHdr,saveAndSubmitLngPlanYearDemandHdr,getUpdateLngPlanYearDemandHdr, getLngPlanYearDemandHdr, exportLngPlanYearDemandHdr,getCuPlanYear, getCuPlanYearVerNo} from '/@/api/plan/PlanYearDemandHdrEc'; import { downloadByData } from '/@/utils/file/download'; import dayjs from 'dayjs'; import { getAppEnvConfig } from '/@/utils/env'; @@ -126,7 +126,7 @@ const { notification } = useMessage(); const { t } = useI18n() - const formState = reactive({ + const formState = reactive({ approCode: 'WTJ' }); const rateTonM3 = ref() @@ -142,6 +142,7 @@ { title: t('小计(万方)'), dataIndex: 'total'}, ]); formState.cuCode = currentRoute.value.query?.cuCode + const curYear = ref() const layout = { labelCol: { span: 8 }, wrapperCol: { span: 16 }, @@ -186,7 +187,12 @@ } getSysRate() getOption() + getYear() }); + async function getYear () { + let data = await getCuPlanYear(formState.cuCode) + curYear.value = data?.planYear + } async function getSysRate () { let a = await getParameter({code: 'RATE_TON_M3'})||[] rateTonM3.value = a[0]?.valueNum1 @@ -266,6 +272,13 @@ if (!record) { v.lngNum = Number(v.lng || 0) * Number(rateTonM3.value || 0)/10000 v.total = Number(v.qty || 0) + Number(v.lngNum || 0) + + let a = (v.lng==null || v.lng==undefined) + let b = (v.qty==null || v.qty==undefined) + v.lngNum = (a&&b) ? '': v.lngNum + v.total = (a&&b) ? '': v.total + v.lng = (v.lng!=null || v.lng!=undefined) ? v.lng : '' + v.qty = (v.qty!=null || v.qty!=undefined) ? v.qty : '' } if (idx<12) { qytTotal+=(Number(v.qty)||0) @@ -306,8 +319,19 @@ async function getOption() { optionSelect.approCodeList = await getDictionary('LNG_APPRO2') } - const yearChange = (val) => { + const disabledYear = (current: dayjs.Dayjs) => { + const minYear = Math.max( + curYear.value ? Number(curYear.value) : 0, + dayjs().year() + ); + return current && current.year() < minYear; + } + const yearChange = async (val: dayjs.Dayjs) => { + if (!val) return; + const planYear = dayjs(val).format('YYYY'); + const data = await getCuPlanYearVerNo(formState.cuCode, planYear); + formState.demandVerNo = data?.demandVerNo ?? null; } function close() { @@ -342,7 +366,7 @@ let request = type == 'save' ? saveLngPlanYearDemandHdr : saveAndSubmitLngPlanYearDemandHdr let obj = { ...formState, - planYear: formState.planYear ? dayjs(formState.planYear).format('YYYY') : null, + planYear: (formState.planYear&&!pageId.value) ? dayjs(formState.planYear).format('YYYY') : formState.planYear, lngPlanYearDemandList: arr } await request(obj) diff --git a/src/views/plan/PlanYearDemandHdrEc/index.vue b/src/views/plan/PlanYearDemandHdrEc/index.vue index 140417c..97a6399 100644 --- a/src/views/plan/PlanYearDemandHdrEc/index.vue +++ b/src/views/plan/PlanYearDemandHdrEc/index.vue @@ -4,7 +4,7 @@