Merge remote-tracking branch 'origin/master'

cuilei

5 天以前 ba77fdc6a30c9ad0941e40319f8c4f6fe6fdf9f1

 src/components/jeecgbiz/JSelectFactory.vue

@@ -59,7 +59,7 @@
        type: String,
        default: ''
      },
      backProduction: {
      backFactory: {
        type: Boolean,
        default: false,
        required: false
@@ -116,8 +116,8 @@
        this.textVals = textVals
      },
      //返回选中的车间信息
      backProductInfo(){
        if(this.backProduction===true){
      backFactoryInfo(){
        if(this.backFactory===true){
          if(this.storeVals && this.storeVals.length>0){
            let arr1 = this.storeVals.split(',')
            let arr2 = this.textVals.split(',')
@@ -150,9 +150,9 @@
          this.textVals = arr2.join(',')
        }
        this.$emit("change", this.storeVals)
        this.backProductInfo()
        this.backFactoryInfo()
      },
     

      handleEmpty(){
        this.handleOK('')
      }