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

This commit is contained in:
super_liu
2022-03-30 14:05:58 +08:00
2 changed files with 10 additions and 5 deletions
@@ -1170,11 +1170,10 @@ export default {
this.form = JSON.parse(JSON.stringify(item))
let wssmrName = this.form.wssmrname
this.form.wssmr = wssmrName
this.form.sycpx = this.form.sycpx.split(',')
this.form.nylx = this.form.nylx.split(',')
this.form.cllx = this.form.cllx.split(',')
this.form.syrz = this.form.syrz.split(',')
this.form.syrz = this.form.syrz.split(',')
this.form.sycpx = this.form.sycpx && this.form.sycpx !== [] ? this.form.sycpx.split(',') : ''
this.form.nylx = this.form.nylx && this.form.nylx !== [] ? this.form.nylx.split(',') : ''
this.form.cllx = this.form.cllx && this.form.cllx !== [] ? this.form.cllx.split(',') : ''
this.form.syrz = this.form.syrz && this.form.syrz !== [] ? this.form.syrz.split(',') : ''
this.defaultCheckedKeys = [this.form.standSystem]
this.defaultCheckedKeys1 = [this.form.cycvppsbm]
this.defaultCheckedKeys2 = [this.form.kccvppsbm]
@@ -1129,6 +1129,12 @@ export default {
getFormFieldList (item) {
this.$nextTick(() => {
this.form = JSON.parse(JSON.stringify(item))
let wssmrName = this.form.wssmrname
this.form.wssmr = wssmrName
this.form.sycpx = this.form.sycpx && this.form.sycpx !== [] ? this.form.sycpx.split(',') : ''
this.form.nylx = this.form.nylx && this.form.nylx !== [] ? this.form.nylx.split(',') : ''
this.form.cllx = this.form.cllx && this.form.cllx !== [] ? this.form.cllx.split(',') : ''
this.form.syrz = this.form.syrz && this.form.syrz !== [] ? this.form.syrz.split(',') : ''
this.defaultCheckedKeys = [this.form.standSystem]
this.defaultCheckedKeys1 = [this.form.cycvppsbm]
this.defaultCheckedKeys2 = [this.form.kccvppsbm]