|
|
@@ -92,10 +92,8 @@
|
|
|
<span v-else>-</span>
|
|
|
</template>
|
|
|
<template #action="scope">
|
|
|
- <div class="action-container--div" style="justify-content: left">
|
|
|
- <template >
|
|
|
- <ActionButton text="查看" @click="handleView(scope.row)" />
|
|
|
- </template>
|
|
|
+ <div class="action-container--div" style="justify-content: flex-start">
|
|
|
+ <ActionButton text="查看" @click="handleView(scope.row)" />
|
|
|
</div>
|
|
|
</template>
|
|
|
</BasicTable>
|
|
|
@@ -246,7 +244,7 @@
|
|
|
<el-cascader
|
|
|
ref="reviewDeptRef"
|
|
|
v-model="sandHiddenDangerFormDataDept.reviewDepartmentId"
|
|
|
- :options="deptTree"
|
|
|
+ :options="issueDeptTree"
|
|
|
:props="cascaderDeptProp"
|
|
|
:show-all-levels="false"
|
|
|
placeholder="请选择复查人员所属部门"
|
|
|
@@ -282,7 +280,7 @@
|
|
|
</el-form-item>
|
|
|
|
|
|
<el-form-item label-width="150px" v-if="sandHiddenDangerFormDataDept.isDrawLessonsPush === 1">
|
|
|
- <el-input placeholder="如:上级检查、院内自查" style="width: 450px" v-model="sandHiddenDangerFormDataDept.drawLessonsContent" />
|
|
|
+ <el-input placeholder="请输入举一反三内容" style="width: 450px" v-model="sandHiddenDangerFormDataDept.drawLessonsContent" />
|
|
|
</el-form-item>
|
|
|
<el-form-item prop="drawLessonsDepartmentIds" v-if="sandHiddenDangerFormDataDept.isDrawLessonsPush === 1" label="举一反三责任部门:">
|
|
|
<el-select
|
|
|
@@ -616,8 +614,7 @@
|
|
|
);
|
|
|
const issueDeptTree = ref<DeptTree[]>([]);
|
|
|
const issueUserList = ref<Array<{ id: number; realname?: string; username?: string }>>([]);
|
|
|
- // 复用部门树与用户下拉,用于复查部门/人员 & 举一反三责任部门
|
|
|
- const deptTree = ref<DeptTree[]>([]);
|
|
|
+ // 部门树与用户下拉:与 onIssueDialogOpen 中加载的 issueDeptTree 同源(整改/复查/举一反三共用)
|
|
|
const cascaderDeptProp = {
|
|
|
checkStrictly: true,
|
|
|
expandTrigger: 'hover' as const,
|
|
|
@@ -628,7 +625,7 @@
|
|
|
const drawLessonsDeptIdsArrayDept = ref<number[]>([]);
|
|
|
const reviewUserListDept = ref<Array<{ id: number; realname?: string; username?: string }>>([]);
|
|
|
|
|
|
- const deptOptions = computed(() => flattenDeptTree(deptTree.value));
|
|
|
+ const deptOptions = computed(() => flattenDeptTree(issueDeptTree.value));
|
|
|
const flattenDeptTree = (nodes: DeptTree[] | undefined): Array<{ id: number; deptName: string }> => {
|
|
|
if (!nodes?.length) return [];
|
|
|
const list: Array<{ id: number; deptName: string }> = [];
|