diff --git a/.env.development b/.env.development index b59befd..6e07116 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.180:8899' +VITE_APP_BASE_API = 'http://192.168.110.149:8899' # 无人机接口地址 diff --git a/src/api/formalities/formalitiesAreConsolidated/types.ts b/src/api/formalities/formalitiesAreConsolidated/types.ts index 0654e2a..f3ca079 100644 --- a/src/api/formalities/formalitiesAreConsolidated/types.ts +++ b/src/api/formalities/formalitiesAreConsolidated/types.ts @@ -1,9 +1,16 @@ export interface FormalitiesAreConsolidatedVO { /** - * + * */ id: string | number; - + /** + * 办理状态 + */ + status: string; + /** + * 计划完成时间 + */ + planTheEndTime: string; /** * 项目id */ @@ -48,15 +55,17 @@ export interface FormalitiesAreConsolidatedVO { * 备注 */ remark: string; - } export interface FormalitiesAreConsolidatedForm extends BaseEntity { /** - * + * */ id?: string | number; - + /** + * 计划完成时间 + */ + planTheEndTime?: string; /** * 项目id */ @@ -101,11 +110,9 @@ export interface FormalitiesAreConsolidatedForm extends BaseEntity { * 备注 */ remark?: string; - } export interface FormalitiesAreConsolidatedQuery extends PageQuery { - /** * 项目id */ @@ -146,11 +153,8 @@ export interface FormalitiesAreConsolidatedQuery extends PageQuery { */ formalitiesUrl?: string; - /** - * 日期范围参数 - */ - params?: any; + /** + * 日期范围参数 + */ + params?: any; } - - - diff --git a/src/views/cory/template/components/engineeringChangeApplicationForm.vue b/src/views/cory/template/components/engineeringChangeApplicationForm.vue index 90d12ff..123467c 100644 --- a/src/views/cory/template/components/engineeringChangeApplicationForm.vue +++ b/src/views/cory/template/components/engineeringChangeApplicationForm.vue @@ -222,7 +222,7 @@ const handleUpdate = (row) => { // 添加审批 proxy.$tab.closePage(proxy.$route); proxy.$router.push({ - path: `/cory/template/indexEdit`, + path: `/approval/changeContact/indexEdit`, query: { thumbnailUrl: props.thumbnail, row: JSON.stringify(row), @@ -235,7 +235,7 @@ const handleViewInfo = (row) => { // 添加审批 proxy.$tab.closePage(proxy.$route); proxy.$router.push({ - path: `/relation-management/changeContact/indexEdit`, + path: `/approval/changeContact/indexEdit`, query: { thumbnailUrl: props.thumbnail, row: JSON.stringify(row), diff --git a/src/views/cory/template/index.vue b/src/views/cory/template/index.vue index acf5175..1d4f331 100644 --- a/src/views/cory/template/index.vue +++ b/src/views/cory/template/index.vue @@ -281,7 +281,7 @@ const handleAddApp = (row) => { // 添加审批 proxy.$tab.closePage(proxy.$route); proxy.$router.push({ - path: `/relation-management/changeContact/indexEdit`, + path: `/approval/changeContact/indexEdit`, query: { thumbnailUrl: projectTypeOptions.value[1].thumbnail, id: projectTypeOptions.value[1].id, diff --git a/src/views/design/Professional/index.vue b/src/views/design/Professional/index.vue index 4c417a6..dc5ba89 100644 --- a/src/views/design/Professional/index.vue +++ b/src/views/design/Professional/index.vue @@ -167,7 +167,7 @@ const resetQuery = () => { const handleAdd = (row) => { proxy.$tab.closePage(proxy.$route); proxy.$router.push({ - path: `/design-management/Professional/indexEdit`, + path: `/approval/Professional/indexEdit`, query: { id: row.id, type: 'add' @@ -177,7 +177,7 @@ const handleAdd = (row) => { const handleViewInfo = (row) => { proxy.$tab.closePage(proxy.$route); proxy.$router.push({ - path: `/design-management/Professional/indexEdit`, + path: `/approval/Professional/indexEdit`, query: { id: row.id, type: 'view' @@ -187,7 +187,7 @@ const handleViewInfo = (row) => { const handleUpdate = (row) => { proxy.$tab.closePage(proxy.$route); proxy.$router.push({ - path: `/design-management/Professional/indexEdit`, + path: `/approval/Professional/indexEdit`, query: { id: row.id, type: 'update' diff --git a/src/views/design/billofQuantities/index.vue b/src/views/design/billofQuantities/index.vue index fdde420..0564912 100644 --- a/src/views/design/billofQuantities/index.vue +++ b/src/views/design/billofQuantities/index.vue @@ -317,7 +317,7 @@ function handleArr(arr, flag, table) { function clickApprovalSheet(row) { proxy.$tab.closePage(proxy.$route); proxy.$router.push({ - path: `/design-management/billofQuantities/indexEdit`, + path: `/approval/billofQuantities/indexEdit`, query: { id: state.queryForm.versions, type: 'update' @@ -327,7 +327,7 @@ function clickApprovalSheet(row) { // 审核流程 function lookApprovalFlow(row) { proxy.$router.push({ - path: `/design-management/billofQuantities/indexEdit`, + path: `/approval/billofQuantities/indexEdit`, query: { id: state.queryForm.versions, type: 'view' diff --git a/src/views/design/condition/comm/filePage.vue b/src/views/design/condition/comm/filePage.vue index cabd923..0db8f8a 100644 --- a/src/views/design/condition/comm/filePage.vue +++ b/src/views/design/condition/comm/filePage.vue @@ -99,7 +99,7 @@ const onUpdate = (row) => { // 审核 proxy.$tab.closePage(proxy.$route); proxy.$router.push({ - path: `/design-management/condition/indexEdit`, + path: `/approval/condition/indexEdit`, query: { id: row.id, type: 'update' @@ -110,7 +110,7 @@ const onView = (row) => { // 查看流程 proxy.$tab.closePage(proxy.$route); proxy.$router.push({ - path: `/design-management/condition/indexEdit`, + path: `/approval/condition/indexEdit`, query: { id: row.id, type: 'view' diff --git a/src/views/design/designChange/index.vue b/src/views/design/designChange/index.vue index ae2634e..e98ed0c 100644 --- a/src/views/design/designChange/index.vue +++ b/src/views/design/designChange/index.vue @@ -208,7 +208,7 @@ const resetQuery = () => { const handleAdd = () => { proxy.$tab.closePage(proxy.$route); proxy.$router.push({ - path: `/design-management/designChange/indexEdit`, + path: `/approval/designChange/indexEdit`, query: { type: 'add' } @@ -218,7 +218,7 @@ const handleAdd = () => { const handleViewDetail = (row) => { proxy.$tab.closePage(proxy.$route); proxy.$router.push({ - path: `/design-management/designChange/indexEdit`, + path: `/approval/designChange/indexEdit`, query: { id: row.id, type: 'view' @@ -229,7 +229,7 @@ const handleViewDetail = (row) => { const handleAddChange = (row) => { proxy.$tab.closePage(proxy.$route); proxy.$router.push({ - path: `/design-management/drawing/indexEdit`, + path: `/approval/drawing/indexEdit`, query: { id: row.id, type: 'add' @@ -240,7 +240,7 @@ const handleAddChange = (row) => { const handleViewInfo = (row) => { proxy.$tab.closePage(proxy.$route); proxy.$router.push({ - path: `/design-management/drawing/indexEdit`, + path: `/approval/drawing/indexEdit`, query: { id: row.id, type: 'view' diff --git a/src/views/design/drawing/index copy.vue b/src/views/design/drawing/index copy.vue index e7b87c9..fc3b601 100644 --- a/src/views/design/drawing/index copy.vue +++ b/src/views/design/drawing/index copy.vue @@ -1,5 +1,5 @@ + + + + + + + + + + + + @@ -206,7 +243,8 @@ const formalitiesAreConsolidatedList = ref([]); const buttonLoading = ref(false); const loading = ref(true); const fileLoading = ref(false); - +const updateStatusVisible = ref(false); +const statusFormRef = ref(); const showSearch = ref(true); const ids = ref>([]); const single = ref(true); @@ -218,7 +256,7 @@ const formalitiesAreConsolidatedFormRef = ref(); const fileList = ref([]); const fileTotal = ref(0); const viewVisible = ref(false); -const fileStatus = ref(0); +const fileStatus = ref('0'); const dialog = reactive({ visible: false, title: '' @@ -229,10 +267,18 @@ const fileParams = reactive({ pageSize: 10, formalitiesId: undefined }); +const statusForm = ref({ + id: undefined, + projectId: currentProject.value?.id, + processingStatus: undefined +}); + const initFormData: FormalitiesAreConsolidatedForm = { id: undefined, projectId: currentProject.value?.id, planTheStartTime: undefined, + planTheEndTime: undefined, + head: undefined }; const data = reactive>({ @@ -251,7 +297,11 @@ const data = reactive { }; const handleUpdateStatus = async (row?: FormalitiesAreConsolidatedVO) => { - await proxy?.$modal.confirm('是否确认修改状态?').finally(() => (loading.value = false)); + statusForm.value.id = row.id; + statusForm.value.processingStatus = row.processingStatus; - await editStatus({ id: row?.id, projectId: currentProject.value?.id }); + updateStatusVisible.value = true; +}; - proxy?.$modal.msgSuccess('修改成功'); - await getList(); +const submitStatus = async () => { + statusFormRef.value?.validate(async (valid: boolean) => { + if (valid) { + await editStatus(statusForm.value); + proxy?.$modal.msgSuccess('修改成功'); + await getList(); + updateStatusVisible.value = false; + } + }); }; /** 提交按钮 */ diff --git a/src/views/formalities/listOfFormalities/index.vue b/src/views/formalities/listOfFormalities/index.vue index 80bb105..2a563a2 100644 --- a/src/views/formalities/listOfFormalities/index.vue +++ b/src/views/formalities/listOfFormalities/index.vue @@ -42,13 +42,13 @@ - + - + diff --git a/src/views/materials/batchPlan/index.vue b/src/views/materials/batchPlan/index.vue index 1c14d89..8877d8f 100644 --- a/src/views/materials/batchPlan/index.vue +++ b/src/views/materials/batchPlan/index.vue @@ -441,7 +441,7 @@ const handleAudit = async () => { return; } proxy?.$tab.closePage(route); - proxy?.$tab.openPage('/materials-management/batchPlan/indexEdit', '审核物资设备批次需求计划', { + proxy?.$tab.openPage('/approval/batchPlan/indexEdit', '审核物资设备批次需求计划', { id: queryParams.value.mainData.mrpBaseId, status: form.value.mrpBaseBo.status + '_batchRequirements', type: 'update' diff --git a/src/views/materials/cailiaoshebei/index.vue b/src/views/materials/cailiaoshebei/index.vue index 2491120..bf945a9 100644 --- a/src/views/materials/cailiaoshebei/index.vue +++ b/src/views/materials/cailiaoshebei/index.vue @@ -425,7 +425,7 @@ const handleAudit = async () => { return; } proxy?.$tab.closePage(proxy.$route); - proxy?.$tab.openPage('/materials-management/cailiaoshebei/indexEdit', '审核材料设备设计', { + proxy?.$tab.openPage('/approval/cailiaoshebei/indexEdit', '审核材料设备设计', { id: form.value.batchNumber + '_materialDesign', approvalDesign: form.value.approvalDesign, type: 'update' diff --git a/src/views/materials/orderEquipment/index.vue b/src/views/materials/orderEquipment/index.vue index 870dc11..70f8c3b 100644 --- a/src/views/materials/orderEquipment/index.vue +++ b/src/views/materials/orderEquipment/index.vue @@ -132,16 +132,7 @@