|
@@ -195,20 +195,21 @@
|
|
|
</el-descriptions-item>
|
|
|
<el-descriptions-item label="验证人">
|
|
|
<el-form-item prop="inspector1" style="display: inline-block;">
|
|
|
- <el-select
|
|
|
- filterable
|
|
|
- :disabled="assessDisabled"
|
|
|
- clearable
|
|
|
- v-model="inspector1"
|
|
|
- placeholder="请选择验证人"
|
|
|
- style="margin-right: 10px;">
|
|
|
- <el-option
|
|
|
- v-for="dict in applicantOptions"
|
|
|
- :key="dict.dictValue"
|
|
|
- :label="dict.dictLabel"
|
|
|
- :value="dict.dictValue"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
+ <el-input v-model="inspector1Name" placeholder="" disabled style="width: 180px; margin-right: 10px;"/>
|
|
|
+ <!--<el-select-->
|
|
|
+ <!--filterable-->
|
|
|
+ <!--:disabled="assessDisabled"-->
|
|
|
+ <!--clearable-->
|
|
|
+ <!--v-model="inspector1"-->
|
|
|
+ <!--placeholder="请选择验证人"-->
|
|
|
+ <!--style="margin-right: 10px;">-->
|
|
|
+ <!--<el-option-->
|
|
|
+ <!--v-for="dict in applicantOptions"-->
|
|
|
+ <!--:key="dict.dictValue"-->
|
|
|
+ <!--:label="dict.dictLabel"-->
|
|
|
+ <!--:value="dict.dictValue"-->
|
|
|
+ <!--></el-option>-->
|
|
|
+ <!--</el-select>-->
|
|
|
</el-form-item>
|
|
|
<el-form-item prop="inspector2" style="display: inline-block;">
|
|
|
<el-select
|
|
@@ -654,6 +655,7 @@ export default {
|
|
|
veItemsList: [],
|
|
|
// 验证人1
|
|
|
inspector1: null,
|
|
|
+ inspector1Name: null,
|
|
|
// 验证人2
|
|
|
inspector2: null,
|
|
|
// 是否禁用不安全状态下拉框
|
|
@@ -701,6 +703,8 @@ export default {
|
|
|
this.inspector1 = inspectors[0];
|
|
|
this.inspector2 = inspectors[1];
|
|
|
}
|
|
|
+ // 加载登记人列表
|
|
|
+ this.listStaffmgrByDeptAndTeam(null, null);
|
|
|
if (this.dataForm.veItems != null) {
|
|
|
let veItems = this.dataForm.veItems.split(",");
|
|
|
for (let i = 0; i < veItems.length; i++) {
|
|
@@ -797,8 +801,7 @@ export default {
|
|
|
});
|
|
|
// 加载登记人部门列表
|
|
|
this.getApplicantDeptOptions();
|
|
|
- // 加载登记人列表
|
|
|
- this.listStaffmgrByDeptAndTeam(null, null);
|
|
|
+
|
|
|
// 加载整改负责人列表
|
|
|
this.listSaiInspectors();
|
|
|
// 加载执行人列表
|
|
@@ -1076,6 +1079,7 @@ export default {
|
|
|
},
|
|
|
/** 加载登记人列表 */
|
|
|
listStaffmgrByDeptAndTeam(applicantDept, applicantTeam) {
|
|
|
+ console.log('123');
|
|
|
listStaffmgrByDeptAndTeam({
|
|
|
deptId: applicantDept,
|
|
|
team: applicantTeam
|
|
@@ -1083,6 +1087,11 @@ export default {
|
|
|
let staffList = response.rows;
|
|
|
this.applicantOptions = [];
|
|
|
for (let i = 0; i < staffList.length; i++) {
|
|
|
+ if (this.inspector1 != null) {
|
|
|
+ if (this.inspector1 == staffList[i].userId) {
|
|
|
+ this.inspector1Name = staffList[i].name;
|
|
|
+ }
|
|
|
+ }
|
|
|
let staffOption = {
|
|
|
dictLabel: staffList[i].name,
|
|
|
dictValue: staffList[i].userId
|