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

This commit is contained in:
super_liu
2022-03-31 10:32:54 +08:00
@@ -691,6 +691,7 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
console.log(data);
let commitStatus = res.commitStatus
if(commitStatus && commitStatus > 0){
this.acceptShow = true
@@ -710,7 +711,7 @@
this.onlyKey = data.form ? data.form.onlyKey : data.onlyKey
this.standId = data.standId
this.getItemList(data.standId,data.textType)
this.data = data.form ? data.form.data : (data.data ? data.data : (data.info ? data.info : []))
this.data = data.form ? (data.form.data ? data.form.data : []) : (data.data ? data.data : (data.info ? data.info : []))
}).catch(e => {
})
})