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:
宋伟佳
2021-08-13 21:35:04 +08:00
parent 76d4cf782e 5ff5a585b6
commit 19078cffdc
16 changed files with 425 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzdy/step4.vue
-1
View File
@@ -252,7 +252,6 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
console.log(data);
this.form.title = data.title || data.form.title
this.form.date = data.date || data.form.date
this.json = data || data.form
src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+13 -9
View File
@@ -333,13 +333,12 @@
this.saveLoading = true
let _formData = new FormData()
_formData.append('taskIds', this.taskIds)
_formData.append('pId', this.pId)
_formData.append('json', JSON.stringify({
form: this.form,
roleForm: this.roleForm,
commentText: this.commentText,
itemList: this.itemList,
sarType: this.sarType
standInData: this.sarType
}))
saveTaskForPub(_formData).then(res => {
this.saveLoading = false
@@ -394,14 +393,19 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.itemsNum = data.itemsNum
this.form.itemsName = data.itemsName
this.form.itemsNum1 = data.itemsNum1
this.form.itemsName1 = data.itemsName1
this.sarType = data.standInData
console.log(data);
this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName
this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1
this.form.itemsName1 = data.itemsName1 || data.form.itemsName1
this.sarType = data.standInData || data.sarType
this.json = data
var arr = []
arr = JSON.parse(data.itemList)
let arr
if (typeof(data.itemList) === 'string') {
arr = JSON.parse(data.itemList)
} else {
arr = data.itemList
}
arr.forEach(item => {
item.zxUserId = ''
item.zxUserIdName = ''
src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+26 -7
View File
@@ -288,6 +288,7 @@
</el-table>
</div>
<ProcessFooter
show-save
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@@ -377,7 +378,7 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,processCreateStand} from 'api/process'
import {inboundLiaisonDetail,processCreateStand,saveTaskForPub} from 'api/process'
export default {
name: "bzjdStep3",
@@ -488,7 +489,24 @@
handleTabs(name) {
this.active = name
},
handleSave() {},
handleSave() {
this.saveLoading = true
let _formData = new FormData()
_formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({
form: this.form,
roleForm: this.roleForm,
commentText: this.commentText,
itemList: this.itemList,
standInData: this.sarType
}))
saveTaskForPub(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
}).catch(e => {
this.saveLoading = false
})
},
handleSubmit() {
this.$refs['bzzqyjForm'].validate((valid) => {
if (valid) {
@@ -558,11 +576,12 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.itemsNum = data.itemsNum
this.form.itemsName = data.itemsName
this.form.itemsNum1 = data.itemsNum1
this.form.itemsName1 = data.itemsName1
this.sarType = data.standInData
console.log(data);
this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName
this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1
this.form.itemsName1 = data.itemsName1 || data.form.itemsName1
this.sarType = data.standInData || data.sarType
this.json = data
let itemList
if (typeof (data.itemList) == 'string') {
src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+5 -5
View File
@@ -378,11 +378,11 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.itemsNum = data.itemsNum
this.form.itemsName = data.itemsName
this.form.itemsNum1 = data.itemsNum1
this.form.itemsName1 = data.itemsName1
this.sarType = data.standInData
this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName
this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1
this.form.itemsName1 = data.itemsName1 || data.form.itemsName1
this.sarType = data.standInData || data.sarType
this.json = data
this.itemList = data.itemList
this.loading = false
src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+5 -5
View File
@@ -378,11 +378,11 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.itemsNum = data.itemsNum
this.form.itemsName = data.itemsName
this.form.itemsNum1 = data.itemsNum1
this.form.itemsName1 = data.itemsName1
this.sarType = data.standInData
this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName
this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1
this.form.itemsName1 = data.itemsName1 || data.form.itemsName1
this.sarType = data.standInData || data.sarType
this.json = data
this.itemList = data.itemList
this.loading = false
src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+5 -5
View File
@@ -377,11 +377,11 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.itemsNum = data.itemsNum
this.form.itemsName = data.itemsName
this.form.itemsNum1 = data.itemsNum1
this.form.itemsName1 = data.itemsName1
this.sarType = data.standInData
this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName
this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1
this.form.itemsName1 = data.itemsName1 || data.form.itemsName1
this.sarType = data.standInData || data.sarType
this.json = data
this.itemList = data.itemList
this.loading = false
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+18
View File
@@ -30,6 +30,20 @@
<el-radio label="1">海外标准入库</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="form.standInData=='1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区" disabled>
<el-option
v-for="item in countryOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
<el-select v-model="form.standSort" placeholder="请选择标准类别" disabled>
<el-option
@@ -819,6 +833,7 @@
children: 'children',
label: 'model'
},
countryOptions:[],//国家地区
busVppsOptions: [], // 车系体系架构
modelOptions: [], // 模块体系架构
standSortOptions: [], // 标准类别
@@ -971,6 +986,8 @@
this.zbjbdFileId = processForm.zbjbd
this.getFormFieldList(processForm)
console.log(processForm);
console.log("processForm");
}
}).catch(e => {
})
@@ -1073,6 +1090,7 @@
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
this.countryOptions=res.data.COUNTRY//国家地区
this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
this.standNatureOptions = res.data.SARPROPERTY // 标准性质
this.standStateOptions = res.data.WBZTCLASS // 文本状态
src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+16
View File
@@ -30,6 +30,20 @@
<el-radio label="1">海外标准入库</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-if="form.standInData=='1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区" disabled>
<el-option
v-for="item in countryOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
<el-select v-model="form.standSort" placeholder="请选择标准类别" disabled>
<el-option
@@ -792,6 +806,7 @@ export default {
children: 'children',
label: 'model'
},
countryOptions:[],//国家地区
busVppsOptions: [], // 车系体系架构
modelOptions: [], // 模块体系架构
standSortOptions: [], // 标准类别
@@ -1047,6 +1062,7 @@ export default {
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
this.countryOptions=res.data.COUNTRY//国家地区
this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
this.standNatureOptions = res.data.SARPROPERTY // 标准性质
this.standStateOptions = res.data.WBZTCLASS // 文本状态
src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
-1
View File
@@ -263,7 +263,6 @@
this.form.endTime = data.endTime
this.form.cname = data.cname
this.json = data
console.log(data);
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
-1
View File
@@ -317,7 +317,6 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
console.log(data);
this.form.cid = data.cid
this.form.endTime = data.endTime
this.form.cname = data.cname
src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue
+1 -1
View File
@@ -64,7 +64,7 @@ export default {
continue;
} else if (entity.id === "63e05705d0c8013162caa34f9fe52865") {
list.push({
label: "项目类清单",
label: "车辆类型清单",
name: "listProject"
});
continue;
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
+68 -20
View File
@@ -4,11 +4,20 @@
<div class="search-area">
<div class="left">
<el-form :modal="sarSarAccessEOSearch" :inline="true" class="label-input-form">
<el-form-item label="项目名称" class="search-item search-item-last">
<el-input
v-model="sarSarAccessEOSearch.projectName"
placeholder="请输入项目名称"
></el-input>
<el-form-item label="车型类别" class="search-item search-item-last">
<el-select
v-model="sarSarAccessEOSearch.carType"
placeholder="请选择"
filterable
size="small"
>
<el-option
v-for="item in energyKindOptions"
:value="item.value"
:key="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
<el-form-item label="清单名称" class="search-item search-item-last">
<el-input
@@ -75,8 +84,8 @@
align="center">
</el-table-column>
<el-table-column
prop="projectName"
label="项目名称"
prop="carType"
label="车型类别"
align="center">
</el-table-column>
<el-table-column
@@ -109,16 +118,6 @@
}}</span>
</template>
</el-table-column>
<!-- <el-table-column
prop="applicationScope"
label="适用领域"
align="center">
<template slot-scope="scope">
<span
v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
}}</span>
</template>
</el-table-column>-->
<el-table-column
prop="updateTime"
label="更新时间"
@@ -158,6 +157,8 @@
</template>
<script>
import {dicTypeData} from "@/api/unqualProcess";
export default {
name: "listProject",
data() {
@@ -169,6 +170,7 @@ export default {
rows: 10,
// 查询相关参数
sarSarAccessEOSearch: {
carType: '',
projectName: "",
detailedListName: "",
},
@@ -178,6 +180,7 @@ export default {
selectedList: [],
// 新增、编辑 准入信息字段
sarAccessEO: {
carType: '',
country: "",
applyArctic: "",
energyKind: "",
@@ -274,7 +277,21 @@ export default {
}, {
_this: this
}, res => {
this.sarAccessListDatas = res.data.records;
this.sarAccessListDatas = res.data.records
this.sarAccessListDatas.forEach(item =>{
// 适用车型转换
if (item.carType !== null) {
let k = (item.carType || "").split(',')
for (let i in this.energyKindOptions) {
for (let m = 0; m< k.length; m++) {
if (this.energyKindOptions[i].value === k[m]) {
k[m] = this.energyKindOptions[i].label
}
item.carType = k.join(',')
}
}
}
})
this.sarSarAccessEOSearch.page = 1
this.sarAccessListTotal = res.data.total
}, e => {
@@ -362,8 +379,39 @@ export default {
}
},
mounted() {
// 分页查询数据
this.searchSarAccess();
dicTypeData().then(res => {
// 车型类别数据字典
this.energyKindOptions = res.data.ENERGYTYPES
this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
page: 1,
pageSize: this.pageSize,
...this.sarSarAccessEOSearch,
sortKey: 2
}, {
_this: this
}, res => {
this.sarAccessListDatas = res.data.records
this.sarAccessListDatas.forEach(item =>{
// 适用车型转换
if (item.carType !== null) {
let k = (item.carType || "").split(',')
for (let i in this.energyKindOptions) {
for (let m = 0; m< k.length; m++) {
if (this.energyKindOptions[i].value === k[m]) {
k[m] = this.energyKindOptions[i].label
}
item.carType = k.join(',')
}
}
}
})
this.sarSarAccessEOSearch.page = 1
this.sarAccessListTotal = res.data.total
}, e => {
});
})
}
};
</script>
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+175 -275
View File
@@ -10,8 +10,20 @@
<el-form-item label="清单名称" prop="detailedListName" class="search-item">
<el-input v-model="sarAccessEO.detailedListName" :disabled="disabledFlag" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="项目名称" prop="projectName" class="search-item">
<el-input v-model="sarAccessEO.projectName" :disabled="disabledFlag" placeholder="请输入"></el-input>
<el-form-item label="车型类别" prop="carType" label-width="100px" class="search-item">
<el-select
v-model="sarAccessEO.carType"
placeholder="请选择"
filterable
size="small"
>
<el-option
v-for="item in energyKindOptions"
:value="item.value"
:key="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
<br/><br/>
<el-form-item label="清单说明" prop="remark" class="search-item max-search-item2">
@@ -88,11 +100,7 @@
@click="clearSearchLaws">清空</el-button>
</el-form-item>
<el-form-item>
<el-button type="primary" v-if="showSelectBox" class="common-button-primary" size="mini" @click="selectMoreBtn">
<i class="iconfont">&#xe7a5;</i>
高级查询
</el-button>
<el-button type="primary" v-if="!showSelectBox" class="common-button-primary" size="mini" @click="selectMoreBtn">
<el-button type="primary" class="common-button-primary" size="mini" @click="selectMoreBtn">
<i class="iconfont">&#xe7a5;</i>
高级查询
</el-button>
@@ -118,6 +126,36 @@
size="small"
clearable/>
</el-form-item>
<el-form-item label="适用车型" class="labelBox1">
<el-select
v-model="sarAccessInfo.typeApplicable"
placeholder="请选择"
filterable
size="small"
>
<el-option
v-for="item in energyKindOptions"
:value="item.value"
:key="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
<el-form-item label="适用认证" class="labelBox1">
<el-select
v-model="sarAccessInfo.syrz"
placeholder="请选择"
filterable
size="small"
>
<el-option
v-for="item in syrzOptions"
:value="item.value"
:key="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button size="small" type="primary" @click="selectBtn">查询</el-button>
</el-form-item>
@@ -176,6 +214,16 @@
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
prop="typeApplicable"
label="适用车型"
>
</el-table-column>
<el-table-column
prop="syrz"
label="适用认证"
>
</el-table-column>
<el-table-column
prop="issueTime"
sortable
@@ -553,16 +601,15 @@ export default {
data () {
return {
textStatusMap: {},
typeApplicableMap: {},
nylxMap: {},
zrbmMap: {},
sycpxMap: {},
selectSearch : [],
// 新增、编辑 基础信息字段
sarAccessEO: {
id: '',
carType: '',
sortKey: 2,
fileIds: '',
syrz: '',
typeApplicable: '',
projectName: '',
detailedListName: '',
energyKind: '',
@@ -582,6 +629,7 @@ export default {
standSortShow:'',
standEnName: '',
typeApplicable: '',
syrz: '',
nylx: '',
ssrq: '',
zccssrqgj: '',
@@ -614,6 +662,7 @@ export default {
energyKindOptions: [], // 能源种类list
sycpxOptions: [], // 适用产品线
applyArcticOptions: [], // 基础车型 适用车型list
syrzOptions: [],
/** ******************************/
regionOptions: [], // 基础信息 区域list
drawerCountryOptions: [], // 基础信息 国家list
@@ -638,6 +687,8 @@ export default {
id: '',
standName: '',
askType: '', // 监管类型
syrz: '',
typeApplicable: '',
dataSource: 'INLAND_STAND', // 数据来源
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
@@ -648,6 +699,8 @@ export default {
id: '',
standName: '',
standNumber: '',
syrz: '',
typeApplicable: '',
askType: '', // 监管类型
dataSource: 'INLAND_STAND', // 数据来源
page: 1,
@@ -879,6 +932,8 @@ export default {
this.applyArcticOptions = res.data.PRODUCTTYPE
// 适用产品线数据字典
this.sycpxOptions = res.data.SYCPXCLASS
//适用认证数据字典
this.syrzOptions = res.data.SYRZCLASS
})
},
methods: {
@@ -993,91 +1048,8 @@ export default {
this.sarAccessInfoSearch.advanceSearchVOStr = ''
// 国内标准法规可查字段
if (val === 'INLAND_STAND'){
this.twoOptions=[
{
label: '适用车辆类型',
value: 'CLLX',
type: 'SEL_OPTION',
disabled: false
}, {
label: '标准编号',
value: 'STAND_NUMBER',
type: 'INPUT',
disabled: false
}, {
label: '中文名称',
value: 'STAND_NAME',
type: 'INPUT',
disabled: false
}, {
label: '标签',
value: 'GXHBQXX',
type: 'SEL_OPTION',
disabled: false
}, {
label: '新车型实施日期(文本)',
value: 'XCXSSRQ',
type: 'DATE_PIC_OPTS',
disabled: false
}, {
label: '在产车实施日期(文本)',
value: 'ZCCSSRQ',
type: 'DATE_PIC_OPTS',
disabled: false
}, {
label: '法规维护人',
value: 'FGWHR',
type: 'SEL_OPTION',
selVal: "USERLIST",
disabled: false
}
]
// 海外标准法规可查字段
}else if (val === 'FOREIGN_STAND'){
this.twoOptions=[
{
label: '适用车辆类型',
value: 'CLLX',
type: 'SEL_OPTION',
disabled: false
}, {
label: '标准编号',
value: 'STAND_NUMBER',
type: 'INPUT',
disabled: false
}, {
label: '中文名称',
value: 'STAND_NAME',
type: 'INPUT',
disabled: false
}, {
label: '英文名称',
value: 'STAND_EN_NAME',
type: 'INPUT',
disabled: false
}, {
label: '标签',
value: 'GXHBQXX',
type: 'SEL_OPTION',
disabled: false
}, {
label: '新车型实施日期(文本)',
value: 'XCXSSRQ',
type: 'DATE_PIC_OPTS',
disabled: false
}, {
label: '在产车实施日期(文本)',
value: 'ZCCSSRQ',
type: 'DATE_PIC_OPTS',
disabled: false
}, {
label: '法规维护人',
value: 'FGWHR',
type: 'SEL_OPTION',
selVal: "USERLIST",
disabled: false
}
]
// 国内外政策可查字段
}
},
@@ -1292,139 +1264,9 @@ export default {
}
})
},
// 查询数据搜索 table 数据
pageInfo() {
StandardsInfoPage(this.sarAccessInfoSearch, this.sarAccessInfo).then(res =>{
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
}
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 => {
})
},
selectLawsStands () {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.standType = 'INLAND'
this.pageInfo()
} else {
this.sarAccessInfoSearch.standType = 'FOREIGN'
this.pageInfo()
}
},
/** 高级查询查询按钮*/
selectPage() {
StandardsInfoPage(this.sarAccessInfo).then(res =>{
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
}
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 => {
})
},
selectBtn() {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.standType = 'INLAND'
this.selectPage()
} else {
this.sarAccessInfoSearch.standType = 'FOREIGN'
this.selectPage()
}
},
// 数据搜索table判断checked状态
selectable (row) {
return row.isRelateAccess === '1'
},
// 数据搜索 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 => {
// 字段转化
changeText(val) {
val.forEach(item => {
// 责任部门转换
if (item.zrbm !== null || item.zrbm !== "") {
let k = (item.zrbm || "").split(',')
@@ -1473,8 +1315,114 @@ export default {
}
}
}
// 适用认证转换
if (item.syrz !== null) {
let k = (item.syrz || "").split(',')
for (let i in this.syrzOptions) {
for (let m = 0; m< k.length; m++) {
if (this.syrzOptions[i].value === k[m]) {
k[m] = this.syrzOptions[i].label
}
item.syrz = k.join(',')
}
}
}
})
},
// 字段添加
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() {
StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{
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.addWord(item)
})
this.changeText(this.sarAccessInfoSearchList)
this.drawerTotal = res.data.count
}, e => {
})
},
selectLawsStands () {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.standType = 'INLAND'
this.pageInfo()
} else {
this.sarAccessInfoSearch.standType = 'FOREIGN'
this.pageInfo()
}
},
/** 高级查询查询按钮*/
selectPage() {
StandardsInfoPage(this.sarAccessInfo).then(res =>{
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.addWord(item)
})
this.changeText(this.sarAccessInfoSearchList)
this.drawerTotal = res.data.list.length
}, e => {
})
},
selectBtn() {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.standType = 'INLAND'
this.selectPage()
} else {
this.sarAccessInfoSearch.standType = 'FOREIGN'
this.selectPage()
}
},
// 数据搜索table判断checked状态
selectable (row) {
return row.isRelateAccess === '1'
},
// 数据搜索 table select事件
sarAccessInfoSearchSelect (val) {
this.selectedAccInfoSearchList = val
this.selectedAccInfoSearchList.forEach(item => {
this.addWord(item)
})
this.changeText(this.selectedAccInfoSearchList)
},
// 数据搜索 清单类型 table select事件
accessSarTypeSelect (selectData) {
this.accessSarTypeList = selectData
@@ -1721,46 +1669,6 @@ export default {
this.isSubmit = false
this.$refs['addEntryForm'].resetFields()
},
/**
* 赋值内容到入库标准抽屉内
* item 清单行数据
*/
copyStandDrawer (item) {
this.sarStandardsInfoEO.accessType = item.accessType
this.sarStandardsInfoEO.standNumber = item.code // 标准编号
this.sarStandardsInfoEO.standName = item.name // 中文名称
this.sarStandardsInfoEO.standEnName = item.enName // 英文名称
this.sarStandardsInfoEO.lawsNumber = item.code // 标准编号
this.sarStandardsInfoEO.lawsName = item.name // 中文名称
this.sarStandardsInfoEO.lawsEnName = item.enName // 英文名称
this.sarStandardsInfoEO.synopsis = item.synopsis
this.sarStandardsInfoEO.XCXSSRQ = item.newPutTime // 新车型实施日期（文本）
this.sarStandardsInfoEO.XCXSSRQXM = item.newPutTextTime // 新车型实施日期（项目）
this.sarStandardsInfoEO.ZCCSSRQ = item.prodPutTime // 在产车实施日期（文本）
this.sarStandardsInfoEO.ZCCSSRQXM = item.prodPutTextTime // 在产车实施日期（项目）
this.sarStandardsInfoEO.EOPSSRQ = item.eopPutTime // EOP实施日期（文本）
this.sarStandardsInfoEO.EOPSSRQXM = item.eopPutTextTime // EOP实施日期（项目）
this.sarStandardsInfoEO.ZRBMName = item.ZRBMName || item.zrbmname // 责任部门
this.sarStandardsInfoEO.ZRBM = item.ZRBM || item.zrbm // 责任部门
this.sarStandardsInfoEO.XGBMName = item.XGBMName || item.xgbmname // 相关部门
this.sarStandardsInfoEO.XGBM = item.XGBM || item.xgbm // 相关部门
this.sarStandardsInfoEO.FOName = item.FOName || item.foname // FO
this.sarStandardsInfoEO.FO = item.FO || item.fo // FO
this.sarStandardsInfoEO.XMPGJS = item.proEssessUserId // 项目评估人员
this.sarStandardsInfoEO.XMPGJSName = item.proEssessUser // 项目评估人员
this.sarStandardsInfoEO.standNature = item.natureId // 标准性质
this.sarStandardsInfoEO.NRDBZFGQD = this.sarAccessEO.countryArea // 国家地区
this.sarStandardsInfoEO.CLLX = item.applyArctic ? item.applyArctic.split(',') : []
this.sarStandardsInfoEO.YQLX = item.askType
this.sarStandardsInfoEO.GXHBQ = item.GXHBQ ? item.GXHBQ.split(',') : []
this.sarStandardsInfoEO.ZRLX = item.askNature ? item.askNature.split(',') : []
if (this.sarStandardsInfoEO.accessType === 'INLAND_STAND') {
this.sarStandardsInfoEO.countryArea = 'CN'
} else {
this.sarStandardsInfoEO.countryArea = ''
}
this.uuid = item.uuid
},
/**
* 获取新增弹框的表单
*/
@@ -1972,10 +1880,6 @@ export default {
setMap(data){
data.forEach(item => {
this.$set(this.textStatusMap, item.value, item.label)
this.$set(this.typeApplicableMap, item.value, item.label)
this.$set(this.nylxMap, item.value, item.label)
this.$set(this.zrbmMap, item.value, item.label)
this.$set(this.sycpxMap, item.value, item.label)
})
},
// 点击上传的文件进行下载
@@ -2027,10 +1931,6 @@ export default {
this.textStatusOptions = res.data.WBZTCLASS
this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
this.setMap(this.textStatusOptions)
this.setMap(this.zrbmOptions)
this.setMap(this.categoryOptions)
this.setMap(this.sycpxOptions)
this.setMap(this.energyKindOptions)
this.getGzzOption()
}, e => {
})
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+48 -41
View File
@@ -3014,52 +3014,59 @@ export default {
},
// 表格排序
sortChange (sortObj) {
console.log(sortObj.column.order+"======"+sortObj.column.property)
console.log(sortObj, '升降序')
if (sortObj.column.order !== 'normal') {
switch (sortObj.prop) {
this.nowOrder = ''
this.orderBy = ''
switch (sortObj.column.property) {
case 'issueTime' :
// 后台联调
if(sortObj.order === null) {
this.nowOrderBy = ''
} else {
this.nowOrderBy = '1'
}
break;
case 'xcxssrq' :
// 后台联调
if(sortObj.order === null) {
this.nowOrderBy = ''
} else {
this.nowOrderBy = '2'
this.orderBy = 1;
this.nowOrder = sortObj.column.order
if (this.nowOrder === 'ascending') {
this.nowOrder = 2
} else if (this.nowOrder === 'descending') {
this.nowOrder = 1
}
break;
case 'zccssrq' :
// 后台联调
if(sortObj.order === null) {
this.nowOrderBy = ''
} else {
this.nowOrderBy = '3'
break
case 'XCXSSRQ' :
this.orderBy = 2;
this.nowOrder = sortObj.column.order
if (this.nowOrder === 'ascending') {
this.nowOrder = 2
} else if (this.nowOrder === 'descending') {
this.nowOrder = 1
}
break;
case 'textStatus' :
// 后台联调
if(sortObj.order === null) {
this.nowOrderBy = ''
} else {
this.nowOrderBy = '4'
}
break;
}
switch (sortObj.order) {
case 'ascending' :
this.nowOrder = '2'
break;
case 'descending' :
this.nowOrder = '1'
break;
default:
this.nowOrder = ''
break;
break
case 'ZCCSSRQ' :
this.orderBy = 3;
this.nowOrder = sortObj.column.order
if (this.nowOrder === 'ascending') {
this.nowOrder = 2
} else if (this.nowOrder === 'descending') {
this.nowOrder = 1
}
break
case 'textStatus' :
this.orderBy = 5;
this.nowOrder = sortObj.column.order
if (this.nowOrder === 'ascending') {
this.nowOrder = 2
} else if (this.nowOrder === 'descending') {
this.nowOrder = 1
}
break
case 'SSRQ' :
this.orderBy = 6;
this.nowOrder = sortObj.column.order
if (this.nowOrder === 'ascending') {
this.nowOrder = 2
} else if (this.nowOrder === 'descending') {
this.nowOrder = 1
}
break
}
}
this.getDomesticStandardTable(this.tableFlag)
@@ -3492,8 +3499,8 @@ export default {
}
// 排序
formData.nowOrderBy = this.nowOrder ? this.orderBy : ''
formData.nowOrder = this.nowOrder
formData.nowOrderBy = this.nowOrderBy
// formData.orderBy = this.orderBy
console.log(this.selectSarMenu.id)
// 处理我的收藏和个性化标签传参
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+1 -1
View File
@@ -3093,7 +3093,7 @@ export default {
},
// 表格排序
sortChange (sortObj) {
console.log(sortObj.column+"======"+sortObj.column.property+"======"+sortObj.column.order);
if (sortObj.column.order !== 'normal') {
this.nowOrder = ''
this.orderBy = ''
src/pages/searchCenter/pages/standardSearch.vue
+44 -8
View File
@@ -230,6 +230,7 @@
<div class="AllBoxTitle">
<span v-html="item.indexType === 'stand' ? '国内标准法规' : (item.indexType === 'FOREIGN' ? '海外标准法规' : (item.indexType === 'laws' ? '国内外政策' : (item.indexType === 'bussstand' ? '企业标准' : (item.indexType === 'items' ? '数据化条目' : '动态&资料'))))" class="typetext"></span>
<span style="cursor:pointer;" class="AllBoxText" v-html="item.title" @click="toPage(item)"></span>
<span @click="checkItems(item)" class="more" style="cursor: pointer; position: absolute; right: 5px;">更多</span>
</div>
<div class="AllBoxContent" v-html="item.textContent"></div>
<div v-if="item.indexType !== 'items' && item.indexType !== 'msgdyinfo'" class="AllTime">
@@ -283,6 +284,20 @@
}"
@confirm="isTreeOk"
></org-table>
<el-dialog
title="查看详情"
:visible.sync="itermsConditionsFlag"
size="800px">
<div style="height: 500px;overflow: auto;" >
<div v-html="itermsConditionsTitle1" style="line-height: 20px;"></div>
<br>
<br>
<div v-html="itermsConditionsTitle2" style="line-height: 20px;"></div>
</div>
<div slot="footer">
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
</div>
</el-dialog>
</div>
</template>
@@ -298,6 +313,9 @@
name: 'StandardSearch',
data () {
return {
itermsConditionsTitle1: '',
itermsConditionsTitle2: '',
itermsConditionsFlag: false,
visibleOrgTable: false, // 分享选人
orgTableVal: '',
orgTableValName: '',
@@ -401,6 +419,14 @@
}
},
methods: {
checkItems (item) {
this.itermsConditionsFlag = true
this.itermsConditionsTitle1 = item.textContent
this.itermsConditionsTitle2 = item.textItems
},
itermsConditionsClose () {
this.itermsConditionsFlag = false
},
// 跳转
toPage (item) {
// 国内外----两个值
@@ -2504,6 +2530,14 @@
<style lang="less" scoped>
@import '~@/assets/styles/mixins';
@import '~@/assets/styles/style';
/deep/.highlight-class {
color: red !important;
}
/deep/.pagination{
position: static !important;
border-bottom-right-radius: 20px;
border-bottom-left-radius: 20px;
}
.standard-search {
padding: 6px 26px;
@borderColor: #BFBFBF;
@@ -2522,15 +2556,22 @@
&:last-child {
margin-bottom: 20px;
}
/deep/.highlight-class {
color: red;
}
.AllBoxTitle {
position: relative;
overflow: hidden;
text-overflow:ellipsis;
white-space: nowrap;
line-height: 20px;
margin-bottom: 10px;
.more {
cursor: pointer;
position: absolute;
right: 5px;
color: #C0C4CC;
}
.more:hover {
color: #3391CE;
}
.typetext {
height: 20px;
line-height: 20px;
@@ -2813,11 +2854,6 @@
}
}
}
.pagination{
position: static;
border-bottom-right-radius: 20px;
border-bottom-left-radius: 20px;
}
}
}
.content-right{