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

This commit is contained in:
super_liu
2021-08-10 14:55:43 +08:00
5 changed files with 261 additions and 219 deletions
@@ -409,6 +409,7 @@ export default {
// 查询相关参数
searching: false,
commentText:'',
fileType: 'FBGBJBD',
standardSearch: {
standType: "",
standName: ""
@@ -847,6 +848,7 @@ export default {
this.$http.post("SarStandItems/sar-stand-items/findStand", {
page: this.page,
size: this.pageSize,
fileType: this.fileType,
...this.standardSearch
}, {
_this: this
@@ -396,6 +396,7 @@ export default {
drawerTitle: "", //drawer标题
// 查询相关参数
searching: false,
fileType: 'FBGBJBD',
standardSearch: {
standType: "",
standName: ""
@@ -822,6 +823,7 @@ export default {
this.$http.post("SarStandItems/sar-stand-items/findStand", {
page: this.page,
size: this.pageSize,
fileType: this.fileType,
...this.standardSearch
}, {
_this: this
@@ -369,6 +369,16 @@ export default {
this.listForm.breakdownList = [];
for (let i = 0; i < item.pepdtos.length; i++) {
for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) {
if(item.pepdtos[i].xCXSSRQ === null){
this.listForm.breakdownList.xCXSSRQ = ""
} else {
this.listForm.breakdownList.xCXSSRQ = item.pepdtos[i].xCXSSRQ
}
if(item.pepdtos[i].zCCSSRQ === null){
this.listForm.breakdownList.zCCSSRQ = ""
} else {
this.listForm.breakdownList.zCCSSRQ = item.pepdtos[i].zCCSSRQ
}
this.listForm.breakdownList.push({
itemsName: item.pepdtos[i].breakdownList[j].itemsName,
itemNum: item.pepdtos[i].breakdownList[j].itemsNum,
@@ -386,8 +396,6 @@ export default {
qualityEngineerName: item.pepdtos[i].qualityEngineerName,
standNumber: item.pepdtos[i].standNumber,
standName: item.pepdtos[i].standName,
xCXSSRQ: item.pepdtos[i].xCXSSRQ,
zCCSSRQ: item.pepdtos[i].zCCSSRQ
});
}
}
@@ -68,8 +68,10 @@
label="标准号"
>
<template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }} {{ scope.row.standNumber }}</a>
<a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort
}} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }}
{{ scope.row.standNumber }}</a>
</template>
</el-table-column>
<el-table-column
@@ -484,6 +486,7 @@ export default {
this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId }, {
_this: this
}, res => {
console.log(res.data.records);
this.listForm.dataList = res.data.records;
this.dataList = res.data.records;
this.listForm.dataList.forEach(item => {
@@ -517,7 +520,12 @@ export default {
{
_this: this
}, res => {
this.listForm.breakdownList = res.data;
if (!res.data.length) {
this.dataList = []
this.$message.warning("请选择带有分解单的标准");
} else {
this.listForm.breakdownList = res.data;
}
});
},
//标准的多选框改变
@@ -595,15 +603,15 @@ export default {
});
},
// 点击查看
handlePreview (item) {
handlePreview(item) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
name: "OtherStandardDetails",
params: {
id: item.standId,
pageType: 'INLAND_STAND'
pageType: "INLAND_STAND"
}
})
window.open(routeUrl.href, '_blank')
});
window.open(routeUrl.href, "_blank");
},
choiceZRR(type, title, id) {
this.nodeList = [];
@@ -15,10 +15,14 @@
clearable></el-input>
</el-form-item>
<el-form-item label="" class="search-item btn-box">
<el-button class="common-button-primary" type="primary" size="mini" @click="searchStandAndLaws" v-btn-permission="'314ad07cd81834dfdd3c58476cdcde68'">查询</el-button>
<el-button class="common-button-primary" type="primary" size="mini" @click="searchStandAndLaws"
v-btn-permission="'314ad07cd81834dfdd3c58476cdcde68'">查询
</el-button>
</el-form-item>
<el-form-item label="" class="search-item btn-box">
<el-button class="common-button-default" @click="resetSelect" size="mini" v-btn-permission="'eb402ab8306d437c7d33e9e4b4e4341a'">清空</el-button>
<el-button class="common-button-default" @click="resetSelect" size="mini"
v-btn-permission="'eb402ab8306d437c7d33e9e4b4e4341a'">清空
</el-button>
</el-form-item>
</el-form>
</div>
@@ -27,24 +31,24 @@
</div>
<div class="content">
<el-table
stripe
ref="selections"
tooltip-effect="dark"
border
:height="tableHeight"
:data="sarProjectListDatas"
class="table"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
stripe
ref="selections"
tooltip-effect="dark"
border
:height="tableHeight"
:data="sarProjectListDatas"
class="table"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column
type="selection"
width="55"
align="center">
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="standType"
label="标准/政策类型"
width="120"
prop="standType"
label="标准/政策类型"
width="120"
>
<template slot-scope="scope">
<div v-if="scope.row.standType === 'INLAND'">国内标准法规</div>
@@ -55,9 +59,9 @@
</template>
</el-table-column>
<el-table-column
prop="standNumber"
label="标准/政策号"
width="180"
prop="standNumber"
label="标准/政策号"
width="180"
>
<template slot-scope="scope">
<a class="table-jump"
@@ -65,8 +69,8 @@
</template>
</el-table-column>
<el-table-column
prop="standName"
label="标准/政策名称"
prop="standName"
label="标准/政策名称"
>
<template slot-scope="scope">
<a class="table-jump"
@@ -74,15 +78,15 @@
</template>
</el-table-column>
<el-table-column
prop="interpretationTime"
label="评估时间"
prop="interpretationTime"
label="评估时间"
>
</el-table-column>
<el-table-column
fixed="right"
label=""
width="50"
align="center">
fixed="right"
label=""
width="50"
align="center">
<template slot-scope="scope">
<i class="el-icon-view btn-i" @click="handleProjectCompliance(scope.row)"></i>
</template>
@@ -93,12 +97,12 @@
</div>
<!-- 查看符合标准性弹窗-->
<el-drawer
title="标准涉及项目符合性"
:visible.sync="showSarProStateModal"
:wrapperClosable="false"
size="1100px"
:before-close="clearSearchPro"
class="not-footer-drawer"
title="标准涉及项目符合性"
:visible.sync="showSarProStateModal"
:wrapperClosable="false"
size="1100px"
:before-close="clearSearchPro"
class="not-footer-drawer"
>
<div class="demo-drawer-content">
<div class="el-drawer-form">
@@ -107,10 +111,10 @@
<el-form :inline="true" :model="sarProStateEO" class="label-input-form">
<el-form-item label="项目名称" class="search-item search-item-last">
<el-input
v-model="sarProStateEO.productName"
placeholder="根据项目名称查找"
:maxlength="100"
clearable></el-input>
v-model="sarProStateEO.productName"
placeholder="根据项目名称查找"
:maxlength="100"
clearable></el-input>
</el-form-item>
<el-form-item label="项目编号" class="search-item search-item-last">
<el-input
@@ -121,18 +125,20 @@
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
type="primary"
class="common-button-primary"
size="mini"
v-btn-permission="'f0ea68cb2c01cd0063ea639ee9bd4cec'"
@click="querySarProStateZero">查询</el-button>
type="primary"
class="common-button-primary"
size="mini"
v-btn-permission="'f0ea68cb2c01cd0063ea639ee9bd4cec'"
@click="querySarProStateZero">查询
</el-button>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
class="common-button-default"
size="mini"
v-btn-permission="'aa4d6d0cc28d016f8241159c9e7d4c80'"
@click="clearSearchProState">清空</el-button>
class="common-button-default"
size="mini"
v-btn-permission="'aa4d6d0cc28d016f8241159c9e7d4c80'"
@click="clearSearchProState">清空
</el-button>
</el-form-item>
</el-form>
</div>
@@ -140,141 +146,153 @@
</div>
</div>
<el-table
ref="multipleTable"
:data="sarProStateListDatas"
tooltip-effect="dark"
style="width: 100%;"
border
:height="sarProStateTableHeight"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
ref="multipleTable"
:data="sarProStateListDatas"
tooltip-effect="dark"
style="width: 100%;"
border
:height="sarProStateTableHeight"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
<el-table-column
type="selection"
width="55"
align="center">
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
width="150px"
align="center"
prop="productLineId"
label="产品线">
prop="productLineId"
label="产品线">
</el-table-column>
<el-table-column
width="150px"
align="center"
prop="productId"
label="项目编号">
prop="productId"
label="项目编号">
</el-table-column>
<el-table-column
width="150px"
align="center"
prop="productName"
label="项目名称">
prop="productName"
label="项目名称">
</el-table-column>
<el-table-column
width="150px"
align="center"
prop="standNumber"
label="标准编号">
prop="standNumber"
label="标准编号">
</el-table-column>
<el-table-column
width="150px"
align="center"
prop="standName"
label="标准名称">
prop="standName"
label="标准名称">
</el-table-column>
<el-table-column
width="150px"
align="center"
prop="standardItem"
label="条款号">
prop="standardItem"
label="条款号">
</el-table-column>
<el-table-column
width="150px"
align="center"
prop="standardInfo"
label="条款名称">
prop="standardInfo"
label="条款名称">
</el-table-column>
<el-table-column
align="center"
prop="productType"
label="在研产品">
prop="productType"
label="在研产品">
<el-table-column
width="150px"
align="center"
prop="researchImplementationTime"
label="实施时间">
prop="researchImplementationTime"
label="实施时间">
<template slot-scope="scope">
<span>{{ scope.row.researchImplementationTime ? $moment(scope.row.researchImplementationTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column
width="150px"
align="center"
prop="researchCompliance"
label="合规">
prop="researchCompliance"
label="合规">
</el-table-column>
<el-table-column
width="150px"
align="center"
label="不合规">
label="不合规">
<el-table-column
width="150px"
align="center"
prop="researchNonCompliance"
label="不合规项目">
prop="researchNonCompliance"
label="不合规项目">
</el-table-column>
<el-table-column
width="150px"
align="center"
prop="researchCountermeasures"
label="应对措施">
prop="researchCountermeasures"
label="应对措施">
</el-table-column>
<el-table-column
width="150px"
align="center"
prop="researchCompletionTime"
label="完成时间">
prop="researchCompletionTime"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.researchCompletionTime ? $moment(scope.row.researchCompletionTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
</el-table-column>
</el-table-column>
<el-table-column
align="center"
prop="center"
label="在产产品">
prop="center"
label="在产产品">
<el-table-column
width="150px"
align="center"
prop="productionImplementationTime"
label="实施时间">
prop="productionImplementationTime"
label="实施时间">
<template slot-scope="scope">
<span>{{ scope.row.productionImplementationTime ? $moment(scope.row.productionImplementationTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column
width="150px"
align="center"
prop="productionCompliance"
label="合规(具体情况)">
prop="productionCompliance"
label="合规(具体情况)">
</el-table-column>
<el-table-column
width="150px"
align="center"
label="不合规">
label="不合规">
<el-table-column
width="150px"
align="center"
prop="productionCountermeasures"
label="应对措施">
prop="productionCountermeasures"
label="应对措施">
</el-table-column>
<el-table-column
width="150px"
align="center"
prop="productionCompletionTime"
label="完成时间">
prop="productionCompletionTime"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.productionCompletionTime ? $moment(scope.row.productionCompletionTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
</el-table-column>
</el-table-column>
</el-table>
<pagination
:page="sarProStateTotalPage"
:total="sarProStateTotal"
@pageChange="pageProStateChange"
@pageSizeChange="pageProStateSizeChange"></pagination>
:page="sarProStateTotalPage"
:total="sarProStateTotal"
@pageChange="pageProStateChange"
@pageSizeChange="pageProStateSizeChange"></pagination>
</div>
</div>
</el-drawer>
@@ -283,12 +301,12 @@
<script>
export default {
name: 'standInvolveProjectDetail',
data () {
name: "standInvolveProjectDetail",
data() {
return {
sarProject: {
standName: '', // 标准政策名称
standNumber: '', // 标准/政策号
standName: "", // 标准政策名称
standNumber: "", // 标准/政策号
standApplicationType: 1
}, // 条件查询
showSarProStateModal: false, // 查看drawer开关
@@ -302,125 +320,127 @@ export default {
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
sarProStateEO: {
productName: '',
standId: ''
productName: "",
standId: ""
},
sarProStateTotal: 0,
sarProStateTotalPage: 1,
sarProStatePageSize: this.$store.getters.userInfo.configContent,
sarProStateListDatas: [], // 符合性项目列表数据
sarProStateTableHeight: null, // 符合性项目列表高度
standId: '' // 符合性项目Id
}
standId: "" // 符合性项目Id
};
},
methods: {
searchStandAndLaws () {
this.page = 1
this.queryStandAndLaws()
}, // 查询
pageChange (page) {
this.page = page
this.queryStandAndLaws()
},
pageSizeChange (pageSize) {
this.pageSize = pageSize
this.$store.getters.userInfo.configContent = pageSize
this.queryStandAndLaws()
},
//点击查看详情
handlePreview(item) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.standId,
pageType: 'INLAND_STAND'
}
})
window.open(routeUrl.href, '_blank')
},
queryStandAndLaws () {
this.sarProject.current = this.page
this.sarProject.size = this.pageSize
this.$http.get('sarStandardComplianceAssessResult/standard', this.sarProject, {
_this: this,
loading: 'loading',
}, res => {
this.sarProjectListDatas = res.data.records
this.total = res.data.total
}, e=> {})
}, // 分页查询
resetSelect () {
this.sarProject.country = ''
this.sarProject.standCode=''
this.sarProject.standName = ''
this.sarProject.standNumber=''
this.queryStandAndLaws()
}, // 外层清空条件查询
handleProjectCompliance (row) {
this.standId = row.standId
this.querySarProStateZero()
}, // 查看项目符合性
querySarProStateZero () {
this.sarProStateTotalPage = 1
var form = this.sarProStateEO
// form.standId = this.standId
form.current = this.sarProStateTotalPage
form.size = this.sarProStatePageSize
this.$http.get('sarStandardComplianceAssessResult/product', form, {
_this: this,
loading: 'loading'
}, res => {
if (res.ok) {
res.data.records.forEach((item)=>{
for(let key in item){
if(item[key] == null){
item[key]='无'
}
}
})
this.sarProStateListDatas = res.data.records
this.sarProStateTotal = res.data.total
}
})
this.showSarProStateModal = true
}, // 查询项目数据
clearSearchProState () {
this.sarProStateEO.productName = ''
this.sarProStateEO.standId = ''
this.sarProStateTotalPage = 1
this.querySarProStateZero()
}, // 清空条件查询
clearSearchPro () {
this.sarProStateEO.productName = ''
this.sarProStateEO.standId = ''
this.showSarProStateModal = false
this.standId = ''
}, // 关闭查看事件
pageProStateChange (page) {
this.sarProStateTotalPage = page
this.querySarProStateZero()
},
pageProStateSizeChange (pageSize) {
this.sarProStatePageSize = pageSize
this.$store.getters.userInfo.configContent = pageSize
this.querySarProStateZero()
},
},
mounted () {
this.queryStandAndLaws()
this.tableHeight = $('.regulatory-repository').height() - 159
this.sarProStateTableHeight=$('.regulatory-repository').height() -120
window.onresize = () => {
this.tableHeight = $('.regulatory-repository').height() - 159
this.sarProStateTableHeight=$('.regulatory-repository').height() - 120
searchStandAndLaws() {
this.page = 1;
this.queryStandAndLaws();
}, // 查询
pageChange(page) {
this.page = page;
this.queryStandAndLaws();
},
pageSizeChange(pageSize) {
this.pageSize = pageSize;
this.$store.getters.userInfo.configContent = pageSize;
this.queryStandAndLaws();
},
//点击查看详情
handlePreview(item) {
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
id: item.standId,
pageType: "INLAND_STAND"
}
});
window.open(routeUrl.href, "_blank");
},
queryStandAndLaws() {
this.sarProject.current = this.page;
this.sarProject.size = this.pageSize;
this.$http.get("sarStandardComplianceAssessResult/standard", this.sarProject, {
_this: this,
loading: "loading"
}, res => {
this.sarProjectListDatas = res.data.records;
this.total = res.data.total;
}, e => {
});
}, // 分页查询
resetSelect() {
this.sarProject.country = "";
this.sarProject.standCode = "";
this.sarProject.standName = "";
this.sarProject.standNumber = "";
this.queryStandAndLaws();
}, // 外层清空条件查询
handleProjectCompliance(row) {
this.standId = row.standId;
this.querySarProStateZero();
}, // 查看项目符合性
querySarProStateZero() {
this.sarProStateTotalPage = 1;
var form = this.sarProStateEO;
// form.standId = this.standId
form.current = this.sarProStateTotalPage;
form.size = this.sarProStatePageSize;
this.$http.get("sarStandardComplianceAssessResult/product", form, {
_this: this,
loading: "loading"
}, res => {
if (res.ok) {
// res.data.records.forEach((item)=>{
// for(let key in item){
// if(item[key] == null){
// item[key]='无'
// }
// }
// })
this.sarProStateListDatas = res.data.records;
this.sarProStateTotal = res.data.total;
}
});
this.showSarProStateModal = true;
}, // 查询项目数据
clearSearchProState() {
this.sarProStateEO.productName = "";
this.sarProStateEO.standId = "";
this.sarProStateTotalPage = 1;
this.querySarProStateZero();
}, // 清空条件查询
clearSearchPro() {
this.sarProStateEO.productName = "";
this.sarProStateEO.standId = "";
this.showSarProStateModal = false;
this.standId = "";
}, // 关闭查看事件
pageProStateChange(page) {
this.sarProStateTotalPage = page;
this.querySarProStateZero();
},
pageProStateSizeChange(pageSize) {
this.sarProStatePageSize = pageSize;
this.$store.getters.userInfo.configContent = pageSize;
this.querySarProStateZero();
}
},
mounted() {
this.queryStandAndLaws();
this.tableHeight = $(".regulatory-repository").height() - 159;
this.sarProStateTableHeight = $(".regulatory-repository").height() - 120;
window.onresize = () => {
this.tableHeight = $(".regulatory-repository").height() - 159;
this.sarProStateTableHeight = $(".regulatory-repository").height() - 120;
};
}
}
};
</script>
<style lang="less" scoped>
.stand-involve-project-detail{
.stand-involve-project-detail {
height: 100%;
.laws-details-header {
background: #fff;
// height: 30px;
@@ -431,6 +451,7 @@ export default {
display: inline-block;
margin-right: 10px;
}
.title {
display: inline-block;
font-weight: bold;
@@ -440,6 +461,7 @@ export default {
text-align: center;
}
}
.contaiiner {
background: #fff;
padding: 5px 10px;
@@ -447,8 +469,8 @@ export default {
}
</style>
<style lang="less">
.stand-involve-project-detail{
.search-area .search-item .el-input--suffix .el-input__inner{
.stand-involve-project-detail {
.search-area .search-item .el-input--suffix .el-input__inner {
padding-right: 15px;
}
}