zhangchong 2 anni fa
parent
commit
f40912c8b3

+ 5 - 2
src/components/LogicFlow/PropertySetting/summary.vue

@@ -60,7 +60,6 @@
 					class="w100"
 					ref="treeSelectRef"
 					v-model="form.handlerClassifiesOrgin"
-					:placeholder="'请选择' + itemName"
 					:data="orgData"
 					multiple
 					:render-after-expand="false"
@@ -68,6 +67,7 @@
 					@check-change="checkChange"
 					check-strictly
 					default-expand-all
+					filterable
 				/>
 			</el-form-item>
 			<el-form-item
@@ -274,12 +274,14 @@ onMounted(async () => {
 			case 0:
 			case 1:
 			case 2:
-			case 4:
 				form.handlerClassifiesOrgin = JSON.parse(form.handlerClassifies);
 				break;
 			case 3:
 				usetList.value = form.handlerClassifiesOrgin = JSON.parse(form.handlerClassifies);
 				break;
+			case 4:
+				form.handlerClassifiesOrgin = JSON.parse(form.handlerClassifies).map((v: any) => v.id);
+				break;
 			default:
 				break;
 		}
@@ -295,6 +297,7 @@ onMounted(async () => {
 	} else if ([3].includes(form.handlerType)) {
 		if (handlerTypeOptions.value.length) itemName.value = handlerTypeOptions.value[form.handlerType].label;
 	} else if ([4].includes(form.handlerType)) {
+		if (handlerTypeOptions.value.length) itemName.value = handlerTypeOptions.value[form.handlerType].label;
 		getcanuseorgFn();
 	}
 	nodesOptions.value = form.nodes ?? [];

+ 6 - 2
src/components/LogicFlow/PropertySetting/task.vue

@@ -60,7 +60,6 @@
 					class="w100"
 					ref="treeSelectRef"
 					v-model="form.handlerClassifiesOrgin"
-					:placeholder="'请选择' + itemName"
 					:data="orgData"
 					multiple
 					:render-after-expand="false"
@@ -68,6 +67,7 @@
 					@check-change="checkChange"
 					check-strictly
 					default-expand-all
+					filterable
 				/>
 			</el-form-item>
 			<el-form-item
@@ -191,6 +191,7 @@ const checkChange = () => {
 			name: v.orgName,
 		};
 	});
+
 	// 使用模板字符串
 	form.handlerClassifies = `${JSON.stringify(arr)}`;
 };
@@ -221,12 +222,14 @@ onMounted(async () => {
 			case 0:
 			case 1:
 			case 2:
-			case 4:
 				form.handlerClassifiesOrgin = JSON.parse(form.handlerClassifies);
 				break;
 			case 3:
 				usetList.value = form.handlerClassifiesOrgin = JSON.parse(form.handlerClassifies);
 				break;
+			case 4:
+				form.handlerClassifiesOrgin = JSON.parse(form.handlerClassifies).map((v: any) => v.id);
+				break;
 			default:
 				break;
 		}
@@ -242,6 +245,7 @@ onMounted(async () => {
 	} else if ([3].includes(form.handlerType)) {
 		if (handlerTypeOptions.value.length) itemName.value = handlerTypeOptions.value[form.handlerType].label;
 	} else if ([4].includes(form.handlerType)) {
+		if (handlerTypeOptions.value.length) itemName.value = handlerTypeOptions.value[form.handlerType].label;
 		getcanuseorgFn();
 	}
 	nodesOptions.value = form.summarynodes ?? [];