diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfProcessController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfProcessController.java index 04f48ad..7f7b9e4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfProcessController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfProcessController.java @@ -199,9 +199,11 @@ public class WfProcessController extends BaseController { * @param variables 变量集合,json对象 */ @SaCheckPermission("workflow:process:start") - @PostMapping("/start/{processDefId}") - public R start(@PathVariable(value = "processDefId") String processDefId, @RequestBody Map variables) { - processService.startProcessByDefId(processDefId, variables); + @PostMapping("/start/{processDefId}/{cellphone}") + public R start(@PathVariable(value = "processDefId") String processDefId, + @PathVariable(value = "cellphone") String cellphone, + @RequestBody Map variables) { + processService.startProcessByDefId(processDefId, cellphone, variables); return R.ok("流程启动成功"); } diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/core/domain/ProcessQuery.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/core/domain/ProcessQuery.java index fea7619..cfbf8d3 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/core/domain/ProcessQuery.java +++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/core/domain/ProcessQuery.java @@ -34,6 +34,11 @@ public class ProcessQuery { */ private String state; + /** + * 手机号码 + */ + private String cellphone; + /** * 请求参数 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/domain/UserDeployRelation.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/domain/UserDeployRelation.java new file mode 100644 index 0000000..2aacc79 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/workflow/domain/UserDeployRelation.java @@ -0,0 +1,47 @@ +package com.ruoyi.workflow.domain; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.io.Serializable; +import java.util.Date; +import java.math.BigDecimal; + +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 用户流程关联对象 user_deploy_relation + * + * @author ruoyi + * @date 2024-04-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("user_deploy_relation") +public class UserDeployRelation extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * id + */ + private String id; + /** + * 手机号码 + */ + private String cellphone; + /** + * 流程id + */ + private String deployId; + /** + * 流程编号 + */ + private String procInsId; + /** + * 备注 + */ + private String remark; + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/domain/bo/UserDeployRelationBo.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/domain/bo/UserDeployRelationBo.java new file mode 100644 index 0000000..1f44c62 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/workflow/domain/bo/UserDeployRelationBo.java @@ -0,0 +1,55 @@ +package com.ruoyi.workflow.domain.bo; + +import com.ruoyi.common.core.validate.AddGroup; +import com.ruoyi.common.core.validate.EditGroup; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + +import java.util.Date; + +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 用户流程关联业务对象 user_deploy_relation + * + * @author ruoyi + * @date 2024-04-25 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class UserDeployRelationBo extends BaseEntity { + + /** + * id + */ + @NotBlank(message = "id不能为空", groups = { AddGroup.class, EditGroup.class }) + private String id; + + /** + * 手机号码 + */ + @NotBlank(message = "手机号码不能为空", groups = { AddGroup.class, EditGroup.class }) + private String cellphone; + + /** + * 流程id + */ + @NotBlank(message = "流程id不能为空", groups = { AddGroup.class, EditGroup.class }) + private String deployId; + + /** + * 流程编号 + */ + @NotBlank(message = "流程编号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String procInsId; + + /** + * 备注 + */ + @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class }) + private String remark; + + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/domain/vo/UserDeployRelationVo.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/domain/vo/UserDeployRelationVo.java new file mode 100644 index 0000000..f94a449 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/workflow/domain/vo/UserDeployRelationVo.java @@ -0,0 +1,55 @@ +package com.ruoyi.workflow.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.ruoyi.common.annotation.ExcelDictFormat; +import com.ruoyi.common.convert.ExcelDictConvert; +import lombok.Data; +import java.util.Date; + + + +/** + * 用户流程关联视图对象 user_deploy_relation + * + * @author ruoyi + * @date 2024-04-25 + */ +@Data +@ExcelIgnoreUnannotated +public class UserDeployRelationVo { + + private static final long serialVersionUID = 1L; + + /** + * id + */ + @ExcelProperty(value = "id") + private String id; + + /** + * 手机号码 + */ + @ExcelProperty(value = "手机号码") + private String cellphone; + + /** + * 流程id + */ + @ExcelProperty(value = "流程id") + private String deployId; + + /** + * 流程编号 + */ + @ExcelProperty(value = "流程编号") + private String procInsId; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/mapper/UserDeployRelationMapper.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/mapper/UserDeployRelationMapper.java new file mode 100644 index 0000000..9fbe1cf --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/workflow/mapper/UserDeployRelationMapper.java @@ -0,0 +1,15 @@ +package com.ruoyi.workflow.mapper; + +import com.ruoyi.common.core.mapper.BaseMapperPlus; +import com.ruoyi.workflow.domain.UserDeployRelation; +import com.ruoyi.workflow.domain.vo.UserDeployRelationVo; + +/** + * 用户流程关联Mapper接口 + * + * @author ruoyi + * @date 2024-04-25 + */ +public interface UserDeployRelationMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/IUserDeployRelationService.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/IUserDeployRelationService.java new file mode 100644 index 0000000..9235eb5 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/IUserDeployRelationService.java @@ -0,0 +1,48 @@ +package com.ruoyi.workflow.service; + +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.workflow.domain.bo.UserDeployRelationBo; +import com.ruoyi.workflow.domain.vo.UserDeployRelationVo; + +import java.util.Collection; +import java.util.List; + +/** + * 用户流程关联Service接口 + * + * @author ruoyi + * @date 2024-04-25 + */ +public interface IUserDeployRelationService { + + /** + * 查询用户流程关联 + */ + UserDeployRelationVo queryById(String id); + + /** + * 查询用户流程关联列表 + */ + TableDataInfo queryPageList(UserDeployRelationBo bo, PageQuery pageQuery); + + /** + * 查询用户流程关联列表 + */ + List queryList(UserDeployRelationBo bo); + + /** + * 新增用户流程关联 + */ + Boolean insertByBo(UserDeployRelationBo bo); + + /** + * 修改用户流程关联 + */ + Boolean updateByBo(UserDeployRelationBo bo); + + /** + * 校验并批量删除用户流程关联信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/IWfProcessService.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/IWfProcessService.java index 1befc0b..3c255bc 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/IWfProcessService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/IWfProcessService.java @@ -83,9 +83,10 @@ public interface IWfProcessService { /** * 启动流程实例 * @param procDefId 流程定义ID + * @param cellphone 发起流程手机号码 * @param variables 扩展参数 */ - void startProcessByDefId(String procDefId, Map variables); + void startProcessByDefId(String procDefId, String cellphone, Map variables); /** * 通过DefinitionKey启动流程 diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/UserDeployRelationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/UserDeployRelationServiceImpl.java new file mode 100644 index 0000000..800bad2 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/UserDeployRelationServiceImpl.java @@ -0,0 +1,110 @@ +package com.ruoyi.workflow.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.core.domain.PageQuery; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.ruoyi.workflow.domain.UserDeployRelation; +import com.ruoyi.workflow.domain.bo.UserDeployRelationBo; +import com.ruoyi.workflow.domain.vo.UserDeployRelationVo; +import com.ruoyi.workflow.mapper.UserDeployRelationMapper; +import com.ruoyi.workflow.service.IUserDeployRelationService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 用户流程关联Service业务层处理 + * + * @author ruoyi + * @date 2024-04-25 + */ +@RequiredArgsConstructor +@Service +public class UserDeployRelationServiceImpl implements IUserDeployRelationService { + + private final UserDeployRelationMapper baseMapper; + + /** + * 查询用户流程关联 + */ + @Override + public UserDeployRelationVo queryById(String id){ + return baseMapper.selectVoById(id); + } + + /** + * 查询用户流程关联列表 + */ + @Override + public TableDataInfo queryPageList(UserDeployRelationBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询用户流程关联列表 + */ + @Override + public List queryList(UserDeployRelationBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(UserDeployRelationBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getCellphone()), UserDeployRelation::getCellphone, bo.getCellphone()); + lqw.eq(StringUtils.isNotBlank(bo.getDeployId()), UserDeployRelation::getDeployId, bo.getDeployId()); + return lqw; + } + + /** + * 新增用户流程关联 + */ + @Override + public Boolean insertByBo(UserDeployRelationBo bo) { + UserDeployRelation add = BeanUtil.toBean(bo, UserDeployRelation.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改用户流程关联 + */ + @Override + public Boolean updateByBo(UserDeployRelationBo bo) { + UserDeployRelation update = BeanUtil.toBean(bo, UserDeployRelation.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(UserDeployRelation entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除用户流程关联 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfProcessServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfProcessServiceImpl.java index 52dade8..81cfe84 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfProcessServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfProcessServiceImpl.java @@ -32,8 +32,10 @@ import com.ruoyi.flowable.utils.TaskUtils; import com.ruoyi.system.service.ISysDeptService; import com.ruoyi.system.service.ISysRoleService; import com.ruoyi.workflow.domain.WfDeployForm; +import com.ruoyi.workflow.domain.bo.UserDeployRelationBo; import com.ruoyi.workflow.domain.vo.*; import com.ruoyi.workflow.mapper.WfDeployFormMapper; +import com.ruoyi.workflow.service.IUserDeployRelationService; import com.ruoyi.workflow.service.IWfProcessService; import com.ruoyi.workflow.service.IWfTaskService; import lombok.RequiredArgsConstructor; @@ -75,6 +77,7 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce private final ISysRoleService roleService; private final ISysDeptService deptService; private final WfDeployFormMapper deployFormMapper; + private final IUserDeployRelationService userDeployRelationService; /** * 流程定义列表 @@ -163,9 +166,25 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce // 构建搜索条件 ProcessUtils.buildProcessSearch(historicProcessInstanceQuery, processQuery); int offset = pageQuery.getPageSize() * (pageQuery.getPageNum() - 1); - List historicProcessInstances = historicProcessInstanceQuery - .listPage(offset, pageQuery.getPageSize()); - page.setTotal(historicProcessInstanceQuery.count()); + List historicProcessInstances = historicProcessInstanceQuery.list(); + if (!StringUtils.isEmpty(processQuery.getCellphone())) { + UserDeployRelationBo userDeployRelationBo = new UserDeployRelationBo(); + userDeployRelationBo.setCellphone(processQuery.getCellphone()); + List userDeployRelationVos = userDeployRelationService.queryList(userDeployRelationBo); + historicProcessInstances = historicProcessInstances.stream() + .filter(taskVo -> userDeployRelationVos.stream() + .anyMatch(userDeployRelationVo -> + (taskVo.getDeploymentId().equals(userDeployRelationVo.getDeployId())) + && taskVo.getId().equals(userDeployRelationVo.getProcInsId()))) + .collect(Collectors.toList()); + } + int pageTotal = historicProcessInstances.size(); + if (pageTotal == 0) { + return TableDataInfo.build(); + } + + historicProcessInstances = historicProcessInstances.subList(offset, pageTotal taskVoList = new ArrayList<>(); for (HistoricProcessInstance hisIns : historicProcessInstances) { WfTaskVo taskVo = new WfTaskVo(); @@ -582,11 +601,11 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce */ @Override @Transactional(rollbackFor = Exception.class) - public void startProcessByDefId(String procDefId, Map variables) { + public void startProcessByDefId(String procDefId, String cellphone, Map variables) { try { ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery() .processDefinitionId(procDefId).singleResult(); - startProcess(processDefinition, variables); + startProcess(processDefinition, variables, cellphone); } catch (Exception e) { e.printStackTrace(); throw new ServiceException("流程启动错误"); @@ -604,7 +623,7 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce try { ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery() .processDefinitionKey(procDefKey).latestVersion().singleResult(); - startProcess(processDefinition, variables); + startProcess(processDefinition, variables, ""); } catch (Exception e) { e.printStackTrace(); throw new ServiceException("流程启动错误"); @@ -680,7 +699,7 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce /** * 启动流程实例 */ - private void startProcess(ProcessDefinition procDef, Map variables) { + private void startProcess(ProcessDefinition procDef, Map variables, String cellphone) { if (ObjectUtil.isNotNull(procDef) && procDef.isSuspended()) { throw new ServiceException("流程已被挂起,请先激活流程"); } @@ -694,6 +713,13 @@ public class WfProcessServiceImpl extends FlowServiceFactory implements IWfProce ProcessInstance processInstance = runtimeService.startProcessInstanceById(procDef.getId(), variables); // 第一个用户任务为发起人,则自动完成任务 wfTaskService.startFirstTask(processInstance, variables); + // 流程编号跟手机绑定 + String deploymentId = procDef.getDeploymentId(); + UserDeployRelationBo userDeployRelationBo = new UserDeployRelationBo(); + userDeployRelationBo.setDeployId(deploymentId); + userDeployRelationBo.setProcInsId(processInstance.getProcessInstanceId()); + userDeployRelationBo.setCellphone(cellphone); + userDeployRelationService.insertByBo(userDeployRelationBo); } diff --git a/ruoyi-ui/.env.development b/ruoyi-ui/.env.development index 57a1e1d..3547885 100644 --- a/ruoyi-ui/.env.development +++ b/ruoyi-ui/.env.development @@ -1,5 +1,5 @@ # 页面标题 -VUE_APP_TITLE = 铭慧通-工单后台管理系统 +VUE_APP_TITLE = 广州城市学院报修管理系统 # 开发环境配置 ENV = 'development' diff --git a/ruoyi-ui/.env.production b/ruoyi-ui/.env.production index 800bed0..967488f 100644 --- a/ruoyi-ui/.env.production +++ b/ruoyi-ui/.env.production @@ -1,11 +1,11 @@ # 页面标题 -VUE_APP_TITLE = 铭慧通-工单后台管理系统 +VUE_APP_TITLE = 广州城市学院报修管理系统 # 生产环境配置 ENV = 'production' # 若依管理系统/生产环境 -VUE_APP_BASE_API = 'http://bx.mhito.net:8090' +VUE_APP_BASE_API = 'https://bxserver.mhito.net:8090' # 应用访问路径 例如使用前缀 /admin/ VUE_APP_CONTEXT_PATH = '/' diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index e4dd562..baf8e6a 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -1,7 +1,7 @@ { "name": "flowable-plus", "version": "0.8.3", - "description": "铭慧通-工单后台管理系统", + "description": "广州城市学院报修管理系统", "author": "mh", "license": "MIT", "scripts": { diff --git a/ruoyi-ui/public/favicon.ico b/ruoyi-ui/public/favicon.ico index 050428e..382b2fa 100644 Binary files a/ruoyi-ui/public/favicon.ico and b/ruoyi-ui/public/favicon.ico differ diff --git a/ruoyi-ui/src/api/workflow/process.js b/ruoyi-ui/src/api/workflow/process.js index a6a8862..9576bea 100644 --- a/ruoyi-ui/src/api/workflow/process.js +++ b/ruoyi-ui/src/api/workflow/process.js @@ -19,9 +19,9 @@ export function getProcessForm(query) { } // 部署流程实例 -export function startProcess(processDefId, data) { +export function startProcess(processDefId, cellphone, data) { return request({ - url: '/workflow/process/start/' + processDefId, + url: '/workflow/process/start/' + processDefId + '/' + cellphone, method: 'post', data: data }) diff --git a/ruoyi-ui/src/assets/logo/logo.png b/ruoyi-ui/src/assets/logo/logo.png index 050428e..382b2fa 100644 Binary files a/ruoyi-ui/src/assets/logo/logo.png and b/ruoyi-ui/src/assets/logo/logo.png differ diff --git a/ruoyi-ui/src/layout/components/Sidebar/Logo.vue b/ruoyi-ui/src/layout/components/Sidebar/Logo.vue index 38900e2..3aa60fa 100644 --- a/ruoyi-ui/src/layout/components/Sidebar/Logo.vue +++ b/ruoyi-ui/src/layout/components/Sidebar/Logo.vue @@ -40,7 +40,7 @@ export default { }, data() { return { - title: '铭慧通-工单系统', + title: '广州城市学院报修管理系统', logo: logoImg } } diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js index 41b1b7b..77cca42 100644 --- a/ruoyi-ui/src/router/index.js +++ b/ruoyi-ui/src/router/index.js @@ -30,6 +30,24 @@ import Layout from '@/layout' // 公共路由 export const constantRoutes = [ + // 手机端发起报修 + { + path: '/bx/start/:deployId([\\w|\\-]+)', + component: () => import('@/views/workflow/work/start_cellphone'), + hidden: true + }, + // 手机端查询报修列表 + { + path: '/bx/list', + component: () => import('@/views/workflow/work/own_cellphone'), + hidden: true + }, + // 手机端查询报修详情 + { + path: '/bx/detail/:procInsId([\\w|\\-]+)', + component: () => import('@/views/workflow/work/detail_cellphone'), + hidden: true + }, { path: '/redirect', component: Layout, @@ -195,6 +213,23 @@ export const dynamicRoutes = [ } ] }, + { + path: '/workflow/process/bx', + children: [ + { + path: 'start/:deployId([\\w|\\-]+)', + component: () => import('@/views/workflow/work/start_cellphone'), + }, + { + path: 'list', + component: () => import('@/views/workflow/work/own_cellphone'), + }, + { + path: 'detail/:procInsId([\\w|\\-]+)', + component: () => import('@/views/workflow/work/detail_cellphone'), + } + ] + }, ] // 防止连续点击多次路由报错 diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue index 045f93f..b699eb4 100644 --- a/ruoyi-ui/src/views/login.vue +++ b/ruoyi-ui/src/views/login.vue @@ -1,7 +1,7 @@ @@ -135,7 +106,7 @@ export default { title: '', open: false, index: undefined, - xmlData:"", + xmlData: "", } } }, @@ -179,6 +150,7 @@ export default { this.processView.open = true; }, handleStart(row) { + debugger this.$router.push({ path: '/workflow/process/start/' + row.deploymentId, query: { @@ -199,6 +171,4 @@ export default { } - + diff --git a/ruoyi-ui/src/views/workflow/work/own.vue b/ruoyi-ui/src/views/workflow/work/own.vue index d48e519..4cee727 100644 --- a/ruoyi-ui/src/views/workflow/work/own.vue +++ b/ruoyi-ui/src/views/workflow/work/own.vue @@ -2,44 +2,24 @@
- + - + - - + 搜索 @@ -49,88 +29,50 @@ - 删除 + 删除 - 导出 + 导出 - - + + - - + + - + - +
@@ -159,7 +101,7 @@ export default { // 总条数 total: 0, categoryOptions: [], - processTotal:0, + processTotal: 0, // 我发起的流程列表数据 ownProcessList: [], // 弹出层标题 @@ -167,7 +109,7 @@ export default { // 是否显示弹出层 open: false, src: "", - definitionList:[], + definitionList: [], // 日期范围 dateRange: [], // 查询参数 @@ -256,11 +198,11 @@ export default { console.log(row); }, /** 取消流程申请 */ - handleStop(row){ + handleStop(row) { const params = { procInsId: row.procInsId } - stopProcess(params).then( res => { + stopProcess(params).then(res => { this.$modal.msgSuccess(res.msg); this.getList(); }); @@ -281,7 +223,7 @@ export default { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning" - }).then(function() { + }).then(function () { return delProcess(ids); }).then(() => { this.getList(); diff --git a/ruoyi-ui/src/views/workflow/work/own_cellphone.vue b/ruoyi-ui/src/views/workflow/work/own_cellphone.vue new file mode 100644 index 0000000..0c5df1b --- /dev/null +++ b/ruoyi-ui/src/views/workflow/work/own_cellphone.vue @@ -0,0 +1,231 @@ + + + diff --git a/ruoyi-ui/src/views/workflow/work/start_cellphone.vue b/ruoyi-ui/src/views/workflow/work/start_cellphone.vue new file mode 100644 index 0000000..1d3e2df --- /dev/null +++ b/ruoyi-ui/src/views/workflow/work/start_cellphone.vue @@ -0,0 +1,91 @@ + + + + + diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js index 299acde..843ef48 100644 --- a/ruoyi-ui/vue.config.js +++ b/ruoyi-ui/vue.config.js @@ -7,7 +7,7 @@ function resolve(dir) { const CompressionPlugin = require('compression-webpack-plugin') -const name = process.env.VUE_APP_TITLE || '铭慧通-工单后台管理系统' // 网页标题 +const name = process.env.VUE_APP_TITLE || '广州城市学院报修管理系统' // 网页标题 const port = process.env.port || process.env.npm_config_port || 80 // 端口 @@ -34,11 +34,11 @@ module.exports = { open: false, proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy - '/dev-api': { - target: 'http://bx.mhito.net:8090', + [process.env.VUE_APP_BASE_API]: { + target: `http://localhost:8080`, changeOrigin: true, pathRewrite: { - '^/dev-api': '' + ['^' + process.env.VUE_APP_BASE_API]: '' } } },