Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -459,39 +459,74 @@ export default {
|
|||||||
},
|
},
|
||||||
// 根据准入id查询标准法规详情
|
// 根据准入id查询标准法规详情
|
||||||
selectInfobyAccid() {
|
selectInfobyAccid() {
|
||||||
this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
|
if(this.sarAccessEO.sortKey === '1'){
|
||||||
...this.standardFormList,
|
this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
|
||||||
...this.standardForm,
|
...this.standardFormList,
|
||||||
id: this.pageId
|
...this.standardForm,
|
||||||
}, {
|
id: this.pageId,
|
||||||
_this: this
|
types: '1',
|
||||||
}, res => {
|
}, {
|
||||||
console.log(res.data.records);
|
_this: this
|
||||||
res.data.records.forEach(item => {
|
}, res => {
|
||||||
if (item.nylx === "[]") {
|
res.data.records.forEach(item => {
|
||||||
item.nylx = null;
|
if (item.nylx === "[]") {
|
||||||
}
|
item.nylx = null;
|
||||||
if (item.typeApplicable === "[]") {
|
}
|
||||||
item.typeApplicable = null;
|
if (item.typeApplicable === "[]") {
|
||||||
}
|
item.typeApplicable = null;
|
||||||
if (item.sycpx === "[]") {
|
}
|
||||||
item.sycpx = null;
|
if (item.sycpx === "[]") {
|
||||||
}
|
item.sycpx = null;
|
||||||
if(item.zrbm === "[]"){
|
}
|
||||||
item.zrbm = 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;
|
}else{
|
||||||
this.standardFormTotal = res.data.total;
|
this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
|
||||||
this.standinfoList.forEach(item => {
|
...this.standardFormList,
|
||||||
if (item.standYear === null) {
|
...this.standardForm,
|
||||||
item.standNumber = item.standSortShow + " " + item.standNumber;
|
id: this.pageId
|
||||||
} else {
|
}, {
|
||||||
item.standNumber = item.standSortShow + " " + item.standNumber + "-" + item.standYear;
|
_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() {
|
selectInfoMore() {
|
||||||
this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
|
this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
|
||||||
|
|||||||
Reference in New Issue
Block a user