Преглед изворни кода

test: 审核角色 字段修改

lanceJiang пре 1 година
родитељ
комит
a50ecb87a7

+ 1 - 1
src/components/scWorkflow/index.vue

@@ -54,7 +54,7 @@ export default {
 				nodeName: '结束'
 				// nodeName: '发起人',
 				// type: 0,
-				// nodeRoleList: []
+				// nodeAssigneeList: []
 			}*/
 		}
 	},

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

@@ -47,8 +47,7 @@ export default {
 					nodeName: '审核人',
 					type: 1, //节点类型
 					setType: 1, //审核人类型
-					nodeAssigneeList: [], //审核人成员 & 角色 统一 todo...
-					nodeRoleList: [], //审核角色
+					nodeAssigneeList: [], //审核人成员 & 角色
 					examineLevel: 1, //指定主管层级
 					directorLevel: 1, //自定义连续主管审批层级
 					selectMode: 1, //发起人自选类型

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

@@ -79,9 +79,9 @@
 							</el-form-item>
 
 							<el-form-item v-if="form.setType === 3" label="选择角色">
-								<el-button type="primary" icon="plus" round @click="selectHandle(2, form.nodeRoleList)">选择角色</el-button>
+								<el-button type="primary" icon="plus" round @click="selectHandle(2, form.nodeAssigneeList)">选择角色</el-button>
 								<div class="tags-list">
-									<el-tag v-for="(role, index) in form.nodeRoleList" :key="role.id" type="info" closable @close="delRole(index)">{{
+									<el-tag v-for="(role, index) in form.nodeAssigneeList" :key="role.id" type="info" closable @close="delRole(index)">{{
 										role.name
 									}}</el-tag>
 								</div>
@@ -276,7 +276,7 @@ export default {
 				if (!_form.nodeAssigneeList || !_form.nodeAssigneeList.length) return this.$message.warning('请选择成员')
 			} else if (_form.setType === 3) {
 				// 选择角色
-				if (!_form.nodeRoleList || !_form.nodeRoleList.length) return this.$message.warning('请选择角色')
+				if (!_form.nodeAssigneeList || !_form.nodeAssigneeList.length) return this.$message.warning('请选择角色')
 			}
 
 			this.emit(_form)
@@ -289,7 +289,7 @@ export default {
 			this.form.nodeAssigneeList.splice(index, 1)
 		},
 		delRole(index) {
-			this.form.nodeRoleList.splice(index, 1)
+			this.form.nodeAssigneeList.splice(index, 1)
 		},
 		selectHandle(type, data) {
 			this.select(type, data)
@@ -305,8 +305,8 @@ export default {
 			} else if (type === 2) {
 				return nodeConfig.examineLevel === 1 ? '直接主管' : `发起人的第${nodeConfig.examineLevel}级主管`
 			} else if (type === 3) {
-				if (nodeConfig.nodeRoleList && nodeConfig.nodeRoleList.length > 0) {
-					return '角色-' + nodeConfig.nodeRoleList.map(item => item.name).join('、')
+				if (nodeConfig.nodeAssigneeList && nodeConfig.nodeAssigneeList.length > 0) {
+					return '角色-' + nodeConfig.nodeAssigneeList.map(item => item.name).join('、')
 				} else {
 					return false
 				}

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

@@ -36,14 +36,14 @@
 				<el-main>
 					<el-form label-position="top">
 						<el-form-item label="谁可以发起此审批">
-							<el-button type="primary" icon="plus" round @click="selectHandle(2, form.nodeRoleList)">选择角色</el-button>
+							<el-button type="primary" icon="plus" round @click="selectHandle(2, form.nodeAssigneeList)">选择角色</el-button>
 							<div class="tags-list">
-								<el-tag v-for="(role, index) in form.nodeRoleList" :key="role.id" type="info" closable @close="delRole(index)">{{
+								<el-tag v-for="(role, index) in form.nodeAssigneeList" :key="role.id" type="info" closable @close="delRole(index)">{{
 									role.name
 								}}</el-tag>
 							</div>
 						</el-form-item>
-						<el-alert v-if="form.nodeRoleList.length == 0" title="不指定则默认所有人都可发起此审批" type="info" :closable="false" />
+						<el-alert v-if="!form.nodeAssigneeList.length" title="不指定则默认所有人都可发起此审批" type="info" :closable="false" />
 					</el-form>
 				</el-main>
 				<el-footer>
@@ -106,15 +106,15 @@ export default {
 			this.select(type, data)
 		},
 		delRole(index) {
-			this.form.nodeRoleList.splice(index, 1)
+			this.form.nodeAssigneeList.splice(index, 1)
 		},
 		save() {
 			this.$emit('update:modelValue', this.form)
 			this.drawer = false
 		},
 		toText(nodeConfig) {
-			if (nodeConfig.nodeRoleList && nodeConfig.nodeRoleList.length > 0) {
-				return nodeConfig.nodeRoleList.map(item => item.name).join('、')
+			if (nodeConfig.nodeAssigneeList && nodeConfig.nodeAssigneeList.length > 0) {
+				return nodeConfig.nodeAssigneeList.map(item => item.name).join('、')
 			} else {
 				return '所有人'
 			}