diff --git a/.env.development b/.env.development index e383271..16ed89f 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ VITE_APP_TITLE = 煤科建管平台 VITE_APP_ENV = 'development' # 开发环境 -VITE_APP_BASE_API = 'http://192.168.110.149:8899' +VITE_APP_BASE_API = 'http://192.168.110.180:8899' # 李陈杰 209 # VITE_APP_BASE_API = 'http://192.168.110.209:8899' diff --git a/src/api/out/monthPlan/index.ts b/src/api/out/monthPlan/index.ts index cf59628..a0be857 100644 --- a/src/api/out/monthPlan/index.ts +++ b/src/api/out/monthPlan/index.ts @@ -93,7 +93,7 @@ export const isSubmit = (id): AxiosPromise => { */ export const getMonthInfo = (query): AxiosPromise => { return request({ - url: '/out/monthPlan/monthInfo', + url: '/out/monthPlan/monthInfo/' + query.id, method: 'get', params: query }); diff --git a/src/views/materials/purchaseDoc/index.vue b/src/views/materials/purchaseDoc/index.vue index 1ece2ac..3174ec7 100644 --- a/src/views/materials/purchaseDoc/index.vue +++ b/src/views/materials/purchaseDoc/index.vue @@ -133,7 +133,7 @@ > - + @@ -145,7 +145,14 @@ > - + @@ -498,13 +505,16 @@ const submitForm = () => { const getPlanList = async () => { form.value.planId = ''; - const res = await getBatch({ - pageNum: 1, - pageSize: 10, - projectId: currentProject.value?.id, - mrpBaseId: form.value.mrpBaseId - }); - planList.value = res.rows; + if (form.value.mrpBaseId && form.value.supplierId) { + const res = await getBatch({ + pageNum: 1, + pageSize: 10, + projectId: currentProject.value?.id, + mrpBaseId: form.value.mrpBaseId, + supplierId: form.value.supplierId + }); + planList.value = res.rows; + } }; const getBatchList = async () => { diff --git a/src/views/out/monthPlan/index.vue b/src/views/out/monthPlan/index.vue index eca4424..49f84fe 100644 --- a/src/views/out/monthPlan/index.vue +++ b/src/views/out/monthPlan/index.vue @@ -272,6 +272,7 @@ const handleDelete = async (row?: MonthPlanVO) => { const handleAudit = async (row?: MonthPlanVO) => { proxy?.$tab.openPage('/approval/monthPlan/indexEdit', '审核月度产值计划', { planMonth: row?.planMonth, + id: row?.id, type: 'update' }); }; diff --git a/src/views/out/monthPlan/indexEdit.vue b/src/views/out/monthPlan/indexEdit.vue index 01cd497..fdc5386 100644 --- a/src/views/out/monthPlan/indexEdit.vue +++ b/src/views/out/monthPlan/indexEdit.vue @@ -104,6 +104,7 @@ import { StartProcessBo } from '@/api/workflow/workflowCommon/types'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; import { useUserStoreHook } from '@/store/modules/user'; import { getMonthInfo, isSubmit } from '@/api/out/monthPlan'; +import { id } from 'element-plus/es/locale/index.mjs'; // 获取用户 store const userStore = useUserStoreHook(); // 从 store 中获取项目列表和当前选中的项目 @@ -169,14 +170,11 @@ const getInfo = () => { loading.value = true; buttonLoading.value = false; nextTick(async () => { - console.log('🚀 ~ routeParams.value:', routeParams.value.businessId); - const projectId = routeParams.value.businessId ? routeParams.value.businessId.split('_')[0] : currentProject.value?.id; - const res = await getMonthInfo({ projectId: projectId, planMonth: routeParams.value.planMonth }); + routeParams.value.businessId ? routeParams.value.businessId.split('_')[0] : currentProject.value?.id; + const res = await getMonthInfo({ id: routeParams.value.id }); form.value = res.data as any; - - console.log('🚀 ~ getInfo ~ form.value:', form.value[0].projectId); form.value[0].mid = form.value[0].id; - form.value[0].id = form.value[0].projectId + '_' + form.value[0].planMonth; + form.value[0].id = form.value[0].projectId + '_plan'; loading.value = false; buttonLoading.value = false; }); @@ -239,12 +237,12 @@ const submit = async (status, data) => { proxy.$tab.closePage(proxy.$route); proxy.$router.go(-1); } else { - const res = await isSubmit(data[0]?.mid); + // const res = await isSubmit(data[0]?.mid); - if (!res.data) { - proxy?.$modal.msgError('三种计划产值必须填写'); - return; - } + // if (!res.data) { + // proxy?.$modal.msgError('三种计划产值必须填写'); + // return; + // } if ((form.value[0]?.planAuditStatus === 'draft' && (flowCode.value === '' || flowCode.value === null)) || routeParams.value.type === 'add') { flowCode.value = flowCodeOptions[0].value; dialogVisible.visible = true; @@ -261,12 +259,9 @@ const submit = async (status, data) => { onMounted(() => { nextTick(async () => { routeParams.value = proxy.$route.query; - console.log('🚀 ~ proxy.$route.query:', proxy.$route.query); reset(); loading.value = false; if (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval') { - console.log('🚀 ~ routeParams.value:', routeParams.value); - getInfo(); } }); diff --git a/src/views/workflows/task/taskCopyList.vue b/src/views/workflows/task/taskCopyList.vue index 673960f..776a064 100644 --- a/src/views/workflows/task/taskCopyList.vue +++ b/src/views/workflows/task/taskCopyList.vue @@ -34,15 +34,13 @@ - - - +