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:
zhaokaiyao@91isoft.com
2021-08-23 15:40:15 +08:00
parent 93f9c65625 9f3b88e759
commit 672374e17d
6 changed files with 64 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/otherBussStandardDetails/index.vue
+6 -6
View File
@@ -32,16 +32,16 @@
<template v-if = "item.label === '基础信息'">
<div class="details-content-modular basic-information" style="margin-bottom: 0">
<div class="basic-information-content">
<p style="color: #C42626;"><label style=" margin-right: 164px;">企标号</label><span>{{ sarStandardsInfoEO.standCode }}</span></p>
<p><label style=" margin-right: 150px;">中文名称</label><span>{{ sarStandardsInfoEO.standName || '-' }}</span></p>
<p><label style=" margin-right: 150px;">英文名称</label><span>{{ sarStandardsInfoEO.standEnName || '-' }}</span></p>
<p style="color: #C42626;"><label style=" margin-right: 171px;">企标号</label><span>{{ sarStandardsInfoEO.standCode }}</span></p>
<p><label style=" margin-right: 157px;">中文名称</label><span>{{ sarStandardsInfoEO.standName || '-' }}</span></p>
<p><label style=" margin-right: 157px;">英文名称</label><span>{{ sarStandardsInfoEO.standEnName || '-' }}</span></p>
<p>
<label style=" margin-right: 132px;"
<label style=" margin-right: 139px;"
title="“修订中”为现行有效版本；“已修订”标准的有效性需根据实际实施情况判定"
>文本状态<i class="el-icon-warning-outline"></i></label><span style="color: #409EFF;">{{ sarStandardsInfoEO.standStatusShow || '-' }}</span>
</p>
<p><label style=" margin-right: 150px;">发布日期</label><span>{{ sarStandardsInfoEO.issueTime || '-' }}</span></p>
<p><label style=" margin-right: 115px;">标准实施日期</label><span>{{ sarStandardsInfoEO.putTime || '-' }}</span></p>
<p><label style=" margin-right: 157px;">发布日期</label><span>{{ sarStandardsInfoEO.issueTime || '-' }}</span></p>
<p><label style=" margin-right: 122px;">标准实施日期</label><span>{{ sarStandardsInfoEO.putTime || '-' }}</span></p>
</div>
</div>
</template>
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
-2
View File
@@ -268,7 +268,6 @@ export default {
_this: this
}, res => {
let arr = res.data.records;
console.log('271', arr)
arr.forEach(item => {
// 国家地区转换
if (item.countryArea !== null || item.countryArea !== "") {
@@ -283,7 +282,6 @@ export default {
}
}
})
console.log('286',arr)
this.sarAccessListDatas = arr
this.tableLoading = false
this.sarSarAccessEOSearch.page = 1
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
+9 -7
View File
@@ -85,7 +85,7 @@
align="center">
</el-table-column>
<el-table-column
prop="carType"
prop="carTypeShow"
label="车型类别"
align="center">
</el-table-column>
@@ -279,8 +279,8 @@ export default {
}, {
_this: this
}, res => {
this.sarAccessListDatas = res.data.records
this.sarAccessListDatas.forEach(item =>{
let arr = res.data.records;
arr.forEach(item =>{
// 适用车型转换
if (item.carType !== null) {
let k = (item.carType || "").split(',')
@@ -289,11 +289,12 @@ export default {
if (this.energyKindOptions[i].value === k[m]) {
k[m] = this.energyKindOptions[i].label
}
item.carType = k.join(',')
item.carTypeShow = k.join(',')
}
}
}
})
this.sarAccessListDatas = arr
this.tableLoading = false
this.sarSarAccessEOSearch.page = 1
this.sarAccessListTotal = res.data.total
@@ -393,8 +394,8 @@ export default {
}, {
_this: this
}, res => {
this.sarAccessListDatas = res.data.records
this.sarAccessListDatas.forEach(item =>{
let arr = res.data.records
arr.forEach(item =>{
// 适用车型转换
if (item.carType !== null) {
let k = (item.carType || "").split(',')
@@ -403,11 +404,12 @@ export default {
if (this.energyKindOptions[i].value === k[m]) {
k[m] = this.energyKindOptions[i].label
}
item.carType = k.join(',')
item.carTypeShow = k.join(',')
}
}
}
})
this.sarAccessListDatas = arr
this.tableLoading = false
this.sarSarAccessEOSearch.page = 1
this.sarAccessListTotal = res.data.total
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+3
View File
@@ -682,6 +682,9 @@ export default {
detailedListName: [
{required: true, message: '清单名称不能为空', trigger: 'blur'},
{type: 'string', max: 100, message: '清单名称不能超过100个字符', trigger: 'blur'}
],
carType: [
{required: true,message: '车型类别不能为空', trigger: 'blur'}
]
},
disabledFlag: false,
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+1 -1
View File
@@ -365,7 +365,7 @@
<el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'dd4ea796dab7a01b105ba657b1968a84'">编辑</el-dropdown-item>
<!-- <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'ESPMBSD4ZP'">分享</el-dropdown-item>-->
<!-- <el-dropdown-item :command="[scope.row, '授权']" v-btn-permission="'CWBPST294ZH7HSKD4452'" v-if="scope.row.attrInfoMap && scope.row.attrInfoMap.QBMJ === 'ACF675Z88W'">授权</el-dropdown-item>-->
<!-- <el-dropdown-item :command="[scope.row, '删除']">删除</el-dropdown-item>-->
<el-dropdown-item :command="[scope.row, '删除']">删除</el-dropdown-item>
<!-- <el-dropdown-item :command="[scope.row, '流程']">流程</el-dropdown-item>-->
</el-dropdown-menu>
</el-dropdown>
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+45
View File
@@ -699,6 +699,51 @@ export default {
cancelStand() {
this.standModel = false;
},
//如果张宇欢改好了就把这个放开，然后把底下那个注释了
// okStand() {
// let _this = this;
// if (this.standList.length < 1) {
// _this.$message.warning("请选择标准");
// } else {
// for (let i = 0; i < this.dataList.length; i++) {
// let newStand = false;
// for (let j = 0; j < this.standList.length; j++) {
// if (this.standList[j].id == this.dataList[i].standId) {
// newStand = true;
// this.standList.splice(j, 1)
// j--
// }
// }
// if (newStand) {
// _this.$message.warning("请勿重复添加数据");
// } else {
// // _this.dataList.push(item);
// }
// }
// this.standardData = []
// _this.standModel = false;
// for (var i = 0; i < this.standList.length; i++) {
// this.standList1.push({
// standId: this.standList[i].id,
// projectId: this.localProEO.id
// })
// }
// if (this.standList1 != '') {
// this.$http.postData("sarStandProjectLibrary/batchInsert", this.standList1, {
// _this: this
// }, res => {
// if (res.ok) {
// // this.$message.success(res.message)
// this.getDataList()
// }
// }, e => {
// });
// }
// this.standList = []
// this.standList1 = []
// _this.standModel = false;
// }
// },
//添加标准确定事件
okStand(){
if(this.standList.length > 0){