diff --git a/src/views/contract/limitPrice/index.vue b/src/views/contract/limitPrice/index.vue index e10bd99..69d7e05 100644 --- a/src/views/contract/limitPrice/index.vue +++ b/src/views/contract/limitPrice/index.vue @@ -35,7 +35,13 @@ - 审核 + 审核 - + @@ -46,13 +46,16 @@ - - 详情 + 详情 + 审批 - - + 查看流程 + + @@ -191,9 +194,10 @@ const userStore = useUserStoreHook(); // 从 store 中获取项目列表和当前选中的项目 const currentProject = computed(() => userStore.selectedProject); -const { safety_inspection_violation_type, safety_inspection_check_type, review_type, safety_inspection_type } = toRefs( - useDict('safety_inspection_violation_type', 'safety_inspection_check_type', 'review_type', 'safety_inspection_type') +const { safety_inspection_violation_type, safety_inspection_check_type, review_type, safety_inspection_type, wf_business_status } = toRefs( + useDict('safety_inspection_violation_type', 'safety_inspection_check_type', 'review_type', 'safety_inspection_type', 'wf_business_status') ); +const { proxy } = getCurrentInstance() as ComponentInternalInstance; const safetyInspectionDetail = ref(); const form = reactive({ @@ -236,6 +240,18 @@ const handleDetail = async (row) => { rectificationFileList.value = rectificationFileRes.data; } }; +const handleAddApp = (row) => { + // 添加审批 + proxy.$tab.closePage(proxy.$route); + proxy.$router.push({ + path: `/approval/workMessage/indexEdit`, + query: { + id: row.id, + + type: 'update' + } + }); +}; const getList = (row) => {}; const handleDelete = (row) => {}; diff --git a/src/views/cory/workMessage/index.vue b/src/views/cory/workMessage/index.vue index 71595ea..805cdc0 100644 --- a/src/views/cory/workMessage/index.vue +++ b/src/views/cory/workMessage/index.vue @@ -1,15 +1,12 @@ - + - - - + + - 删除 + 删除 - + @@ -56,14 +54,12 @@ - + - + @@ -71,8 +67,7 @@ - + @@ -87,16 +82,13 @@ - + - + - + @@ -253,8 +245,8 @@ const changeForeman = (value: string | number) => { form.value.correctorId = ''; }; -const handleQuery = () => { }; -const resetQuery = () => { }; +const handleQuery = () => {}; +const resetQuery = () => {}; const getList = async () => { if (!queryParams.value.projectType) { const res = await listContactTypeformtemplate(queryParams.value); @@ -289,7 +281,7 @@ const handleDelete = async (id?: string) => { getList(); } }; -const handleUpdate = () => { }; +const handleUpdate = () => {}; /** 多选框选中数据 */ const handleSelectionChange = (selection: any) => { @@ -308,6 +300,7 @@ const selectType = (value: string) => { const resetForm = () => { formRef.value?.resetFields(); }; + //监听项目id刷新数据 const listeningProject = watch( () => currentProject.value?.id, diff --git a/src/views/cory/workMessage/indexEdit.vue b/src/views/cory/workMessage/indexEdit.vue new file mode 100644 index 0000000..c04c34b --- /dev/null +++ b/src/views/cory/workMessage/indexEdit.vue @@ -0,0 +1,482 @@ + + + + + + + + + + + + 工作联系单审批 + + + + 通知单 + + 填报人:{{ safetyInspectionDetail?.creatorName }} + 填报时间:{{ safetyInspectionDetail?.createTime }} + + + {{ currentProject?.name }} + + + + + + + + {{ safetyInspectionDetail?.checkTime }} + + {{ safetyInspectionDetail?.creatorName }} + + {{ safetyInspectionDetail?.correctorName }} + + + {{ dayjs(safetyInspectionDetail?.rectificationDeadline).format('YYYY 年 MM 月 DD 日') }} + + + + + + + {{ safetyInspectionDetail?.hiddenDanger }} + + + + + + + + + + {{ item.originalName }} + + + + + + + + + + + + + + + + {{ safetyInspectionDetail?.teamName }} + + {{ safetyInspectionDetail?.rectificationTime }} + + + {{ safetyInspectionDetail?.measure }} + + + + + + + + + + {{ item.originalName }} + + + + + + + + + + + {{ safetyInspectionDetail?.creatorName }} + + {{ safetyInspectionDetail?.reviewTime }} + + {{ safetyInspectionDetail?.review }} + + + + + + + + + + + + 请选择要启动的流程: + + + + + + + + + + + + + + diff --git a/src/views/design/Professional/index.vue b/src/views/design/Professional/index.vue index 27952ed..25340b2 100644 --- a/src/views/design/Professional/index.vue +++ b/src/views/design/Professional/index.vue @@ -37,7 +37,15 @@ - 审核 + 审核 { loading.value = true; try { - const res = await joinList({ type: catalogueId.value, ...queryParams.value }); + const res = await joinList({ type: catalogueId.value, ...queryParams.value, auditStatus: 'finish' }); volumeCatalogList.value = res.rows; total.value = res.total; } finally { diff --git a/src/views/tender/plan/index.vue b/src/views/tender/plan/index.vue index 63a4eff..0245141 100644 --- a/src/views/tender/plan/index.vue +++ b/src/views/tender/plan/index.vue @@ -161,7 +161,7 @@ - + @@ -187,6 +187,16 @@ + + + + {{ + (scope.row.quantity ? Number(scope.row.quantity) : 0) - (scope.row.useQuantity ? Number(scope.row.useQuantity) : 0) == 0 + ? '' + : (scope.row.quantity ? Number(scope.row.quantity) : 0) - (scope.row.useQuantity ? Number(scope.row.useQuantity) : 0) + }} + + - - - - {{ - (scope.row.quantity ? Number(scope.row.quantity) : 0) - (scope.row.useQuantity ? Number(scope.row.useQuantity) : 0) == 0 - ? '' - : (scope.row.quantity ? Number(scope.row.quantity) : 0) - (scope.row.useQuantity ? Number(scope.row.useQuantity) : 0) - }} - - - @@ -431,9 +430,12 @@ const getVersionNums = async () => { options.value = res.data; if (res.data.length > 0) { console.log(11111); - treeForm.value.versions = res.data[0].versions; - getSheetName(); + if (planType.value == '2') { + getSheetName(); + } else { + getTreeList(); + } } else { treeForm.value.versions = ''; // getSheetName();
请选择要启动的流程: