Browse Source

test: 审核人成员 字段修改

lanceJiang 1 year ago
parent
commit
6d9f53e057

+ 2 - 2
src/components/scWorkflow/nodes/addNode.vue

@@ -47,7 +47,7 @@ export default {
 					nodeName: '审核人',
 					nodeName: '审核人',
 					type: 1, //节点类型
 					type: 1, //节点类型
 					setType: 1, //审核人类型
 					setType: 1, //审核人类型
-					nodeUserList: [], //审核人成员
+					nodeAssigneeList: [], //审核人成员 & 角色 统一 todo...
 					nodeRoleList: [], //审核角色
 					nodeRoleList: [], //审核角色
 					examineLevel: 1, //指定主管层级
 					examineLevel: 1, //指定主管层级
 					directorLevel: 1, //自定义连续主管审批层级
 					directorLevel: 1, //自定义连续主管审批层级
@@ -66,7 +66,7 @@ export default {
 					nodeName: '抄送人',
 					nodeName: '抄送人',
 					type: 2,
 					type: 2,
 					allowSelection: true,
 					allowSelection: true,
-					nodeUserList: [],
+					nodeAssigneeList: [],
 					childNode: this.modelValue
 					childNode: this.modelValue
 				}
 				}
 			} else if (type == 4) {
 			} else if (type == 4) {

+ 6 - 6
src/components/scWorkflow/nodes/approver.vue

@@ -68,9 +68,9 @@
 							</el-form-item>
 							</el-form-item>
 
 
 							<el-form-item v-if="form.setType === 1" label="选择成员">
 							<el-form-item v-if="form.setType === 1" label="选择成员">
-								<el-button type="primary" icon="plus" round @click="selectHandle(1, form.nodeUserList)">选择人员</el-button>
+								<el-button type="primary" icon="plus" round @click="selectHandle(1, form.nodeAssigneeList)">选择人员</el-button>
 								<div class="tags-list">
 								<div class="tags-list">
-									<el-tag v-for="(user, index) in form.nodeUserList" :key="user.id" closable @close="delUser(index)">{{ user.name }}</el-tag>
+									<el-tag v-for="(user, index) in form.nodeAssigneeList" :key="user.id" closable @close="delUser(index)">{{ user.name }}</el-tag>
 								</div>
 								</div>
 							</el-form-item>
 							</el-form-item>
 
 
@@ -264,7 +264,7 @@ export default {
 			const _form = this.form
 			const _form = this.form
 			if (_form.setType === 1) {
 			if (_form.setType === 1) {
 				// 选择成员
 				// 选择成员
-				if (!_form.nodeUserList || !_form.nodeUserList.length) return this.$message.warning('请选择成员')
+				if (!_form.nodeAssigneeList || !_form.nodeAssigneeList.length) return this.$message.warning('请选择成员')
 			} else if (_form.setType === 3) {
 			} else if (_form.setType === 3) {
 				// 选择角色
 				// 选择角色
 				if (!_form.nodeRoleList || !_form.nodeRoleList.length) return this.$message.warning('请选择角色')
 				if (!_form.nodeRoleList || !_form.nodeRoleList.length) return this.$message.warning('请选择角色')
@@ -277,7 +277,7 @@ export default {
 			this.emit(this.nodeConfig.childNode)
 			this.emit(this.nodeConfig.childNode)
 		},
 		},
 		delUser(index) {
 		delUser(index) {
-			this.form.nodeUserList.splice(index, 1)
+			this.form.nodeAssigneeList.splice(index, 1)
 		},
 		},
 		delRole(index) {
 		delRole(index) {
 			this.form.nodeRoleList.splice(index, 1)
 			this.form.nodeRoleList.splice(index, 1)
@@ -288,8 +288,8 @@ export default {
 		toText(nodeConfig) {
 		toText(nodeConfig) {
 			const type = nodeConfig.setType
 			const type = nodeConfig.setType
 			if (type === 1) {
 			if (type === 1) {
-				if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 0) {
-					return nodeConfig.nodeUserList.map(item => item.name).join('、')
+				if (nodeConfig.nodeAssigneeList && nodeConfig.nodeAssigneeList.length > 0) {
+					return nodeConfig.nodeAssigneeList.map(item => item.name).join('、')
 				} else {
 				} else {
 					return false
 					return false
 				}
 				}

+ 5 - 5
src/components/scWorkflow/nodes/send.vue

@@ -36,9 +36,9 @@
 				<el-main>
 				<el-main>
 					<el-form label-position="top">
 					<el-form label-position="top">
 						<el-form-item label="选择要抄送的人员">
 						<el-form-item label="选择要抄送的人员">
-							<el-button type="primary" icon="plus" round @click="selectHandle(1, form.nodeUserList)">选择人员</el-button>
+							<el-button type="primary" icon="plus" round @click="selectHandle(1, form.nodeAssigneeList)">选择人员</el-button>
 							<div class="tags-list">
 							<div class="tags-list">
-								<el-tag v-for="(user, index) in form.nodeUserList" :key="user.id" closable @close="delUser(index)">{{ user.name }}</el-tag>
+								<el-tag v-for="(user, index) in form.nodeAssigneeList" :key="user.id" closable @close="delUser(index)">{{ user.name }}</el-tag>
 							</div>
 							</div>
 						</el-form-item>
 						</el-form-item>
 						<el-form-item label="">
 						<el-form-item label="">
@@ -113,14 +113,14 @@ export default {
 			this.$emit('update:modelValue', this.nodeConfig.childNode)
 			this.$emit('update:modelValue', this.nodeConfig.childNode)
 		},
 		},
 		delUser(index) {
 		delUser(index) {
-			this.form.nodeUserList.splice(index, 1)
+			this.form.nodeAssigneeList.splice(index, 1)
 		},
 		},
 		selectHandle(type, data) {
 		selectHandle(type, data) {
 			this.select(type, data)
 			this.select(type, data)
 		},
 		},
 		toText(nodeConfig) {
 		toText(nodeConfig) {
-			if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 0) {
-				const users = nodeConfig.nodeUserList.map(item => item.name).join('、')
+			if (nodeConfig.nodeAssigneeList && nodeConfig.nodeAssigneeList.length > 0) {
+				const users = nodeConfig.nodeAssigneeList.map(item => item.name).join('、')
 				return users
 				return users
 			} else {
 			} else {
 				if (nodeConfig.allowSelection) {
 				if (nodeConfig.allowSelection) {