diff --git a/.env.development b/.env.development index fe20df3..21892b7 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.159:8898' +VITE_APP_BASE_API = 'http://192.168.110.180:8898' # 无人机接口地址 diff --git a/src/views/design/designChange/index.vue b/src/views/design/designChange/index.vue index e79d626..97a8492 100644 --- a/src/views/design/designChange/index.vue +++ b/src/views/design/designChange/index.vue @@ -44,8 +44,7 @@ - - + @@ -77,20 +76,14 @@ - + @@ -162,14 +155,6 @@ const resetQuery = () => { queryFormRef.value?.resetFields(); handleQuery(); }; - -/** 多选框选中数据 */ -const handleSelectionChange = (selection: DesignChangeVO[]) => { - ids.value = selection.map((item) => item.id); - single.value = selection.length != 1; - multiple.value = !selection.length; -}; - /** 新增按钮操作 */ const handleAdd = () => { proxy.$tab.closePage(proxy.$route); diff --git a/src/views/design/designChange/indexEdit.vue b/src/views/design/designChange/indexEdit.vue index d03e2ae..fc92386 100644 --- a/src/views/design/designChange/indexEdit.vue +++ b/src/views/design/designChange/indexEdit.vue @@ -58,7 +58,45 @@ - + + + + + + + 原图作废 + 原图保留,部分修改 + 原图保留,补充设计 + + + + + + + + + 重大设计变更 + 一般设计变更 + + + + + + 建设单位重新申报初步设计审批 + 建设单位送原施工图审查机构审查、建设主管部分备案后交付实施 + 建设单位确认后交付实施 + + + + + + + + - + (''); const status = ref(''); const dialogVisible = reactive({ @@ -177,7 +218,6 @@ const submitFormData = ref({ variables: {} }); const taskVariables = ref>({}); - const initFormData = { id: undefined, projectId: currentProject.value?.id, @@ -195,7 +235,15 @@ const initFormData = { costEstimationFile: undefined, fileId: undefined, status: undefined, - remark: undefined + remark: undefined, + extendDetail: { + changeCategory: undefined, + ImpProcedure: undefined, + involvingProfessions: undefined, + subName: undefined, + designDisposal: undefined, + designPhase: undefined + } }; const data = reactive({ form: { ...initFormData }, @@ -260,6 +308,16 @@ const submitForm = (status1: string) => { } if (res.code == 200) { dialog.visible = false; + if (res.data.extendDetail == null) { + res.data.extendDetail = { + 'changeCategory': '', + 'ImpProcedure': '', + 'involvingProfessions': '', + 'subName': '', + 'designDisposal': '', + 'designPhase': '' + }; + } submit(status.value, res.data); } } @@ -278,7 +336,8 @@ const handleStartWorkFlow = async (data: LeaveForm) => { //流程变量 taskVariables.value = { // leave4/5 使用的流程变量 - userList: ['1', '3', '4'] + userList: ['1', '3', '4'], + costEstimation: form.value.costEstimation }; submitFormData.value.variables = taskVariables.value; const resp = await startWorkFlow(submitFormData.value); @@ -303,7 +362,6 @@ const submitCallback = async () => { const approvalVerifyOpen = async () => { submitVerifyRef.value.openDialog(routeParams.value.taskId); }; -// 图纸上传成功之后 开始提交 const submit = async (status, data) => { form.value = data; if (status === 'draft') {