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-09-01 16:05:12 +08:00
parent ab4bc4f3a5 e28621a77d
commit 1df56128e8
4 changed files with 638 additions and 610 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/localTool/standardWarning.vue
+507 -496
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
+7 -2
View File
@@ -312,8 +312,13 @@ export default {
let listJSON = JSON.parse(JSON.stringify(item.responUserList)) let listJSON = JSON.parse(JSON.stringify(item.responUserList))
this.dataList = [listJSON][0].standardInfoList this.dataList = [listJSON][0].standardInfoList
} else { } else {
let listJSONInfo = item.info if (item.dockUserList !== undefined) {
this.dataList = [listJSONInfo] let listJSON = JSON.parse(JSON.stringify(item.dockUserList))
this.dataList = listJSON[0].standardInfoList
}else {
let listJSONInfo = item.info
this.dataList = [listJSONInfo]
}
} }
this.dataList.forEach(item => { this.dataList.forEach(item => {
if (item.fileText.length !== 0) { if (item.fileText.length !== 0) {
src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+2 -2
View File
@@ -398,7 +398,7 @@ export default {
// 相关人员姓名 // 相关人员姓名
}, },
// 新增编辑弹窗里的数据 // 新增编辑弹窗里的数据
localProEODefault: { /* localProEODefault: {
// 项目相关人员 // 项目相关人员
userEOList: [], userEOList: [],
// 产品代码 // 产品代码
@@ -460,7 +460,7 @@ export default {
// 相关人员信息 // 相关人员信息
relatePersonShow: "" relatePersonShow: ""
// 相关人员姓名 // 相关人员姓名
}, },*/
//查询3类 //查询3类
projectLibrarySearch: { projectLibrarySearch: {
// 项目名称 // 项目名称
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+122 -110
View File
@@ -14,10 +14,16 @@
<el-col :span="5" :push="1">项目编号: <span class="valueColor">{{ localProEO.projectNumber }}</span></el-col> <el-col :span="5" :push="1">项目编号: <span class="valueColor">{{ localProEO.projectNumber }}</span></el-col>
<el-col :span="5" :push="2"> <el-col :span="5" :push="2">
<el-tooltip class="item" effect="dark" :content="localProEO.projectName" placement="top"> <el-tooltip class="item" effect="dark" :content="localProEO.projectName" placement="top">
<div slot="content" class="toolip-content" v-if="localProEO.projectName !== undefined && localProEO.projectName.length>15">{{ localProEO.projectName }}</div> <div slot="content" class="toolip-content" v-if="localProEO.projectName !== undefined && localProEO.projectName.length>15">
{{ localProEO.projectName }}
</div>
<div v-else></div> <div v-else></div>
<div class="check-item-value" v-if="localProEO.projectName !== undefined && localProEO.projectName.length>15">项目名称: <span class="valueColor">{{localProEO.projectName && localProEO.projectName.substring(0,15)+"..." }}</span></div> <div class="check-item-value" v-if="localProEO.projectName !== undefined && localProEO.projectName.length>15">
<div class="check-item-value" v-else>项目名称: <span class="valueColor">{{localProEO.projectName}}</span></div> 项目名称: <span class="valueColor">{{
localProEO.projectName && localProEO.projectName.substring(0, 15) + "..."
}}</span></div>
<div class="check-item-value" v-else>项目名称: <span class="valueColor">{{ localProEO.projectName }}</span>
</div>
</el-tooltip> </el-tooltip>
</el-col> </el-col>
<el-col :span="4" :push="3">项目分类:<span class="valueColor">{{ localProEO.projectClassification }}</span> <el-col :span="4" :push="3">项目分类:<span class="valueColor">{{ localProEO.projectClassification }}</span>
@@ -32,52 +38,56 @@
<el-row style="margin-top: 10px"> <el-row style="margin-top: 10px">
<el-col :span="5">项目经理: <span class="valueColor">{{ localProEO.uname }} </span></el-col> <el-col :span="5">项目经理: <span class="valueColor">{{ localProEO.uname }} </span></el-col>
<el-col :span="5" :push="1"> 项目计划开始时间: <span <el-col :span="5" :push="1"> 项目计划开始时间: <span
class="valueColor">{{ $moment(localProEO.projectStartDate).format('YYYY-MM-DD') }}</span></el-col> class="valueColor">{{ $moment(localProEO.projectStartDate).format('YYYY-MM-DD') }}</span></el-col>
<el-col :span="5" :push="2">项目计划完成时间: <span <el-col :span="5" :push="2">项目计划完成时间: <span
class="valueColor">{{ $moment(localProEO.projectEndDate).format('YYYY-MM-DD') }} </span></el-col> class="valueColor">{{ $moment(localProEO.projectEndDate).format('YYYY-MM-DD') }} </span></el-col>
</el-row> </el-row>
</div> </div>
</el-card> </el-card>
<div class="action-bar"> <div class="action-bar">
<!-- <el-button plain class="common-button-primary" v-btn-permission="''" size="mini" @click="transfer">调取</el-button>--> <el-row>
<!-- <el-button plain class="common-button-primary" v-btn-permission="''" size="mini" @click="deleteList">批量删除--> <el-col :span="12">
<!-- </el-button>--> <span style="font-size: 16px;font-weight: bold">清单版本: {{ }}</span>
<el-button class="common-button-default export-button" </el-col>
size="mini" @click="exportStandard" <el-col :span="12" style="text-align: end">
v-btn-permission="''" <el-button
title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项" type="primary"
icon="export" class="common-button-default export-button"
>导出 size="mini" @click="exportStandard"
</el-button> v-btn-permission="''"
</div> title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
<!-- <el-tabs type="border-card">--> icon="export"
<!-- <el-tab-pane :label="localProEO.productName" class="details-panel-tabs-item">--> >导出
</el-button>
</el-col>
</el-row>
</div>
<div class="table-wrapper"> <div class="table-wrapper">
<el-table <el-table
:data="dataList" :data="dataList"
style="width: 100%" style="width: 100%"
:height="Height" :height="Height"
border border
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px',textAlign: 'center'}" fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px',textAlign: 'center'}"
@selection-change="standSelectChange" @selection-change="standSelectChange"
ref="selection" ref="selection"
:cell-style="{ textAlign: 'center' }" :cell-style="{ textAlign: 'center' }"
> >
<el-table-column <el-table-column
type="selection" type="selection"
width="55" width="55"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standNumber" prop="standNumber"
label="标准号" label="标准号"
fixed="left" fixed="left"
width="260px" width="260px"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.standSortShow === undefined" <span v-if="scope.row.standSortShow === undefined"
style="margin-left: 10px">{{ style="margin-left: 10px">{{
scope.row.standSort + ' ' + scope.row.standNumber + '-' + scope.row.standYear scope.row.standSort + ' ' + scope.row.standNumber + '-' + scope.row.standYear
}}</span> }}</span>
<span v-else <span v-else
@@ -87,22 +97,22 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standName" prop="standName"
label="中文名称" label="中文名称"
width="180px" width="180px"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standEnName" prop="standEnName"
label="英文名称" label="英文名称"
width="180px" width="180px"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="ssrq" prop="ssrq"
width="190px" width="190px"
sortable sortable
label="标准实施日期"> label="标准实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span style="margin-left: 10px">{{ <span style="margin-left: 10px">{{
scope.row.ssrq ? $moment(scope.row.ssrq).format('YYYY-MM-DD') : '-' scope.row.ssrq ? $moment(scope.row.ssrq).format('YYYY-MM-DD') : '-'
@@ -110,9 +120,9 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="xcxssrqgj" prop="xcxssrqgj"
width="190px" width="190px"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span style="margin-left: 10px">{{ <span style="margin-left: 10px">{{
scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format('YYYY-MM-DD') : '-' scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format('YYYY-MM-DD') : '-'
@@ -120,10 +130,10 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zccssrqgj" prop="zccssrqgj"
sortable sortable
width="190px" width="190px"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span style="margin-left: 10px">{{ <span style="margin-left: 10px">{{
scope.row.zccssrq ? $moment(scope.row.zccssrq).format('YYYY-MM-DD') : '-' scope.row.zccssrq ? $moment(scope.row.zccssrq).format('YYYY-MM-DD') : '-'
@@ -131,9 +141,9 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zrbm" prop="zrbm"
label="责任部门" label="责任部门"
width="180px" width="180px"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span style="margin-left: 10px"> <span style="margin-left: 10px">
@@ -142,45 +152,43 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="kccvppsbm" prop="kccvppsbm"
width="180px" width="180px"
label="卡车VPPS编码"> label="卡车VPPS编码">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="cycvppscn" prop="cycvppscn"
width="180px" width="180px"
label="卡车vpps中文名称"> label="卡车vpps中文名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="cycvppsbm" prop="cycvppsbm"
width="180px" width="180px"
label="乘车VPPS编码"> label="乘车VPPS编码">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="cycvppscn" prop="cycvppscn"
width="180px" width="180px"
label="乘车vpps中文名称"> label="乘车vpps中文名称">
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
style="position: relative;" style="position: relative;"
:page="page" :page="page"
:total="total" :total="total"
@pageChange="pageChangeLaws" @pageChange="pageChangeLaws"
@pageSizeChange="pageSizeChangeLaws"></pagination> @pageSizeChange="pageSizeChangeLaws"></pagination>
</div> </div>
<loading :loading="loading">数据获取中</loading> <loading :loading="loading">数据获取中</loading>
<!-- </el-tab-pane>-->
<!-- </el-tabs>-->
</div> </div>
<!-- 调取弹窗 --> <!-- 调取弹窗 -->
<el-drawer <el-drawer
title="调取" title="调取"
:visible.sync="detailedListModel" :visible.sync="detailedListModel"
size="900px" size="900px"
custom-class="demo-drawer" custom-class="demo-drawer"
> >
<div class="demo-drawer-content"> <div class="demo-drawer-content">
<div style="position: absolute;bottom: 48px;top:16px;left: 0;right: 0"> <div style="position: absolute;bottom: 48px;top:16px;left: 0;right: 0">
@@ -245,9 +253,9 @@
align="center" align="center"
width="260px" width="260px"
> >
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <a class="table-jump" @click.stop="showTable(scope.row)">{{ scope.row.detailedListName }}</a>--> <!-- <a class="table-jump" @click.stop="showTable(scope.row)">{{ scope.row.detailedListName }}</a>-->
<!-- </template>--> <!-- </template>-->
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="detailedListState" prop="detailedListState"
@@ -265,7 +273,8 @@
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span <span
v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{
scope.row.detailedListVision
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
@@ -274,7 +283,10 @@
label="更新时间" label="更新时间"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD') : scope.row.updateTime }}</div> <div>{{
scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD') : scope.row.updateTime
}}
</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -292,12 +304,12 @@
</el-table> </el-table>
</div> </div>
<pagination <pagination
:page="pageNo" :page="pageNo"
:pageSize="pageSizeNo" :pageSize="pageSizeNo"
:total="totalNo" :total="totalNo"
@pageChange="pageChangeNo" @pageChange="pageChangeNo"
@pageSizeChange="pageSizeChangeNo" @pageSizeChange="pageSizeChangeNo"
style="position: absolute;" style="position: absolute;"
/> />
</div> </div>
</div> </div>
@@ -477,7 +489,7 @@ export default {
pageSize: this.$store.getters.userInfo.configContent, pageSize: this.$store.getters.userInfo.configContent,
pageNo: 1, pageNo: 1,
pageDo: 1, pageDo: 1,
pageSizeDo: this.$store.getters.userInfo.configContent, pageSizeDo: this.$store.getters.userInfo.configContent,
standardData: [], //添加标准数据 standardData: [], //添加标准数据
detailedId: '', //清单id detailedId: '', //清单id
totalNo: 0, totalNo: 0,
@@ -512,7 +524,7 @@ export default {
}, },
methods: { methods: {
//搜索清单 //搜索清单
searchSarAccess(){ searchSarAccess() {
this.pageDo = 1 this.pageDo = 1
this.pageSizeDo = this.$store.getters.userInfo.configContent; this.pageSizeDo = this.$store.getters.userInfo.configContent;
this.transfer() this.transfer()
@@ -523,7 +535,7 @@ export default {
this.pageSizeNo = this.$store.getters.userInfo.configContent; this.pageSizeNo = this.$store.getters.userInfo.configContent;
this.getStand() this.getStand()
}, },
clearSearchAccess(){ clearSearchAccess() {
this.sarSarAccessEOSearch.carType = '' this.sarSarAccessEOSearch.carType = ''
this.sarSarAccessEOSearch.detailedListName = '' this.sarSarAccessEOSearch.detailedListName = ''
this.transfer() this.transfer()
@@ -547,11 +559,11 @@ export default {
this.pageNo = page this.pageNo = page
this.getStand() this.getStand()
}, },
pageChangeDo(page){ pageChangeDo(page) {
this.pageDo = page this.pageDo = page
this.transfer() this.transfer()
}, },
pageSizeChangeDo(pageSize){ pageSizeChangeDo(pageSize) {
this.pageDo = pageSize this.pageDo = pageSize
this.transfer() this.transfer()
}, },
@@ -582,7 +594,7 @@ export default {
}); });
}, },
//点击获取项目清单 //点击获取项目清单
transfer(){ transfer() {
this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", { this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
page: 1, page: 1,
pageSize: this.pageSize, pageSize: this.pageSize,
@@ -592,14 +604,14 @@ export default {
_this: this _this: this
}, res => { }, res => {
this.sarAccessListDatas = res.data.records; this.sarAccessListDatas = res.data.records;
this.sarAccessListDatas.forEach(item =>{ this.sarAccessListDatas.forEach(item => {
// 适用车型转换 // 适用车型转换
if (item.carType !== null) { if (item.carType !== null) {
let k = (item.carType || "").split(',') let k = (item.carType || "").split(',')
for (let i in this.energyKindOptions) { for (let i in this.energyKindOptions) {
for (let m = 0; m< k.length; m++) { for (let m = 0; m < k.length; m++) {
if (this.energyKindOptions[i].value === k[m]) { if (this.energyKindOptions[i].value === k[m]) {
k[m] = this.energyKindOptions[i].label k[m] = this.energyKindOptions[i].label
} }
item.carType = k.join(',') item.carType = k.join(',')
} }
@@ -692,8 +704,8 @@ export default {
}) })
}, },
//调取清单取消事件 //调取清单取消事件
cancelDetailed(){ cancelDetailed() {
this.detailedListModel = false; this.detailedListModel = false;
}, },
//添加标准取消事件 //添加标准取消事件
cancelStand() { cancelStand() {
@@ -747,28 +759,28 @@ export default {
} }
}, },
//获取标准 //获取标准
getStandrd(data){ getStandrd(data) {
this.detailedId = data.id this.detailedId = data.id
this.getStand(); this.getStand();
}, },
getStand(data){ getStand(data) {
this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", { this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
id:this.detailedId, id: this.detailedId,
...this.standCommonlySearch, ...this.standCommonlySearch,
}, { }, {
_this: this _this: this
}, res => { }, res => {
if(res.data === null){ if (res.data === null) {
this.standardData = '' this.standardData = ''
this.totalDo ='' this.totalDo = ''
this.standModel = true; this.standModel = true;
} }
this.standardData = res.data.records this.standardData = res.data.records
this.standardData.forEach(item => { this.standardData.forEach(item => {
if(item.zccssrqgj === '-'){ if (item.zccssrqgj === '-') {
item.zccssrqgj = '' item.zccssrqgj = ''
} }
if(item.xcxssrqgj === '-'){ if (item.xcxssrqgj === '-') {
item.xcxssrq = '' item.xcxssrq = ''
} }
}) })
@@ -895,7 +907,7 @@ export default {
ids += ',\'' + this.selectList[i].standId + '\'' ids += ',\'' + this.selectList[i].standId + '\''
} }
const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' + const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' +
'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName + '&id=' + this.localProEO.id 'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName + '&id=' + this.localProEO.id
window.open(exportURL, '_self') window.open(exportURL, '_self')
this.$message.success('导出信息成功') this.$message.success('导出信息成功')
} }
@@ -911,7 +923,7 @@ export default {
} }
} }
const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' + const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' +
'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName + '&id=' + this.localProEO.id 'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName + '&id=' + this.localProEO.id
window.open(exportURL, '_self') window.open(exportURL, '_self')
this.$message.success('导出信息成功') this.$message.success('导出信息成功')
} }