From 76d3f1513bfef6b4e8a6d56c8a587933962a9ec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Sat, 22 Feb 2025 18:09:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yanzhu/system/api/domain/SysDept.java | 3 + .../common/core/enums/UserTypeEnums.java | 5 +- .../yanzhu/flowable/domain/vo/FlowTaskVo.java | 6 ++ .../domain/ProProjectInfoSubdeptsUsers.java | 1 + .../ProProjectInfoSubdeptsUsersMapper.xml | 1 + .../resources/mapper/system/SysUserMapper.xml | 2 +- .../controller/FlowTaskController.java | 14 +++ ...roProjectInfoSubdeptsUsersServiceImpl.java | 66 ++++++++++--- .../system/controller/SysUserController.java | 2 +- .../service/impl/SysUserServiceImpl.java | 44 ++++----- yanzhu-ui-app/miniprogram/api/flowable.js | 9 ++ .../project_flowable/approveTask/index.wxml | 4 +- .../project_flowable/detailTask/index.wxml | 4 +- .../project_flowable/editTask/index.wxml | 2 +- .../project_flowable/subDepts/index.wxml | 2 +- .../project_flowable/subDeptsUsers/index.js | 99 ++++++++++++++++++- .../project_flowable/subDeptsUsers/index.wxml | 9 +- .../project_flowable/subDeptsUsers/index.wxss | 11 ++- .../miniprogram/pages/project_more/index.wxml | 1 + .../miniprogram/pages/project_qr/index.wxml | 10 +- .../src/components/Process/index.vue | 4 +- .../components/Process/panel/commonPanel.vue | 9 +- .../proProjectInfoSubdeptsUsers/index.vue | 3 +- 23 files changed, 250 insertions(+), 61 deletions(-) diff --git a/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/domain/SysDept.java b/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/domain/SysDept.java index f0666cd0..db929607 100644 --- a/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/domain/SysDept.java +++ b/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/domain/SysDept.java @@ -19,6 +19,9 @@ public class SysDept extends BaseEntity { private static final long serialVersionUID = 1L; + /** 项目单位... */ + public static final String XMDW = "4"; + /** 部门ID */ private Long deptId; diff --git a/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/enums/UserTypeEnums.java b/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/enums/UserTypeEnums.java index 5eb14347..f1534a8f 100644 --- a/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/enums/UserTypeEnums.java +++ b/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/enums/UserTypeEnums.java @@ -5,8 +5,9 @@ package com.yanzhu.common.core.enums; */ public enum UserTypeEnums { - ZSRY("00", "正式人员","key"), - LSRY("08", "临时人员","key"), + XTRY("00", "正式人员","key"), + XMRY("08", "项目人员","key"), + QTRY("99", "其它人员","key"), FBWTDL("80", "分包代理人","fbwtdl"), FBXMJL("79", "分包项目经理","fbxmjl"), FBBZZZ("78", "分包班组组长","fbbzzz"), diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/flowable/domain/vo/FlowTaskVo.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/flowable/domain/vo/FlowTaskVo.java index dcca168e..dd54f535 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/flowable/domain/vo/FlowTaskVo.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/flowable/domain/vo/FlowTaskVo.java @@ -20,6 +20,9 @@ public class FlowTaskVo { @ApiModelProperty("任务Id") private String taskId; + @ApiModelProperty("任务Id") + private List taskIds; + @ApiModelProperty("用户Id") private String userId; @@ -29,6 +32,9 @@ public class FlowTaskVo { @ApiModelProperty("流程实例Id") private String instanceId; + @ApiModelProperty("流程实例Id") + private List instanceIds; + @ApiModelProperty("节点") private String targetKey; diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdeptsUsers.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdeptsUsers.java index 370a4a9b..a188287f 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdeptsUsers.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdeptsUsers.java @@ -5,6 +5,7 @@ import com.yanzhu.common.core.annotation.Excel; import com.yanzhu.common.core.web.domain.BaseEntity; import java.util.Date; +import java.util.List; /** * 花名册人员 对象pro_project_info_subdepts_users diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml index 18811831..63934c95 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml @@ -96,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and psu.user_phone = #{userPhone} and psu.approve_status = ]]> 100 and psu.is_del = #{isDel} + and psu.user_post != '66' and date(psu.use_date) between #{params.beginTime} and #{params.endTime} and psu.is_del != 2 diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserMapper.xml index 9b7dc633..dc07036d 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserMapper.xml @@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from sys_user u left join sys_dept d on u.dept_id = d.dept_id left join sys_user_ext ex on u.user_id=ex.user_id - where u.del_flag = '0' and u.remark is null + where u.del_flag = '0' and ex.user_type != '99' AND u.user_id = #{userId} diff --git a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowTaskController.java b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowTaskController.java index ffd3d5d0..5f673c07 100644 --- a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowTaskController.java +++ b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/FlowTaskController.java @@ -107,6 +107,20 @@ public class FlowTaskController extends BaseController { return flowTaskService.complete(flowTaskVo); } + @ApiOperation(value = "批量审批任务") + @Log(title = "批量审批任务", businessType = BusinessType.UPDATE) + @PostMapping(value = "/batchComplete") + public AjaxResult batchComplete(@RequestBody FlowTaskVo flowTaskVo) { + for(int i=0;i register(@RequestBody SysUser sysUser) { String username = sysUser.getUserName(); - if (Objects.isNull(sysUser.getUserType()) || Objects.equals(UserTypeEnums.ZSRY.getCode(), sysUser.getUserType())) { + if (Objects.isNull(sysUser.getUserType()) || Objects.equals(UserTypeEnums.XTRY.getCode(), sysUser.getUserType()) || Objects.equals(UserTypeEnums.XMRY.getCode(), sysUser.getUserType())) { if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) { return R.fail("当前系统没有开启注册功能！"); } diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserServiceImpl.java b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserServiceImpl.java index aac9e7a3..fcb842f8 100644 --- a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserServiceImpl.java +++ b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserServiceImpl.java @@ -1,28 +1,31 @@ package com.yanzhu.system.service.impl; -import java.util.*; -import java.util.stream.Collectors; -import javax.validation.Validator; - import com.yanzhu.common.core.constant.SecurityConstants; +import com.yanzhu.common.core.constant.UserConstants; import com.yanzhu.common.core.domain.R; import com.yanzhu.common.core.enums.ShiFouEnums; import com.yanzhu.common.core.enums.UserTypeEnums; +import com.yanzhu.common.core.exception.ServiceException; import com.yanzhu.common.core.text.Convert; import com.yanzhu.common.core.utils.DateUtils; +import com.yanzhu.common.core.utils.SpringUtils; +import com.yanzhu.common.core.utils.StringUtils; +import com.yanzhu.common.core.utils.bean.BeanValidators; import com.yanzhu.common.core.web.domain.AjaxResult; +import com.yanzhu.common.datascope.annotation.DataScope; import com.yanzhu.common.redis.service.RedisService; import com.yanzhu.common.security.service.TokenService; +import com.yanzhu.common.security.utils.SecurityUtils; import com.yanzhu.manage.domain.ProProjectInfo; import com.yanzhu.manage.mapper.ProProjectInfoMapper; -import com.yanzhu.manage.mapper.ProProjectInfoSubdeptsUsersMapper; import com.yanzhu.system.api.RemoteProService; -import com.yanzhu.system.api.RemoteUserService; import com.yanzhu.system.api.domain.*; import com.yanzhu.system.api.model.LoginUser; import com.yanzhu.system.domain.*; import com.yanzhu.system.mapper.*; +import com.yanzhu.system.service.ISysConfigService; import com.yanzhu.system.service.ISysUserExtService; +import com.yanzhu.system.service.ISysUserService; import com.yanzhu.system.vo.AlertUserPassVo; import net.sourceforge.pinyin4j.PinyinHelper; import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat; @@ -33,15 +36,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; -import com.yanzhu.common.core.constant.UserConstants; -import com.yanzhu.common.core.exception.ServiceException; -import com.yanzhu.common.core.utils.SpringUtils; -import com.yanzhu.common.core.utils.StringUtils; -import com.yanzhu.common.core.utils.bean.BeanValidators; -import com.yanzhu.common.datascope.annotation.DataScope; -import com.yanzhu.common.security.utils.SecurityUtils; -import com.yanzhu.system.service.ISysConfigService; -import com.yanzhu.system.service.ISysUserService; + +import javax.validation.Validator; +import java.util.*; +import java.util.stream.Collectors; /** * 用户 业务层处理 @@ -88,6 +86,7 @@ public class SysUserServiceImpl implements ISysUserService @Autowired private ISysUserExtService userExtService; + @Autowired private SysUserComMapper userComMapper; @@ -366,7 +365,7 @@ public class SysUserServiceImpl implements ISysUserService SysUserExt where=new SysUserExt(); where.setUserId(sysUser.getUserId()); where.setProjectId(user.getDeptId()); - List userExts=userExtService.selectSysUserExtList(where); + userExtService.selectSysUserExtList(where); user.setUserId(sysUser.getUserId()); user.setIsActive(0l); @@ -392,7 +391,7 @@ public class SysUserServiceImpl implements ISysUserService user.setCreateBy(user.getUpdateBy()); user.setCreateTime(user.getUpdateTime()); if(StringUtils.isBlank(user.getUserType())) { - user.setUserType("99"); + user.setUserType(UserTypeEnums.XTRY.getCode()); } rows=userMapper.insertUser(user); user.setIsActive(1l); @@ -457,6 +456,7 @@ public class SysUserServiceImpl implements ISysUserService if(Objects.nonNull(sysUser)){ user.setUserId(sysUser.getUserId()); sysUser.setUserName(user.getUserName()); + sysUser.setUserType(UserTypeEnums.QTRY.getCode()); sysUser.setPhonenumber(user.getUserName()); sysUser.setNickName(user.getNickName()); sysUser.setUpdateBy(user.getUpdateBy()); @@ -464,9 +464,9 @@ public class SysUserServiceImpl implements ISysUserService sysUser.setPassword(user.getPassword()); userMapper.updateUser(sysUser); }else{ + user.setUserType(UserTypeEnums.QTRY.getCode()); user.setCreateBy(user.getUpdateBy()); user.setCreateTime(user.getUpdateTime()); - user.setUserType("99"); user.setWorkType(user.getWorkType()); userMapper.insertUser(user); try { @@ -497,14 +497,14 @@ public class SysUserServiceImpl implements ISysUserService SysUserExt where=new SysUserExt(); where.setUserId(user.getUserId()); where.setComId(user.getComId()); - where.setWorkType(user.getWorkType()); + where.setUserType(UserTypeEnums.QTRY.getCode()); List userExts=userExtService.selectSysUserExtList(where); if(userExts.size()==0){ where.setIsActive(1l); where.setProjectId(user.getDeptId()); userExtService.insertSysUserExt(where); }else{ - long cnt= userExts.stream().filter(d->d.getProjectId().equals(user.getDeptId())).count(); + long cnt = userExts.stream().filter(d->d.getProjectId().equals(user.getDeptId())).count(); if(cnt==0){ where.setIsActive(0l); where.setProjectId(user.getDeptId()); @@ -689,11 +689,11 @@ public class SysUserServiceImpl implements ISysUserService userExtService.updateSysUserExt(oldExt); } try { - if(Objects.equals(user.getUserType(),"99")){ + if(Objects.equals(user.getUserType(),UserTypeEnums.XMRY.getCode())){ // 根据单位递归查询项目信息 SysDept sysDept = deptMapper.selectDeptById(user.getDeptId()); // 是项目单位时，将人员信息加入到花名册 - if(StringUtils.isNotEmpty(sysDept.getDeptType()) && Objects.equals(sysDept.getDeptType(),"4")){ + if(StringUtils.isNotEmpty(sysDept.getDeptType()) && Objects.equals(sysDept.getDeptType(),SysDept.XMDW)){ Map data = packageSubDeptUsers(user,sysDept); remoteProService.syspushSubDeptsUser(data, SecurityConstants.INNER); } diff --git a/yanzhu-ui-app/miniprogram/api/flowable.js b/yanzhu-ui-app/miniprogram/api/flowable.js index 01329af6..07339ad4 100644 --- a/yanzhu-ui-app/miniprogram/api/flowable.js +++ b/yanzhu-ui-app/miniprogram/api/flowable.js @@ -61,6 +61,15 @@ export function complete(data) { }) } +// 批量审批任务 +export function batchComplete(data) { + return request({ + url: '/flowable/task/batchComplete', + method: 'post', + data: data + }) +} + // 驳回任务流程 export function reject(data) { return request({ diff --git a/yanzhu-ui-app/miniprogram/pages/project_flowable/approveTask/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_flowable/approveTask/index.wxml index 7ba1d4e7..5f666928 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_flowable/approveTask/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/project_flowable/approveTask/index.wxml @@ -26,7 +26,7 @@ {{(flowRecordList.length-index) < 9 ?'0'+(flowRecordList.length-index):(flowRecordList.length-index)}} - {{item.taskName}}{{item.commentResult}} + {{item.taskName}} {{item.commentResult}} {{item.commentResult}} {{item.commentResult}} @@ -236,7 +236,7 @@ - + 单位委托书 diff --git a/yanzhu-ui-app/miniprogram/pages/project_flowable/detailTask/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_flowable/detailTask/index.wxml index eb80ea1f..c037392a 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_flowable/detailTask/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/project_flowable/detailTask/index.wxml @@ -26,7 +26,7 @@ {{(flowRecordList.length-index) < 9 ?'0'+(flowRecordList.length-index):(flowRecordList.length-index)}} - {{item.taskName}}{{item.commentResult}} + {{item.taskName}} {{item.commentResult}} {{item.commentResult}} {{item.commentResult}} @@ -236,7 +236,7 @@ - + 单位委托书 diff --git a/yanzhu-ui-app/miniprogram/pages/project_flowable/editTask/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_flowable/editTask/index.wxml index b7496b38..65e01501 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_flowable/editTask/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/project_flowable/editTask/index.wxml @@ -26,7 +26,7 @@ {{(flowRecordList.length-index) < 9 ?'0'+(flowRecordList.length-index):(flowRecordList.length-index)}} - {{item.taskName}}{{item.commentResult}} + {{item.taskName}} {{item.commentResult}} {{item.commentResult}} {{item.commentResult}} diff --git a/yanzhu-ui-app/miniprogram/pages/project_flowable/subDepts/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_flowable/subDepts/index.wxml index 00163495..ce4830e9 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_flowable/subDepts/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/project_flowable/subDepts/index.wxml @@ -26,7 +26,7 @@ {{index < 9 ?'0'+(index+1):(index+1)}} - + 申请时间 {{item.createTime}} 办结时间 {{item.endTime}} diff --git a/yanzhu-ui-app/miniprogram/pages/project_flowable/subDeptsUsers/index.js b/yanzhu-ui-app/miniprogram/pages/project_flowable/subDeptsUsers/index.js index 1354f88d..c918a58a 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_flowable/subDeptsUsers/index.js +++ b/yanzhu-ui-app/miniprogram/pages/project_flowable/subDeptsUsers/index.js @@ -1,9 +1,11 @@ import config from '../../../config' import { - getToken + getToken, + getUserInfo } from '../../../utils/auth' import { quueryCount, + batchComplete, myAwaitFlowTaskList, myFinishedFlowTaskList, } from '../../../api/flowable' @@ -24,6 +26,8 @@ Page({ pageNum: 1, pageSize: 10, total: 0, + checkedAll:false, + showChecked:false, imgBaseUrl: config.baseImgUrl }, @@ -57,12 +61,18 @@ Page({ text: app.globalData.useProjectName, } }); + let userInfo = getUserInfo(); + if(userInfo && userInfo.projectUserInfo && userInfo.projectUserInfo.subDeptType=="1"){ + this.setData({ + showChecked:true + }); + } this.getListData(); this.getFlowableCount(); } else { console.log("未查询到Token...{}...准备重新登录") wx.redirectTo({ - url: '../login/login', + url: '../../login/login', }) } }, @@ -178,6 +188,91 @@ Page({ } }, + /** + * 选中节点 + * @param {*} e + */ + selectItem: function(event){ + let procInsId = event.currentTarget.dataset.set; + console.log("procInsId==>",procInsId) + let _listData = this.data.listData; + _listData.forEach(item =>{ + if(procInsId==item.procInsId){ + item.selected=!item.selected; + } + }) + this.setData({ + listData: _listData + }); + }, + + /** + * 全选 + */ + onCheckedAll(){ + let _checked = !this.data.checkedAll; + let _listData = this.data.listData; + _listData.forEach(item =>{ + item.selected=_checked; + }); + this.setData({ + listData: _listData, + checkedAll: _checked + }); + }, + + /** + * 批量 + * 审核通过 + */ + onBatchPass(){ + let taskIds = []; + let _listData = this.data.listData; + _listData.forEach(item =>{ + if(item.selected){ + taskIds.push(item.taskId); + } + }); + if(taskIds.length==0){ + app.toast("请选择要审批的数据项!","none",1500); + return false; + } + let that = this; + //弹出确认 + wx.showModal({ + title: '提示', + content: '是否确认批量审批通过？', + success: function (sm) { + if (sm.confirm) { + that.submitBatchPass(); + } + } + }) + }, + + /** + * 提交审批 + */ + submitBatchPass(){ + let taskIds = []; + let instanceIds = []; + let _listData = this.data.listData; + _listData.forEach(item =>{ + if(item.selected){ + taskIds.push(item.taskId); + instanceIds.push(item.procInsId); + } + }); + let _data = { + 'taskIds':taskIds, + 'instanceIds':instanceIds + } + batchComplete(_data).then(res =>{ + app.toast("批量审批通过成功!"); + this.onLoad(); + }); + }, + /** * 办理时间计算 * @param {*} val diff --git a/yanzhu-ui-app/miniprogram/pages/project_flowable/subDeptsUsers/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_flowable/subDeptsUsers/index.wxml index 3a191233..860d6724 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_flowable/subDeptsUsers/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/project_flowable/subDeptsUsers/index.wxml @@ -26,10 +26,13 @@ {{index < 9 ?'0'+(index+1):(index+1)}} - + 申请时间 {{item.createTime}} 办结时间 {{item.endTime}} + + + @@ -47,6 +50,10 @@ + + {{checkedAll?"全不选":"全选"}} + 审批通过 + diff --git a/yanzhu-ui-app/miniprogram/pages/project_flowable/subDeptsUsers/index.wxss b/yanzhu-ui-app/miniprogram/pages/project_flowable/subDeptsUsers/index.wxss index 49456f6e..f1f92344 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_flowable/subDeptsUsers/index.wxss +++ b/yanzhu-ui-app/miniprogram/pages/project_flowable/subDeptsUsers/index.wxss @@ -1 +1,10 @@ -/* pages/project_flowable/subDeptsUsers/index.wxss */ \ No newline at end of file +/* pages/project_flowable/subDeptsUsers/index.wxss */ +.myIcon{ + position: fixed; + right: 25px; +} +.myIcon image { + width: 22px; + height: 22px; + background-color: #eeeeee; + } \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pages/project_more/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_more/index.wxml index 2e871e30..7c665c39 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_more/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/project_more/index.wxml @@ -32,6 +32,7 @@ + 紧急联系人电话 - + @@ -305,7 +305,7 @@ 紧急联系人电话 - + @@ -448,7 +448,7 @@ 紧急联系人电话 - + @@ -700,7 +700,7 @@ {{item.questionTitle}} - + @@ -766,7 +766,7 @@ {{item.questionTitle}} - + diff --git a/yanzhu-ui-vue3/src/components/Process/index.vue b/yanzhu-ui-vue3/src/components/Process/index.vue index 97b92e4e..0f1230d4 100644 --- a/yanzhu-ui-vue3/src/components/Process/index.vue +++ b/yanzhu-ui-vue3/src/components/Process/index.vue @@ -123,10 +123,10 @@ onMounted(() => { modelerStore.setModules('selection', markRaw(modeler.get('selection'))); modelerStore.setModules('canvas', markRaw(modeler.get('canvas'))); // 直接点击新建按钮时,进行新增流程图 - if (StrUtil.isBlank(props.xml.value)) { + if (StrUtil.isBlank(props.xml)) { newDiagram() } else { - createNewDiagram(props.xml.value) + createNewDiagram(props.xml) } }) diff --git a/yanzhu-ui-vue3/src/components/Process/panel/commonPanel.vue b/yanzhu-ui-vue3/src/components/Process/panel/commonPanel.vue index b82087ac..6cb81ece 100644 --- a/yanzhu-ui-vue3/src/components/Process/panel/commonPanel.vue +++ b/yanzhu-ui-vue3/src/components/Process/panel/commonPanel.vue @@ -3,12 +3,12 @@