Browse Source

Merge remote-tracking branch 'origin/master'

master
李磊 3 years ago
parent
commit
63a510245e
  1. 146
      src/views/ysjl/3000/common/index.vue
  2. 5
      src/views/ysjl/3000/dj/common/table.vue
  3. 82
      src/views/ysjl/3000/dj/common/table2.vue
  4. 108
      src/views/ysjl/3000/dj/zdft/index.vue

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

@ -188,7 +188,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="fromType == 1" :gutter="20"> <el-row v-if="fromType == 1||fromType==5||fromType==3" :gutter="20">
<el-col :span="18"> <el-col :span="18">
<el-form-item label="使用单位名称" prop="shiyongdanwei"> <el-form-item label="使用单位名称" prop="shiyongdanwei">
<el-input <el-input
@ -199,7 +199,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="fromType == 2" :gutter="20"> <el-row v-if="fromType == 2 ||fromType == 4" :gutter="20">
<el-col :span="18"> <el-col :span="18">
<el-form-item <el-form-item
label="施工单位名称" label="施工单位名称"
@ -213,7 +213,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="fromType == 2" :gutter="20"> <el-row v-if="fromType == 2 ||fromType == 4" :gutter="20">
<el-col :span="9"> <el-col :span="9">
<el-form-item <el-form-item
label="施工单位许可证编号" label="施工单位许可证编号"
@ -247,7 +247,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="fromType == 1" :gutter="20"> <el-row :gutter="20">
<el-col :span="9"> <el-col :span="9">
<el-form-item label="安全管理人员" prop="anquanguanlirenyuan"> <el-form-item label="安全管理人员" prop="anquanguanlirenyuan">
<el-input <el-input
@ -290,7 +290,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="fromType == 1" :gutter="20"> <el-row v-if="fromType == 1 ||fromType == '5'" :gutter="20">
<el-col :span="18"> <el-col :span="18">
<el-form-item label="注册代码" prop="zhucedaima"> <el-form-item label="注册代码" prop="zhucedaima">
<el-input <el-input
@ -301,7 +301,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="fromType == 1" :gutter="20"> <el-row :gutter="20">
<el-col :span="18"> <el-col :span="18">
<el-form-item label="设备使用地点" prop="anzhuangdidian"> <el-form-item label="设备使用地点" prop="anzhuangdidian">
<el-input <el-input
@ -312,7 +312,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="fromType == 1" :gutter="20"> <el-row :gutter="20">
<el-col :span="9"> <el-col :span="9">
<el-form-item label="单位内编号" prop="danweineibubianhao"> <el-form-item label="单位内编号" prop="danweineibubianhao">
<el-input <el-input
@ -333,7 +333,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="fromType == 1" :gutter="20"> <el-row :gutter="20">
<el-col :span="9"> <el-col :span="9">
<el-form-item label="改造单位名称" prop="gaizaodanwei"> <el-form-item label="改造单位名称" prop="gaizaodanwei">
<el-input <el-input
@ -386,7 +386,14 @@
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="9"> <el-col :span="9">
<el-form-item 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-input <el-input
v-model="ysjl.weibaodanweiDianhua" v-model="ysjl.weibaodanweiDianhua"
type="text" type="text"
@ -404,8 +411,22 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="fromType!=='5'" :gutter="20">
<el-col :span="18">
<el-form-item label="现场检验条件" prop="xianchangjianyantiaojian">
<el-radio-group v-model="ysjl.xianchangjianyantiaojian">
<el-radio label="符合">
符合
</el-radio>
<el-radio label="不符合">
不符合
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
</fieldset> </fieldset>
<fieldset> <fieldset v-if="fromType !=='5'">
<legend>设备技术参数</legend> <legend>设备技术参数</legend>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="9"> <el-col :span="9">
@ -416,7 +437,15 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="9"> <el-col :span="9">
<el-form-item label="额定速度" prop="edingsudu"> <el-form-item v-if="fromType==4" label="额定速度">
<el-input v-model="param.edingsuduShangxing" type="text">
<span slot="suffix">m/s</span>
</el-input>
<el-input v-model="param.edingsuduXiaxing" type="text">
<span slot="suffix">m/s</span>
</el-input>
</el-form-item>
<el-form-item v-else label="额定速度" prop="edingsudu">
<el-input v-model="param.edingsudu" type="text"> <el-input v-model="param.edingsudu" type="text">
<span slot="suffix">m/s</span> <span slot="suffix">m/s</span>
</el-input> </el-input>
@ -449,6 +478,72 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-if="fromType==3|| fromType==4" :gutter="20">
<el-col :span="9">
<el-form-item label="油缸数量" prop="youguanshuliang">
<el-input v-model="param.youguanshuliang" type="text" />
</el-form-item>
</el-col>
<el-col :span="9">
<el-form-item label="顶升形式" prop="dingshengxingshi">
<el-input v-model="param.dingshengxingshi" type="text" />
</el-form-item>
</el-col>
</el-row>
</fieldset>
<fieldset v-else>
<legend>设备技术参数</legend>
<el-row :gutter="20">
<el-col :span="9">
<el-form-item label="名义速度" prop="mingyisudu">
<el-input v-model="param.mingyisudu" type="text">
<span slot="suffix">m/s</span>
</el-input>
</el-form-item>
</el-col>
<el-col :span="9">
<el-form-item label="名义宽度" prop="mingyikuandu">
<el-input v-model="param.mingyikuandu" type="text">
<span slot="suffix">mm</span>
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="9">
<el-form-item label="倾斜角" prop="qingxiejiao">
<el-input
v-model="param.qingxiejiao"
type="text"
>
<span slot="suffix">°</span>
</el-input>
</el-form-item>
</el-col>
<el-col :span="9">
<el-form-item label="输送能力" prop="shusongnengli">
<el-input v-model="param.shusongnengli" type="text">
<span slot="suffix">p/h</span>
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="9">
<el-form-item label="提升高度" prop="tishenggaodu">
<el-input v-model="param.tishenggaodu" type="text">
<span slot="suffix">m</span>
</el-input>
</el-form-item>
</el-col>
<el-col :span="9">
<el-form-item label="使用区长度" prop="quduanchangdu">
<el-input v-model="param.quduanchangdu" type="text">
<span slot="suffix">m</span>
</el-input>
</el-form-item>
</el-col>
</el-row>
</fieldset> </fieldset>
<fieldset> <fieldset>
<el-row :gutter="20"> <el-row :gutter="20">
@ -511,7 +606,7 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col v-if="fromType!=='5'" :span="8">
<el-form-item label="检验完成日期" prop="jianyanjieshuriqi"> <el-form-item label="检验完成日期" prop="jianyanjieshuriqi">
<el-date-picker <el-date-picker
v-model="ysjl.jianyanjieshuriqi" v-model="ysjl.jianyanjieshuriqi"
@ -560,8 +655,12 @@
<el-tab-pane label="检验项目" name="second"> <el-tab-pane label="检验项目" name="second">
<Inspection :bgfy-data="bgfyData" /> <Inspection :bgfy-data="bgfyData" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane v-if="fromType == '5'" label="附表1" name="three">
<Table2 ref="table2" />
</el-tab-pane>
<el-tab-pane <el-tab-pane
v-for="(item, index) in arrayGroup" v-for="(item, index) in arrayGroup"
v-else
:key="index" :key="index"
:label="'附表' + (index + 1)" :label="'附表' + (index + 1)"
:name="'tab' + index" :name="'tab' + index"
@ -570,13 +669,14 @@
ref="table3" ref="table3"
:tabel-header="item.header" :tabel-header="item.header"
:table-data="item.data" :table-data="item.data"
:from-type="fromType"
@addfn="addfn(item)" @addfn="addfn(item)"
/> />
</el-tab-pane> </el-tab-pane>
<!-- <el-tab-pane v-if="fromType==1" label="附表二" name="four"> <!-- <el-tab-pane v-if="fromType==1" label="附表二" name="four">
<Table ref="table2" :tabel-header="tableHeader1" :table-data="list1"/> <Table ref="table2" :tabel-header="tableHeader1" :table-data="list1"/>
</el-tab-pane> --> </el-tab-pane> -->
<el-tab-pane v-if="fromType == 1" label="附表3" name="five"> <el-tab-pane v-if="fromType == 1||fromType==3" label="附表3" name="five">
<Table1 ref="table1" :pic="pic" /> <Table1 ref="table1" :pic="pic" />
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
@ -662,10 +762,11 @@ import Enclosure from '@/views/common/Enclosure'
import Inspection from '@/views/ysjl/3000/common/inspection-items' import Inspection from '@/views/ysjl/3000/common/inspection-items'
import Table from '@/views/ysjl/3000/dj/common/table' import Table from '@/views/ysjl/3000/dj/common/table'
import Table1 from '@/views/ysjl/3000/dj/common/table1' import Table1 from '@/views/ysjl/3000/dj/common/table1'
import Table2 from '@/views/ysjl/3000/dj/common/table2'
export default { export default {
name: 'BaseInfo', name: 'BaseInfo',
components: { SignName, Sticky, Enclosure, Inspection, Table, Table1 }, components: { SignName, Sticky, Enclosure, Inspection, Table, Table1, Table2 },
props: { props: {
arrayGroup: { arrayGroup: {
require: true, require: true,
@ -766,7 +867,6 @@ export default {
}, },
methods: { methods: {
addfn(item) { addfn(item) {
console.log('哈哈哈哈哈')
const length = item.data.length const length = item.data.length
item.data.push({ item.data.push({
id: parseInt(length), id: parseInt(length),
@ -778,7 +878,6 @@ export default {
D6: '', D6: '',
D7: '' D7: ''
}) })
console.log(item)
}, },
initYsjl() { initYsjl() {
this.ysjlController.init(this.$route.query).then((data) => { this.ysjlController.init(this.$route.query).then((data) => {
@ -807,7 +906,6 @@ export default {
}) })
}, },
getFbList() { getFbList() {
console.log(this.ysjlId)
this.ysjlController.getYsjlFb(this.ysjlId).then((data) => { this.ysjlController.getYsjlFb(this.ysjlId).then((data) => {
console.log(data) console.log(data)
// this.param = data // this.param = data
@ -833,12 +931,10 @@ export default {
}) })
}, },
getParam() { getParam() {
console.log(this.ysjlId)
const id = this.ysjlId || this.$route.query.templateId const id = this.ysjlId || this.$route.query.templateId
this.ysjlController this.ysjlController
.getParam(id, this.$route.query.sbzldm) .getParam(id, this.$route.query.sbzldm)
.then((data) => { .then((data) => {
console.log(data)
this.param = data this.param = data
}) })
}, },
@ -862,13 +958,11 @@ export default {
if (this.$route.query.state === 'update') { if (this.$route.query.state === 'update') {
this.jyxmController.getJdCyJyxm(this.ysjlId, this.$route.query.templateId, sort).then((data) => { this.jyxmController.getJdCyJyxm(this.ysjlId, this.$route.query.templateId, sort).then((data) => {
this.bgfyData = data this.bgfyData = data
console.log(data, 5685)
this.tableJs.mergeColRows(this.cols, this.rows, data) this.tableJs.mergeColRows(this.cols, this.rows, data)
}) })
} else { } else {
this.jyxmController.getCyJyxm(this.$route.query.templateId, sort).then((data) => { this.jyxmController.getCyJyxm(this.$route.query.templateId, sort).then((data) => {
this.bgfyData = data this.bgfyData = data
console.log(data, 5685)
this.tableJs.mergeColRows(this.cols, this.rows, data) this.tableJs.mergeColRows(this.cols, this.rows, data)
}) })
} }
@ -1012,6 +1106,9 @@ export default {
saveYsjl(operation) { saveYsjl(operation) {
const tableData = [] const tableData = []
const arr = [] const arr = []
if(this.fromType=='5'){
arr.push(this.$refs.table2.tableData)
} else{
this.arrayGroup.map((item) => { this.arrayGroup.map((item) => {
item.data.forEach(k => { item.data.forEach(k => {
delete k.id delete k.id
@ -1023,7 +1120,7 @@ export default {
delete item.name delete item.name
}) })
arr.push(arr1) arr.push(arr1)
console.log(arr, 333333333) }
this.bgfyData.forEach((row) => { this.bgfyData.forEach((row) => {
tableData.push({ tableData.push({
ysjlId: this.ysjlId, ysjlId: this.ysjlId,
@ -1078,9 +1175,8 @@ export default {
}, },
save(operation, type, jyxm, fb) { save(operation, type, jyxm, fb) {
console.log(JSON.stringify(fb), jyxm, 222222222222222) if(this.fromType!=='5')this.ysjl.imagePath = this.$refs.table1.imgPath
console.log(this.ysjl.imagePath, this.$refs.table1, 55555555)
this.ysjl.imagePath = this.$refs.table1.imgPath
// //
if (this.isRepeat) { if (this.isRepeat) {
this.$message({ this.$message({

5
src/views/ysjl/3000/dj/common/table.vue

@ -60,6 +60,10 @@ export default {
return [] return []
} }
}, },
fromType: {
type: String,
default: ''
},
tableData: { tableData: {
type: Array, type: Array,
require: true, require: true,
@ -70,7 +74,6 @@ export default {
}, },
data() { data() {
return { return {
type: '1',
options: [ options: [
{ {
value: '√', value: '√',

82
src/views/ysjl/3000/dj/common/table2.vue

@ -0,0 +1,82 @@
<template>
<div class="app-container">
<el-table :data="tableData" style="width: 50%" border>
<el-table-column label="" prop="D2" />
<el-table-column label="制停距离(m)" prop="D1">
<template slot-scope="scope">
<el-input v-model="scope.row.D1" />
</template>
</el-table-column>
</el-table>
</div>
</template>
<script>
export default {
name: 'Table2',
components: {},
props: {
tabelHeader: {
type: Array,
require: true,
default: () => {
return []
}
},
tableData: {
type: Array,
require: true,
default: () => {
return []
}
}
},
data() {
return {
options: [
{
value: '√',
id: '1'
},
{
value: 'X',
id: '2'
},
{
value: '/',
id: '3'
}
]
}
},
computed: {},
created() {
this.tableData = [
{
D1: '',
D2: '第一行'
},
{
D1: '',
D2: '第二行'
},
{
D1: '',
D2: '第三行'
}
]
},
mounted() {
},
methods: {
}
}
</script>
<style scoped>
.searchBox {
display: flex;
flex-direction: row;
margin-bottom: 20px;
}
</style>

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

@ -0,0 +1,108 @@
<template>
<div class="app-container">
<baseInfo :from-type="type" :array-group="arrayGroup" />
</div>
</template>
<script>
import baseInfo from '@/views/ysjl/3000/common/index'
export default {
name: 'ElevatorYeyin',
components: { baseInfo },
data() {
return {
type: '5',
arrayGroup: [
{
header: [
{
label: '',
prop: 'D2',
type: 1
},
{
label: '制停距离(m)',
prop: 'D1',
type: 1
}
],
data: [{
D2: '第一次',
D1: ''
}, {
D2: '第二次',
D1: ''
}, {
D2: '第三次',
D1: ''
}]
}
],
tableHeader2: [
{
label: '载荷',
type: 1
},
{
label: '30%',
prop: 'D1',
type: 1
},
{
label: '40%',
prop: 'D2',
type: 1
},
{
label: '45%',
prop: 'D3',
type: 1
},
{
label: '50%',
prop: 'D4',
type: 1
},
{
label: '60%',
prop: 'D5',
type: 1
}
],
list: [],
list1: []
}
},
computed: {},
created() {},
methods: {}
}
</script>
<style>
.el-input__inner {
border: 1px solid #00000075;
border-radius: 4px;
}
.el-textarea__inner {
border: 1px solid #91393975;
border-radius: 4px;
}
.el-form-item__error {
padding-top: 0;
position: absolute;
}
.el-input.is-disabled .el-input__inner {
color: #606266;
}
.el-textarea.is-disabled .el-textarea__inner {
color: #606266;
}
.el-dialog__body {
padding-top: 10px;
}
.myTable .el-input__inner {
padding: 0 5px;
text-align: center;
}
</style>
Loading…
Cancel
Save