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:
super_liu
2021-08-23 17:49:39 +08:00
parent e87f39d83b b9388d5c77
commit c1ac951e43
5 changed files with 97 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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/localProductsOrProjectLibrary/pages/details.vue
+45 -108
View File
@@ -699,115 +699,52 @@ 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){
this.standList.forEach(item => {
let addIndex
addIndex = this.dataList.findIndex(items => {
return items.standId === item.id
})
if(addIndex > -1){
this.$message.warning('请勿重复添加数据')
}else{
this.dataList.push(item)
}
})
this.detailedListModel = false
this.standModel = false
}else{
this.$message.warning('请至少选择一条数据进行添加')
}
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.detailedListModel = false;
_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;
// }
// },
//获取标准
getStandrd(data){
this.detailedId = data.id
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
+15 -13
View File
@@ -109,6 +109,13 @@
<div class="search-area">
<div class="left">
<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.productId"
placeholder="根据项目编号查找"
:maxlength="100"
clearable></el-input>
</el-form-item>
<el-form-item label="项目名称" class="search-item search-item-last">
<el-input
v-model="sarProStateEO.productName"
@@ -116,13 +123,6 @@
:maxlength="100"
clearable></el-input>
</el-form-item>
<el-form-item label="项目编号" class="search-item search-item-last">
<el-input
v-model="sarProStateEO.standId"
placeholder="根据项目编号查找"
:maxlength="100"
clearable></el-input>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
type="primary"
@@ -327,7 +327,7 @@ export default {
pageSize: this.$store.getters.userInfo.configContent,
sarProStateEO: {
productName: "",
standId: "",
productId: "",
type: ""
},
sarProStateTotal: 0,
@@ -335,7 +335,7 @@ export default {
sarProStatePageSize: this.$store.getters.userInfo.configContent,
sarProStateListDatas: [], // 符合性项目列表数据
sarProStateTableHeight: null, // 符合性项目列表高度
standId: "" // 符合性项目Id
productId: "" // 符合性项目Id
};
},
methods: {
@@ -384,16 +384,18 @@ export default {
}, // 外层清空条件查询
handleProjectCompliance(row) {
this.sarProStateEO.type = row.type
this.standId = row.standId;
this.productId = row.productId;
this.querySarProStateZero();
}, // 查看项目符合性
querySarProStateZero(page) {
console.log(page)
if (page) {
this.sarProStateTotalPage = page
} else {
this.sarProStateTotalPage = 1;
}
var form = this.sarProStateEO;
console.log('395',form)
// form.standId = this.standId
form.current = this.sarProStateTotalPage;
form.size = this.sarProStatePageSize;
@@ -416,15 +418,15 @@ export default {
}, // 查询项目数据
clearSearchProState() {
this.sarProStateEO.productName = "";
this.sarProStateEO.standId = "";
this.sarProStateEO.productId = "";
this.sarProStateTotalPage = 1;
this.querySarProStateZero();
}, // 清空条件查询
clearSearchPro() {
this.sarProStateEO.productName = "";
this.sarProStateEO.standId = "";
this.sarProStateEO.productId = "";
this.showSarProStateModal = false;
this.standId = "";
this.productId = "";
}, // 关闭查看事件
pageProStateChange(page) {
this.sarProStateTotalPage = page;