From 5c45db7c1be28da293b3583c16834ee97e8bac47 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: Wed, 02 Apr 2025 13:43:06 +0800
Subject: [PATCH] 修改
---
src/views/analyse/identify/index.vue | 2 +-
src/views/experiment/developing/components/developDialog.vue | 6 +++++-
src/views/analyse/riskUnit/index.ts | 3 ++-
src/views/analyse/assessApply/components/riskUnitDialog.vue | 24 ++++++++++++++++++++----
src/views/experiment/project/components/projectDialog.vue | 6 +++++-
src/views/analyse/evaluate/index.vue | 2 +-
6 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/src/views/analyse/assessApply/components/riskUnitDialog.vue b/src/views/analyse/assessApply/components/riskUnitDialog.vue
index edf1305..60a19d0 100644
--- a/src/views/analyse/assessApply/components/riskUnitDialog.vue
+++ b/src/views/analyse/assessApply/components/riskUnitDialog.vue
@@ -28,8 +28,9 @@
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
- <el-form-item label="负责部门" prop="liabilityDep">
- <el-input v-model="riskUnitDialogState.riskUnitForm.liabilityDep" :disabled="riskUnitDialogState.disabled" placeholder="负责部门" clearable class="input-length"></el-input>
+ <el-form-item label="负责部门" prop="liabilityDepId">
+ <el-cascader :options="riskUnitDialogState.departmentData" :disabled="riskUnitDialogState.disabled" :props="{ emitPath: false, checkStrictly: true, value: 'id', label: 'depName' }" placeholder="负责部门" clearable v-model="riskUnitDialogState.riskUnitForm.liabilityDepId"> </el-cascader>
+<!-- <el-input v-model="riskUnitDialogState.riskUnitForm.liabilityDep" :disabled="riskUnitDialogState.disabled" placeholder="负责部门" clearable class="input-length"></el-input>-->
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-if="riskUnitDialogState.experimentType === 1">
@@ -61,6 +62,7 @@
import { isValidKey } from "/@/utils/methods";
import {ElMessage} from "element-plus";
import {riskUnitApi} from "/@/api/analyse/riskUnit";
+import {departmentApi} from "/@/api/systemManage/department";
const riskUnitFormRef = ref()
@@ -76,10 +78,11 @@
riskName: '',
riskUnitTypeId: null,
liabilityUserId: null,
- liabilityDep: '',
+ liabilityDepId: null,
description: '',
basicRiskUnitId: null,
},
+ departmentData: [],
riskUnitFormRules: {
riskCode: [{ required: true, message: '请填写风险单元编号', trigger: 'blur' }],
riskName: [{ required: true, message: '请填写风险单元名称', trigger: 'blur' }],
@@ -104,6 +107,7 @@
})
const showRiskUnitDialog = (title: string, val, id: number, basicUnitList: UnitType [], allPersonList: AllPersonListType [], allRiskTypeList: RiskType []) => {
+ getDeptData()
riskUnitDialogState.riskUnitDialogVisible = true;
riskUnitDialogState.basicUnitList = basicUnitList
riskUnitDialogState.allPersonList = allPersonList
@@ -121,7 +125,7 @@
riskName: '',
riskUnitTypeId: null,
liabilityUserId: null,
- liabilityDep: '',
+ liabilityDepId: null,
description: '',
basicRiskUnitId: null,
};
@@ -143,6 +147,18 @@
}
};
+const getDeptData =async () => {
+ let res = await departmentApi().getDepartmentList()
+ if (res.data.code === 100) {
+ riskUnitDialogState.departmentData = res.data.data
+ } else {
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
+ }
+}
+
const onSubmitRiskUnit = () => {
riskUnitFormRef.value.validate(async(valid: boolean) => {
if(valid){
diff --git a/src/views/analyse/evaluate/index.vue b/src/views/analyse/evaluate/index.vue
index 356dda1..ec0c8be 100644
--- a/src/views/analyse/evaluate/index.vue
+++ b/src/views/analyse/evaluate/index.vue
@@ -74,7 +74,7 @@
</template>
</el-table-column>
<el-table-column prop="riskUnitName" label="风险单元" />
- <el-table-column prop="identificationUser" label="计划负责人" />
+ <el-table-column prop="planUserName" label="计划负责人" />
<el-table-column prop="identificationUser" label="辨识专家" />
<el-table-column prop="evaluateUser" label="评价专家" />
<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip></el-table-column>
diff --git a/src/views/analyse/identify/index.vue b/src/views/analyse/identify/index.vue
index bd98c0c..f5c5d8d 100644
--- a/src/views/analyse/identify/index.vue
+++ b/src/views/analyse/identify/index.vue
@@ -34,7 +34,7 @@
<span>{{`${identifyState.identificationMethodList.find(item =>item.id === scope.row.identificationMethod)?.name}`}}</span>
</template>
</el-table-column>
- <el-table-column prop="identificationUser" label="计划负责人" />
+ <el-table-column prop="planUserName" label="计划负责人" />
<el-table-column prop="identificationUser" label="辨识专家" />
<el-table-column prop="evaluateUser" label="评价专家" />
<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip></el-table-column>
diff --git a/src/views/analyse/riskUnit/index.ts b/src/views/analyse/riskUnit/index.ts
index b1dde19..fcf6512 100644
--- a/src/views/analyse/riskUnit/index.ts
+++ b/src/views/analyse/riskUnit/index.ts
@@ -49,7 +49,7 @@
riskCode: string,
riskName: string,
riskUnitTypeId: number | null,
- liabilityDep: string,
+ liabilityDepId: number | null,
liabilityUserId: number | null,
description: string,
basicRiskUnitId: number | null,
@@ -58,6 +58,7 @@
riskUnitFormRules: {
},
+ departmentData: []
riskTypeList: Array<RiskType>,
specialDeviceList: Array<Type>,
deviceUnitList: Array<Type>,
diff --git a/src/views/experiment/developing/components/developDialog.vue b/src/views/experiment/developing/components/developDialog.vue
index 51bc6c0..ede740d 100644
--- a/src/views/experiment/developing/components/developDialog.vue
+++ b/src/views/experiment/developing/components/developDialog.vue
@@ -3,7 +3,7 @@
<el-dialog :title="projectDialogState.title" v-model="projectDialogState.projectDialogVisible" width="80%" @close="handleClose">
<el-form ref="ProjectFormRef" :rules="projectDialogState.projectFormRules" :model="projectDialogState.projectForm" size="default" label-width="0">
<table class="report-table">
- <th class="m-color b-font" style="text-align: center">***研究所/***大学<br />科学研究实验项目安全风险基础信息录入表（已开展）（带<span style="color: red">*</span>为必填项）</th>
+ <th class="m-color b-font" style="text-align: center">材料科学姑苏实验室<br/>科学研究实验项目安全风险基础信息录入表（已开展）（带<span style="color: red">*</span>为必填项）</th>
<tr>
<td class="w-25 m-color required">实验名称</td>
<td class="w-75 m-color">
@@ -36,6 +36,7 @@
<!-- <el-form-item prop="dep">-->
<!-- <el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.dep" />-->
<!-- </el-form-item>-->
+ <el-form-item prop="dep">
<el-select style="width: 100%" v-model="projectDialogState.projectForm.dep" clearable filterable>
<el-option
@@ -45,6 +46,7 @@
:label="item.depName"
></el-option>
</el-select>
+ </el-form-item>
</td>
</tr>
<tr>
@@ -86,6 +88,7 @@
<!-- <el-form-item prop="safeLiabilityUser">-->
<!-- <el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.safeLiabilityUser"/>-->
<!-- </el-form-item>-->
+ <el-form-item prop="safeLiabilityUser">-->
<el-select style="width: 100%" v-model="projectDialogState.projectForm.safeLiabilityUser" clearable filterable @change="getSafeLiabilityUserPhone($event)">
<el-option
v-for="item in projectDialogState.systemPersonList"
@@ -94,6 +97,7 @@
:label="item.realName"
></el-option>
</el-select>
+ </el-form-item>
</td>
<td class="w-25 m-color required">电话</td>
<td class="w-25 m-color">
diff --git a/src/views/experiment/project/components/projectDialog.vue b/src/views/experiment/project/components/projectDialog.vue
index f4f593c..34fc950 100644
--- a/src/views/experiment/project/components/projectDialog.vue
+++ b/src/views/experiment/project/components/projectDialog.vue
@@ -3,7 +3,7 @@
<el-dialog :title="projectDialogState.title" v-model="projectDialogState.projectDialogVisible" width="80%" :before-close="handleClose">
<el-form ref="ProjectFormRef" :rules="projectDialogState.projectFormRules" :model="projectDialogState.projectForm" size="default" label-width="0">
<table class="report-table">
- <th class="m-color b-font" style="text-align: center">***研究所/***大学<br />科学研究实验项目安全风险基础信息录入表（新立项）（带<span style="color: red">*</span>为必填项）</th>
+ <th class="m-color b-font" style="text-align: center">材料科学姑苏实验室<br/>科学研究实验项目安全风险基础信息录入表（新立项）（带<span style="color: red">*</span>为必填项）</th>
<tr>
<td class="w-25 m-color required">实验名称</td>
<td class="w-75 m-color">
@@ -36,6 +36,7 @@
<!-- <el-form-item prop="dep">-->
<!-- <el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.dep" />-->
<!-- </el-form-item>-->
+ <el-form-item prop="dep">
<el-select style="width: 100%" v-model="projectDialogState.projectForm.dep" clearable filterable>
<el-option
v-for="item in projectDialogState.deptList"
@@ -44,6 +45,7 @@
:label="item.depName"
></el-option>
</el-select>
+ </el-form-item>
</td>
<td class="w-25 m-color required">立项时间</td>
<td class="w-25 m-color">
@@ -88,6 +90,7 @@
<!-- :label="item.personName"-->
<!-- ></el-option>-->
<!-- </el-select>-->
+ <el-form-item prop="safeLiabilityUser">
<el-select style="width: 100%" v-model="projectDialogState.projectForm.safeLiabilityUser" clearable filterable @change="getSafeLiabilityUserPhone($event)">
<el-option
v-for="item in projectDialogState.systemPersonList"
@@ -96,6 +99,7 @@
:label="item.realName"
></el-option>
</el-select>
+ </el-form-item>
<!-- <el-form-item prop="safeLiabilityUser">-->
<!-- <el-input :disabled="projectDialogState.disabled" v-model="projectDialogState.projectForm.safeLiabilityUser" />-->
<!-- </el-form-item>-->
--
Gitblit v1.9.2