Browse Source

提交配置依旧修改附表数据渲染方式

master
xiaobai 3 years ago
parent
commit
d5c4d70952
  1. 98
      src/views/ysjl/3000/common/index.vue
  2. 33
      src/views/ysjl/3000/dj/common/zdftFb.vue
  3. 9
      src/views/ysjl/3000/dj/yeyin/index.vue
  4. 12
      src/views/ysjl/3000/dj/zdft/index.vue

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

@ -188,7 +188,10 @@
</el-form-item>
</el-col>
</el-row>
<el-row v-if="fromType === 1 || fromType === 5 || fromType === 3" :gutter="20">
<el-row
v-if="fromType === 1 || fromType === 5 || fromType === 3"
:gutter="20"
>
<el-col :span="18">
<el-form-item label="使用单位名称" prop="shiyongdanwei">
<el-input
@ -290,7 +293,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row v-if="fromType === 1 ||fromType === 5" :gutter="20">
<el-row v-if="fromType === 1 || fromType === 5" :gutter="20">
<el-col :span="18">
<el-form-item label="注册代码" prop="zhucedaima">
<el-input
@ -386,14 +389,22 @@
</el-row>
<el-row :gutter="20">
<el-col :span="9">
<el-form-item v-if="fromType === 5" label="维护保养单位电话" prop="weibaodanweiDianhua">
<el-form-item
v-if="fromType === 5"
label="维护保养单位电话"
prop="weibaodanweiDianhua"
>
<el-input
v-model="ysjl.weibaodanweiDianhua"
type="text"
:disabled="edit"
/>
</el-form-item>
<el-form-item v-else label="维保电话" prop="weibaodanweiDianhua">
<el-form-item
v-else
label="维保电话"
prop="weibaodanweiDianhua"
>
<el-input
v-model="ysjl.weibaodanweiDianhua"
type="text"
@ -413,7 +424,10 @@
</el-row>
<el-row v-if="fromType !== 5" :gutter="20">
<el-col :span="18">
<el-form-item label="现场检验条件" prop="xianchangjianyantiaojian">
<el-form-item
label="现场检验条件"
prop="xianchangjianyantiaojian"
>
<el-radio-group v-model="ysjl.xianchangjianyantiaojian">
<el-radio label="符合">
符合
@ -512,10 +526,7 @@
<el-row :gutter="20">
<el-col :span="9">
<el-form-item label="倾斜角" prop="qingxiejiao">
<el-input
v-model="param.qingxiejiao"
type="text"
>
<el-input v-model="param.qingxiejiao" type="text">
<span slot="suffix">°</span>
</el-input>
</el-form-item>
@ -557,7 +568,10 @@
<el-row :gutter="20">
<el-col :span="18">
<el-form-item label="主要检验仪器和设备" prop="gongjuxianghao">
<el-input v-model="param.gongjuxianghao" style="width: 100px" />号检验专用工具箱
<el-input
v-model="param.gongjuxianghao"
style="width: 100px"
/>
</el-form-item>
</el-col>
</el-row>
@ -582,7 +596,7 @@
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="18" style="height: auto;">
<el-col :span="18" style="height: auto">
<el-form-item label="备注" prop="beizhu">
<el-input
v-model="ysjl.beizhu"
@ -656,17 +670,34 @@
<Inspection :bgfy-data="bgfyData" />
</el-tab-pane>
<el-tab-pane v-if="fromType === 5" label="附表1" name="three">
<zdft-fb ref="table1" :table-data.sync="fubiao1" />
<zdft-fb ref="table1" :table-data.sync="fubiao1" :state.sync="state" />
</el-tab-pane>
<template v-else>
<el-tab-pane label="附表一" name="four">
<Table ref="table1" :tabel-header="arrayGroup[0].header" :table-data.sync="fubiao1" />
<Table
ref="table1"
:tabel-header="arrayGroup[0].header"
:table-data.sync="fubiao1"
/>
</el-tab-pane>
<el-tab-pane label="附表二" name="five">
<Table ref="table2" :tabel-header="arrayGroup[1].header" :table-data.sync="fubiao2" />
<Table
ref="table2"
:tabel-header="arrayGroup[1].header"
:table-data.sync="fubiao2"
/>
</el-tab-pane>
<el-tab-pane v-if="fromType === 1 || fromType === 3" label="附表3" name="six">
<phxsb ref="table3" :table-data.sync="fubiao3" :ysjl-param.sync="param" @loadPhxsImage="loadPhxsImage" />
<el-tab-pane
v-if="fromType === 1 || fromType === 3"
label="附表3"
name="six"
>
<phxsb
ref="table3"
:table-data.sync="fubiao3"
:ysjl-param.sync="param"
@loadPhxsImage="loadPhxsImage"
/>
</el-tab-pane>
</template>
</el-tabs>
@ -833,6 +864,7 @@ export default {
if (fubiao[2]) {
this.fubiao3 = fubiao[2]
}
console.log(this.fubiao1)
})
},
getYsjl() {
@ -856,9 +888,7 @@ export default {
},
getParam() {
const id = this.ysjlId || this.$route.query.templateId
this.ysjlService
.getParam(id, this.$route.query.sbzldm)
.then((data) => {
this.ysjlService.getParam(id, this.$route.query.sbzldm).then((data) => {
this.param = data
})
},
@ -880,13 +910,17 @@ export default {
},
getJyxm(sort) {
if (this.$route.query.state === 'update') {
this.jyxmService.getJdCyJyxm(this.ysjlId, this.$route.query.templateId, sort).then((data) => {
this.jyxmService
.getJdCyJyxm(this.ysjlId, this.$route.query.templateId, sort)
.then((data) => {
this.bgfyData = data
this.tableJs.getData(this.cols, this.rows, this.bgfyData)
})
} else {
this.jyxmService.getCyJyxm(this.$route.query.templateId, sort).then((data) => {
data.forEach(row => {
this.jyxmService
.getCyJyxm(this.$route.query.templateId, sort)
.then((data) => {
data.forEach((row) => {
row.dicJyxmId = row.id
})
this.bgfyData = data
@ -988,14 +1022,20 @@ export default {
this.save(operation, 'post', tableData, fubiao)
} else if (operation === 'build') {
this.ysjl.baogaobianhao = this.ysjl.jilubianhao
if (this.ysjl.jilubianhao && this.ysjl.jilubianhao.indexOf('COPY') > -1) {
if (
this.ysjl.jilubianhao &&
this.ysjl.jilubianhao.indexOf('COPY') > -1
) {
this.$message({
type: 'error',
message: '请先修改报告编号,不允许携带COPY标志生成报告!'
})
return false
}
if (this.ysjl.jianyanrenyuan === null || this.ysjl.jianyanrenyuan === '') {
if (
this.ysjl.jianyanrenyuan === null ||
this.ysjl.jianyanrenyuan === ''
) {
this.$message({
type: 'error',
message: '请先签名再生成报告!'
@ -1004,7 +1044,9 @@ export default {
}
for (let i = 0; i < this.bgfyData.length; i++) {
if (!this.bgfyData[i].jianjianyuan || !this.bgfyData[i].querenriqi) {
this.$message.error('请将检验项目中的监检人员及监检日期填写完毕,再生成报告!')
this.$message.error(
'请将检验项目中的监检人员及监检日期填写完毕,再生成报告!'
)
return false
}
}
@ -1082,11 +1124,13 @@ export default {
if (!this.pic) {
return false
}
this.uploadService.uploadPhxsBase64File({
this.uploadService
.uploadPhxsBase64File({
ysjlId: this.ysjl.id,
base64File: this.pic,
shebeizhongleidaima: this.ysjl.shebeizhongleidaima
}).then(() => {
})
.then(() => {
if (operation !== 'add') {
this.buildSaveData(operation)
}

33
src/views/ysjl/3000/dj/common/zdftFb.vue

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<el-table :data="tableData" style="width: 50%">
<el-table :data="data" style="width: 50%">
<el-table-column label="" prop="D2" />
<el-table-column label="制停距离(m)" prop="D1">
<template slot-scope="scope">
@ -18,6 +18,10 @@ export default {
tableData: {
type: Array,
required: true
},
state: {
type: String,
require: true
}
},
data() {
@ -37,7 +41,34 @@ export default {
}
]
}
},
computed: {
data() {
if (this.state == 'create') {
const arr = [
{
D2: '第一次',
D1: ''
},
{
D2: '第二次',
D1: ''
},
{
D2: '第三次',
D1: ''
}
]
return arr
} else {
return this.tableData
}
}
},
mounted() {
},
methods: {}
}
</script>

9
src/views/ysjl/3000/dj/yeyin/index.vue

@ -63,16 +63,21 @@ export default {
header: [
{
label: '层站',
prop: 'D8',
prop: 'D9',
type: 1
},
{
label: '6.3施力层门间隙',
prop: 'D7',
prop: 'D8',
type: 1
},
{
label: '6.3门扇与门扇',
prop: 'D7',
type: 1
},
{
label: '6.3门扇与立柱',
prop: 'D6',
type: 1
},

12
src/views/ysjl/3000/dj/zdft/index.vue

@ -25,17 +25,7 @@ export default {
prop: 'D1',
type: 1
}
],
data: [{
D2: '第一次',
D1: ''
}, {
D2: '第二次',
D1: ''
}, {
D2: '第三次',
D1: ''
}]
]
}
],
tableHeader2: [

Loading…
Cancel
Save