|
|
@@ -20,7 +20,7 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-descriptions-item>
|
|
|
- <el-descriptions-item label="TPM状态" :span="2" v-if="form.saiType == 'TPM'">
|
|
|
+ <el-descriptions-item label="TPM状态" :span="2" v-if="dataForm.saiType == 'TPM'">
|
|
|
<el-form-item prop="tpmStatus">
|
|
|
<el-select
|
|
|
v-model="dataForm.tpmStatus"
|
|
|
@@ -85,7 +85,7 @@
|
|
|
<el-input :disabled="assessDisabled" v-model="dataForm.reaction" placeholder="请输入采取的措施" type="textarea" :rows="3"/>
|
|
|
</el-form-item>
|
|
|
</el-descriptions-item>
|
|
|
- <el-descriptions-item label="SAI级别" :span="1">
|
|
|
+ <el-descriptions-item label="SAI级别" :span="1" v-if="dataForm.saiType == 'SAI'">
|
|
|
<el-form-item prop="saiLevel">
|
|
|
<el-select v-model="dataForm.saiLevel" placeholder="请选择SAI级别" :disabled="applyDisabled">
|
|
|
<el-option key="1" label="1" value="1"></el-option>
|
|
|
@@ -94,7 +94,7 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-descriptions-item>
|
|
|
- <el-descriptions-item label="SAI类别" :span="1">
|
|
|
+ <el-descriptions-item label="SAI类别" :span="1" v-if="dataForm.saiType == 'SAI'">
|
|
|
<el-form-item prop="category">
|
|
|
<el-select
|
|
|
filterable
|
|
|
@@ -117,14 +117,9 @@
|
|
|
filterable
|
|
|
clearable
|
|
|
v-model="dataForm.workArea"
|
|
|
- placeholder="请选择片区"
|
|
|
- :disabled="applyDisabled">
|
|
|
- <el-option
|
|
|
- v-for="dict in workAreaList"
|
|
|
- :key="dict"
|
|
|
- :label="dict"
|
|
|
- :value="dict"
|
|
|
- ></el-option>
|
|
|
+ placeholder="请选择片区">
|
|
|
+ <el-option key="EOEG" label="EOEG" value="EOEG"></el-option>
|
|
|
+ <el-option key="NIS" label="NIS" value="NIS"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-descriptions-item>
|
|
|
@@ -185,7 +180,7 @@
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
</el-descriptions-item>
|
|
|
- <el-descriptions-item label="隐患" :span="3">
|
|
|
+ <el-descriptions-item label="隐患" :span="3" v-if="dataForm.saiType == 'SAI'">
|
|
|
<el-radio v-model="unsafeChoice" label="1" style="margin-right: 10px;" :disabled="applyDisabled" @change="handleUnsafeChoiceChange">不安全状态</el-radio>
|
|
|
<el-form-item prop="unsafeStatus" style="display: inline-block;">
|
|
|
<el-select :disabled="applyDisabled" v-model="dataForm.unsafeStatus" placeholder="请选择不安全状态" style="margin-right: 20px;" clearable>
|
|
|
@@ -243,12 +238,12 @@
|
|
|
</el-form-item>
|
|
|
</el-descriptions-item>
|
|
|
<el-descriptions-item label="验证人">
|
|
|
- <el-form-item prop="inspector" style="display: inline-block;">
|
|
|
+ <el-form-item prop="inspectors" style="display: inline-block;">
|
|
|
<el-select
|
|
|
filterable
|
|
|
:disabled="assessDisabled"
|
|
|
clearable
|
|
|
- v-model="inspector"
|
|
|
+ v-model="dataForm.inspectors"
|
|
|
placeholder="请选择验证人">
|
|
|
<el-option
|
|
|
v-for="dict in applicantOptions"
|
|
|
@@ -566,11 +561,8 @@ export default {
|
|
|
executor: [
|
|
|
{ required: true, message: this.$t('整改负责人') + this.$t('不能为空'), trigger: "change" }
|
|
|
],
|
|
|
- inspector1: [
|
|
|
- { required: true, message: this.$t('验证人1') + this.$t('不能为空'), trigger: "change" }
|
|
|
- ],
|
|
|
- inspector2: [
|
|
|
- { required: true, message: this.$t('验证人2') + this.$t('不能为空'), trigger: "change" }
|
|
|
+ inspector: [
|
|
|
+ { required: true, message: this.$t('验证人') + this.$t('不能为空'), trigger: "change" }
|
|
|
],
|
|
|
veResult: [
|
|
|
{ required: true, message: this.$t('验证成果') + this.$t('不能为空'), trigger: "change" }
|
|
|
@@ -581,6 +573,9 @@ export default {
|
|
|
},
|
|
|
// SAI开项管理对象
|
|
|
dataForm: {
|
|
|
+ saiType: null,
|
|
|
+ workArea: null,
|
|
|
+ tpmStatus: null,
|
|
|
saiApplyId: null,
|
|
|
deptId: null,
|
|
|
applyStatus: null,
|
|
|
@@ -601,11 +596,7 @@ export default {
|
|
|
taskName: null,
|
|
|
estimateFinishDate: null,
|
|
|
actualFinishDate: null,
|
|
|
- isRecorded: null,
|
|
|
- recordNo: null,
|
|
|
reaction: null,
|
|
|
- needVe: null,
|
|
|
- veItems: null,
|
|
|
veResult: null,
|
|
|
veItemOther: null,
|
|
|
remarksAssess: null,
|
|
|
@@ -660,7 +651,6 @@ export default {
|
|
|
executeDisabled: false,
|
|
|
// 是否禁用验收
|
|
|
inspectDisabled: false,
|
|
|
- workAreaList: [],
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
@@ -671,9 +661,6 @@ export default {
|
|
|
this.doc.pId = id;
|
|
|
// 表单重置
|
|
|
this.reset();
|
|
|
- this.inspector1 = null;
|
|
|
- this.inspector2 = null;
|
|
|
- this.veItemsList = [];
|
|
|
this.dataForm = {};
|
|
|
this.historyList = [];
|
|
|
this.dataForm.saiApplyId = id || 0;
|
|
|
@@ -686,30 +673,10 @@ export default {
|
|
|
// 查询SAI开项管理详细
|
|
|
getApply(id).then(response => {
|
|
|
this.dataForm = response.data;
|
|
|
+ this.dataForm.workArea = this.dataForm.workArea.toString();
|
|
|
this.getFileList()
|
|
|
- this.inspector1 = this.dataForm.applicant;
|
|
|
- if (this.dataForm.inspectors != null) {
|
|
|
- let inspectors = this.dataForm.inspectors.split(",");
|
|
|
- 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++) {
|
|
|
- this.veItemsList.push(veItems[i]);
|
|
|
- }
|
|
|
- }
|
|
|
- if (this.dataForm.isRecorded != null) {
|
|
|
- this.dataForm.isRecorded = this.dataForm.isRecorded.toString();
|
|
|
- }
|
|
|
- if (this.dataForm.needVe != null) {
|
|
|
- this.dataForm.needVe = this.dataForm.needVe.toString();
|
|
|
- }
|
|
|
- this.handleIsRecordedChange();
|
|
|
- this.handleNeedVeChange();
|
|
|
- this.handleVeItemOtherVeChange();
|
|
|
this.handleUnsafeChoiceChange();
|
|
|
if (this.dataForm.unsafeStatus != null && this.dataForm.unsafeStatus != "") {
|
|
|
this.unsafeChoice = '1';
|
|
|
@@ -726,7 +693,6 @@ export default {
|
|
|
this.dataForm.veResult = '1';
|
|
|
}
|
|
|
let applyStatus = this.dataForm.applyStatus;
|
|
|
- console.log(applyStatus);
|
|
|
switch (applyStatus) {
|
|
|
case 1:
|
|
|
this.showAssess = true;
|
|
|
@@ -811,15 +777,6 @@ export default {
|
|
|
this.getLoginStaffInfo();
|
|
|
// 加载SAI类别字典
|
|
|
this.getCategoryList();
|
|
|
- this.getWorkAreaList();
|
|
|
- },
|
|
|
- getWorkAreaList() {
|
|
|
- selectDevice().then(response => {
|
|
|
- let data = response.data;
|
|
|
- for (let i = 0; i < data.length; i++) {
|
|
|
- this.workAreaList.push(data[i]);
|
|
|
- }
|
|
|
- });
|
|
|
},
|
|
|
/** 获取SAI类别列表数据 */
|
|
|
getCategoryList() {
|
|
|
@@ -1045,41 +1002,6 @@ export default {
|
|
|
this.unsafeActionDisabled = false;
|
|
|
}
|
|
|
},
|
|
|
- /** VE验证条款（其它）单选按钮值改变事件 */
|
|
|
- handleVeItemOtherVeChange() {
|
|
|
- let veItemsList = this.veItemsList;
|
|
|
- let flag = false;
|
|
|
- for (let i = 0; i < veItemsList.length; i++) {
|
|
|
- if (veItemsList[i] == '其它') {
|
|
|
- flag = true;
|
|
|
- }
|
|
|
- }
|
|
|
- if (flag) {
|
|
|
- this.veItemOtherDisabled = false;
|
|
|
- } else {
|
|
|
- this.veItemOtherDisabled = true;
|
|
|
- this.dataForm.veItemOther = null;
|
|
|
- }
|
|
|
- },
|
|
|
- /** 是否需要VE验证单选按钮值改变事件 */
|
|
|
- handleNeedVeChange() {
|
|
|
- if (this.dataForm.needVe == '1') {
|
|
|
- this.veItemsDisabled = false;
|
|
|
- } else if (this.dataForm.needVe == '0') {
|
|
|
- this.veItemsDisabled = true;
|
|
|
- this.veItemsList = [];
|
|
|
- this.handleVeItemOtherVeChange();
|
|
|
- }
|
|
|
- },
|
|
|
- /** 是否录入开项系统单选按钮值改变事件 */
|
|
|
- handleIsRecordedChange() {
|
|
|
- if (this.dataForm.isRecorded == '1') {
|
|
|
- this.recordNoDisabled = false;
|
|
|
- } else if (this.dataForm.isRecorded == '0') {
|
|
|
- this.recordNoDisabled = true;
|
|
|
- this.dataForm.recordNo = null;
|
|
|
- }
|
|
|
- },
|
|
|
/** 加载登记人部门列表 */
|
|
|
getApplicantDeptOptions() {
|
|
|
this.applicantDeptOptions = [];
|
|
|
@@ -1203,19 +1125,7 @@ export default {
|
|
|
*/
|
|
|
dataFormSubmit(condition) {
|
|
|
if (condition == 0) {
|
|
|
- // 验证人字符串拼接
|
|
|
- this.dataForm.inspectors = this.inspector1 + "," + this.inspector2;
|
|
|
- // VE验证条款字符串拼接
|
|
|
- if (this.veItemsList.length != 0) {
|
|
|
- this.dataForm.veItems = "";
|
|
|
- for (let i = 0; i < this.veItemsList.length; i++) {
|
|
|
- this.dataForm.veItems += this.veItemsList[i];
|
|
|
- if (i != this.veItemsList.length - 1) {
|
|
|
- this.dataForm.veItems += ",";
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- this.taskForm.saiApply = this.dataForm;
|
|
|
+ this.taskForm.eoegSaiApply = this.dataForm;
|
|
|
this.taskForm.condition = condition;
|
|
|
handleApply(this.taskForm).then(response =>{
|
|
|
this.msgSuccess("提交成功");
|
|
|
@@ -1226,19 +1136,7 @@ export default {
|
|
|
} else {
|
|
|
this.$refs["form"].validate(valid => {
|
|
|
if (valid) {
|
|
|
- // 验证人字符串拼接
|
|
|
- this.dataForm.inspectors = this.inspector1 + "," + this.inspector2;
|
|
|
- // VE验证条款字符串拼接
|
|
|
- if (this.veItemsList.length != 0) {
|
|
|
- this.dataForm.veItems = "";
|
|
|
- for (let i = 0; i < this.veItemsList.length; i++) {
|
|
|
- this.dataForm.veItems += this.veItemsList[i];
|
|
|
- if (i != this.veItemsList.length - 1) {
|
|
|
- this.dataForm.veItems += ",";
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- this.taskForm.saiApply = this.dataForm;
|
|
|
+ this.taskForm.eoegSaiApply = this.dataForm;
|
|
|
this.taskForm.condition = condition;
|
|
|
handleApply(this.taskForm).then(response =>{
|
|
|
this.msgSuccess("提交成功");
|
|
|
@@ -1256,18 +1154,6 @@ export default {
|
|
|
dataFormSave() {
|
|
|
this.$refs["form"].validate(valid => {
|
|
|
if (valid) {
|
|
|
- // 验证人字符串拼接
|
|
|
- this.dataForm.inspectors = this.inspector1 + "," + this.inspector2;
|
|
|
- // VE验证条款字符串拼接
|
|
|
- if (this.veItemsList.length != 0) {
|
|
|
- this.dataForm.veItems = "";
|
|
|
- for (let i = 0; i < this.veItemsList.length; i++) {
|
|
|
- this.dataForm.veItems += this.veItemsList[i];
|
|
|
- if (i != this.veItemsList.length - 1) {
|
|
|
- this.dataForm.veItems += ",";
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
updateApply(this.dataForm).then(response =>{
|
|
|
this.msgSuccess("保存成功");
|
|
|
// refreshDataList事件：调用父组件getList方法刷新页面
|
wangggziwen