xiaobai
/
equipment
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

提交场车 起重机

master
xiaobai 3 years ago
parent
b02b155551
commit
246ea1ceb4
5 changed files with 54 additions and 59 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      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

19
src/views/ysjl/3000/common/index.vue
View File

@ -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)

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

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

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

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

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

@ -27,7 +27,7 @@
<el-form-item label="记录编号"> <el-form-item label="记录编号">
<el-input v-model="jlbh1" style="width:80px" disabled /> <el-input v-model="jlbh1" style="width:80px" disabled />
<el-input v-model="jlbh2" 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-form-item>
</el-col> </el-col>
<el-col v-else :span="9"> <el-col v-else :span="9">
@ -366,9 +366,9 @@
<el-table-column align="center" prop="jianyanmu" width="200" /> <el-table-column align="center" prop="jianyanmu" width="200" />
<el-table-column align="left" prop="jianyanneirong" /> <el-table-column align="left" prop="jianyanneirong" />
</el-table-column> </el-table-column>
<el-table-column align="center" prop="D1" label="检验结果"> <el-table-column align="center" prop="jianyanjieguo" label="检验结果">
<template slot-scope="scope"> <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="○" /> <el-option label="○" value="○" />
<el-option label="×" value="×" /> <el-option label="×" value="×" />
@ -447,13 +447,13 @@ export default {
}, },
watch: { watch: {
// jlbh3: function(val) { jlbh3: function(val) {
// this.ysjl.jilubianhao = this.jlbh1 + this.jlbh2 + '-' + val this.ysjl.jilubianhao = this.jlbh1 + this.jlbh2 + '-' + val
// this.judgeRepeat(this.ysjl.jilubianhao, this.ysjl.id) this.judgeRepeat(this.ysjl.jilubianhao, this.ysjl.id)
// }, },
// jilubianhao: function(newValue) { jilubianhao: function(newValue) {
// this.judgeRepeat(newValue, this.ysjl.id) this.judgeRepeat(newValue, this.ysjl.id)
// } }
}, },
// 添加F5刷新监听事件 // 添加F5刷新监听事件
mounted() { mounted() {

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

@ -27,7 +27,7 @@
<el-form-item label="记录编号"> <el-form-item label="记录编号">
<el-input v-model="jlbh1" style="width:80px" disabled /> <el-input v-model="jlbh1" style="width:80px" disabled />
<el-input v-model="jlbh2" 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-form-item>
</el-col> </el-col>
<el-col v-else :span="9"> <el-col v-else :span="9">
@ -359,9 +359,9 @@
<el-table-column align="center" prop="jianyanmu" width="200" /> <el-table-column align="center" prop="jianyanmu" width="200" />
<el-table-column align="left" prop="jianyanneirong" /> <el-table-column align="left" prop="jianyanneirong" />
</el-table-column> </el-table-column>
<el-table-column align="center" prop="D1" label="检验结果"> <el-table-column align="center" prop="jianyanjieguo" label="检验结果">
<template slot-scope="scope"> <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="○" /> <el-option label="○" value="○" />
<el-option label="×" value="×" /> <el-option label="×" value="×" />
@ -441,13 +441,13 @@ export default {
}, },
watch: { watch: {
// jlbh3: function(val) { jlbh3: function(val) {
// this.ysjl.jilubianhao = this.jlbh1 + this.jlbh2 + '-' + val this.ysjl.jilubianhao = this.jlbh1 + this.jlbh2 + '-' + val
// this.judgeRepeat(this.ysjl.jilubianhao, this.ysjl.id) this.judgeRepeat(this.ysjl.jilubianhao, this.ysjl.id)
// }, },
// jilubianhao: function(newValue) { jilubianhao: function(newValue) {
// this.judgeRepeat(newValue, this.ysjl.id) this.judgeRepeat(newValue, this.ysjl.id)
// } }
}, },
// 添加F5刷新监听事件 // 添加F5刷新监听事件
mounted() { mounted() {

Write Preview
Loading…
Cancel
Save