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

2022-05-10 15:23:33 +08:00
parent 9136e0eef5 ebacbf636a
commit f12c1685a7
6 changed files with 74 additions and 41 deletions
@@ -1110,7 +1110,7 @@ export default {
                      if (this.energyKindOptions[i].value === k[m]) {
                        k[m] = this.energyKindOptions[i].label;
                      }
-                      item.sycx = k.join(",");
+                      item.typeApplicable = k.join(",");
                    }
                  }
                }
@@ -3753,6 +3753,9 @@ export default {
      })

      let nameNew=Array.from(arr).join(',')
+      if(nameNew.length > 0){
+        nameNew = nameNew.replace("undefined","").replace(",,",",")
+      }
      this.$set(this.sarBussionessStandEO, 'QCDW', nameNew)

      if (this.sarBussionessStandEO.QCRBUSS) {