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

This commit is contained in:
super_liu
2022-05-10 10:33:24 +08:00
12 changed files with 236 additions and 54 deletions
@@ -1540,17 +1540,17 @@ export default {
}
if (this.editRowData.ssrq === "-") {
this.editRowData.ssrq = "";
} else if (this.editRowData.ssrq !== null && this.editRowData.ssrq !== "-" && this.editRowData.ssrq !== "") {
} else if (this.editRowData.ssrq&& this.editRowData.ssrq !== "-" ) {
this.editRowData.ssrq = this.editRowData.ssrq.split(",");
}
if (this.editRowData.zccssrqgj === "-") {
this.editRowData.zccssrqgj = "";
} else if (this.editRowData.zccssrqgj !== null && this.editRowData.zccssrqgj !== "-" && this.editRowData.zccssrqgj !== "") {
} else if (this.editRowData.zccssrqgj && this.editRowData.zccssrqgj !== "-") {
this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.split(",");
}
if (this.editRowData.xcxssrqgj === "-") {
this.editRowData.xcxssrqgj = "";
} else if (this.editRowData.xcxssrqgj !== null && this.editRowData.xcxssrqgj !== "-" && this.editRowData.xcxssrqgj !== " ") {
} else if (this.editRowData.xcxssrqgj && this.editRowData.xcxssrqgj !== "-") {
this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.split(",");
}
this.drawerEdit = true;
@@ -2316,7 +2316,7 @@ export default {
id: this.zqaId,
types: '1',
page: this.page,
Size: this.Size
Size: 1000,
}, {
_this: this
}, res => {