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

This commit is contained in:
yanyizhou
2021-12-23 16:52:27 +08:00
@@ -459,39 +459,74 @@ export default {
},
// 根据准入id查询标准法规详情
selectInfobyAccid() {
this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
...this.standardFormList,
...this.standardForm,
id: this.pageId
}, {
_this: this
}, res => {
console.log(res.data.records);
res.data.records.forEach(item => {
if (item.nylx === "[]") {
item.nylx = null;
}
if (item.typeApplicable === "[]") {
item.typeApplicable = null;
}
if (item.sycpx === "[]") {
item.sycpx = null;
}
if(item.zrbm === "[]"){
item.zrbm = null
}
if(this.sarAccessEO.sortKey === '1'){
this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
...this.standardFormList,
...this.standardForm,
id: this.pageId,
types: '1',
}, {
_this: this
}, res => {
res.data.records.forEach(item => {
if (item.nylx === "[]") {
item.nylx = null;
}
if (item.typeApplicable === "[]") {
item.typeApplicable = null;
}
if (item.sycpx === "[]") {
item.sycpx = null;
}
if(item.zrbm === "[]"){
item.zrbm = null
}
});
this.standinfoList = res.data.records;
this.standardFormTotal = res.data.total;
this.standinfoList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + " " + item.standNumber;
} else {
item.standNumber = item.standSortShow + " " + item.standNumber + "-" + item.standYear;
}
});
}, e => {
});
this.standinfoList = res.data.records;
this.standardFormTotal = res.data.total;
this.standinfoList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + " " + item.standNumber;
} else {
item.standNumber = item.standSortShow + " " + item.standNumber + "-" + item.standYear;
}
}else{
this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
...this.standardFormList,
...this.standardForm,
id: this.pageId
}, {
_this: this
}, res => {
res.data.records.forEach(item => {
if (item.nylx === "[]") {
item.nylx = null;
}
if (item.typeApplicable === "[]") {
item.typeApplicable = null;
}
if (item.sycpx === "[]") {
item.sycpx = null;
}
if(item.zrbm === "[]"){
item.zrbm = null
}
});
this.standinfoList = res.data.records;
this.standardFormTotal = res.data.total;
this.standinfoList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + " " + item.standNumber;
} else {
item.standNumber = item.standSortShow + " " + item.standNumber + "-" + item.standYear;
}
});
}, e => {
});
}, e => {
});
}
},
selectInfoMore() {
this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {