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

Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop

Browse Source
This commit is contained in:
宋伟佳
2021-07-23 14:02:47 +08:00
parent 74da433d63 d48d54b4a7
commit 4deb01c6bd
10 changed files with 221 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/config/pages/linkManage/index.vue
+23 -3
View File
@@ -50,7 +50,7 @@
<!-- label="序号"-->
<!-- sortable-->
<!-- width="170px">-->
</el-table-column>
<!-- </el-table-column>-->
<el-table-column
label="操作"
width="50px">
@@ -103,6 +103,7 @@
</template>
<script>
import Sortable from 'sortablejs'
export default {
name: "linkManage",
data () {
@@ -143,7 +144,8 @@
children: 'children'
},
linkList: []
linkList: [],
sortData: [],
}
},
methods: {
@@ -299,8 +301,26 @@
loading: 'Loading'
}, res=> {
this.linkList = res.data
this.initSortable()
})
},
initSortable () {
this.sortData = [...this.linkList]
const el = document.querySelector('.el-table__body-wrapper tbody')
//创建拖拽对象
this.sortable = Sortable.create(el, {
sort: true, //是否可进行拖拽排序
animation: 150,
onEnd: ({newIndex, oldIndex}) => {
const val = this.sortData[oldIndex]
this.sortData.splice(oldIndex, 1)
this.sortData.splice(newIndex, 0, val)
this.sortData.forEach((item, index) => {
item.orderBy = index + 1
})
}
})
},
},
mounted() {
this.getLink();
@@ -319,4 +339,4 @@
height: calc(~'100% - 50px')
}
}
</style>
</style>
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+3 -1
View File
@@ -353,7 +353,9 @@ export default {
name: "ListOfStandardsAndRegulationsDetails",
query: {
id: item.id,
fileIds: item.fileIds
fileIds: item.fileIds,
page: 1,
Size: this.$store.getters.userInfo.configContent
}
});
},
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
+3 -1
View File
@@ -353,7 +353,9 @@ export default {
name: "OtherAddEit",
query: {
id: item.id,
fileIds: item.fileIds
fileIds: item.fileIds,
page: 1,
Size: this.$store.getters.userInfo.configContent
}
});
}
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
+3 -1
View File
@@ -356,7 +356,9 @@ export default {
name: "ProjectAddEit",
query: {
id: item.id,
fileIds: item.fileIds
fileIds: item.fileIds,
page: 1,
Size: this.$store.getters.userInfo.configContent
}
});
}
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+25 -12
View File
@@ -80,9 +80,9 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('m.keywords')" class="search-item">
<el-form-item label="标准名称" class="search-item">
<el-input
v-model="sarAccessInfoSearch.keywords"
v-model="sarAccessInfoSearch.standName"
placeholder="请输入"
:maxlength="100"
></el-input>
@@ -495,7 +495,7 @@
width="210px"
label="卡车VPPS中文名称">
</el-table-column>
<el-table-column width="200">
<el-table-column width="240" label="操作">
<template slot-scope="scope">
<el-button
class="common-button-default"
@@ -558,9 +558,11 @@
:wrapperClosable="false"
size="800px"
>
<el-form :modal="editRowData" ref="editRowData" label-width="150px" style="margin: 20px">
<el-form :modal="editRowData" label-position="left" ref="editRowData" label-width="150px" style="margin: 20px">
<el-form-item label="标准号">
<a>{{ editRowData.standSortShow }} {{ editRowData.standNumber }}</a>
<el-input v-model.trim="editRowData.standNumber" :disabled="true">
<!-- <a>{{ editRowData.standSortShow }} {{ editRowData.standNumber }}</a>-->
</el-input>
</el-form-item>
<el-form-item label="标准名称" prop="standName">
<el-input v-model.trim="editRowData.standName" :disabled="true"></el-input>
@@ -656,6 +658,7 @@ import CustomRoleTree from '@/components/CustomFormComponents/roleTree'
import stand from "../../../config/pages/attributeCustom/components/stand";
import { mapGetters } from 'vuex'
import { editDataInfo } from '@/api/unqualProcess'
import {interfaceUrl} from "@/sysConfig";
export default {
name: 'ListOfStandardsAndRegulationsDetails',
components: {
@@ -1339,6 +1342,7 @@ export default {
editTghisRow(row) {
this.rowList = row
this.editRowData = this.rowList
this.editRowData.standNumber = this.rowList.standSortShow + this.rowList.standNumber
this.drawerEdit = true
},
// 抽屉取消按钮
@@ -1509,7 +1513,6 @@ export default {
// 数据搜索 table select事件
sarAccessInfoSearchSelect (val) {
this.selectedAccInfoSearchList = val
console.log(val)
},
// 数据搜索 清单类型 table select事件
accessSarTypeSelect (selectData) {
@@ -1528,8 +1531,13 @@ export default {
},
// 点击 导出、全部导出按钮事件
exportAccessInfo (type) {
this.exportTestItemNameFlag = true
this.exportName = ''
if (this.sarAccessInfoListArry.length > 0) {
this.exportTestItemNameFlag = true
this.exportName = ''
}else {
this.$message.warning('请选择数据进行导出')
}
},
// 导出确定功能
exportTestItem () {
@@ -1545,10 +1553,9 @@ export default {
for (var accessInfo in exportList) {
accIdAndrestype.push(exportList[accessInfo].id)
}
window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames
const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
window.open(exportURL)
this.$message.success('导出信息成功')
} else {
this.$message.warning('当前没有需要导出的数据')
}
this.exportTestItemNameFlag = false
},
@@ -1952,7 +1959,11 @@ export default {
return formatText(str)
},
getData() {
this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById', {id: this.zqaId}, {
this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById', {
id: this.zqaId,
page: this.page,
Size: this.Size
}, {
_this: this
}, res => {
this.sarAccessInfoList = res.data
@@ -1987,6 +1998,8 @@ export default {
},
mounted () {
this.zqaId =this.$route.query.id;
this.page = this.$route.query.page
this.Size = this.$route.query.Size
// this.getData()
this.getDept()
// 从数据库中查询各下拉框数据
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+10 -4
View File
@@ -102,7 +102,7 @@
</el-button>
</el-form>
<div v-if="!showSelectBox">
<el-form :model="standardForm" class="label-input-form" label-width="auto" inline>
<el-form :model="standardForm" class="label-input-form" label-width="150px" inline>
<el-form-item label="中文名称" class="search-item">
<el-input
v-model="standardForm.standName"
@@ -119,8 +119,9 @@
size="small"
/>
</el-form-item>
<el-form-item label="适用车型" >
<el-form-item label="适用车型">
<el-select
class="showBox"
v-model="standardForm.typeApplicable"
placeholder="请选择"
filterable
@@ -136,6 +137,7 @@
</el-form-item>
<el-form-item label="能源类型" >
<el-select
class="showBox"
v-model="standardForm.nylx"
placeholder="请选择"
filterable
@@ -151,6 +153,7 @@
</el-form-item>
<el-form-item label="责任部门" >
<el-select
class="showBox"
v-model="standardForm.zrbm"
placeholder="请选择"
filterable
@@ -166,6 +169,7 @@
</el-form-item>
<el-form-item label="适用产品线" >
<el-select
class="showBox"
v-model="standardForm.sycpx"
placeholder="请选择"
filterable
@@ -774,13 +778,12 @@ export default {
mounted() {
this.$nextTick(() => {
let accessRow = JSON.parse(sessionStorage.getItem("accessRow"));
console.log(accessRow)
this.pageId = accessRow.id
this.sarAccessEO = accessRow;
this.sarAccessEOInfo = this.sarAccessEO.countryArea.indexOf(',')
this.selectInfobyAccid();
this.getOrgTreeSource();
this.getFileInfo();
// this.sarAccessEOInfo = this.sarAccessEO.countryArea.indexOf(',')
});
// 从数据库中查询各下拉框数据
@@ -972,6 +975,9 @@ export default {
}
}
/deep/.showBox{
width: 165px;
}
.iconClass {
width: 18px;
height: 18px;
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+22 -29
View File
@@ -13,24 +13,6 @@
<el-form-item label="清单类别" prop="detailedList" class="search-item">
<el-input v-model="sarAccessEO.detailedList" :disabled="disabledFlag" placeholder="请输入"></el-input>
</el-form-item>
<!-- <el-form-item label="适用领域" prop="applicationScope" class="search-item">
<el-select
v-model="sarAccessEO.applicationScope"
multiple
placeholder="请选择"
filterable
:disabled="disabledFlag"
class="wx-resolve"
>
<el-option
v-for="item in applyOptions"
:value="item.value"
:key="item.value"
:label="item.label"
>
</el-option>
</el-select>
</el-form-item>-->
<br/><br/>
<el-form-item label="清单说明" prop="remark" class="search-item max-search-item2">
<el-input
@@ -83,9 +65,9 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('m.keywords')" class="search-item">
<el-form-item label="标准名称" class="search-item">
<el-input
v-model="sarAccessInfoSearch.keywords"
v-model="sarAccessInfoSearch.standName"
placeholder="请输入"
:maxlength="100"
></el-input>
@@ -433,7 +415,7 @@
width="210px"
label="卡车VPPS中文名称">
</el-table-column>
<el-table-column width="150">
<el-table-column width="150" label="操作">
<template slot-scope="scope">
<el-button
class="common-button-default"
@@ -506,6 +488,7 @@ import CustomInputForPolicy from '@/components/CustomFormComponents/InputForPoli
import CustomRoleTree from '@/components/CustomFormComponents/roleTree'
import stand from "../../../config/pages/attributeCustom/components/stand";
import { mapGetters } from 'vuex'
import {interfaceUrl} from "@/sysConfig";
export default {
name: 'OtherAddEit',
components: {
@@ -615,7 +598,7 @@ export default {
askType: '', // 监管类型
dataSource: 'INLAND_STAND', // 数据来源
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
Size: this.$store.getters.userInfo.configContent,
validFlag: 0,
advanceSearchVOStr: ''
},
@@ -1297,13 +1280,17 @@ export default {
// 数据搜索table分页条数改变回调
drawerPageSizeChange () {
this.sarAccessInfoSearch.pageSize = this.$store.getters.userInfo.configContent
this.sarAccessInfoSearch.Size = this.$store.getters.userInfo.configContent
this.selectLawsStands()
},
// 点击 导出、全部导出按钮事件
exportAccessInfo (type) {
this.exportTestItemNameFlag = true
this.exportName = ''
if (this.sarAccessInfoListArry.length > 0) {
this.exportTestItemNameFlag = true
this.exportName = ''
}else {
this.$message.warning('请选择数据进行导出')
}
},
// 导出确定功能
exportTestItem () {
@@ -1319,10 +1306,10 @@ export default {
for (var accessInfo in exportList) {
accIdAndrestype.push(exportList[accessInfo].id)
}
window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames
const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
window.open(exportURL)
// window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames
this.$message.success('导出信息成功')
} else {
this.$message.warning('当前没有需要导出的数据')
}
this.exportTestItemNameFlag = false
},
@@ -1727,7 +1714,11 @@ export default {
return formatText(str)
},
getData() {
this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById', {id: this.zqaId}, {
this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById', {
id: this.zqaId,
page: this.page,
Size: this.Size
}, {
_this: this
}, res => {
this.sarAccessInfoList = res.data
@@ -1768,6 +1759,8 @@ export default {
},
mounted () {
this.zqaId =this.$route.query.id;
this.page = this.$route.query.page
this.Size = this.$route.query.Size
// this.getData()
this.getDept()
// 从数据库中查询各下拉框数据
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+20 -25
View File
@@ -13,24 +13,6 @@
<el-form-item label="项目名称" prop="projectName" class="search-item">
<el-input v-model="sarAccessEO.projectName" :disabled="disabledFlag" placeholder="请输入"></el-input>
</el-form-item>
<!-- <el-form-item label="适用领域" prop="applicationScope" class="search-item">
<el-select
v-model="sarAccessEO.applicationScope"
multiple
placeholder="请选择"
filterable
:disabled="disabledFlag"
class="wx-resolve"
>
<el-option
v-for="item in applyOptions"
:value="item.value"
:key="item.value"
:label="item.label"
>
</el-option>
</el-select>
</el-form-item>-->
<br/><br/>
<el-form-item label="清单说明" prop="remark" class="search-item max-search-item2">
<el-input
@@ -83,9 +65,9 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('m.keywords')" class="search-item">
<el-form-item label="标准名称" class="search-item">
<el-input
v-model="sarAccessInfoSearch.keywords"
v-model="sarAccessInfoSearch.standName"
placeholder="请输入"
:maxlength="100"
></el-input>
@@ -433,7 +415,7 @@
width="210px"
label="卡车VPPS中文名称">
</el-table-column>
<el-table-column width="150">
<el-table-column width="150" label="操作">
<template slot-scope="scope">
<el-button
class="common-button-default"
@@ -506,6 +488,7 @@ import CustomInputForPolicy from '@/components/CustomFormComponents/InputForPoli
import CustomRoleTree from '@/components/CustomFormComponents/roleTree'
import stand from "../../../config/pages/attributeCustom/components/stand";
import { mapGetters } from 'vuex'
import {interfaceUrl} from "@/sysConfig";
export default {
name: 'OtherAddEit',
components: {
@@ -1303,8 +1286,12 @@ export default {
},
// 点击 导出、全部导出按钮事件
exportAccessInfo (type) {
this.exportTestItemNameFlag = true
this.exportName = ''
if (this.sarAccessInfoListArry.length > 0) {
this.exportTestItemNameFlag = true
this.exportName = ''
}else {
this.$message.warning('请选择数据进行导出')
}
},
// 导出确定功能
exportTestItem () {
@@ -1320,7 +1307,9 @@ export default {
for (var accessInfo in exportList) {
accIdAndrestype.push(exportList[accessInfo].id)
}
window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames
const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
window.open(exportURL)
// window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames
this.$message.success('导出信息成功')
} else {
this.$message.warning('当前没有需要导出的数据')
@@ -1728,7 +1717,11 @@ export default {
return formatText(str)
},
getData() {
this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById', {id: this.zqaId}, {
this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById', {
id: this.zqaId,
page: this.page,
Size: this.Size
}, {
_this: this
}, res => {
this.sarAccessInfoList = res.data
@@ -1769,6 +1762,8 @@ export default {
},
mounted () {
this.zqaId =this.$route.query.id;
this.page = this.$route.query.page
this.Size = this.$route.query.Size
//this.getData()
this.getDept()
// 从数据库中查询各下拉框数据