Compare commits

...

2 Commits

  1. 43
      src/views/ysjl/3000/common/index.vue
  2. 6
      src/views/ysjl/4000/dj/common/index.vue
  3. 24
      src/views/ysjl/4000/jj/common/index.vue
  4. 20
      src/views/ysjl/5000/dj/jdgy-cl/index.vue
  5. 20
      src/views/ysjl/5000/dj/lygg-cl/index.vue

43
src/views/ysjl/3000/common/index.vue

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

6
src/views/ysjl/4000/dj/common/index.vue

@ -1,4 +1,3 @@
<!--工业锅炉内部检验-->
<template>
<div class="app-container">
<sticky style="margin-bottom: 10px">
@ -821,7 +820,7 @@
<el-table-column align="center" prop="jianyanxiang" width="200" />
<el-table-column align="left" prop="jianyanneirong" />
</el-table-column>
<el-table-column align="center" prop="D1" label="检验结果">
<el-table-column align="center" prop="jianyanjieguo" label="检验结果">
<template slot-scope="scope">
<el-select
v-model="scope.row.jianyanjieguo"
@ -831,6 +830,7 @@
style="width: 100%"
filterable
allow-create
autocomplete
default-first-option
>
<el-option label="√" value="√" />
@ -864,7 +864,7 @@ export default {
},
data() {
return {
jlbh1: 'QD',
jlbh1: 'QZ',
jlbh2: '(' + new Date().getFullYear() + ')',
jlbh3: '',
ysjl: {

24
src/views/ysjl/4000/jj/common/index.vue

@ -64,11 +64,7 @@
<el-form-item label="记录编号">
<el-input v-model="jlbh1" style="width: 80px" disabled />
<el-input v-model="jlbh2" style="width: 80px" disabled />-
<el-input
v-model="jlbh3"
style="width: 85px"
@blur="judgeRepeat(jlbh1 + jlbh2 + '-' + jlbh3, ysjl.id)"
/>
<el-input v-model="jlbh3" style="width: 85px" />
</el-form-item>
</el-col>
<el-col v-else :span="9">
@ -903,10 +899,10 @@
<el-table-column align="center" prop="jianyanmu" width="200" />
<el-table-column align="left" prop="jianyanneirong" />
</el-table-column>
<el-table-column align="center" prop="D1" label="检验结果">
<el-table-column align="center" prop="jianyanjieguo" label="检验结果">
<template slot-scope="scope">
<el-select
v-model="scope.row.D1"
v-model="scope.row.jianyanjieguo"
:disabled="edit"
type="text"
placeholder="请选择"
@ -1000,13 +996,13 @@ export default {
},
computed: {},
watch: {
// jlbh3: function(val) {
// this.ysjl.jilubianhao = this.jlbh1 + this.jlbh2 + '-' + val
// this.judgeRepeat(this.ysjl.jilubianhao, this.ysjl.id)
// },
// jilubianhao: function(newValue) {
// this.judgeRepeat(newValue, this.ysjl.id)
// }
jlbh3: function(val) {
this.ysjl.jilubianhao = this.jlbh1 + this.jlbh2 + '-' + val
this.judgeRepeat(this.ysjl.jilubianhao, this.ysjl.id)
},
jilubianhao: function(newValue) {
this.judgeRepeat(newValue, this.ysjl.id)
}
},
// F5
mounted() {

20
src/views/ysjl/5000/dj/jdgy-cl/index.vue

@ -27,7 +27,7 @@
<el-form-item label="记录编号">
<el-input v-model="jlbh1" style="width:80px" disabled />
<el-input v-model="jlbh2" style="width:80px" disabled />-
<el-input v-model="jlbh3" style="width:85px" @blur="judgeRepeat(jlbh1 + jlbh2 + '-' + jlbh3 , ysjl.id)" />
<el-input v-model="jlbh3" style="width:85px" />
</el-form-item>
</el-col>
<el-col v-else :span="9">
@ -366,9 +366,9 @@
<el-table-column align="center" prop="jianyanmu" width="200" />
<el-table-column align="left" prop="jianyanneirong" />
</el-table-column>
<el-table-column align="center" prop="D1" label="检验结果">
<el-table-column align="center" prop="jianyanjieguo" label="检验结果">
<template slot-scope="scope">
<el-select v-model="scope.row.D1" :disabled="edit" type="text" placeholder="请选择" style="width: 100%;" filterable allow-create default-first-option>
<el-select v-model="scope.row.jianyanjieguo" :disabled="edit" type="text" placeholder="请选择" style="width: 100%;" filterable allow-create default-first-option>
<el-option label="√" value="√" />
<el-option label="○" value="○" />
<el-option label="×" value="×" />
@ -447,13 +447,13 @@ export default {
},
watch: {
// jlbh3: function(val) {
// this.ysjl.jilubianhao = this.jlbh1 + this.jlbh2 + '-' + val
// this.judgeRepeat(this.ysjl.jilubianhao, this.ysjl.id)
// },
// jilubianhao: function(newValue) {
// this.judgeRepeat(newValue, this.ysjl.id)
// }
jlbh3: function(val) {
this.ysjl.jilubianhao = this.jlbh1 + this.jlbh2 + '-' + val
this.judgeRepeat(this.ysjl.jilubianhao, this.ysjl.id)
},
jilubianhao: function(newValue) {
this.judgeRepeat(newValue, this.ysjl.id)
}
},
// F5
mounted() {

20
src/views/ysjl/5000/dj/lygg-cl/index.vue

@ -27,7 +27,7 @@
<el-form-item label="记录编号">
<el-input v-model="jlbh1" style="width:80px" disabled />
<el-input v-model="jlbh2" style="width:80px" disabled />-
<el-input v-model="jlbh3" style="width:85px" @blur="judgeRepeat(jlbh1 + jlbh2 + '-' + jlbh3 , ysjl.id)" />
<el-input v-model="jlbh3" style="width:85px" />
</el-form-item>
</el-col>
<el-col v-else :span="9">
@ -359,9 +359,9 @@
<el-table-column align="center" prop="jianyanmu" width="200" />
<el-table-column align="left" prop="jianyanneirong" />
</el-table-column>
<el-table-column align="center" prop="D1" label="检验结果">
<el-table-column align="center" prop="jianyanjieguo" label="检验结果">
<template slot-scope="scope">
<el-select v-model="scope.row.D1" :disabled="edit" type="text" placeholder="请选择" style="width: 100%;" filterable allow-create default-first-option>
<el-select v-model="scope.row.jianyanjieguo" :disabled="edit" type="text" placeholder="请选择" style="width: 100%;" filterable allow-create default-first-option>
<el-option label="√" value="√" />
<el-option label="○" value="○" />
<el-option label="×" value="×" />
@ -441,13 +441,13 @@ export default {
},
watch: {
// jlbh3: function(val) {
// this.ysjl.jilubianhao = this.jlbh1 + this.jlbh2 + '-' + val
// this.judgeRepeat(this.ysjl.jilubianhao, this.ysjl.id)
// },
// jilubianhao: function(newValue) {
// this.judgeRepeat(newValue, this.ysjl.id)
// }
jlbh3: function(val) {
this.ysjl.jilubianhao = this.jlbh1 + this.jlbh2 + '-' + val
this.judgeRepeat(this.ysjl.jilubianhao, this.ysjl.id)
},
jilubianhao: function(newValue) {
this.judgeRepeat(newValue, this.ysjl.id)
}
},
// F5
mounted() {

Loading…
Cancel
Save