|
|
@ -483,11 +483,11 @@ |
|
|
prop="xianchangjianyantiaojian" |
|
|
prop="xianchangjianyantiaojian" |
|
|
> |
|
|
> |
|
|
<el-radio-group v-model="ysjl.xianchangjianyantiaojian"> |
|
|
<el-radio-group v-model="ysjl.xianchangjianyantiaojian"> |
|
|
<el-radio label="符合"> |
|
|
<el-radio label="符合"> |
|
|
符合 |
|
|
符合 |
|
|
</el-radio> |
|
|
</el-radio> |
|
|
<el-radio label="不符合"> |
|
|
<el-radio label="不符合"> |
|
|
不符合 |
|
|
不符合 |
|
|
</el-radio> |
|
|
</el-radio> |
|
|
</el-radio-group> |
|
|
</el-radio-group> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
@ -667,17 +667,17 @@ |
|
|
<el-col :span="18"> |
|
|
<el-col :span="18"> |
|
|
<el-form-item label="检验结论" prop="jianyanjielun"> |
|
|
<el-form-item label="检验结论" prop="jianyanjielun"> |
|
|
<el-radio-group v-model="ysjl.jianyanjielun"> |
|
|
<el-radio-group v-model="ysjl.jianyanjielun"> |
|
|
<el-radio label="合格"> |
|
|
<el-radio label="合格"> |
|
|
合格 |
|
|
合格 |
|
|
</el-radio> |
|
|
</el-radio> |
|
|
<el-radio label="不合格"> |
|
|
<el-radio label="不合格"> |
|
|
不合格 |
|
|
不合格 |
|
|
</el-radio> |
|
|
</el-radio> |
|
|
<el-radio label="复检合格"> |
|
|
<el-radio label="复检合格"> |
|
|
复检合格 |
|
|
复检合格 |
|
|
</el-radio> |
|
|
</el-radio> |
|
|
<el-radio label="复检不合格"> |
|
|
<el-radio label="复检不合格"> |
|
|
复检不合格 |
|
|
复检不合格 |
|
|
</el-radio> |
|
|
</el-radio> |
|
|
</el-radio-group> |
|
|
</el-radio-group> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
@ -942,7 +942,6 @@ export default { |
|
|
} else { |
|
|
} else { |
|
|
this.getYsjl() |
|
|
this.getYsjl() |
|
|
this.getParam() |
|
|
this.getParam() |
|
|
this.getJyxm(1) |
|
|
|
|
|
this.getJyxmInfoByYsjl() |
|
|
this.getJyxmInfoByYsjl() |
|
|
} |
|
|
} |
|
|
this.getDepartment() |
|
|
this.getDepartment() |
|
|
@ -1041,6 +1040,7 @@ export default { |
|
|
.then((data) => { |
|
|
.then((data) => { |
|
|
this.isRepeat = data |
|
|
this.isRepeat = data |
|
|
}) |
|
|
}) |
|
|
|
|
|
this.getJyxm(1) |
|
|
}) |
|
|
}) |
|
|
}, |
|
|
}, |
|
|
getParam() { |
|
|
getParam() { |
|
|
@ -1066,7 +1066,6 @@ export default { |
|
|
}) |
|
|
}) |
|
|
}, |
|
|
}, |
|
|
getJyxm(sort) { |
|
|
getJyxm(sort) { |
|
|
console.log(this.jybgTemplateId, this.ysjl.jybgTemplateId) |
|
|
|
|
|
if (this.$route.query.state === 'update') { |
|
|
if (this.$route.query.state === 'update') { |
|
|
this.jyxmService |
|
|
this.jyxmService |
|
|
.getJdCyJyxm(this.ysjlId, this.$route.query.templateId, sort, 0) |
|
|
.getJdCyJyxm(this.ysjlId, this.$route.query.templateId, sort, 0) |
|
|
@ -1247,14 +1246,14 @@ export default { |
|
|
}) |
|
|
}) |
|
|
return false |
|
|
return false |
|
|
} |
|
|
} |
|
|
for (let i = 0; i < this.bgfyData.length; i++) { |
|
|
// for (let i = 0; i < this.bgfyData.length; i++) { |
|
|
if (!this.bgfyData[i].jianjianyuan || !this.bgfyData[i].querenriqi) { |
|
|
// if (!this.bgfyData[i].jianjianyuan || !this.bgfyData[i].querenriqi) { |
|
|
this.$message.error( |
|
|
// this.$message.error( |
|
|
'请将检验项目中的监检人员及监检日期填写完毕，再生成报告！' |
|
|
// '请将检验项目中的监检人员及监检日期填写完毕，再生成报告！' |
|
|
) |
|
|
// ) |
|
|
return false |
|
|
// return false |
|
|
} |
|
|
// } |
|
|
} |
|
|
// } |
|
|
this.save(operation, 'put', tableData, fubiao) |
|
|
this.save(operation, 'put', tableData, fubiao) |
|
|
} else if (operation === 'upd') { |
|
|
} else if (operation === 'upd') { |
|
|
this.save(operation, 'put', tableData, fubiao) |
|
|
this.save(operation, 'put', tableData, fubiao) |
|
|
|
