Browse Source

修改相关内容

master
xiaobai 3 years ago
parent
commit
37d07cf207
  1. 40
      src/views/ysjl/5000/dj/jdgy-cl/index.vue
  2. 69
      src/views/ysjl/5000/dj/lygg-cl/index.vue

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

@ -333,6 +333,7 @@
<el-table ref="sybjSData" :data="sybjSData" :span-method="tableJs.mergeColRows" border stripe style="width:90%">
<el-table-column align="center" label="检验项目">
<el-table-column align="center" prop="jianyanxiang" width="200" />
<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="检验结果">
@ -376,7 +377,6 @@ export default {
edit: false,
sybjSData: [],
tableData: [],
users: [],
checkedTab: 'first',
ysjlId: this.$route.query.id,
//
@ -387,9 +387,28 @@ export default {
getValue(row) { //
return row.jianyanxiang
}
},
{
name: 'jianyanmu', // el-table-column prop=''
getValue(row) { //
return row.jianyanmu
}
}
],
departmemtArr: []
rows: [
{
name: 'jianyanxiang',
getValue(row) {
return row.jianyanxiang
}
},
{
name: 'jianyanneirong',
getValue(row) {
return row.jianyanneirong
}
}
]
}
},
computed: {
@ -418,18 +437,11 @@ export default {
this.getYsjl(this.$route.query.id)
this.getJyxm(1)
}
this.getUserList()
this.getDepartmentArr()
},
beforeDestroy() {
window.removeEventListener('beforeunload', this.beforeunloadHandler, false)
},
methods: {
getDepartmentArr() {
getDepartmentTreeList().then(res => {
this.departmemtArr = res
})
},
/**
* 签名方法
* @param data
@ -583,15 +595,7 @@ export default {
})
})
}
this.tableJs.getData(this.cols, undefined, this.sybjSData)
})
},
getUserList() {
this.api({
url: '/user/all',
method: 'get'
}).then(data => {
this.users = data
this.tableJs.getData(this.cols, this.rows, this.sybjSData)
})
},
saveYsjl: function(operation) {

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

@ -164,6 +164,20 @@
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="18">
<el-form-item label="检验类别" prop="jianyanleibie" label-width="300px">
<el-radio-group v-model="ysjl.jianyanleibie">
<el-radio label="SC">
首次检验
</el-radio>
<el-radio label="DQ">
定期检验
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
</fieldset>
<fieldset>
<legend>设备技术参数</legend>
@ -329,6 +343,7 @@
<el-table ref="sybjSData" :data="sybjSData" :span-method="tableJs.mergeColRows" border stripe style="width:90%">
<el-table-column align="center" label="检验项目">
<el-table-column align="center" prop="jianyanxiang" width="200" />
<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="检验结果">
@ -373,7 +388,6 @@ export default {
edit: false,
sybjSData: [],
tableData: [],
users: [],
checkedTab: 'first',
ysjlId: this.$route.query.id,
//
@ -384,9 +398,28 @@ export default {
getValue(row) { //
return row.jianyanxiang
}
},
{
name: 'jianyanmu', // el-table-column prop=''
getValue(row) { //
return row.jianyanmu
}
}
],
departmemtArr: []
rows: [
{
name: 'jianyanxiang',
getValue(row) {
return row.jianyanxiang
}
},
{
name: 'jianyanneirong',
getValue(row) {
return row.jianyanneirong
}
}
]
}
},
computed: {
@ -415,18 +448,11 @@ export default {
this.getYsjl(this.$route.query.id)
this.getJyxm(1)
}
this.getUserList()
this.getDepartmentArr()
},
beforeDestroy() {
window.removeEventListener('beforeunload', this.beforeunloadHandler, false)
},
methods: {
getDepartmentArr() {
getDepartmentTreeList().then(res => {
this.departmemtArr = res
})
},
/**
* 签名方法
* @param data
@ -520,16 +546,9 @@ export default {
this.getParam(this.ysjl.id, this.ysjl.shebeizhongleidaima)
})
},
getParam(ysjlId, sbzldm) {
// id
this.api({
url: '/ysjl/getParamByYsjlId',
method: 'get',
params: {
ysjlId: ysjlId,
sbzldm: sbzldm
}
}).then(data => {
getParam() {
const id = this.ysjlId || this.$route.query.templateId
this.ysjlService.getParam(id, this.$route.query.sbzldm).then((data) => {
this.param = data
})
},
@ -539,7 +558,7 @@ export default {
.getJdCyJyxm(this.ysjlId, this.$route.query.templateId, sort)
.then((data) => {
this.sybjSData = data
this.tableJs.getData(this.cols, undefined, this.sybjSData)
this.tableJs.getData(this.cols, this.rows, this.sybjSData)
})
} else {
this.jyxmService
@ -549,18 +568,10 @@ export default {
row.dicJyxmId = row.id
})
this.sybjSData = data
this.tableJs.getData(this.cols, undefined, this.sybjSData)
this.tableJs.getData(this.cols, this.rows, this.sybjSData)
})
}
},
getUserList() {
this.api({
url: '/user/all',
method: 'get'
}).then(data => {
this.users = data
})
},
saveYsjl: function(operation) {
if (operation === 'add') {
if (this.jlbh3.trim() === '') {

Loading…
Cancel
Save