Merge remote-tracking branch 'origin/master'

cuilei

5 天以前 ba77fdc6a30c9ad0941e40319f8c4f6fe6fdf9f1

 src/views/mdc/base/modules/EquipmentList/EquipmentModal.vue

@@ -64,7 +64,7 @@

        <!--车间分配-->
        <a-form-model-item label="车间分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!productionDisabled">
          <j-select-production  v-model="model.selectedProduction" :multi="true" @back="backProductionInfo" :backProduction="true" :treeProductOpera="true"></j-select-production>
          <j-select-production  v-model="model.selectedFactory" :multi="true" @back="backProductionInfo" :backProduction="true" :treeProductOpera="true"></j-select-production>
        </a-form-model-item>

        <a-form-model-item label="负责部门" :labelCol="labelCol" :wrapperCol="wrapperCol"  v-if="departIdShow==true">
@@ -220,7 +220,7 @@
        this.resetScreenSize();
        that.userId = record.id;
        that.model = Object.assign({},{selectedroles:'',selecteddeparts:''}, record);
        that.model = Object.assign({},{selectedroles:'',selectedProduction:''}, record);
        that.model = Object.assign({},{selectedroles:'',selectedFactory:''}, record);

        //身份为上级显示负责部门，否则不显示
        if(this.model.userIdentity==2){
@@ -305,7 +305,7 @@
            }

            that.model.selecteddeparts = selectDepartKeys.join(",")
            that.model.selectedProduction = selectDepartKeys.join(",")
            that.model.selectedFactory = selectDepartKeys.join(",")

            that.nextDepartOptions=departOptions;
            console.log('that.nextDepartOptions=',that.nextDepartOptions)
@@ -325,7 +325,7 @@
              })
            }

            that.model.selectedProduction = selectProductKeys.join(",")
            that.model.selectedFactory = selectProductKeys.join(",")

            that.nextProductionOptions=ProductionOptions;
            console.log('that.nextProductionOptions=',that.nextProductionOptions)
@@ -341,7 +341,7 @@
        })
      },
      backProductionInfo(info) {
        this.model.productionIds = this.model.selectedProduction;
        this.model.productionIds = this.model.selectedFactory;
        this.nextProductionOptions = info.map((item,index,arr)=>{
          let c = {label:item.text, value: item.value+""}
          return c;