From e4ffdc74b58bcca7de4b1b05f589444c493d9b01 Mon Sep 17 00:00:00 2001
From: 李喆(开发组) <lzhe@yxqiche.com>
Date: 星期一, 04 八月 2025 17:34:14 +0800
Subject: [PATCH] 1
---
src/views/basesetting/machine.vue | 42 ++++++++++++++++++++++++------------------
src/views/flow/todolist.vue | 4 ++--
2 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/src/views/basesetting/machine.vue b/src/views/basesetting/machine.vue
index ed759ad..3c1e0f6 100644
--- a/src/views/basesetting/machine.vue
+++ b/src/views/basesetting/machine.vue
@@ -34,7 +34,7 @@
<el-dialog :title="machineTitle" append-to-body v-model="editBox" width="60%">
<avue-form ref="editFormModal1" :option="editFormModal" v-model="editForm" @submit="formSubmit" @resetForm="resetForm">
<template #ownerDept="{}">
- <el-tree-select v-model="editForm.ownerDept" :data="organizationTreeList"/>
+ <el-tree-select v-model="editForm.ownerDept" :data="organizationTreeList" :props="treePropsConfig"/>
</template>
</avue-form>
</el-dialog>
@@ -51,6 +51,11 @@
data() {
var that = this;
return {
+ treePropsConfig: {
+ value: 'id',
+ label: 'title',
+ children: 'children'
+ },
organizationTreeList: [],
machineTitle: "鏂板",
isAdd: true,
@@ -202,12 +207,13 @@
{
label: '鎵�灞炵粍缁�',
prop: 'ownerDept',
+ type: 'tree',
span: 12,
rules: [
{
required: true,
message: '璇烽�夋嫨鎵�灞炵粍缁�',
- trigger: 'change'
+ trigger: 'click'
}
]
},
@@ -266,6 +272,17 @@
};
},
methods: {
+ initData(tenantId) {
+ axios({
+ url: 'blade-system/dept/tree',
+ method: 'get'
+ }).then(
+ res => {
+ //const column = this.findObject(this.option.column, 'parentId');
+ //column.dicData = res.data.data;
+ }
+ );
+ },
handleAdd() {
this.machineTitle = "鏂板";
this.isAdd = true;
@@ -432,22 +449,11 @@
});
}
},
- mounted() {
- //鍒ゆ柇鐗堟湰 0:娑夊瘑缃戯紝1:宸ユ帶缃戯紱//宸ユ帶缃�5涓紝娑夊瘑缃�4涓� 宸ユ帶缃戜笉鍋氫簡
- // 宸ユ帶缃戞槸/blade-mdm/system/dept/lazy-list
- // 娑夊瘑缃戞槸/blade-mdm/dept/lazy-list
- axios({url: '/blade-mdm/system/param/getValue?paramKey=networkType',method: 'get'}).then(res => {
- // if(res.data.data === "0") {
- // var aurl = "/blade-mdm/dept/lazy-list";
- // }else {
- // var aurl = "/blade-mdm/system/dept/lazy-list";
- // }
- var aurl = "/blade-mdm/system/dept/lazy-list";
- axios({url: aurl,method: 'get'}).then(resp => {
- this.organizationTreeList = this.traversalLabelValueToTree(resp.data.data);
- })
- }
- );
+ mounted() {
+ //鎵�灞炵粍缁� /api/blade-system/dept/tree
+ axios({url: '/blade-system/dept/tree',method: 'get'}).then(resp => {
+ this.organizationTreeList = this.traversalLabelValueToTree(resp.data.data);
+ })
}
};
</script>
diff --git a/src/views/flow/todolist.vue b/src/views/flow/todolist.vue
index d8cd0e9..1bfb122 100644
--- a/src/views/flow/todolist.vue
+++ b/src/views/flow/todolist.vue
@@ -9,8 +9,7 @@
</el-button>
</template>
<template #menu="scope">
- <el-button type="primary" text size="default" v-if="permission.flow_model_update"
- @click.stop="handleAction(scope.row, scope.index)">瀹℃壒
+ <el-button type="primary" text size="default" @click.stop="handleAction(scope.row, scope.index)">瀹℃壒
</el-button>
</template>
</avue-crud>
@@ -44,6 +43,7 @@
},
data() {
return {
+
applist: [],
assigneeData: [],
row: {},
--
Gitblit v1.9.3