diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue index d1e745a..3fd0fd8 100644 --- a/src/layout/components/Sidebar/SidebarItem.vue +++ b/src/layout/components/Sidebar/SidebarItem.vue @@ -7,6 +7,7 @@ @@ -36,7 +37,7 @@ import { isExternal } from '@/utils/validate'; import AppLink from './Link.vue'; import { getNormalPath } from '@/utils/ruoyi'; import { RouteRecordRaw } from 'vue-router'; -import { pageByTaskWait } from '@/api/workflow/task'; +import { pageByTaskWait, pageByTaskCopy } from '@/api/workflow/task'; import useUserStore from '@/store/modules/user'; import useNoticeStore from '@/store/modules/notice'; const userStore = useUserStore(); @@ -56,21 +57,27 @@ const props = defineProps({ } }); const total = ref(0); +const totalChao = ref(0); onMounted(() => { - if (onlyOneChild.value.meta?.title == '我的待办' || props.item.meta?.title == '我的任务') { - console.log(44444444); + if (onlyOneChild.value.meta?.title == '我的待办') { getWaitingList(); } + if (onlyOneChild.value.meta?.title == '我的抄送') { + getChaoList(); + } }); // 获取我的待办 -//分页 const getWaitingList = () => { pageByTaskWait({ pageNum: 1, pageSize: 10 }).then((resp) => { - console.log(resp); - total.value = resp.total; }); }; +// 获取我的抄送 +const getChaoList = () => { + pageByTaskCopy({ pageNum: 1, pageSize: 10 }).then((resp) => { + totalChao.value = resp.total; + }); +}; const onlyOneChild = ref({}); const hasOneShowingChild = (parent: RouteRecordRaw, children?: RouteRecordRaw[]) => { diff --git a/src/views/design/designChange/index.vue b/src/views/design/designChange/index.vue index 7ec17a6..ebe8fb7 100644 --- a/src/views/design/designChange/index.vue +++ b/src/views/design/designChange/index.vue @@ -93,11 +93,10 @@ >审核通知单 查看通知单 @@ -113,8 +112,7 @@ type="warning" link icon="View" - v-hasPermi="['design:drawingreviewReceipts:list']" - v-if="scope.row.status != 'draft'" + v-if="scope.row.status != 'draft' || scope.row.auditStatus != 'draft'" @click="handleViewHistory(scope.row)" >查看单据 diff --git a/src/views/design/volumeCatalog/codeDetail.vue b/src/views/design/volumeCatalog/codeDetail.vue index b4c063f..7fb50eb 100644 --- a/src/views/design/volumeCatalog/codeDetail.vue +++ b/src/views/design/volumeCatalog/codeDetail.vue @@ -121,10 +121,10 @@ -->
- 更新时间 + 上传时间
- {{ info.updateTime || '未更新' }} + {{ info.createTime || '暂无' }}
diff --git a/src/views/design/volumeCatalog/index.vue b/src/views/design/volumeCatalog/index.vue index e265e13..478716d 100644 --- a/src/views/design/volumeCatalog/index.vue +++ b/src/views/design/volumeCatalog/index.vue @@ -153,8 +153,8 @@ - - + + diff --git a/src/views/materials/purchaseDoc/index.vue b/src/views/materials/purchaseDoc/index.vue index 3174ec7..546339b 100644 --- a/src/views/materials/purchaseDoc/index.vue +++ b/src/views/materials/purchaseDoc/index.vue @@ -197,18 +197,17 @@ > --> - + - - + - + @@ -364,6 +363,7 @@ const data = reactive({ docCode: [{ required: true, message: '采购单编号不能为空', trigger: 'blur' }], planId: [{ required: true, message: '需求计划不能为空', trigger: 'blur' }], mrpBaseId: [{ required: true, message: '需求批次号不能为空', trigger: 'blur' }], + supplierId: [{ required: true, message: '供应商不能为空', trigger: 'blur' }], // 电话号码验证 technicalDirectorTel: [ { required: true, message: '请输入电话', trigger: 'blur' }, @@ -468,9 +468,16 @@ const handleUpdate = async (row?: PurchaseDocVO) => { const _id = row?.id || ids.value[0]; const res = await getPurchaseDoc(_id); Object.assign(form.value, res.data); - getPlanList(); - form.value.planId = form.value.associationList?.map((item: any) => item.planId); + await getPlanList(); + form.value.planId = form.value.associationList?.map((item: any) => item.planId); + planList.value.forEach((item) => { + form.value.associationList.forEach((items: any) => { + if (item.id == items.planId) { + item.demandQuantity = items.demandQuantity; + } + }); + }); dialog.visible = true; dialog.title = '修改物资-采购联系单'; }; @@ -478,6 +485,7 @@ const handleUpdate = async (row?: PurchaseDocVO) => { const selectPlanList = computed(() => { if (!form.value.planId) return []; const result = planList.value.filter((item) => form.value.planId.includes(item.id)); + return result; }); @@ -486,11 +494,12 @@ const submitForm = () => { purchaseDocFormRef.value?.validate(async (valid: boolean) => { if (valid) { buttonLoading.value = true; - form.value.associationList = form.value.planId?.map((item: any) => ({ - planId: item - })); + form.value.associationList = selectPlanList.value; + form.value.associationList.forEach((item: any) => { + item.planId = item.id; + delete item.id; + }); form.value.supplier = supplierOptions.value.find((item) => item.id == form.value.supplierId)?.supplierName; - if (form.value.id) { await updatePurchaseDoc(form.value).finally(() => (buttonLoading.value = false)); } else { diff --git a/src/views/out/monthPlan/index.vue b/src/views/out/monthPlan/index.vue index 49f84fe..af7bebd 100644 --- a/src/views/out/monthPlan/index.vue +++ b/src/views/out/monthPlan/index.vue @@ -113,13 +113,7 @@ import { useUserStoreHook } from '@/store/modules/user'; const userStore = useUserStoreHook(); // 从 store 中获取项目列表和当前选中的项目 const currentProject = computed(() => userStore.selectedProject); -const month = computed(() => { - const now = new Date(); - const year = now.getFullYear(); - const month = String(now.getMonth() + 1).padStart(2, '0'); // getMonth() 从0开始 - const currentMonth = `${year}-${month}`; - return currentMonth; -}); +const month = ''; const monthPlanList = ref([]); const buttonLoading = ref(false); const loading = ref(true); @@ -246,7 +240,6 @@ const submitForm = () => { if (valid) { buttonLoading.value = true; form.value.isDesign = true; - if (form.value.id) { await updateMonthPlan(form.value).finally(() => (buttonLoading.value = false)); } else { @@ -270,6 +263,7 @@ const handleDelete = async (row?: MonthPlanVO) => { /** 审核按钮操作 */ const handleAudit = async (row?: MonthPlanVO) => { + proxy.$tab.closePage(proxy.$route); proxy?.$tab.openPage('/approval/monthPlan/indexEdit', '审核月度产值计划', { planMonth: row?.planMonth, id: row?.id, diff --git a/src/views/out/monthPlan/indexEdit.vue b/src/views/out/monthPlan/indexEdit.vue index fdc5386..0456285 100644 --- a/src/views/out/monthPlan/indexEdit.vue +++ b/src/views/out/monthPlan/indexEdit.vue @@ -170,11 +170,12 @@ const getInfo = () => { loading.value = true; buttonLoading.value = false; nextTick(async () => { - routeParams.value.businessId ? routeParams.value.businessId.split('_')[0] : currentProject.value?.id; - const res = await getMonthInfo({ id: routeParams.value.id }); + console.log(routeParams.value); + // routeParams.value.businessId ? routeParams.value.businessId.split('_')[0] : routeParams.value.id; + const res = await getMonthInfo({ id: routeParams.value.id.split('_')[0] }); form.value = res.data as any; form.value[0].mid = form.value[0].id; - form.value[0].id = form.value[0].projectId + '_plan'; + form.value[0].id = form.value[0].id + '_plan'; loading.value = false; buttonLoading.value = false; }); @@ -194,7 +195,7 @@ const submitFlow = async () => { const handleStartWorkFlow = async (data: LeaveForm) => { try { submitFormData.value.flowCode = flowCode.value; - submitFormData.value.businessId = currentProject.value?.id + '_' + form.value[0]?.planMonth; + submitFormData.value.businessId = routeParams.value.id + '_plan'; //流程变量 taskVariables.value = { @@ -213,8 +214,6 @@ const handleStartWorkFlow = async (data: LeaveForm) => { }; //审批记录 const handleApprovalRecord = () => { - console.log(form.value[0]?.id); - approvalRecordRef.value.init(form.value[0]?.id); }; //提交回调 @@ -229,20 +228,12 @@ const approvalVerifyOpen = async () => { // 图纸上传成功之后 开始提交 const submit = async (status, data) => { form.value = data; - console.log(form.value); - if (status === 'draft') { buttonLoading.value = false; proxy?.$modal.msgSuccess('暂存成功'); proxy.$tab.closePage(proxy.$route); proxy.$router.go(-1); } else { - // const res = await isSubmit(data[0]?.mid); - - // 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; diff --git a/src/views/system/user/comm/editInfo.vue b/src/views/system/user/comm/editInfo.vue index 834e836..1e8b39d 100644 --- a/src/views/system/user/comm/editInfo.vue +++ b/src/views/system/user/comm/editInfo.vue @@ -77,7 +77,7 @@
取 消 - 确 定 +
diff --git a/src/views/system/user/comm/roleInfo.vue b/src/views/system/user/comm/roleInfo.vue index 74c7108..e4d7568 100644 --- a/src/views/system/user/comm/roleInfo.vue +++ b/src/views/system/user/comm/roleInfo.vue @@ -219,7 +219,7 @@ const removeProject = (projectId: number | string) => { // 提交表单 const submitForm = async () => { // 整理项目角色数据 - if (form.value.projectRoles.length == 0) { + if (selectedProjects.value.length == 0) { proxy?.$modal.msgWarning('请选择项目角色'); return; }