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:
fanlin
2021-07-26 15:22:00 +08:00
parent 1aedcffb5b 662d241358
commit 886ebf6212
4 changed files with 102 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+23 -13
View File
@@ -237,13 +237,13 @@
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="code" prop="standNumber"
show-overflow-tooltip
fixed="left" fixed="left"
width="180px" width="180px"
label="标准号"> label="标准号">
<template slot-scope="scope"> <template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a> <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -370,12 +370,13 @@
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standNumber"
show-overflow-tooltip
width="180px" width="180px"
fixed="left" fixed="left"
label="标准号"> label="标准号">
<template slot-scope="scope"> <template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a> <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -1357,15 +1358,17 @@ export default {
roundButton: true, roundButton: true,
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
// i 全部对象数组的下标 let exits = []
// s 选中对象数组的下标 this.sarAccessInfoListArry.map(item => {
for (var s in this.sarAccessInfoListArry) { let index
for (var i in this.sarAccessInfoList) { index = this.sarAccessInfoList.findIndex(items => {
if (this.sarAccessInfoListArry[s].uuid === this.sarAccessInfoList[i].uuid) { return items.id = item
this.sarAccessInfoList.splice(i, 1) })
} if (index > -1) {
this.sarAccessInfoList.splice(index, 1)
} }
} exits.push(item)
})
this.sarAccessInfoListArry = [] this.sarAccessInfoListArry = []
this.$refs.entryTable.clearSelection() this.$refs.entryTable.clearSelection()
}).catch(() => {}) }).catch(() => {})
@@ -1467,6 +1470,13 @@ export default {
selectLawsStands () { selectLawsStands () {
StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{ StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{
this.sarAccessInfoSearchList = res.data.list this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
})
this.drawerTotal = res.data.list.length this.drawerTotal = res.data.list.length
}, e => { }, e => {
}) })
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+33 -9
View File
@@ -117,10 +117,10 @@
</el-button> </el-button>
</el-form> </el-form>
<div v-if="!showSelectBox"> <div v-if="!showSelectBox">
<el-form :model="standardForm" class="label-input-form" label-width="108px" inline> <el-form :model="standardFormList" class="label-input-form" label-width="108px" inline>
<el-form-item label="英文名称" class="search-item"> <el-form-item label="中文名称" class="search-item">
<el-input <el-input
v-model="standardForm.standName" v-model="standardFormList.standName"
placeholder="请输入" placeholder="请输入"
:maxlength="100" :maxlength="100"
size="small" size="small"
@@ -129,7 +129,7 @@
<el-form-item label="适用车型" class="labelBox" label-width="61px"> <el-form-item label="适用车型" class="labelBox" label-width="61px">
<el-select <el-select
class="showBox" class="showBox"
v-model="standardForm.typeApplicable" v-model="standardFormList.typeApplicable"
placeholder="请选择" placeholder="请选择"
filterable filterable
size="small" size="small"
@@ -145,7 +145,7 @@
<el-form-item label="能源类型" > <el-form-item label="能源类型" >
<el-select <el-select
class="showBox" class="showBox"
v-model="standardForm.nylx" v-model="standardFormList.nylx"
placeholder="请选择" placeholder="请选择"
filterable filterable
size="small" size="small"
@@ -161,7 +161,7 @@
<el-form-item label="责任部门" > <el-form-item label="责任部门" >
<el-select <el-select
class="showBox" class="showBox"
v-model="standardForm.zrbm" v-model="standardFormList.zrbm"
placeholder="请选择" placeholder="请选择"
filterable filterable
size="small" size="small"
@@ -177,7 +177,7 @@
<el-form-item label="适用产品线" > <el-form-item label="适用产品线" >
<el-select <el-select
class="showBox" class="showBox"
v-model="standardForm.sycpx" v-model="standardFormList.sycpx"
placeholder="请选择" placeholder="请选择"
filterable filterable
size="small" size="small"
@@ -428,6 +428,13 @@ export default {
page: 1, page: 1,
Size: this.$store.getters.userInfo.configContent Size: this.$store.getters.userInfo.configContent
}, },
standardFormList: {
standNumber: '',
standName: '',
responseUnit: '',
page: 1,
Size: this.$store.getters.userInfo.configContent
},
page: 1, page: 1,
// pageSize: this.$store.getters.userInfo.configContent, // pageSize: this.$store.getters.userInfo.configContent,
total: 0, total: 0,
@@ -493,6 +500,7 @@ export default {
// 根据准入id查询标准法规详情 // 根据准入id查询标准法规详情
selectInfobyAccid() { selectInfobyAccid() {
this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", { this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
...this.standardFormList,
...this.standardForm, ...this.standardForm,
id: this.pageId, id: this.pageId,
}, { }, {
@@ -507,8 +515,24 @@ export default {
back() { back() {
this.$router.push({ this.$router.push({
name: "AccessStandardsAndRegulations" name: 'AccessStandardsAndRegulations',
}); })
/* if (this.sarAccessEO.sortKey === '1') {
this.$router.push({
name: 'AccessStandardsAndRegulations',
menuName: '国家/地区清单'
})
} else if(this.sarAccessEO.sortKey === '2') {
this.$router.push({
name: 'AccessStandardsAndRegulations',
menuName: '项目类清单'
})
} else {
this.$router.push({
name: 'AccessStandardsAndRegulations',
menuName: '其他清单'
})
}*/
// this.$router.push(this.$store.state.detailMap) // this.$router.push(this.$store.state.detailMap)
// this.$store.commit('setDetailMap', '') // this.$store.commit('setDetailMap', '')
}, },
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+23 -13
View File
@@ -211,13 +211,13 @@
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="code" prop="standNumber"
show-overflow-tooltip
fixed="left" fixed="left"
width="180px" width="180px"
label="标准号"> label="标准号">
<template slot-scope="scope"> <template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a> <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -338,12 +338,13 @@
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standNumber"
show-overflow-tooltip
width="180px" width="180px"
fixed="left" fixed="left"
label="标准号"> label="标准号">
<template slot-scope="scope"> <template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a> <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -1187,15 +1188,17 @@ export default {
roundButton: true, roundButton: true,
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
// i 全部对象数组的下标 let exits = []
// s 选中对象数组的下标 this.sarAccessInfoListArry.map(item => {
for (var s in this.sarAccessInfoListArry) { let index
for (var i in this.sarAccessInfoList) { index = this.sarAccessInfoList.findIndex(items => {
if (this.sarAccessInfoListArry[s].uuid === this.sarAccessInfoList[i].uuid) { return items.id = item
this.sarAccessInfoList.splice(i, 1) })
} if (index > -1) {
this.sarAccessInfoList.splice(index, 1)
} }
} exits.push(item)
})
this.sarAccessInfoListArry = [] this.sarAccessInfoListArry = []
this.$refs.entryTable.clearSelection() this.$refs.entryTable.clearSelection()
}).catch(() => {}) }).catch(() => {})
@@ -1278,6 +1281,13 @@ export default {
_this: this _this: this
}, res =>{ }, res =>{
this.sarAccessInfoSearchList = res.data.list this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
})
this.drawerTotal = res.data.list.length this.drawerTotal = res.data.list.length
}, e => { }, e => {
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+23 -13
View File
@@ -215,13 +215,13 @@
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="code" prop="standNumber"
show-overflow-tooltip
fixed="left" fixed="left"
width="180px" width="180px"
label="标准号"> label="标准号">
<template slot-scope="scope"> <template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a> <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -342,12 +342,13 @@
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standNumber"
show-overflow-tooltip
width="180px" width="180px"
fixed="left" fixed="left"
label="标准号"> label="标准号">
<template slot-scope="scope"> <template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a> <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -1185,15 +1186,17 @@ export default {
roundButton: true, roundButton: true,
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
// i 全部对象数组的下标 let exits = []
// s 选中对象数组的下标 this.sarAccessInfoListArry.map(item => {
for (var s in this.sarAccessInfoListArry) { let index
for (var i in this.sarAccessInfoList) { index = this.sarAccessInfoList.findIndex(items => {
if (this.sarAccessInfoListArry[s].uuid === this.sarAccessInfoList[i].uuid) { return items.id = item
this.sarAccessInfoList.splice(i, 1) })
} if (index > -1) {
this.sarAccessInfoList.splice(index, 1)
} }
} exits.push(item)
})
this.sarAccessInfoListArry = [] this.sarAccessInfoListArry = []
this.$refs.entryTable.clearSelection() this.$refs.entryTable.clearSelection()
}).catch(() => {}) }).catch(() => {})
@@ -1276,6 +1279,13 @@ export default {
_this: this _this: this
}, res =>{ }, res =>{
this.sarAccessInfoSearchList = res.data.list this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
})
this.drawerTotal = res.data.list.length this.drawerTotal = res.data.list.length
}, e => { }, e => {