diff --git a/src/api/design/designChange/index.ts b/src/api/design/designChange/index.ts new file mode 100644 index 0000000..020acf8 --- /dev/null +++ b/src/api/design/designChange/index.ts @@ -0,0 +1,63 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { DesignChangeVO, DesignChangeForm, DesignChangeQuery } from '@/api/design/designChange/types'; + +/** + * 查询设计变更管理列表 + * @param query + * @returns {*} + */ + +export const listDesignChange = (query?: DesignChangeQuery): AxiosPromise => { + return request({ + url: '/design/designChange/list', + method: 'get', + params: query + }); +}; + +/** + * 查询设计变更管理详细 + * @param id + */ +export const getDesignChange = (id: string | number): AxiosPromise => { + return request({ + url: '/design/designChange/' + id, + method: 'get' + }); +}; + +/** + * 新增设计变更管理 + * @param data + */ +export const addDesignChange = (data: DesignChangeForm) => { + return request({ + url: '/design/designChange', + method: 'post', + data: data + }); +}; + +/** + * 修改设计变更管理 + * @param data + */ +export const updateDesignChange = (data: DesignChangeForm) => { + return request({ + url: '/design/designChange', + method: 'put', + data: data + }); +}; + +/** + * 删除设计变更管理 + * @param id + */ +export const delDesignChange = (id: string | number | Array) => { + return request({ + url: '/design/designChange/' + id, + method: 'delete' + }); +}; diff --git a/src/api/design/designChange/types.ts b/src/api/design/designChange/types.ts new file mode 100644 index 0000000..b1d48fd --- /dev/null +++ b/src/api/design/designChange/types.ts @@ -0,0 +1,221 @@ +export interface DesignChangeVO { + /** + * 主键id + */ + id: string | number; + + /** + * 项目id + */ + projectId: string | number; + + /** + * 申请单编号 + */ + formNo: string; + + /** + * 工程名称 + */ + projectName: string; + + /** + * 提出单位 + */ + submitUnit: string; + + /** + * 专业 + */ + specialty: string; + + /** + * 提出日期 + */ + submitDate: string; + + /** + * 卷册名称 + */ + volumeName: string; + + /** + * 卷册号 + */ + volumeNo: string; + + /** + * 变更原因 + */ + changeReason: string; + + /** + * 变更内容 + */ + changeContent: string; + + /** + * 变更费用估算 + */ + costEstimation: string; + + /** + * 审核状态 + */ + status: string; + + /** + * 备注 + */ + remark: string; + +} + +export interface DesignChangeForm extends BaseEntity { + /** + * 主键id + */ + id?: string | number; + + /** + * 项目id + */ + projectId?: string | number; + + /** + * 申请单编号 + */ + formNo?: string; + + /** + * 工程名称 + */ + projectName?: string; + + /** + * 提出单位 + */ + submitUnit?: string; + + /** + * 专业 + */ + specialty?: string; + + /** + * 提出日期 + */ + submitDate?: string; + + /** + * 卷册名称 + */ + volumeName?: string; + + /** + * 卷册号 + */ + volumeNo?: string; + + /** + * 附图 + */ + attachmentPic?: string; + + /** + * 变更原因 + */ + changeReason?: string; + + /** + * 变更内容 + */ + changeContent?: string; + + /** + * 变更费用估算 + */ + costEstimation?: string; + + /** + * 变更费用估算计算表 + */ + costEstimationFile?: string; + + /** + * 变更文件 + */ + fileId?: string | number; + + /** + * 审核状态 + */ + status?: string; + + /** + * 备注 + */ + remark?: string; + +} + +export interface DesignChangeQuery extends PageQuery { + + /** + * 项目id + */ + projectId?: string | number; + + /** + * 申请单编号 + */ + formNo?: string; + + /** + * 工程名称 + */ + projectName?: string; + + /** + * 提出单位 + */ + submitUnit?: string; + + /** + * 专业 + */ + specialty?: string; + + /** + * 提出日期 + */ + submitDate?: string; + + /** + * 卷册名称 + */ + volumeName?: string; + + /** + * 卷册号 + */ + volumeNo?: string; + + /** + * 变更原因 + */ + changeReason?: string; + + /** + * 审核状态 + */ + status?: string; + + /** + * 日期范围参数 + */ + params?: any; +} + + + diff --git a/src/api/design/drawing/index.ts b/src/api/design/drawing/index.ts new file mode 100644 index 0000000..fbaa117 --- /dev/null +++ b/src/api/design/drawing/index.ts @@ -0,0 +1,63 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { DrawingVO, DrawingForm, DrawingQuery } from '@/api/design/drawing/types'; + +/** + * 查询图纸管理列表 + * @param query + * @returns {*} + */ + +export const listDrawing = (query?: DrawingQuery): AxiosPromise => { + return request({ + url: '/design/drawing/list', + method: 'get', + params: query + }); +}; + +/** + * 查询图纸管理详细 + * @param id + */ +export const getDrawing = (id: string | number): AxiosPromise => { + return request({ + url: '/design/drawing/' + id, + method: 'get' + }); +}; + +/** + * 新增图纸管理 + * @param data + */ +export const addDrawing = (data: DrawingForm) => { + return request({ + url: '/design/drawing', + method: 'post', + data: data + }); +}; + +/** + * 修改图纸管理 + * @param data + */ +export const updateDrawing = (data: DrawingForm) => { + return request({ + url: '/design/drawing', + method: 'put', + data: data + }); +}; + +/** + * 删除图纸管理 + * @param id + */ +export const delDrawing = (id: string | number | Array) => { + return request({ + url: '/design/drawing/' + id, + method: 'delete' + }); +}; diff --git a/src/api/design/drawing/types.ts b/src/api/design/drawing/types.ts new file mode 100644 index 0000000..b794d2b --- /dev/null +++ b/src/api/design/drawing/types.ts @@ -0,0 +1,146 @@ +export interface DrawingVO { + /** + * 主键id + */ + id: string | number; + + /** + * 项目id + */ + projectId: string | number; + + /** + * 版本号 + */ + versionNumber: string; + + /** + * 文件名称 + */ + fileName: string; + + /** + * 文件访问路径 + */ + fileUrl: string; + + /** + * 文件类型(1过程图纸 2蓝图 3变更图纸) + */ + fileType: string; + + /** + * 文件后缀 + */ + fileSuffix: string; + + /** + * 原文件名 + */ + originalName: string; + + /** + * 是否最新(0否 1是) + */ + newest: string; + + /** + * 备注 + */ + remark: string; + +} + +export interface DrawingForm extends BaseEntity { + /** + * 主键id + */ + id?: string | number; + + /** + * 项目id + */ + projectId?: string | number; + + /** + * 版本号 + */ + versionNumber?: string; + + /** + * 文件名称 + */ + fileName?: string; + + /** + * 文件访问路径 + */ + fileUrl?: string; + + /** + * 文件类型(1过程图纸 2蓝图 3变更图纸) + */ + fileType?: string; + + /** + * 文件后缀 + */ + fileSuffix?: string; + + /** + * 原文件名 + */ + originalName?: string; + + /** + * 备注 + */ + remark?: string; + +} + +export interface DrawingQuery extends PageQuery { + + /** + * 项目id + */ + projectId?: string | number; + + /** + * 文件名称 + */ + fileName?: string; + + /** + * 文件类型(1过程图纸 2蓝图 3变更图纸) + */ + fileType?: string; + + /** + * 文件后缀 + */ + fileSuffix?: string; + + /** + * 状态(0正常 1删除) + */ + fileStatus?: string; + + /** + * 原文件名 + */ + originalName?: string; + + /** + * 是否最新(0否 1是) + */ + newest?: string; + + /** + * 日期范围参数 + */ + params?: any; +} + + + diff --git a/src/api/design/specialScheme/index.ts b/src/api/design/specialScheme/index.ts new file mode 100644 index 0000000..9a505f3 --- /dev/null +++ b/src/api/design/specialScheme/index.ts @@ -0,0 +1,63 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { SpecialSchemeVO, SpecialSchemeForm, SpecialSchemeQuery } from '@/api/design/specialScheme/types'; + +/** + * 查询专项方案管理列表 + * @param query + * @returns {*} + */ + +export const listSpecialScheme = (query?: SpecialSchemeQuery): AxiosPromise => { + return request({ + url: '/design/specialScheme/list', + method: 'get', + params: query + }); +}; + +/** + * 查询专项方案管理详细 + * @param id + */ +export const getSpecialScheme = (id: string | number): AxiosPromise => { + return request({ + url: '/design/specialScheme/' + id, + method: 'get' + }); +}; + +/** + * 新增专项方案管理 + * @param data + */ +export const addSpecialScheme = (data: SpecialSchemeForm) => { + return request({ + url: '/design/specialScheme', + method: 'post', + data: data + }); +}; + +/** + * 修改专项方案管理 + * @param data + */ +export const updateSpecialScheme = (data: SpecialSchemeForm) => { + return request({ + url: '/design/specialScheme', + method: 'put', + data: data + }); +}; + +/** + * 删除专项方案管理 + * @param id + */ +export const delSpecialScheme = (id: string | number | Array) => { + return request({ + url: '/design/specialScheme/' + id, + method: 'delete' + }); +}; diff --git a/src/api/design/specialScheme/types.ts b/src/api/design/specialScheme/types.ts new file mode 100644 index 0000000..285e78a --- /dev/null +++ b/src/api/design/specialScheme/types.ts @@ -0,0 +1,126 @@ +export interface SpecialSchemeVO { + /** + * 主键id + */ + id: string | number; + + /** + * 项目id + */ + projectId: string | number; + + /** + * 版本号 + */ + versionNumber: string; + + /** + * 文件名称 + */ + fileName: string; + + /** + * 文件访问路径 + */ + fileUrl: string; + + /** + * 文件后缀 + */ + fileSuffix: string; + + /** + * 原文件名 + */ + originalName: string; + + /** + * 审核状态 + */ + status: string; + + /** + * 备注 + */ + remark: string; + + /** + * 创建时间 + */ + createTime: string; + +} + +export interface SpecialSchemeForm extends BaseEntity { + /** + * 主键id + */ + id?: string | number; + + /** + * 项目id + */ + projectId?: string | number; + + /** + * 版本号 + */ + versionNumber?: string; + + /** + * 文件名称 + */ + fileName?: string; + + /** + * 文件访问路径 + */ + fileUrl?: string; + + /** + * 文件后缀 + */ + fileSuffix?: string; + + /** + * 备注 + */ + remark?: string; + +} + +export interface SpecialSchemeQuery extends PageQuery { + + /** + * 项目id + */ + projectId?: string | number; + + /** + * 版本号 + */ + versionNumber?: string; + + /** + * 文件名称 + */ + fileName?: string; + + /** + * 原文件名 + */ + originalName?: string; + + /** + * 审核状态 + */ + status?: string; + + /** + * 日期范围参数 + */ + params?: any; +} + + + diff --git a/src/api/design/technicalStandard/index.ts b/src/api/design/technicalStandard/index.ts new file mode 100644 index 0000000..c5ed076 --- /dev/null +++ b/src/api/design/technicalStandard/index.ts @@ -0,0 +1,136 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { + KnowledgeDocumentVO, + KnowledgeDocumentForm, + KnowledgeDocumentQuery, + KnowledgeDocumentPutFileNameQuery +} from '@/api/design/technicalStandard/types'; + +/** + * 查询安全知识库列表 + * @param query + * @returns {*} + */ + +export const listKnowledgeDocument = (query?: any): AxiosPromise => { + return request({ + url: '/design/technicalStandard/file/page', + method: 'get', + params: query + }); +}; + +/** + * 查询安全知识库详细 + * @param id + */ +export const getKnowledgeDocument = (id: string | number): AxiosPromise => { + return request({ + url: '/design/technicalStandard/' + id, + method: 'get' + }); +}; + +/** + * 新增安全知识库 + * @param data + */ +export const addKnowledgeDocument = (data: { file: string }, query: { projectId: string; pid: string }) => { + return request({ + url: '/design/technicalStandard/file', + method: 'post', + data: data, + params: query + }); +}; + +/** + * 修改安全知识库 + * @param data + */ +export const updateKnowledgeDocument = (data: KnowledgeDocumentForm) => { + return request({ + url: '/design/technicalStandard', + method: 'put', + data: data + }); +}; + +/** + * 删除安全知识库 + * @param id + */ +export const delKnowledgeDocument = (id: string | number | Array) => { + return request({ + url: '/design/technicalStandard/file/' + id, + method: 'delete' + }); +}; + +/** + * 查询安全知识库文件树列表 + * @param id + */ +export const treeStructureData = (projectId: string | number): AxiosPromise => { + return request({ + url: '/design/technicalStandard/folder/tree/list', + method: 'get', + params: { projectId } + }); +}; + +/** + * 修改安全知识库 + * @param data + */ +export const documentDataEdit = (data: KnowledgeDocumentPutFileNameQuery) => { + return request({ + url: '/design/technicalStandard/file', + method: 'put', + data: data + }); +}; + +//查询质量知识库文件下载列表 +export const getUniFolderDownloadList = (id: string): AxiosPromise => { + return request({ + url: '/design/technicalStandard/file/list/' + id, + method: 'get' + }); +}; + +//查询安全知识库回收站文件列表 +export const documentDataAllList = (query: any) => { + return request({ + url: '/design/technicalStandard/recycleBin/list', + method: 'get', + params: query + }); +}; + +/** + * 根据主键id批量恢复 + * @param data + */ +export const dataRecyclingStation = (ids: string) => { + return request({ + url: '/design/technicalStandard/recovery/' + ids, + method: 'post' + }); +}; + +/** + * 根据主键id批量删除 + * @param data + */ +export const templateRecycleBin = (ids: string) => { + return request({ + url: '/design/technicalStandard/file/recycleBin/' + ids, + method: 'delete' + }); +}; + +export const getProfileDetail = (data: any): AxiosPromise => { + return request({}); +}; diff --git a/src/api/design/technicalStandard/types.ts b/src/api/design/technicalStandard/types.ts new file mode 100644 index 0000000..f8921b7 --- /dev/null +++ b/src/api/design/technicalStandard/types.ts @@ -0,0 +1,175 @@ +export interface KnowledgeDocumentVO { + /** + * 主键id + */ + id: string | number; + + /** + * 项目id + */ + projectId: string | number; + + /** + * 父级(0代表顶级) + */ + pid: string | number; + + /** + * 文件名称 + */ + fileName: string; + + /** + * 文件路径 + */ + filePath: string; + + /** + * 文件访问路径 + */ + fileUrl: string; + + /** + * 文件类型(1文件夹 2文件 3图片) + */ + fileType: string; + + /** + * 文件后缀 + */ + fileSuffix: string; + + /** + * 状态(0正常 1删除) + */ + fileStatus: string; + + /** + * 原文件名 + */ + originalName: string; + + /** + * 备注 + */ + remark: string; + + /** + * 子对象 + */ + children: KnowledgeDocumentVO[]; +} + +export interface KnowledgeDocumentForm extends BaseEntity { + /** + * 主键id + */ + id?: string | number; + + /** + * 项目id + */ + projectId?: string | number; + + /** + * 父级(0代表顶级) + */ + pid?: string | number; + + /** + * 文件名称 + */ + fileName?: string; + + /** + * 文件路径 + */ + filePath?: string; + + /** + * 文件访问路径 + */ + fileUrl?: string; + + /** + * 文件类型(1文件夹 2文件 3图片) + */ + fileType?: string; + + /** + * 文件后缀 + */ + fileSuffix?: string; + + /** + * 状态(0正常 1删除) + */ + fileStatus?: string; + + /** + * 原文件名 + */ + originalName?: string; + + /** + * 备注 + */ + remark?: string; +} + +export interface KnowledgeDocumentPutFileNameQuery { + id: string | number; + fileName: string; +} + +export interface KnowledgeDocumentQuery { + /** + * 项目id + */ + projectId?: string | number; + + /** + * 父级(0代表顶级) + */ + pid?: string | number; + + /** + * 文件名称 + */ + fileName?: string; + + /** + * 文件路径 + */ + filePath?: string; + + /** + * 文件访问路径 + */ + fileUrl?: string; + + /** + * 文件类型(1文件夹 2文件 3图片) + */ + fileType?: string; + + /** + * 文件后缀 + */ + fileSuffix?: string; + + /** + * 状态(0正常 1删除) + */ + fileStatus?: string; + + /** + * 原文件名 + */ + originalName?: string; + + /** + * 日期范围参数 + */ + params?: any; +} diff --git a/src/components/Process/flowChart.vue b/src/components/Process/flowChart.vue index 7603375..01d96cb 100644 --- a/src/components/Process/flowChart.vue +++ b/src/components/Process/flowChart.vue @@ -21,7 +21,7 @@ const iframeUrl = ref(''); const baseUrl = import.meta.env.VITE_APP_BASE_API; onMounted(async () => { - const url = baseUrl + `/warm-flow-ui/index.html?id=${props.insId}&type=FlowChart&t=${Date.now()}`; + const url = `/warm-flow-ui/index.html?id=${props.insId}&type=FlowChart&t=${Date.now()}`; iframeUrl.value = url + '&Authorization=Bearer ' + getToken() + '&clientid=' + import.meta.env.VITE_APP_CLIENT_ID; }); diff --git a/src/components/wordDetial/icon/down.png b/src/components/wordDetial/icon/down.png new file mode 100644 index 0000000..f8fe596 Binary files /dev/null and b/src/components/wordDetial/icon/down.png differ diff --git a/src/components/wordDetial/index.vue b/src/components/wordDetial/index.vue new file mode 100644 index 0000000..e2e8513 --- /dev/null +++ b/src/components/wordDetial/index.vue @@ -0,0 +1,273 @@ + +import { click } from 'ol/events/condition'; +import { includes } from 'lodash'; import { map } from 'lodash'; + + + + + diff --git a/src/views/design/designChange/index.vue b/src/views/design/designChange/index.vue new file mode 100644 index 0000000..93ae49c --- /dev/null +++ b/src/views/design/designChange/index.vue @@ -0,0 +1,344 @@ + + + diff --git a/src/views/design/drawing/index.vue b/src/views/design/drawing/index.vue new file mode 100644 index 0000000..af5bc1f --- /dev/null +++ b/src/views/design/drawing/index.vue @@ -0,0 +1,282 @@ + + + diff --git a/src/views/design/drawing/indexEdit.vue b/src/views/design/drawing/indexEdit.vue new file mode 100644 index 0000000..b859f0a --- /dev/null +++ b/src/views/design/drawing/indexEdit.vue @@ -0,0 +1,279 @@ + + + diff --git a/src/views/design/specialScheme/index.vue b/src/views/design/specialScheme/index.vue new file mode 100644 index 0000000..3763dcd --- /dev/null +++ b/src/views/design/specialScheme/index.vue @@ -0,0 +1,267 @@ + + + diff --git a/src/views/design/specialScheme/indexEdit.vue b/src/views/design/specialScheme/indexEdit.vue new file mode 100644 index 0000000..32a5fee --- /dev/null +++ b/src/views/design/specialScheme/indexEdit.vue @@ -0,0 +1,261 @@ + + + diff --git a/src/views/design/technicalStandard/component/bookFile.vue b/src/views/design/technicalStandard/component/bookFile.vue new file mode 100644 index 0000000..a4089b2 --- /dev/null +++ b/src/views/design/technicalStandard/component/bookFile.vue @@ -0,0 +1,137 @@ + + + + + diff --git a/src/views/design/technicalStandard/component/documentsDeails.vue b/src/views/design/technicalStandard/component/documentsDeails.vue new file mode 100644 index 0000000..99e9705 --- /dev/null +++ b/src/views/design/technicalStandard/component/documentsDeails.vue @@ -0,0 +1,190 @@ + + + diff --git a/src/views/design/technicalStandard/component/documentsEdit.vue b/src/views/design/technicalStandard/component/documentsEdit.vue new file mode 100644 index 0000000..3a0754b --- /dev/null +++ b/src/views/design/technicalStandard/component/documentsEdit.vue @@ -0,0 +1,203 @@ + + + diff --git a/src/views/design/technicalStandard/component/recyclingStation.vue b/src/views/design/technicalStandard/component/recyclingStation.vue new file mode 100644 index 0000000..b5cae76 --- /dev/null +++ b/src/views/design/technicalStandard/component/recyclingStation.vue @@ -0,0 +1,149 @@ + + + + + diff --git a/src/views/design/technicalStandard/icon/full.png b/src/views/design/technicalStandard/icon/full.png new file mode 100644 index 0000000..973cf14 Binary files /dev/null and b/src/views/design/technicalStandard/icon/full.png differ diff --git a/src/views/design/technicalStandard/icon/suo.png b/src/views/design/technicalStandard/icon/suo.png new file mode 100644 index 0000000..80f2233 Binary files /dev/null and b/src/views/design/technicalStandard/icon/suo.png differ diff --git a/src/views/design/technicalStandard/index.vue b/src/views/design/technicalStandard/index.vue new file mode 100644 index 0000000..838bead --- /dev/null +++ b/src/views/design/technicalStandard/index.vue @@ -0,0 +1,554 @@ + + + + + diff --git a/src/views/workflow/leave/leaveEdit.vue b/src/views/workflow/leave/leaveEdit.vue index 8e5bf62..ec23163 100644 --- a/src/views/workflow/leave/leaveEdit.vue +++ b/src/views/workflow/leave/leaveEdit.vue @@ -283,6 +283,8 @@ const approvalVerifyOpen = async () => { }; onMounted(() => { + console.log(proxy.$route.query); + nextTick(async () => { routeParams.value = proxy.$route.query; reset(); diff --git a/src/views/workflow/processDefinition/design.vue b/src/views/workflow/processDefinition/design.vue index 35b7da1..428ab6f 100644 --- a/src/views/workflow/processDefinition/design.vue +++ b/src/views/workflow/processDefinition/design.vue @@ -23,8 +23,9 @@ const iframeLoaded = () => { } }; }; +//baseUrl + const open = async (definitionId, disabled) => { - const url = baseUrl + `/warm-flow-ui/index.html?id=${definitionId}&disabled=${disabled}`; + const url = `/warm-flow-ui/index.html?id=${definitionId}&disabled=${disabled}`; iframeUrl.value = url + '&Authorization=Bearer ' + getToken() + '&clientid=' + import.meta.env.VITE_APP_CLIENT_ID; }; /** 关闭按钮 */ diff --git a/src/views/workflow/processDefinition/index.vue b/src/views/workflow/processDefinition/index.vue index 1d4ca0c..1339e3b 100644 --- a/src/views/workflow/processDefinition/index.vue +++ b/src/views/workflow/processDefinition/index.vue @@ -173,7 +173,9 @@ /> - + + + @@ -198,9 +200,13 @@ import { CategoryTreeVO } from '@/api/workflow/category/types'; import { FlowDefinitionQuery, FlowDefinitionVo, FlowDefinitionForm } from '@/api/workflow/definition/types'; import { UploadRequestOptions, TabsPaneContext } from 'element-plus'; import { ElMessageBoxOptions } from 'element-plus/es/components/message-box/src/message-box.type'; +import { useUserStoreHook } from '@/store/modules/user'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; - +// 获取用户 store +const userStore = useUserStoreHook(); +// 从 store 中获取项目列表和当前选中的项目 +const currentProject = computed(() => userStore.selectedProject); const queryFormRef = ref(); const categoryTreeRef = ref(); @@ -240,7 +246,8 @@ const queryParams = ref({ pageSize: 10, flowName: undefined, flowCode: undefined, - category: undefined + category: undefined, + projectId: currentProject.value?.id }); const rules = { category: [{ required: true, message: '分类名称不能为空', trigger: 'blur' }], @@ -252,7 +259,8 @@ const initFormData: FlowDefinitionForm = { flowName: '', flowCode: '', category: '', - formPath: '' + formPath: '', + projectId: currentProject.value?.id }; //流程定义参数 const form = ref({ @@ -260,7 +268,8 @@ const form = ref({ flowName: '', flowCode: '', category: '', - formPath: '' + formPath: '', + projectId: currentProject.value?.id }); onMounted(() => { getPageList(); @@ -478,6 +487,7 @@ const handleUpdate = async (row?: FlowDefinitionVo) => { const id = row?.id || ids.value[0]; const res = await getInfo(id); Object.assign(form.value, res.data); + form.value.flowCode = form.value.flowCode.split('_')[1]; modelDialog.visible = true; modelDialog.title = '修改流程'; }; @@ -486,6 +496,7 @@ const handleSubmit = async () => { defFormRef.value.validate(async (valid: boolean) => { if (valid) { loading.value = true; + form.value.flowCode = currentProject.value.id + '_' + form.value.flowCode; if (form.value.id) { await edit(form.value).finally(() => (loading.value = false)); } else { diff --git a/src/views/workflow/task/taskWaiting.vue b/src/views/workflow/task/taskWaiting.vue index c4b9267..d4225c5 100644 --- a/src/views/workflow/task/taskWaiting.vue +++ b/src/views/workflow/task/taskWaiting.vue @@ -32,7 +32,6 @@ - @@ -155,6 +154,7 @@ const getWaitingList = () => { }; //办理 const handleOpen = async (row: FlowTaskVO) => { + console.log(row); const routerJumpVo = reactive({ businessId: row.businessId, taskId: row.id, diff --git a/vite.config.ts b/vite.config.ts index e684f96..82e75da 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -29,6 +29,22 @@ export default defineConfig(({ mode, command }: ConfigEnv): UserConfig => { changeOrigin: true, ws: true, rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '') + },"/warm-flow-ui": { + target: 'http://192.168.110.119:8899', + changeOrigin: true, + ws: true, + rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '') + },"/warm-flow": { + target: 'http://192.168.110.119:8899', + changeOrigin: true, + ws: true, + rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '') + }, + "/workflow": { + target: 'http://192.168.110.119:8899', + changeOrigin: true, + ws: true, + rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '') } } },