diff --git a/src/views/system/process/detailProcess.vue b/src/views/system/process/detailProcess.vue index e1daeca..97d1f7b 100644 --- a/src/views/system/process/detailProcess.vue +++ b/src/views/system/process/detailProcess.vue @@ -11,11 +11,12 @@ const $route = useRoute() const selectFormId = ref('') const ruleFormRef = ref() +const getRowData = ref({}) as any const form: Ref = ref({ - number: '11111', // 编号 - name: '111', // 名称 - business: 'sss', // 关联业务 - desc: '2', // 流程描述 + number: '', // 编号 + name: '', // 名称 + business: '', // 关联业务 + desc: '', // 流程描述 selectDecision: '同意 驳回 拒绝', // 选择的决策 rejectTo: '2', // 可驳回至 changeData: '2', // 驳回修改数据 @@ -73,10 +74,12 @@ onMounted(() => { const rowData: any = $route.query.rowData - // console.log('111111', JSON.parse(rowData)) - const data = JSON.parse(rowData) - selectFormId.value = data.formId - console.log('selectFormId', selectFormId.value) + getRowData.value = JSON.parse(rowData) + selectFormId.value = getRowData.value.formId + form.value.number = getRowData.value.number + form.value.name = getRowData.value.name + form.value.business = getRowData.value.business + form.value.desc = getRowData.value.describe }) @@ -92,7 +95,8 @@ - {{ form.number }} + + @@ -105,12 +109,14 @@ - + - {{ form.name }} + + + @@ -136,7 +142,9 @@ - {{ form.business }} + + + diff --git a/src/views/system/process/detailProcess.vue b/src/views/system/process/detailProcess.vue index e1daeca..97d1f7b 100644 --- a/src/views/system/process/detailProcess.vue +++ b/src/views/system/process/detailProcess.vue @@ -11,11 +11,12 @@ const $route = useRoute() const selectFormId = ref('') const ruleFormRef = ref() +const getRowData = ref({}) as any const form: Ref = ref({ - number: '11111', // 编号 - name: '111', // 名称 - business: 'sss', // 关联业务 - desc: '2', // 流程描述 + number: '', // 编号 + name: '', // 名称 + business: '', // 关联业务 + desc: '', // 流程描述 selectDecision: '同意 驳回 拒绝', // 选择的决策 rejectTo: '2', // 可驳回至 changeData: '2', // 驳回修改数据 @@ -73,10 +74,12 @@ onMounted(() => { const rowData: any = $route.query.rowData - // console.log('111111', JSON.parse(rowData)) - const data = JSON.parse(rowData) - selectFormId.value = data.formId - console.log('selectFormId', selectFormId.value) + getRowData.value = JSON.parse(rowData) + selectFormId.value = getRowData.value.formId + form.value.number = getRowData.value.number + form.value.name = getRowData.value.name + form.value.business = getRowData.value.business + form.value.desc = getRowData.value.describe }) @@ -92,7 +95,8 @@ - {{ form.number }} + + @@ -105,12 +109,14 @@ - + - {{ form.name }} + + + @@ -136,7 +142,9 @@ - {{ form.business }} + + + diff --git a/src/views/system/process/editProcess.vue b/src/views/system/process/editProcess.vue index ec793e0..dc288a4 100644 --- a/src/views/system/process/editProcess.vue +++ b/src/views/system/process/editProcess.vue @@ -11,7 +11,7 @@ const processSetting = ref() const selectFormId = ref('') // formid const $route = useRoute() -const getRowData = ref({}) +const getRowData = ref({}) as any const ruleFormRef = ref() const form: Ref = ref({ number: '', // 编号 @@ -133,7 +133,6 @@ onMounted(() => { const rowData: any = $route.query.rowData - console.log('111111', JSON.parse(rowData)) getRowData.value = JSON.parse(rowData) selectFormId.value = getRowData.value.formId form.value.number = getRowData.value.number diff --git a/src/views/system/process/detailProcess.vue b/src/views/system/process/detailProcess.vue index e1daeca..97d1f7b 100644 --- a/src/views/system/process/detailProcess.vue +++ b/src/views/system/process/detailProcess.vue @@ -11,11 +11,12 @@ const $route = useRoute() const selectFormId = ref('') const ruleFormRef = ref() +const getRowData = ref({}) as any const form: Ref = ref({ - number: '11111', // 编号 - name: '111', // 名称 - business: 'sss', // 关联业务 - desc: '2', // 流程描述 + number: '', // 编号 + name: '', // 名称 + business: '', // 关联业务 + desc: '', // 流程描述 selectDecision: '同意 驳回 拒绝', // 选择的决策 rejectTo: '2', // 可驳回至 changeData: '2', // 驳回修改数据 @@ -73,10 +74,12 @@ onMounted(() => { const rowData: any = $route.query.rowData - // console.log('111111', JSON.parse(rowData)) - const data = JSON.parse(rowData) - selectFormId.value = data.formId - console.log('selectFormId', selectFormId.value) + getRowData.value = JSON.parse(rowData) + selectFormId.value = getRowData.value.formId + form.value.number = getRowData.value.number + form.value.name = getRowData.value.name + form.value.business = getRowData.value.business + form.value.desc = getRowData.value.describe }) @@ -92,7 +95,8 @@ - {{ form.number }} + + @@ -105,12 +109,14 @@ - + - {{ form.name }} + + + @@ -136,7 +142,9 @@ - {{ form.business }} + + + diff --git a/src/views/system/process/editProcess.vue b/src/views/system/process/editProcess.vue index ec793e0..dc288a4 100644 --- a/src/views/system/process/editProcess.vue +++ b/src/views/system/process/editProcess.vue @@ -11,7 +11,7 @@ const processSetting = ref() const selectFormId = ref('') // formid const $route = useRoute() -const getRowData = ref({}) +const getRowData = ref({}) as any const ruleFormRef = ref() const form: Ref = ref({ number: '', // 编号 @@ -133,7 +133,6 @@ onMounted(() => { const rowData: any = $route.query.rowData - console.log('111111', JSON.parse(rowData)) getRowData.value = JSON.parse(rowData) selectFormId.value = getRowData.value.formId form.value.number = getRowData.value.number diff --git a/src/views/system/process/process.ts b/src/views/system/process/process.ts index 033977f..dc53552 100644 --- a/src/views/system/process/process.ts +++ b/src/views/system/process/process.ts @@ -39,3 +39,9 @@ isMessage: string // 审批结果通知发起人 } +// 关联业务列表 +export interface IBusinessList { + formId: string + formName: string +} + diff --git a/src/views/system/process/detailProcess.vue b/src/views/system/process/detailProcess.vue index e1daeca..97d1f7b 100644 --- a/src/views/system/process/detailProcess.vue +++ b/src/views/system/process/detailProcess.vue @@ -11,11 +11,12 @@ const $route = useRoute() const selectFormId = ref('') const ruleFormRef = ref() +const getRowData = ref({}) as any const form: Ref = ref({ - number: '11111', // 编号 - name: '111', // 名称 - business: 'sss', // 关联业务 - desc: '2', // 流程描述 + number: '', // 编号 + name: '', // 名称 + business: '', // 关联业务 + desc: '', // 流程描述 selectDecision: '同意 驳回 拒绝', // 选择的决策 rejectTo: '2', // 可驳回至 changeData: '2', // 驳回修改数据 @@ -73,10 +74,12 @@ onMounted(() => { const rowData: any = $route.query.rowData - // console.log('111111', JSON.parse(rowData)) - const data = JSON.parse(rowData) - selectFormId.value = data.formId - console.log('selectFormId', selectFormId.value) + getRowData.value = JSON.parse(rowData) + selectFormId.value = getRowData.value.formId + form.value.number = getRowData.value.number + form.value.name = getRowData.value.name + form.value.business = getRowData.value.business + form.value.desc = getRowData.value.describe }) @@ -92,7 +95,8 @@ - {{ form.number }} + + @@ -105,12 +109,14 @@ - + - {{ form.name }} + + + @@ -136,7 +142,9 @@ - {{ form.business }} + + + diff --git a/src/views/system/process/editProcess.vue b/src/views/system/process/editProcess.vue index ec793e0..dc288a4 100644 --- a/src/views/system/process/editProcess.vue +++ b/src/views/system/process/editProcess.vue @@ -11,7 +11,7 @@ const processSetting = ref() const selectFormId = ref('') // formid const $route = useRoute() -const getRowData = ref({}) +const getRowData = ref({}) as any const ruleFormRef = ref() const form: Ref = ref({ number: '', // 编号 @@ -133,7 +133,6 @@ onMounted(() => { const rowData: any = $route.query.rowData - console.log('111111', JSON.parse(rowData)) getRowData.value = JSON.parse(rowData) selectFormId.value = getRowData.value.formId form.value.number = getRowData.value.number diff --git a/src/views/system/process/process.ts b/src/views/system/process/process.ts index 033977f..dc53552 100644 --- a/src/views/system/process/process.ts +++ b/src/views/system/process/process.ts @@ -39,3 +39,9 @@ isMessage: string // 审批结果通知发起人 } +// 关联业务列表 +export interface IBusinessList { + formId: string + formName: string +} + diff --git a/src/views/system/process/process.vue b/src/views/system/process/process.vue index 1be7c1d..ff43037 100644 --- a/src/views/system/process/process.vue +++ b/src/views/system/process/process.vue @@ -4,7 +4,7 @@ import { ElLoading, ElMessage, ElMessageBox } from 'element-plus' import { Delete } from '@element-plus/icons-vue' import { useRoute, useRouter } from 'vue-router' -import type { IlistQuery } from './process' +import type { IBusinessList, IlistQuery } from './process' import EditProcess from './editProcess.vue' import DetailProcess from './detailProcess.vue' import { delProcessList, exportProcessList, getBusinessList, getProcessList, updateState } from '@/api/system/process' @@ -14,7 +14,7 @@ const { proxy } = getCurrentInstance() as any const active = ref('main') -const businessList = ref([]) // 关联业务列表 +const businessList = ref([]) // 关联业务列表 const listQuery = reactive({ deploymentId: '', // 流程部署id suspensionState: '', // 状态流程 1激活 2废止 @@ -38,23 +38,6 @@ label: '废止', }, ] -const businessDic = { - FILE_APPROVAL: 'jlglwjsp', // 文件审批, - TRAIN_APPROVAL: 'jlglpxjhsp', // 培训计划审批 - SUPPLIER_APPROVAL: 'jlglsygfsp', // 溯源供方审批 - STANDARD_CHANGE_APPROVAL: 'sbglbzzzghsq', // 标准装置更换申请 - STANDARD_PAUSE_APPROVAL: 'sbglbzzzghsq', // 标准装置暂停申请 - STANDARD_REVERT_APPROVAL: 'sbglbzzzghsq', // 标准装置撤销申请 - STANDARD_RESUME_APPROVAL: 'sbglbzzzghsq', // 标准装置恢复申请 - STANDARD_CHECK_APPROVAL: 'sbglbzzzfcsq', // 标准装置复查申请 - DEVICE_UNUSED_APPROVAL: 'sbglsbxzsq', // 设备闲置申请 - DEVICE_SEALED_APPROVAL: 'sbglsbfcsq', // 设备封存申请 - DEVICE_UNSEALED_APPROVAL: 'sbglsbqfsq', // 设备启封申请 - DEVICE_SCRAPPED_ROVAL: 'sbglsbbfsq', // 设备报废申请 - DEVICE_HANDLE_APPROVAL: 'sbglsbczsq', // 设备处置申请 - DEVICE_CONSUMING_APPROVAL: 'sbglsblysq', // 设备领用申请 - DEVICE_BORROW_APPROVAL: 'sbglsbjysq', // 设备借用申请 -} const columns = ref([ { text: '流程编号',