|
@@ -22,37 +22,41 @@
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
|
|
|
|
|
<el-form-item label="安全责任所/中心" prop="safetyResponsibleCenter">
|
|
<el-form-item label="安全责任所/中心" prop="safetyResponsibleCenter">
|
|
|
- <el-select
|
|
|
|
|
- v-model="formValue.safetyResponsibleCenter"
|
|
|
|
|
- placeholder="请选择"
|
|
|
|
|
- size="large"
|
|
|
|
|
|
|
+ <el-cascader
|
|
|
|
|
+ v-model="formValue.safetyResponsibleCenterId"
|
|
|
style="width: 50%"
|
|
style="width: 50%"
|
|
|
|
|
+ size="large"
|
|
|
|
|
+ :ref="(el) => (cascaderRef['safetyResponsibleCenter'] = el)"
|
|
|
|
|
+ :options="firstLevelDepts"
|
|
|
|
|
+ :props="cascaderProp"
|
|
|
|
|
+ :show-all-levels="false"
|
|
|
|
|
+ placeholder="请选择安全责任部门"
|
|
|
filterable
|
|
filterable
|
|
|
- >
|
|
|
|
|
- <el-option
|
|
|
|
|
- v-for="item in firstLevelDepts"
|
|
|
|
|
- :key="item.hrIdtOrgId"
|
|
|
|
|
- :label="item.deptName"
|
|
|
|
|
- :value="item.deptName"
|
|
|
|
|
- />
|
|
|
|
|
- </el-select>
|
|
|
|
|
|
|
+ @change="(val) => handleChangeDept(val, 'safetyResponsibleCenter')"
|
|
|
|
|
+ />
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
|
|
|
|
|
<el-form-item label="安全责任所/中心负责人" prop="safetyCenterManager">
|
|
<el-form-item label="安全责任所/中心负责人" prop="safetyCenterManager">
|
|
|
<el-select
|
|
<el-select
|
|
|
|
|
+ :disabled="!safetyCenterManagerOptions.length"
|
|
|
v-model="formValue.safetyCenterManager"
|
|
v-model="formValue.safetyCenterManager"
|
|
|
placeholder="请选择"
|
|
placeholder="请选择"
|
|
|
size="large"
|
|
size="large"
|
|
|
style="width: 50%"
|
|
style="width: 50%"
|
|
|
filterable
|
|
filterable
|
|
|
- @change="(val) => syncUserName(val, 'safetyCenterManagerName')"
|
|
|
|
|
|
|
+ @change="(val) => syncUserName(safetyCenterManagerOptions, val, 'safetyCenterManagerName')"
|
|
|
>
|
|
>
|
|
|
- <el-option v-for="item in userOptions" :key="item.id" :label="item.name" :value="item.id" />
|
|
|
|
|
|
|
+ <el-option
|
|
|
|
|
+ v-for="item in safetyCenterManagerOptions"
|
|
|
|
|
+ :key="item.value"
|
|
|
|
|
+ :label="item.label"
|
|
|
|
|
+ :value="item.value"
|
|
|
|
|
+ />
|
|
|
</el-select>
|
|
</el-select>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
|
|
|
|
|
<el-form-item label="安全责任部门" prop="safetyResponsibleDepartment">
|
|
<el-form-item label="安全责任部门" prop="safetyResponsibleDepartment">
|
|
|
- <el-select
|
|
|
|
|
|
|
+ <!-- <el-select
|
|
|
v-model="formValue.safetyResponsibleDepartment"
|
|
v-model="formValue.safetyResponsibleDepartment"
|
|
|
placeholder="请选择"
|
|
placeholder="请选择"
|
|
|
size="large"
|
|
size="large"
|
|
@@ -65,32 +69,46 @@
|
|
|
:label="item.deptName"
|
|
:label="item.deptName"
|
|
|
:value="item.deptName"
|
|
:value="item.deptName"
|
|
|
/>
|
|
/>
|
|
|
- </el-select>
|
|
|
|
|
|
|
+ </el-select> -->
|
|
|
|
|
+ <el-cascader
|
|
|
|
|
+ v-model="formValue.safetyResponsibleDepartmentId"
|
|
|
|
|
+ style="width: 50%"
|
|
|
|
|
+ size="large"
|
|
|
|
|
+ :ref="(el) => (cascaderRef['safetyResponsibleDepartment'] = el)"
|
|
|
|
|
+ :options="firstLevelDepts"
|
|
|
|
|
+ :props="cascaderProp"
|
|
|
|
|
+ :show-all-levels="false"
|
|
|
|
|
+ placeholder="请选择安全责任部门"
|
|
|
|
|
+ filterable
|
|
|
|
|
+ @change="(val) => handleChangeDept(val, 'safetyResponsibleDepartment')"
|
|
|
|
|
+ />
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
|
|
|
|
|
<el-form-item label="安全责任部门负责人" prop="safetyDepartmentManager">
|
|
<el-form-item label="安全责任部门负责人" prop="safetyDepartmentManager">
|
|
|
<el-select
|
|
<el-select
|
|
|
|
|
+ :disabled="!userOptions.length"
|
|
|
v-model="formValue.safetyDepartmentManager"
|
|
v-model="formValue.safetyDepartmentManager"
|
|
|
placeholder="请选择"
|
|
placeholder="请选择"
|
|
|
size="large"
|
|
size="large"
|
|
|
style="width: 50%"
|
|
style="width: 50%"
|
|
|
filterable
|
|
filterable
|
|
|
- @change="(val) => syncUserName(val, 'safetyDepartmentManagerName')"
|
|
|
|
|
|
|
+ @change="(val) => syncUserName(userOptions, val, 'safetyDepartmentManagerName')"
|
|
|
>
|
|
>
|
|
|
- <el-option v-for="item in userOptions" :key="item.id" :label="item.name" :value="item.id" />
|
|
|
|
|
|
|
+ <el-option v-for="item in userOptions" :key="item.value" :label="item.label" :value="item.value" />
|
|
|
</el-select>
|
|
</el-select>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
|
|
|
|
|
<el-form-item label="安全具体责任人" prop="safetySpecificPerson">
|
|
<el-form-item label="安全具体责任人" prop="safetySpecificPerson">
|
|
|
<el-select
|
|
<el-select
|
|
|
|
|
+ :disabled="!userOptions.length"
|
|
|
v-model="formValue.safetySpecificPerson"
|
|
v-model="formValue.safetySpecificPerson"
|
|
|
placeholder="请选择"
|
|
placeholder="请选择"
|
|
|
size="large"
|
|
size="large"
|
|
|
style="width: 50%"
|
|
style="width: 50%"
|
|
|
filterable
|
|
filterable
|
|
|
- @change="handleSpecificPersonChange"
|
|
|
|
|
|
|
+ @change="(val) => syncUserName(userOptions, val, 'safetySpecificPersonName')"
|
|
|
>
|
|
>
|
|
|
- <el-option v-for="item in userOptions" :key="item.id" :label="item.name" :value="item.id" />
|
|
|
|
|
|
|
+ <el-option v-for="item in userOptions" :key="item.value" :label="item.label" :value="item.value" />
|
|
|
</el-select>
|
|
</el-select>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
|
|
|
|
@@ -112,15 +130,12 @@
|
|
|
</template>
|
|
</template>
|
|
|
|
|
|
|
|
<script lang="ts" setup>
|
|
<script lang="ts" setup>
|
|
|
- import { ref, reactive, onMounted } from 'vue';
|
|
|
|
|
|
|
+ import { ref, reactive, onMounted, nextTick } from 'vue';
|
|
|
import { useRouter } from 'vue-router';
|
|
import { useRouter } from 'vue-router';
|
|
|
import { ElMessage } from 'element-plus';
|
|
import { ElMessage } from 'element-plus';
|
|
|
import { getAllDepartments } from '@/api/auth/dept';
|
|
import { getAllDepartments } from '@/api/auth/dept';
|
|
|
import { formatDeptTree } from '@/views/disaster/utils/formatDeptTree';
|
|
import { formatDeptTree } from '@/views/disaster/utils/formatDeptTree';
|
|
|
- import {
|
|
|
|
|
- queryUserPageByUsername,
|
|
|
|
|
- areaCheckListSavaArea,
|
|
|
|
|
- } from '@/api/production-safety/responsibility-implementation';
|
|
|
|
|
|
|
+ import { areaCheckListSavaArea, queryAvailableUserList } from '@/api/production-safety/responsibility-implementation';
|
|
|
import { getUserList } from '@/api/system/user-operate';
|
|
import { getUserList } from '@/api/system/user-operate';
|
|
|
|
|
|
|
|
const router = useRouter();
|
|
const router = useRouter();
|
|
@@ -129,6 +144,17 @@
|
|
|
|
|
|
|
|
const userOptions = ref<any[]>([]);
|
|
const userOptions = ref<any[]>([]);
|
|
|
const firstLevelDepts = ref<any[]>([]);
|
|
const firstLevelDepts = ref<any[]>([]);
|
|
|
|
|
+ const cascaderProp = {
|
|
|
|
|
+ expandTrigger: 'click',
|
|
|
|
|
+ checkStrictly: true,
|
|
|
|
|
+ // emitPath: false,
|
|
|
|
|
+ value: 'id',
|
|
|
|
|
+ label: 'deptName',
|
|
|
|
|
+ };
|
|
|
|
|
+
|
|
|
|
|
+ const cascaderRef = ref({});
|
|
|
|
|
+
|
|
|
|
|
+ const safetyCenterManagerOptions = ref<any[]>([]);
|
|
|
|
|
|
|
|
const formValue = reactive({
|
|
const formValue = reactive({
|
|
|
buildingNo: '',
|
|
buildingNo: '',
|
|
@@ -136,9 +162,11 @@
|
|
|
floorRoomNo: '',
|
|
floorRoomNo: '',
|
|
|
nameFunction: '',
|
|
nameFunction: '',
|
|
|
safetyResponsibleCenter: '',
|
|
safetyResponsibleCenter: '',
|
|
|
|
|
+ safetyResponsibleCenterId: [],
|
|
|
safetyCenterManager: null as number | null,
|
|
safetyCenterManager: null as number | null,
|
|
|
safetyCenterManagerName: '',
|
|
safetyCenterManagerName: '',
|
|
|
safetyResponsibleDepartment: '',
|
|
safetyResponsibleDepartment: '',
|
|
|
|
|
+ safetyResponsibleDepartmentId: [],
|
|
|
safetyDepartmentManager: null as number | null,
|
|
safetyDepartmentManager: null as number | null,
|
|
|
safetyDepartmentManagerName: '',
|
|
safetyDepartmentManagerName: '',
|
|
|
safetySpecificPerson: null as number | null,
|
|
safetySpecificPerson: null as number | null,
|
|
@@ -172,31 +200,68 @@
|
|
|
});
|
|
});
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
- const getUserData = () => {
|
|
|
|
|
- getUserList({ pageNumber: 1, pageSize: 200, queryParam: {} }).then((res: any) => {
|
|
|
|
|
- userOptions.value = (res.records || []).map((u: any) => ({
|
|
|
|
|
- id: u.userId || u.id,
|
|
|
|
|
- name: u.realName || u.username,
|
|
|
|
|
- }));
|
|
|
|
|
|
|
+ const handleChangeDept = (val, prop) => {
|
|
|
|
|
+ const cascader = cascaderRef.value?.[prop];
|
|
|
|
|
+ const deptInfo = cascader?.getCheckedNodes();
|
|
|
|
|
+ formValue[prop] = deptInfo[0].label;
|
|
|
|
|
+ formRef.value.validateField(prop);
|
|
|
|
|
+ nextTick(() => {
|
|
|
|
|
+ handleQueryAvailableUserList(deptInfo[0].label, prop);
|
|
|
});
|
|
});
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
- const syncUserName = (id: number, nameField: string) => {
|
|
|
|
|
- const user = userOptions.value.find((u) => u.id === id);
|
|
|
|
|
- if (user) formValue[nameField] = user.name;
|
|
|
|
|
|
|
+ const handleQueryAvailableUserList = (value, prop) => {
|
|
|
|
|
+ switch (prop) {
|
|
|
|
|
+ case 'safetyResponsibleCenter':
|
|
|
|
|
+ formValue.safetyCenterManager = null;
|
|
|
|
|
+ getUserData(safetyCenterManagerOptions, value);
|
|
|
|
|
+ break;
|
|
|
|
|
+ case 'safetyResponsibleDepartment':
|
|
|
|
|
+ formValue.safetySpecificPerson = null;
|
|
|
|
|
+ formValue.safetyDepartmentManager = null;
|
|
|
|
|
+ getUserData(userOptions, value);
|
|
|
|
|
+ break;
|
|
|
|
|
+ default:
|
|
|
|
|
+ break;
|
|
|
|
|
+ }
|
|
|
|
|
+ };
|
|
|
|
|
+
|
|
|
|
|
+ const getUserData = (optionList, deptName, realname = '') => {
|
|
|
|
|
+ queryAvailableUserList({
|
|
|
|
|
+ pageNumber: 1,
|
|
|
|
|
+ pageSize: 200,
|
|
|
|
|
+ queryParam: {
|
|
|
|
|
+ deptName,
|
|
|
|
|
+ realname,
|
|
|
|
|
+ },
|
|
|
|
|
+ }).then((res: any) => {
|
|
|
|
|
+ optionList['value'] = (res.records || []).map((u: any) => ({
|
|
|
|
|
+ value: u.id,
|
|
|
|
|
+ label: u.realname,
|
|
|
|
|
+ }));
|
|
|
|
|
+ });
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
- const handleSpecificPersonChange = (id: number) => {
|
|
|
|
|
- const user = userOptions.value.find((u) => u.id === id);
|
|
|
|
|
|
|
+ const syncUserName = (optionList, id: number, nameField: string) => {
|
|
|
|
|
+ console.log('opt:', optionList, id);
|
|
|
|
|
+ const user = optionList?.find((u) => u.value === id);
|
|
|
if (user) {
|
|
if (user) {
|
|
|
- formValue.safetySpecificPersonName = user.name;
|
|
|
|
|
- formValue.safetyPersonContact = user.mobile;
|
|
|
|
|
|
|
+ formValue[nameField] = user.value;
|
|
|
|
|
+ console.log(formValue[nameField]);
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
|
|
+ // const handleSpecificPersonChange = (id: number) => {
|
|
|
|
|
+ // const user = userOptions.value.find((u) => u.id === id);
|
|
|
|
|
+ // if (user) {
|
|
|
|
|
+ // formValue.safetySpecificPersonName = user.name;
|
|
|
|
|
+ // formValue.safetyPersonContact = user.mobile;
|
|
|
|
|
+ // }
|
|
|
|
|
+ // };
|
|
|
|
|
+
|
|
|
onMounted(() => {
|
|
onMounted(() => {
|
|
|
getDeptData();
|
|
getDeptData();
|
|
|
- getUserData();
|
|
|
|
|
|
|
+ // getUserData();
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
const handleSubmit = () => {
|
|
const handleSubmit = () => {
|
|
@@ -227,11 +292,6 @@
|
|
|
border-radius: 4px;
|
|
border-radius: 4px;
|
|
|
margin-right: 20px;
|
|
margin-right: 20px;
|
|
|
overflow: hidden;
|
|
overflow: hidden;
|
|
|
-
|
|
|
|
|
- // :deep(.w-e-text-container) {
|
|
|
|
|
- // min-height: 400px;
|
|
|
|
|
- // overflow-y: auto;
|
|
|
|
|
- // }
|
|
|
|
|
}
|
|
}
|
|
|
// :deep(.breadcrumb .title) {
|
|
// :deep(.breadcrumb .title) {
|
|
|
// margin-left: 0;
|
|
// margin-left: 0;
|