|
@@ -57,19 +57,14 @@
|
|
|
>
|
|
|
<el-col :span="10">
|
|
|
<el-form-item label="" prop="userName">
|
|
|
- <el-select
|
|
|
+ <el-tree-select
|
|
|
v-model="per.userName"
|
|
|
- filterable
|
|
|
+ :data="userList"
|
|
|
placeholder="请选择人员"
|
|
|
- value-key="id"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="item in dictStroe.allUsers"
|
|
|
- :key="item.id"
|
|
|
- :label="item.userName"
|
|
|
- :value="item.userName"
|
|
|
- />
|
|
|
- </el-select>
|
|
|
+ :default-expand-all="false"
|
|
|
+ filterable
|
|
|
+ clearable
|
|
|
+ />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="10" v-if="false">
|
|
@@ -169,6 +164,7 @@ import { emitter, EventsNames } from "@/utils/common";
|
|
|
import { CirclePlus, Remove } from "@element-plus/icons-vue";
|
|
|
import { useUserStore } from "@/store/modules/user";
|
|
|
import { reportWork, signList } from "@/api/process/reportBreak";
|
|
|
+import { getUserTree } from "@/api/user";
|
|
|
|
|
|
const processStore = useProcessStore();
|
|
|
const dictStroe = useDictionaryStore();
|
|
@@ -210,7 +206,6 @@ const visibleSeq = (val) => {
|
|
|
const currentUser = ref(null);
|
|
|
const getUserName = (index) =>{
|
|
|
currentUser.value=index;
|
|
|
- console.log(currentUser.value);
|
|
|
}
|
|
|
const handleCheckAll = (person) => {
|
|
|
console.log("handleCheckAll", person);
|
|
@@ -335,6 +330,19 @@ const rateArray: { label: string; value: number }[] = [
|
|
|
// ================= 选择工序相关
|
|
|
const selectedProcess = ref<any[]>([]);
|
|
|
const processList = ref<any[]>([]);
|
|
|
+
|
|
|
+
|
|
|
+// ================= 人员树结构
|
|
|
+const userList = ref([])
|
|
|
+const queryUserList = () => {
|
|
|
+ getUserTree().then((data) => {
|
|
|
+ userList.value = data.data;
|
|
|
+ });
|
|
|
+}
|
|
|
+onMounted(async () =>
|
|
|
+ queryUserList()
|
|
|
+)
|
|
|
+
|
|
|
</script>
|
|
|
|
|
|
<style lang="scss" scoped>
|