FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
yanyizhou
2021-12-19 15:48:26 +08:00
parent 5a6a0309eb 113662795d
commit 1cf0d89076
74 changed files with 4131 additions and 1920 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+12 -276
View File
@@ -298,7 +298,7 @@
align="center"
label="标准号">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)">{{ scope.row.standNumber || scope.row.lawsNumber || scope.row.standCode }}</a>
<a @click="handlePreview(scope.row)">{{ scope.row.standNumber }}</a>
</template>
</el-table-column>
<el-table-column
@@ -368,34 +368,6 @@
align="center"
label="适用产品线">
</el-table-column>
<!-- <el-table-column
show-overflow-tooltip
prop="cycvppsbm"
width="210px"
align="center"
label="乘用车VPPS编码">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="cycvppscn"
width="210px"
align="center"
label="乘用车VPPS中文名称">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="kccvppsbm"
align="center"
width="210px"
label="卡车VPPS编码">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="kccvppscn"
align="center"
width="210px"
label="卡车VPPS中文名称">
</el-table-column>-->
<el-table-column width="240" align="center" fixed="right" label="操作">
<template slot-scope="scope">
<el-button
@@ -514,18 +486,6 @@
<el-form-item label="适用产品线" prop="sycpx">
<el-input v-model.trim="editRowData.sycpx" :disabled="true"/>
</el-form-item>
<!-- <el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
<el-input v-model.trim="editRowData.cycvppsbm" :disabled="true"/>
</el-form-item>
<el-form-item label="乘用车VPPS中文名称" prop="cycvppscn">
<el-input v-model.trim="editRowData.cycvppscn" :disabled="true"/>
</el-form-item>
<el-form-item label="卡车VPPS编码" prop="kccvppsbm">
<el-input v-model.trim="editRowData.kccvppsbm" :disabled="true"/>
</el-form-item>
<el-form-item label="卡车VPPS中文名称" prop="kccvppscn">
<el-input v-model.trim="editRowData.kccvppscn" :disabled="true"/>
</el-form-item>-->
</el-form>
<div class="demo-drawer-footer">
<el-button
@@ -947,18 +907,6 @@ export default {
},
// selectMoreBtn() {
// this.isAdvancedSearch = true
// this.standardFormList.standName = ''
// this.standardFormList.typeApplicable = ''
// this.standardFormList.nylx = ''
// this.standardFormList.zrbm = ''
// this.standardFormList.sycpx = ''
// this.showTableFlag = false
// this.page = 1
// this.standardForm.page = 1
// this.selectInfoMore()
// },
// 法规维护人树
getDept() {
return new Promise((resolve, reject) => {
@@ -1497,120 +1445,6 @@ export default {
}
})
},
// saveSarAccess () {
// this.$refs['sarAccessForm'].validate((valid) => {
// if (valid) {
// let rowlist = []
// let rowlist1 = []
// let rowlist2 = []
// let rowlist3 = []
// for (let i = 0; i < this.sarAccessInfoList.length; i++) {
// rowlist.push(this.sarAccessInfoList[i].id)
// if (this.sarAccessInfoList[i].ssrq === null) {
// rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
// }else {
// rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
// }
// if (this.sarAccessInfoList[i].xcxssrqgj === null) {
// rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
// }else {
// rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
// }
// if (this.sarAccessInfoList[i].zccssrqgj === null) {
// rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
// }else {
// rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
// }
// }
// rowlist = rowlist.join(',')
// rowlist1 = rowlist1.join(',')
// rowlist2 = rowlist2.join(',')
// rowlist3 = rowlist3.join(',')
// let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
// sarAccessEO.inforlist = rowlist
// sarAccessEO.inforlist1 = rowlist1
// sarAccessEO.inforlist2 = rowlist2
// sarAccessEO.inforlist3 = rowlist3
// sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
// // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
// // 判断是否有附件
// if (this.fileInfoList.length > 0) {
// let relateFile = []
// this.fileInfoList.map(item => {
// relateFile.push(item.id)
// })
// sarAccessEO.fileIds = relateFile.join(',')
// }
// if (!sarAccessEO.id) {
// // 新增
// sarAccessEO.state = '1'
// sarAccessEO.version = 0
// this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/insertList', sarAccessEO, {
// _this: this,
// loading: 'loadData'
// }, res => {
// if (this.sarAccessInfoList.length !== 0) {
// if (res.ok) {
// if (res.data === "数据库为空，添加成功"){
// this.$message.success('新增成功')
// this.isNext = true
// this.$router.push({
// name: 'AccessStandardsAndRegulations'
// })
// }
// else if (res.data === "其他清单添加成功"){
// this.$message.success('新增成功')
// this.isNext = true
// this.$router.push({
// name: 'AccessStandardsAndRegulations'
// })
// }
// else if (res.data === "车型类别清单添加成功"){
// this.$message.success('新增成功')
// this.isNext = true
// this.$router.push({
// name: 'AccessStandardsAndRegulations'
// })
// }else if(res.data === "车型类别清单添加失败"){
// this.$message.error('已存在此车型类别清单，新增失败')
// }
// else if (res.data === "国家/地区清单添加成功"){
// this.$message.success('新增成功')
// this.isNext = true
// this.$router.push({
// name: 'AccessStandardsAndRegulations'
// })
// }else if(res.data === "国家/地区清单添加失败"){
// this.$message.error('已存在此国家/地区清单，新增失败')
// }
//
// }
// } else {
// this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
// }
// }, e => {
// })
// } else {
// // 编辑
// this.$http.putData('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, {
// _this: this,
// loading: 'loadData'
// }, res => {
// if (res.ok) {
// //this.$message.success('编辑成功')
// this.isNext = true
// this.$router.push({
// name: 'AccessStandardsAndRegulations'
// })
// }
// }, e => {
// })
// }
// }else {
// this.$message.error('请检查表单是否填写正确')
// }
// })
// },
pageInfo() {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'){
StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
@@ -1621,31 +1455,6 @@ export default {
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
if (item.attrInfoMap === null) {
this.$set(item, 'zccssrqgj', '')
this.$set(item, 'xcxssrqgj', '')
this.$set(item, 'sycpx', '')
this.$set(item, 'ssrq', '')
this.$set(item, 'typeApplicable', '')
this.$set(item, 'nylx', '')
this.$set(item, 'zrbm', '')
this.$set(item, 'cycvppsbm', '')
this.$set(item, 'cycvppscn', '')
this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
} else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
}
})
this.drawerTotal = res.data.count
}, e => {
@@ -1695,31 +1504,6 @@ export default {
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
if (item.attrInfoMap === null) {
this.$set(item, 'zccssrqgj', '')
this.$set(item, 'xcxssrqgj', '')
this.$set(item, 'ssrq', '')
this.$set(item, 'sycpx', '')
this.$set(item, 'typeApplicable', '')
this.$set(item, 'nylx', '')
this.$set(item, 'zrbm', '')
this.$set(item, 'cycvppsbm', '')
this.$set(item, 'cycvppscn', '')
this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
} else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
}
})
this.drawerTotal = res.data.list.length
}, e => {
@@ -1748,33 +1532,6 @@ export default {
// 数据搜索 table select事件
sarAccessInfoSearchSelect(val) {
this.selectedAccInfoSearchList = val
this.selectedAccInfoSearchList.forEach(item => {
if (item.attrInfoMap === null) {
this.$set(item, 'zccssrqgj', '')
this.$set(item, 'xcxssrqgj', '')
this.$set(item, 'ssrq', '')
this.$set(item, 'sycpx', '')
this.$set(item, 'typeApplicable', '')
this.$set(item, 'nylx', '')
this.$set(item, 'zrbm', '')
this.$set(item, 'cycvppsbm', '')
this.$set(item, 'cycvppscn', '')
this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
} else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
}
})
this.selectedAccInfoSearchList.forEach(item => {
// 责任部门转换
if (item.zrbm !== null || item.zrbm !== "") {
@@ -2279,38 +2036,17 @@ export default {
}, {
_this: this
}, res => {
this.sarAccessInfoList = res.data.records
this.sarAccessInfoList.forEach(item => {
if (item.standYear === null && item.standType !== null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
} else if (item.standYear !== null && item.standType !== null){
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
if (item.attrInfoMap === null) {
this.$set(item, 'zccssrqgj', '')
this.$set(item, 'xcxssrqgj', '')
this.$set(item, 'sycpx', '')
this.$set(item, 'typeApplicable', '')
this.$set(item, 'nylx', '')
this.$set(item, 'zrbm', '')
this.$set(item, 'cycvppsbm', '')
this.$set(item, 'cycvppscn', '')
this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
} else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
}
})
}, e => {
if (res.ok) {
this.sarAccessInfoList = res.data.records
this.sarAccessInfoList.map(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
console.log(item.standNumber)
})
}
})
},
// 将文本状态的id与name对应
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+6 -187
View File
@@ -452,7 +452,7 @@
<el-form-item label="标准实施日期" prop="ssrq">
<el-date-picker
v-model.trim="editRowData.ssrq"
type="date"
type="dates"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
@@ -460,7 +460,7 @@
<el-form-item label="在产车实施日期" prop="zccssrqgj">
<el-date-picker
v-model.trim="editRowData.zccssrqgj"
type="date"
type="dates"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
@@ -468,7 +468,7 @@
<el-form-item label="新车型实施日期" prop="xcxssrqgj">
<el-date-picker
v-model.trim="editRowData.xcxssrqgj"
type="date"
type="dates"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
@@ -1419,92 +1419,6 @@ export default {
}
})
},
// 提交按钮 事件
// saveSarAccess () {
// this.$refs['sarAccessForm'].validate((valid) => {
// if (valid) {
// let rowlist = []
// let rowlist1 = []
// let rowlist2 = []
// let rowlist3 = []
// for (let i = 0; i < this.sarAccessInfoList.length; i++) {
// rowlist.push(this.sarAccessInfoList[i].id)
// if (this.sarAccessInfoList[i].ssrq === null) {
// rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
// }else {
// rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
// }
// if (this.sarAccessInfoList[i].xcxssrqgj === null) {
// rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
// }else {
// rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
// }
// if (this.sarAccessInfoList[i].zccssrqgj === null) {
// rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
// }else {
// rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
// }
// }
// rowlist = rowlist.join(',')
// rowlist1 = rowlist1.join(',')
// rowlist2 = rowlist2.join(',')
// rowlist3 = rowlist3.join(',')
// let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
// sarAccessEO.inforlist = rowlist
// sarAccessEO.inforlist1 = rowlist1
// sarAccessEO.inforlist2 = rowlist2
// sarAccessEO.inforlist3 = rowlist3
// // sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
// // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
// // 判断是否有附件
// if (this.fileInfoList.length > 0) {
// let relateFile = []
// this.fileInfoList.map(item => {
// relateFile.push(item.id)
// })
// sarAccessEO.fileIds = relateFile.join(',')
// }
// if (!sarAccessEO.id) {
// // 新增
// sarAccessEO.state = '1'
// sarAccessEO.version = 0
// this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/insertList', sarAccessEO, {
// _this: this,
// loading: 'loadData'
// }, res => {
// if (this.sarAccessInfoList.length !== 0) {
// if (res.ok) {
// this.$message.success('新增成功')
// this.isNext = true
// this.$router.push({
// name: 'AccessStandardsAndRegulations'
// })
// }
// }else {
// this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
// }
// }, e => {
// })
// } else {
// // 编辑
// this.$http.putData('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, {
// _this: this,
// loading: 'loadData'
// }, res => {
// if (res.ok) {
// this.isNext = true
// this.$router.push({
// name: 'AccessStandardsAndRegulations'
// })
// }
// }, e => {
// })
// }
// }else {
// this.$message.error('请检查表单是否填写正确')
// }
// })
// },
pageInfo() {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') {
StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
@@ -1515,31 +1429,6 @@ export default {
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
if (item.attrInfoMap === null) {
this.$set(item, 'zccssrqgj', '')
this.$set(item, 'xcxssrqgj', '')
this.$set(item, 'ssrq', '')
this.$set(item, 'sycpx', '')
this.$set(item, 'typeApplicable', '')
this.$set(item, 'nylx', '')
this.$set(item, 'zrbm', '')
this.$set(item, 'cycvppsbm', '')
this.$set(item, 'cycvppscn', '')
this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
} else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
}
})
this.drawerTotal = res.data.count
}, e => {
@@ -1589,31 +1478,6 @@ export default {
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
if (item.attrInfoMap === null) {
this.$set(item, 'zccssrqgj', '')
this.$set(item, 'xcxssrqgj', '')
this.$set(item, 'ssrq', '')
this.$set(item, 'sycpx', '')
this.$set(item, 'typeApplicable', '')
this.$set(item, 'nylx', '')
this.$set(item, 'zrbm', '')
this.$set(item, 'cycvppsbm', '')
this.$set(item, 'cycvppscn', '')
this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
}else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
}
})
this.drawerTotal = res.data.list.length
}, e => {
@@ -1643,31 +1507,6 @@ export default {
sarAccessInfoSearchSelect (val) {
this.selectedAccInfoSearchList = val
this.selectedAccInfoSearchList.forEach(item => {
if (item.attrInfoMap === null) {
this.$set(item, 'zccssrqgj', '')
this.$set(item, 'xcxssrqgj', '')
this.$set(item, 'ssrq', '')
this.$set(item, 'sycpx', '')
this.$set(item, 'typeApplicable', '')
this.$set(item, 'nylx', '')
this.$set(item, 'zrbm', '')
this.$set(item, 'cycvppsbm', '')
this.$set(item, 'cycvppscn', '')
this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
}else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
}
})
this.selectedAccInfoSearchList.forEach(item => {
// 责任部门转换
@@ -2181,29 +2020,6 @@ export default {
} else if (item.standYear !== null && item.standType !== null){
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
if (item.attrInfoMap === null) {
this.$set(item, 'zccssrqgj', '')
this.$set(item, 'xcxssrqgj', '')
this.$set(item, 'sycpx', '')
this.$set(item, 'typeApplicable', '')
this.$set(item, 'nylx', '')
this.$set(item, 'zrbm', '')
this.$set(item, 'cycvppsbm', '')
this.$set(item, 'cycvppscn', '')
this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
}else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
}
})
}, e => {
@@ -2350,6 +2166,9 @@ export default {
background: #ffffff;
text-align: right;
}
/deep/.el-date-editor.el-input {
width: 100%;
}
}
.labelBox {
/deep/ .el-form-item__label {
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+7 -157
View File
@@ -399,34 +399,6 @@
align="center"
label="适用产品线">
</el-table-column>
<!-- <el-table-column
show-overflow-tooltip
prop="cycvppsbm"
width="210px"
align="center"
label="乘用车VPPS编码">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="cycvppscn"
width="210px"
align="center"
label="乘用车VPPS中文名称">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="kccvppsbm"
align="center"
width="210px"
label="卡车VPPS编码">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="kccvppscn"
align="center"
width="210px"
label="卡车VPPS中文名称">
</el-table-column>-->
<el-table-column width="240" align="center" fixed="right" label="操作">
<template slot-scope="scope">
<el-button
@@ -517,7 +489,7 @@
<el-form-item label="标准实施日期" prop="ssrq">
<el-date-picker
v-model.trim="editRowData.ssrq"
type="date"
type="dates"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
@@ -525,7 +497,7 @@
<el-form-item label="在产车实施日期" prop="zccssrqgj">
<el-date-picker
v-model.trim="editRowData.zccssrqgj"
type="date"
type="dates"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
@@ -533,7 +505,7 @@
<el-form-item label="新车型实施日期" prop="xcxssrqgj">
<el-date-picker
v-model.trim="editRowData.xcxssrqgj"
type="date"
type="dates"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
@@ -1428,95 +1400,6 @@ export default {
}
})
},
// saveSarAccess () {
// this.$refs['sarAccessForm'].validate((valid) => {
// if (valid) {
// let rowlist = []
// let rowlist1 = []
// let rowlist2 = []
// let rowlist3 = []
// for (let i = 0; i < this.sarAccessInfoList.length; i++) {
// rowlist.push(this.sarAccessInfoList[i].id)
// if (this.sarAccessInfoList[i].ssrq === null) {
// rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
// }else {
// rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
// }
// if (this.sarAccessInfoList[i].xcxssrqgj === null) {
// rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
// }else {
// rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
// }
// if (this.sarAccessInfoList[i].zccssrqgj === null) {
// rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
// }else {
// rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
// }
// }
// rowlist = rowlist.join(',')
// rowlist1 = rowlist1.join(',')
// rowlist2 = rowlist2.join(',')
// rowlist3 = rowlist3.join(',')
// let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
// sarAccessEO.inforlist = rowlist
// sarAccessEO.inforlist1 = rowlist1
// sarAccessEO.inforlist2 = rowlist2
// sarAccessEO.inforlist3 = rowlist3
// // sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
// // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
// // 判断是否有附件
// if (this.fileInfoList.length > 0) {
// let relateFile = []
// this.fileInfoList.map(item => {
// relateFile.push(item.id)
// })
// sarAccessEO.fileIds = relateFile.join(',')
// }
// if (!sarAccessEO.id) {
// // 新增
// sarAccessEO.state = '1'
// sarAccessEO.version = 0
// this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/insertList', sarAccessEO, {
// _this: this,
// loading: 'loadData'
// }, res => {
// if (this.sarAccessInfoList.length !== 0) {
// if (res.ok) {
// if (res.data === "车型类别清单添加成功") {
// this.$message.success('新增成功')
// this.isNext = true
// this.$router.push({
// name: 'AccessStandardsAndRegulations'
// })
// }else{
// this.$message.error('已存在此车型类别清单，新增失败')
// }
// }
// }else {
// this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
// }
// }, e => {
// })
// } else {
// // 编辑
// this.$http.putData('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, {
// _this: this,
// loading: 'loadData'
// }, res => {
// if (res.ok) {
// this.isNext = true
// this.$router.push({
// name: 'AccessStandardsAndRegulations'
// })
// }
// }, e => {
// })
// }
// }else {
// this.$message.error('请检查表单是否填写正确')
// }
// })
// },
// 字段转化
changeText(val) {
val.forEach(item => {
@@ -1583,35 +1466,7 @@ export default {
})
},
// 字段添加
addWord(item) {
if (item.attrInfoMap === null) {
this.$set(item, 'zccssrqgj', '')
this.$set(item, 'xcxssrqgj', '')
this.$set(item, 'ssrq', '')
this.$set(item, 'syrz', '')
this.$set(item, 'sycpx', '')
this.$set(item, 'typeApplicable', '')
this.$set(item, 'nylx', '')
this.$set(item, 'zrbm', '')
this.$set(item, 'cycvppsbm', '')
this.$set(item, 'cycvppscn', '')
this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
} else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
this.$set(item, 'syrz', item.attrInfoMap.SYRZ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
}
},
// 查询数据搜索 table 数据
pageInfo() {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'){
@@ -1635,7 +1490,6 @@ export default {
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
this.addWord(item)
})
this.changeText(this.sarAccessInfoSearchList)
this.drawerTotal = res.data.count
@@ -1687,7 +1541,6 @@ export default {
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
this.addWord(item)
})
this.changeText(this.sarAccessInfoSearchList)
this.drawerTotal = res.data.list.length
@@ -1717,9 +1570,6 @@ export default {
// 数据搜索 table select事件
sarAccessInfoSearchSelect(val) {
this.selectedAccInfoSearchList = val
this.selectedAccInfoSearchList.forEach(item => {
this.addWord(item)
})
this.changeText(this.selectedAccInfoSearchList)
},
// 数据搜索 清单类型 table select事件
@@ -2168,9 +2018,6 @@ export default {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
})
this.sarAccessInfoSearchList.forEach(item => {
this.addWord(item)
})
}, e => {
})
@@ -2318,6 +2165,9 @@ export default {
background: #ffffff;
text-align: right;
}
/deep/.el-date-editor.el-input {
width: 100%;
}
}
.labelBox {
src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+18 -5
View File
@@ -152,7 +152,7 @@
</el-table-column>
<el-table-column
align="center"
prop="unit"
prop="unitName"
label="起草责任单位">
</el-table-column>
<!-- <el-table-column fixed="right" v-if="isPermission('f9745194958bc9ed3ee5127459795dbc,e8d690904ee1895dd0d17d9c794fbcd7,b299fa5edb3f3f35badb2adb6bda9f2e')>0" label="操作" align="center" width="100">-->
@@ -258,11 +258,15 @@
</el-form-item>
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" class="add-form-item" prop="unit" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<div style="display: flex;justify-content: space-between;align-items: center;">
<el-input
style="display: none;"
v-model="addForm.unit">
</el-input>
<el-input
:key="addForm.unit"
:config="addForm"
clearable
v-model="addForm.unit"
v-model="addForm.unitName"
placeholder="请选择起草责任单位"
@click.native="choiceZRBM(addForm.unit)">
</el-input>
@@ -386,6 +390,7 @@
ids: [],
addForm: {
unit: '', // 单位
unitName: '',
esName: '', // 企标名称
planStatus: '', // 计划状态
reviseStatus: '', // 制修订状态
@@ -446,20 +451,27 @@
methods: {
drawerCheckZRBM (data) {
let list = ''
let listName = ''
for (let a = 0; a < data.length; a++) {
if (list.length > 0) {
list += ','
list += data[a].name
list += data[a].id
listName += ','
listName += data[a].name
} else {
list = data[a].name
list = data[a].id
listName = data[a].name
}
}
this.addForm.unit = list
this.addForm.unitName = listName
this.modalshowflagZRBM = false
},
choiceZRBM(id) {
this.nodeListZRBM = []
this.nodeListZRBM = id.split(',')
if (id) {
this.nodeListZRBM = id.split(',')
}
this.modalshowflagZRBM = true
},
QCDWOK () {
@@ -629,6 +641,7 @@
this.DrawerType = 'edit'
this.addDrawer = true
this.addForm = {
unitName:command[0].unitName,
id: command[0].id,
unit: command[0].unit, // 单位
esName: command[0].esName, // 企标名称
src/pages/regulatoryRepository/workingGroup/index.vue
+15 -1
View File
@@ -14,6 +14,7 @@
<workingGroup2 v-if="activeName === 'workingGroup2'"></workingGroup2>
</el-tab-pane>
</el-tabs>
<el-button size="mini" type="primary" @click="statisticsBtn" class="statistics">工作组统计</el-button>
</div>
</template>
<script>
@@ -30,14 +31,27 @@
activeName: 'workingGroup1',
}
},
methods: {},
methods: {
statisticsBtn(){
this.$router.push({
name: 'dataStatisComments'
})
}
},
mounted() {},
beforeDestroy() {}
}
</script>
<style lang="less" scoped>
.workingGroup{
position: relative;
height: 100%;
.statistics{
position: absolute;
top: 0;
right: 0;
margin: 5px;
}
.home-tabs {
height: 100%;
/deep/.el-tabs__content {