MDC设备车间树改造，设备权限改造

Lius

7 天以前 2b6c67c330d86e84dfbeec9b7b66a45567aaeb00

MDC设备车间树改造，设备权限改造

 src/components/jeecgbiz/JSelectEquipmentFactory.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,183 @@
<template>
  <div class="components-input-demo-presuffix">
    <!---->
    <a-input @click="openModal" placeholder="请点击选择车间" v-model="textVals" readOnly :disabled="disabled">
      <a-icon slot="prefix" type="cluster" title="车间选择控件"/>
      <a-icon v-if="storeVals&&!disabled" slot="suffix" type="close-circle" @click="handleEmpty" title="清空"/>
    </a-input>
    <j-select-equipment-factory-modal
      ref="innerDepartSelectModal"
      :modal-width="modalWidth"
      :multi="multi"
      :rootOpened="rootOpened"
      :factory-id="value"
      :store="storeField"
      :text="textField"
      :treeProductOpera="treeProductOpera"
      @ok="handleOK"
      @initComp="initComp">

    </j-select-equipment-factory-modal>
  </div>
</template>

<script>
  import JSelectEquipmentFactoryModal from './modal/JSelectEquipmentFactoryModal'
  import { underLinetoHump } from '@comp/_util/StringUtil'
  export default {
    name: 'JSelectEquipmentFactory',
    components:{
      JSelectEquipmentFactoryModal,
    },
    props:{
      modalWidth:{
        type:Number,
        default:500,
        required:false
      },
      multi:{
        type:Boolean,
        default:false,
        required:false
      },
      rootOpened:{
        type:Boolean,
        default:true,
        required:false
      },
      value:{
        type:String,
        required:false
      },
      disabled:{
        type: Boolean,
        required: false,
        default: false
      },
      // è‡ªå®šä¹‰è¿”回字段，默认返回 id
      customReturnField: {
        type: String,
        default: ''
      },
      backFactory: {
        type: Boolean,
        default: false,
        required: false
      },
      // å­˜å‚¨å­—段 [key field]
      store: {
        type: String,
        default: 'id',
        required: false
      },
      // æ˜¾ç¤ºå­—段 [label field]
      text: {
        type: String,
        default: 'factoryName',
        required: false
      },
      treeProductOpera: {
        type: Boolean,
        default: false,
        required: false
      }

    },
    data(){
      return {
        visible:false,
        confirmLoading:false,
        storeVals: '', //[key values]
        textVals: '' //[label values]
      }
    },
    computed:{
      storeField(){
        let field = this.customReturnField
        if(!field){
          field = this.store;
        }
        return underLinetoHump(field)
      },
      textField(){
        return underLinetoHump(this.text)
      }
    },
    mounted(){
      this.storeVals = this.value
    },
    watch:{
      value(val){
        this.storeVals = val
      }
    },
    methods:{
      initComp(textVals){
        this.textVals = textVals
      },
      //返回选中的车间信息
      backProductInfo(){
        if(this.backFactory===true){
          //LOWCOD-2147 ã€ç”¨æˆ·ç®¡ç†ã€‘选择部门和上级以后，负责部门没有数据可选 (陶炎改造自定义返回字段导致)
          if(this.storeVals && this.storeVals.length>0){
            let arr1 = this.storeVals.split(',')
            let arr2 = this.textVals.split(',')
            let info = []
            for(let i=0;i<arr1.length;i++){
              info.push({
                value: arr1[i],
                text: arr2[i]
              })
            }
            this.$emit('back', info)
          }
        }
      },
      openModal(){
        this.$refs.innerDepartSelectModal.show()
      },
      handleOK(rows) {
        if (!rows && rows.length <= 0) {
          this.textVals = ''
          this.storeVals = ''
        } else {
          let arr1 = []
          let arr2 = []
          for(let dep of rows){
            arr1.push(dep[this.storeField])
            arr2.push(dep[this.textField])
          }
          this.storeVals = arr1.join(',')
          this.textVals = arr2.join(',')
        }
        this.$emit("change", this.storeVals)
        this.backProductInfo()
      },
      getDepartNames(){
        return this.departNames
      },
      handleEmpty(){
        this.handleOK('')
      }
    },
    model: {
      prop: 'value',
      event: 'change'
    }
  }
</script>

<style scoped>
  .components-input-demo-presuffix .anticon-close-circle {
    cursor: pointer;
    color: #ccc;
    transition: color 0.3s;
    font-size: 12px;
  }
  .components-input-demo-presuffix .anticon-close-circle:hover {
    color: #f5222d;
  }
  .components-input-demo-presuffix .anticon-close-circle:active {
    color: #666;
  }
</style>

 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('')
      }

 src/components/jeecgbiz/modal/JSelectEquipmentFactoryModal.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,348 @@
<template>
  <j-modal
    title="选择车间"
    :width="modalWidth"
    :visible="visible"
    :confirmLoading="confirmLoading"
    @ok="handleSubmit"
    @cancel="handleCancel"
    @update:fullscreen="isFullscreen"
    wrapClassName="j-factory-select-modal"
    switchFullscreen
    cancelText="关闭">
    <a-spin tip="Loading..." :spinning="false">
      <a-input-search style="margin-bottom: 1px" placeholder="请输入车间名称按回车进行搜索" @search="onSearch" />
      <a-tree
        checkable
        :class="treeScreenClass"
        :treeData="treeData"
        :checkStrictly="checkStrictly"
        @check="onCheck"
        @select="onSelect"
        @expand="onExpand"
        :autoExpandParent="autoExpandParent"
        :expandedKeys="expandedKeys"
        :checkedKeys="checkedKeys">

        <template slot="title" slot-scope="{title}">
          <span v-if="title.indexOf(searchValue) > -1">
            {{title.substr(0, title.indexOf(searchValue))}}
            <span style="color: #f50">{{searchValue}}</span>
            {{title.substr(title.indexOf(searchValue) + searchValue.length)}}
          </span>
          <span v-else>{{title}}</span>
        </template>
      </a-tree>
    </a-spin>
    <!--底部父子关联操作和确认取消按钮-->
    <!--<template slot="footer">-->
    <!--<div class="drawer-bootom-button">-->
    <!--<a-dropdown style="float: left" :trigger="['click']" placement="topCenter">-->
    <!--<a-menu slot="overlay">-->
    <!--<a-menu-item key="1" @click="switchCheckStrictly(1)">父子关联</a-menu-item>-->
    <!--<a-menu-item key="2" @click="switchCheckStrictly(2)">取消关联</a-menu-item>-->
    <!--</a-menu>-->
    <!--<a-button>-->
    <!--树操作 <a-icon type="up" />-->
    <!--</a-button>-->
    <!--</a-dropdown>-->
    <!--<a-button @click="handleCancel" type="primary" style="margin-right: 0.8rem">关闭</a-button>-->
    <!--<a-button @click="handleSubmit" type="primary" >确认</a-button>-->
    <!--</div>-->
    <!--</template>-->
  </j-modal>
</template>

<script>
  import { queryFactoryTreeList } from '@/api/api'
  import { getAction } from '@/api/manage'
  export default {
    name: 'JSelectEquipmentFactoryModal',
    props:['modalWidth','multi','rootOpened','factoryId', 'store', 'text','treeOpera'],
    data(){
      return {
        visible:false,
        confirmLoading:false,
        treeData:[],
        autoExpandParent:true,
        expandedKeys:[],
        dataList:[],
        checkedKeys:[],
        checkedRows:[],
        searchValue:"",
        checkStrictly: true,
        fullscreen:false,
        allTreeKeys:[],
        url:{
          queryTreeIdList:'/base/factory/queryTreeIdList'
        }
      }
    },
    created(){
      this.loadFactoryTree();
    },
    watch:{
      factoryId(){
        this.initDepartComponent()
      },
      visible: {
        handler() {
          this.initDepartComponent(true)
        }
      }
    },
    computed:{
      treeScreenClass() {
        return {
          'my-dept-select-tree': true,
          'fullscreen': this.fullscreen,
        }
      },
    },
    methods:{
      loadFactoryTree(){
        getAction(this.url.queryTreeIdList).then(res => {
          if (res.success) {
            this.allTreeKeys = res.result
            this.loadDepart()
          } else {
            // this.$message.warning(res.message)
            this.$notification.warning({
              message:'消息',
              description:res.message
            });
          }
        }).finally(() => {
          this.loading = false
        })
      },
      matterTree(data) {
        for (var i = 0; i < data.length; i++) {
          if(data[i].leaf == false){
            data[i].disabled = true
          }

          // // è¿™é‡Œé¢å°±æ˜¯ä½ å¤„理数据的地方
          // data[i].width = '200'
          if (data[i].children && data[i].children.length > 0) {
            // children若不为空数组，则继续 é€’归调用 æœ¬æ–¹æ³•
            this.matterTree(data[i].children)
          }
        }
        return data
      },
      show(){
        this.visible=true
        this.checkedRows=[]
        this.checkedKeys=[]
      },
      loadDepart(){
        // è¿™ä¸ªæ–¹æ³•æ˜¯æ‰¾åˆ°æ‰€æœ‰çš„部门信息
        queryFactoryTreeList().then(res=>{
          if(res.success){
            let arr = [...res.result]
            this.reWriterWithSlot(arr)
            this.treeData = arr
            this.initDepartComponent()
            if(this.rootOpened){
              this.initExpandedKeys(res.result)
            }
            this.matterTree(this.treeData)
            this.expandedKeys = this.allTreeKeys
          }
        })
      },
      initDepartComponent(flag){
        let arr = []
        //该方法两个地方用 1.visible改变事件重新设置选中项 2.组件编辑页面回显
        let fieldName = flag==true?'key':this.text
        if(this.factoryId){
          let arr2 = this.factoryId.split(',')
          for(let item of this.dataList){
            if(arr2.indexOf(item[this.store])>=0){
              arr.push(item[fieldName])
            }
          }
        }
        if(flag==true){
          this.checkedKeys = [...arr]
        }else{
          this.$emit("initComp", arr.join(','))
        }
      },
      reWriterWithSlot(arr){
        for(let item of arr){
          if(item.children && item.children.length>0){
            this.reWriterWithSlot(item.children)
            let temp = Object.assign({},item)
            temp.children = {}
            this.dataList.push(temp)
          }else{
            this.dataList.push(item)
            item.scopedSlots={ title: 'title' }
          }
        }
      },
      initExpandedKeys(arr){
        if(arr && arr.length>0){
          let keys = []
          for(let item of arr){
            if(item.children && item.children.length>0){
              keys.push(item.id)
            }
          }
          this.expandedKeys=[...keys]
          //全部keys
          //this.allTreeKeys = [...keys]
        }else{
          this.expandedKeys=[]
          //this.allTreeKeys = []
        }
      },
      onCheck (checkedKeys,info) {
        if(!this.multi){
          let arr = checkedKeys.checked.filter(item => this.checkedKeys.indexOf(item) < 0)
          this.checkedKeys = [...arr]
          this.checkedRows = (this.checkedKeys.length === 0) ? [] : [info.node.dataRef]
        }else{
          if(this.checkStrictly){
            this.checkedKeys = checkedKeys.checked
          }else{
            this.checkedKeys = checkedKeys
          }
          this.checkedRows = this.getCheckedRows(this.checkedKeys)
        }
      },
      onSelect(selectedKeys,info) {
        //取消关联的情况下才走onSelect的逻辑
        if(this.checkStrictly){
          let keys = []
          keys.push(selectedKeys[0])
          if(!this.checkedKeys || this.checkedKeys.length===0 || !this.multi){
            this.checkedKeys = [...keys]
            this.checkedRows=[info.node.dataRef]
          }else{
            let currKey = info.node.dataRef.key
            if(this.checkedKeys.indexOf(currKey)>=0){
              this.checkedKeys = this.checkedKeys.filter(item=> item !==currKey)
            }else{
              this.checkedKeys.push(...keys)
            }
          }
          this.checkedRows = this.getCheckedRows(this.checkedKeys)
        }
      },
      onExpand (expandedKeys) {
        this.expandedKeys = expandedKeys
        this.autoExpandParent = false
      },
      handleSubmit(){
        if(!this.checkedKeys || this.checkedKeys.length==0){
          this.$emit("ok",'')
        }else{
          let checkRow = this.getCheckedRows(this.checkedKeys)
          let keyStr = this.checkedKeys.join(",")
          this.$emit("ok", checkRow, keyStr)
        }
        this.handleClear()
      },
      handleCancel(){
        this.handleClear()
      },
      handleClear(){
        this.visible=false
        this.checkedKeys=[]
      },
      getParentKey(currKey,treeData){
        let parentKey
        for (let i = 0; i < treeData.length; i++) {
          const node = treeData[i]
          if (node.children) {
            if (node.children.some(item => item.key === currKey)) {
              parentKey = node.key
            } else if (this.getParentKey(currKey, node.children)) {
              parentKey = this.getParentKey(currKey, node.children)
            }
          }
        }
        return parentKey
      },
      onSearch(value){
        const expandedKeys = this.dataList.map((item) => {
          if (item.title.indexOf(value) > -1) {
            return this.getParentKey(item.key,this.treeData)
          }
          return null
        }).filter((item, i, self) => item && self.indexOf(item) === i)

        Object.assign(this, {
          expandedKeys,
          searchValue: value,
          autoExpandParent: true,
        })


      },
      // æ ¹æ® checkedKeys èŽ·å– rows
      getCheckedRows(checkedKeys) {
        const forChildren = (list, key) => {
          for (let item of list) {
            if (item.id === key) {
              return item
            }
            if (item.children instanceof Array) {
              let value = forChildren(item.children, key)
              if (value != null) {
                return value
              }
            }
          }
          return null
        }

        let rows = []
        for (let key of checkedKeys) {
          let row = forChildren(this.treeData, key)
          if (row != null) {
            rows.push(row)
          }
        }
        return rows
      },
      switchCheckStrictly (v) {
        if(v==1){
          this.checkStrictly = false
        }else if(v==2){
          this.checkStrictly = true
        }
      },
      isFullscreen(val){
        this.fullscreen=val
      }
    }
  }

</script>

<style lang="less" scoped>
  // é™åˆ¶éƒ¨é—¨é€‰æ‹©æ ‘高度，避免部门太多时点击确定不便
  .my-dept-select-tree{
    height:350px;

    &.fullscreen{
      height: calc(100vh - 250px);
    }
    overflow-y: scroll;
  }
  .drawer-bootom-button {
    position: absolute;
    bottom: 0;
    width: 100%;
    border-top: 1px solid #e8e8e8;
    padding: 10px 16px;
    text-align: right;
    left: 0;
    background: #fff;
    border-radius: 0 0 2px 2px;
  }
</style>

 src/store/index.js

@@ -11,6 +11,7 @@
import Production from './modules/Production'
//部门树权限
import DepartTree from './modules/DepartTree'
import factory from './modules/factory'

Vue.use(Vuex)

@@ -22,6 +23,7 @@
    enhance,
    online,
    Production,
    factory,
    DepartTree
  },
  state: {

 src/store/modules/factory.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,45 @@
import Vue from 'vue'
import { SET_FACTORY } from "@/store/mutation-types"
import { getAction } from '@/api/manage'

const Factory = {
  state: {
    token: '',
    //产线树
    FactoryTree:[]

  },

  mutations: {
    SET_TOKEN: (state, token) => {
      state.token = token
    },
    SET_FACTORY:(state,FactoryTree) => {
      state.FactoryTree = FactoryTree
    }
  },

  actions: {
    // äº§çº¿æ ‘
      QueryFactory({ commit }) {
      return new Promise((resolve, reject) => {
        getAction("/mdc/mdcEquipment/queryTreeListByFactory").then(response => {
          if(response.success){
            const result = response.result
            Vue.ls.set(SET_FACTORY, result)
            commit('SET_FACTORY', result)
            resolve(response)
          }else{
            resolve(response)
          }
        }).catch(error => {
          reject(error)
        })
      })
    },


  }
}

export default Factory

 src/store/mutation-types.js

@@ -30,4 +30,6 @@
//产线树
export const SYS_PRODUCTION = 'SYS_PRODUCTION'
//部门树权限
export const  SYS_DEPARTTREE = 'SYS_DEPARTTREE'
export const  SYS_DEPARTTREE = 'SYS_DEPARTTREE'

export const SET_FACTORY = 'SET_FACTORY'

 src/views/mdc/base/EquipmentList.vue

@@ -107,7 +107,7 @@
<script>
  import UserModal from './modules/EquipmentList/UserModal'
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  import { queryProductionTreeListByMdc } from '@/api/api'
  import { queryFactoryTreeList } from '@/api/api'
  import { mapActions } from 'vuex'

  export default {
@@ -256,12 +256,12 @@
                  width: 200
                  // sorter: true
                },
                {
                  title: '安装位置',
                  align: 'center',
                  width: 200,
                  dataIndex: 'equipmentAddress'
                },
                // {
                //   title: '安装位置',
                //   align: 'center',
                //   width: 200,
                //   dataIndex: 'equipmentAddress'
                // },
                {
                  title: '车间',
                  align: 'center',
@@ -406,7 +406,7 @@
       * è°ƒç”¨æŽ¥å£èŽ·å–查询区域车间树列表
       */
      getWorkshopListByApi() {
        queryProductionTreeListByMdc().then(res => {
        queryFactoryTreeList().then(res => {
          if (res.success) {
            this.workshopTreeData = res.result
            this.treeDefaultExpandedKeys = [...res.result].map(item => item.key)

 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;

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

@@ -57,12 +57,12 @@
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="车间分配" v-show="!productionDisabled"
                               ref="selectedProduction" prop="selectedProduction">
            <a-form-model-item label="车间分配" v-show="!factoryDisabled"
                               ref="selectedFactory" prop="selectedFactory">
              <!--<j-select-equipment-production  v-decorator="['selectedProduction',{rules:[{required:true,message:'请选择车间!'}]}]" :multi="false" @back="backProductionInfo" :backProduction="true" :treeProductOpera="true"></j-select-equipment-production>-->
              <j-select-equipment-production :disabled="disableSubmit" v-model="model.selectedProduction" :multi="false"
                                             @back="backProductionInfo" :backProduction="true"
                                             :treeProductOpera="true"></j-select-equipment-production>
              <j-select-equipment-factory :disabled="disableSubmit" v-model="model.selectedFactory" :multi="false"
                                             @back="backFactoryInfo" :backFactory="true"
                                             :treeProductOpera="true"></j-select-equipment-factory>
            </a-form-model-item>

          </a-col>
@@ -124,13 +124,13 @@
        </a-row>

        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item label="系统类型">
              <j-dict-select-tag placeholder="请选择系统类型" :triggerChange="true" dictCode="system_type"
                                 :disabled="disableSubmit"
                                 v-model="model.systemType" allow-clear/>
            </a-form-model-item>
          </a-col>
<!--          <a-col :span="12">-->
<!--            <a-form-model-item label="系统类型">-->
<!--              <j-dict-select-tag placeholder="请选择系统类型" :triggerChange="true" dictCode="system_type"-->
<!--                                 :disabled="true"-->
<!--                                 v-model="model.systemType" allow-clear/>-->
<!--            </a-form-model-item>-->
<!--          </a-col>-->
          <a-col :span="12">
            <a-form-model-item label="排序">
              <a-input :disabled="disableSubmit" :readOnly="disableSubmit" placeholder="请输入排序"
@@ -139,22 +139,22 @@
          </a-col>
        </a-row>

        <a-row :gutter="24">
          <a-col :span='12' v-if="systemType">
            <a-form-model-item label="系统类型">
              <a-radio-group name="radioGroup" v-model="systemValue" :disabled="disableSubmit">
                <a-radio value="1">DNC</a-radio>
                <a-radio value="2">MDC</a-radio>
                <a-radio value="3">通用</a-radio>
              </a-radio-group>
            </a-form-model-item>
          </a-col>
          <a-col :span='12'>
            <a-form-model-item label="安装位置">
              <a-input v-model="model.equipmentAddress" allow-clear placeholder="请输入安装位置" :disabled="disableSubmit"/>
            </a-form-model-item>
          </a-col>
        </a-row>
<!--        <a-row :gutter="24">-->
<!--          <a-col :span='12' v-if="systemType">-->
<!--            <a-form-model-item label="系统类型">-->
<!--              <a-radio-group name="radioGroup" v-model="systemValue" :disabled="disableSubmit">-->
<!--                <a-radio value="1">DNC</a-radio>-->
<!--                <a-radio value="2">MDC</a-radio>-->
<!--                <a-radio value="3">通用</a-radio>-->
<!--              </a-radio-group>-->
<!--            </a-form-model-item>-->
<!--          </a-col>-->
<!--          <a-col :span='12'>-->
<!--            <a-form-model-item label="安装位置">-->
<!--              <a-input v-model="model.equipmentAddress" allow-clear placeholder="请输入安装位置" :disabled="disableSubmit"/>-->
<!--            </a-form-model-item>-->
<!--          </a-col>-->
<!--        </a-row>-->


        <a-row :gutter="24">
@@ -198,8 +198,8 @@
  import { addEquipment, editEquipment } from '@/api/api'
  import { disabledAuthFilter } from '@/utils/authFilter'
  import { duplicateCheck } from '@/api/api'
  import JSelectEquipmentProduction from '../../../../../components/jeecgbiz/JSelectEquipmentProduction'
  import JSelectProduction from '../../../../../components/jeecgbiz/JSelectProduction'
  import JSelectEquipmentFactory from '../../../../../components/jeecgbiz/JSelectEquipmentFactory'
  import JSelectFactory from '../../../../../components/jeecgbiz/JSelectFactory'
  import DeviceListModel from './DeviceListModal'
  import JSelectEquipmentDepart from '../../../../../components/jeecgbiz/JSelectEquipmentDepart'
  import { mapActions } from 'vuex'
@@ -207,15 +207,15 @@
  export default {
    name: 'UserModal',
    components: {
      JSelectProduction,
      JSelectFactory,
      JSelectEquipmentDepart,
      JSelectEquipmentProduction,
      JSelectEquipmentFactory,
      DeviceListModel
    },
    data() {
      return {
        departDisabled: false, //是否是我的部门调用该页面
        productionDisabled: false, //是否是我的车间调用该页面
        factoryDisabled: false, //是否是我的车间调用该页面
        roleDisabled: false, //是否是角色维护调用该页面
        modalWidth: 800,
        drawerWidth: 700,
@@ -240,7 +240,7 @@
            ],
          // trigger: 'blur' // è§¦å‘方式

          selectedProduction:
          selectedFactory:
            [
              {
                required: true, message: '请选择车间！'
@@ -289,7 +289,7 @@
          fileUpload: window._CONFIG['domianURL'] + '/sys/common/upload',
          userWithDepart: '/mdc/mdcEquipment/equipmentDepartList', // å¼•å…¥ä¸ºæŒ‡å®šç”¨æˆ·æŸ¥çœ‹éƒ¨é—¨ä¿¡æ¯éœ€è¦çš„url
          //引入为指定用户查看车间信息需要的url
          userProductionList: '/mdc/mdcEquipment/equipmentProductionList',
          equipmentFactoryList: '/mdc/mdcEquipment/equipmentFactoryList',
          userId: '/sys/user/generateUserId', // å¼•å…¥ç”Ÿæˆæ·»åŠ ç”¨æˆ·æƒ…况下的url
          syncUserByUserName: '/act/process/extActProcess/doSyncUserByUserName',//同步用户到工作流
          queryTenantList: '/sys/tenant/queryList',
@@ -309,7 +309,7 @@
      this.headers = { 'X-Access-Token': token }
      this.queryGroup()
      this.queryTreeData()
      this.getAppPlatformName()
      // this.getAppPlatformName()
      // this.initRoleList()
      // this.initTenantList()
    },
@@ -334,13 +334,13 @@
        }).finally(() => {
        })
      },
      getAppPlatformName() {
        getAction(`/system/sysParams/query/by/settingKey?settingKey=system_type`).then(res => {
          if (res.success) {
            this.systemType = res.result.settingValue === '0'
          }
        })
      },
      // getAppPlatformName() {
      //   getAction(`/system/sysParams/query/by/settingKey?settingKey=system_type`).then(res => {
      //     if (res.success) {
      //       this.systemType = res.result.settingValue === '0'
      //     }
      //   })
      // },
      queryGroup() {
        getAction(this.url.queryEquipmentType).then(res => {
          if (res.success) {
@@ -412,7 +412,7 @@
        // this.model = Object.assign({}, record)

        this.$nextTick(() => {
          this.form.setFieldsValue(pick(that.model, 'selectedDeparts', 'selectedProduction', 'equipmentId', 'equipmentName', 'equipmentModel', 'equipmentType', 'equipmentIp', 'dataPort',
          this.form.setFieldsValue(pick(that.model, 'selectedDeparts', 'selectedFactory', 'equipmentId', 'equipmentName', 'equipmentModel', 'equipmentType', 'equipmentIp', 'dataPort',
            'driveType', 'sortNo', 'remark', 'systemVersion', 'devicePower', 'controlSystem', 'saveTableName', 'systemValue', 'equipmentAddress'))
        })
        if (record.hasOwnProperty('id')) {
@@ -467,24 +467,24 @@
          }
        })

        getAction(that.url.userProductionList, { equipmentId: userid }).then((res) => {
        getAction(that.url.equipmentFactoryList, { equipmentId: userid }).then((res) => {
          if (res.success) {
            // console.log(res.result)
            let ProductionOptions = []
            let factoryOptions = []
            let selectProductKeys = []
            // console.log(res.result)
            for (let i = 0; i < res.result.length; i++) {
              selectProductKeys.push(res.result[i].key)
              //新增负责部门选择下拉框
              ProductionOptions.push({
              factoryOptions.push({
                value: res.result[i].key,
                label: res.result[i].title
              })
            }

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

            that.nextProductionOptions = ProductionOptions
            that.nextProductionOptions = factoryOptions
            // console.log('that.nextProductionOptions=',that.nextProductionOptions)
          }
        })
@@ -498,9 +498,9 @@
          return c
        })
      },
      backProductionInfo(info) {
      backFactoryInfo(info) {
        // console.log(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

 src/views/mdc/common/BaseTree.vue

@@ -115,7 +115,7 @@
    }
    ,
    methods: {
      ...mapActions(['QueryProduction']),
      ...mapActions(['QueryFactory']),
      getCurrSelectedTitle() {
        return !this.currSelected.title ? '' : this.currSelected.title
      },
@@ -149,7 +149,7 @@
      queryTreeData() {
        this.loading = true
        this.cardLoading = true
        this.QueryProduction().then(res => {
        this.QueryFactory().then(res => {
          if (res.success) {
            this.dataList = []
            this.allTreeKeys = []

 src/views/system/modules/UserModal.vue

@@ -136,40 +136,55 @@
        </a-form-model-item>

        <!--车间分配-->
<!--        <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>-->
<!--        </a-form-model-item>-->

        <!--中心分配-->
        <a-form-model-item
          label="车间分配"
          label="中心分配"
          :labelCol="labelCol"
          :wrapperCol="wrapperCol"
          v-show="!productionDisabled"
          v-show="!factoryDisabled"
        >
          <j-select-production
            v-model="model.selectedProduction"
          <j-select-factory
            v-model="model.selectedFactorys"
            :multi="true"
            @back="backProductionInfo"
            :backProduction="true"
            :treeProductOpera="true"
          ></j-select-production>
            @back="backFactoryInfo"
            :backFactory="true"
            :treeFactoryOpera="true"
          ></j-select-factory>
        </a-form-model-item>


        <a-form-model-item
          label="选择设备"
          :labelCol="labelCol"
          :wrapperCol="wrapperCol"
          v-show="!productionDisabled"
        >
          <a-tooltip title="选择设备后，用户就只有这些设备的权限！不选择设备，则会根据车间分配控制设备的权限！"
                     placement="topRight">
            <a-input-search
              :readOnly="true"
              v-model="model.equipmentIds"
              @search="deviceSearch"
              enter-button
              placeholder="请选择设备"
              :disabled="!model.selectedProduction"
            />
          </a-tooltip>
        </a-form-model-item>
<!--        <a-form-model-item-->
<!--          label="选择设备"-->
<!--          :labelCol="labelCol"-->
<!--          :wrapperCol="wrapperCol"-->
<!--          v-show="!productionDisabled"-->
<!--        >-->
<!--          <a-tooltip title="选择设备后，用户就只有这些设备的权限！不选择设备，则会根据车间分配控制设备的权限！"-->
<!--                     placement="topRight">-->
<!--            <a-input-search-->
<!--              :readOnly="true"-->
<!--              v-model="model.equipmentIds"-->
<!--              @search="deviceSearch"-->
<!--              enter-button-->
<!--              placeholder="请选择设备"-->
<!--              :disabled="!model.selectedProduction"-->
<!--            />-->
<!--          </a-tooltip>-->
<!--        </a-form-model-item>-->


        <!--<a-form-model-item-->
@@ -356,7 +371,7 @@
import { addUser, editUser, queryUserRole, queryall } from '@/api/api'
import { disabledAuthFilter } from '@/utils/authFilter'
import { duplicateCheck } from '@/api/api'
import JSelectProduction from '../../../components/jeecgbiz/JSelectProduction'
import JSelectFactory from '../../../components/jeecgbiz/JSelectFactory'
import { mapActions } from 'vuex'
import { ajaxGetDictItems, getDictItemsFromCache } from '@/api/api'
import SelectDeviceModal from './SelectDeviceModal'
@@ -365,12 +380,12 @@
  name: 'UserModal',
  components: {
    SelectDeviceModal,
    JSelectProduction
    JSelectFactory
  },
  data() {
    return {
      departDisabled: false, //是否是我的部门调用该页面
      productionDisabled: false, //是否是我的车间调用该页面
      factoryDisabled: false, //是否是我的车间调用该页面
      roleDisabled: false, //是否是角色维护调用该页面
      modalWidth: 800,
      drawerWidth: 700,
@@ -404,7 +419,6 @@
      departIdShow: false,
      title: '操作',
      visible: false,
      model: {},
      labelCol: {
        xs: { span: 24 },
        sm: { span: 5 }
@@ -420,7 +434,7 @@
        fileUpload: window._CONFIG['domianURL'] + 'sys/common/upload',
        userWithDepart: '/sys/user/userDepartList', // å¼•å…¥ä¸ºæŒ‡å®šç”¨æˆ·æŸ¥çœ‹éƒ¨é—¨ä¿¡æ¯éœ€è¦çš„url
        //引入为指定用户查看车间信息需要的url
        userProductionList: '/sys/user/userProductionList',
        userFactoryList: '/sys/user/userFactorysList',
        userId: '/sys/user/generateUserId', // å¼•å…¥ç”Ÿæˆæ·»åŠ ç”¨æˆ·æƒ…况下的url
        syncUserByUserName: '/act/process/extActProcess/doSyncUserByUserName',//同步用户到工作流
        queryTenantList: '/sys/tenant/queryList'
@@ -428,10 +442,10 @@
      tenantsOptions: [],
      rolesOptions: [],
      nextDepartOptions: [],
      nextProductionOptions: [],
      nextFactoryOptions: [],
      isDepartType: '',
      model: {
        selectedProduction: ''
        selectedFactorys: ''
      }
    }
  },
@@ -441,7 +455,7 @@
        if (value) this.initDictData('password_length')
      }
    },
    'model.selectedProduction': {
    'model.selectedFactorys': {
      handler(newVal, oldVal) {
        if (newVal && this.$refs.selectDeviceModal) {
          // å¦‚果车间选择前后不一致则重置选择设备
@@ -489,7 +503,7 @@
        userIdentity: 1,
        selectedroles: '',
        selecteddeparts: '',
        selectedProduction: ''
        selectedFactorys: ''
      })
    },
    edit(record) {
@@ -510,6 +524,7 @@
      if (record.hasOwnProperty('id')) {
        that.getUserRoles(record.id)
        that.getUserDeparts(record.id)
        that.getUserFactorys(record.id)
      }
    },
    isDisabledAuth(code) {
@@ -582,26 +597,27 @@
          that.nextDepartOptions = departOptions
        }
      })

    },
    getUserFactorys(userid) {
      let that = this
      // èŽ·å–车间分配
      getAction(that.url.userProductionList, { userId: userid }).then((res) => {
      getAction(that.url.userFactoryList, { userId: userid }).then((res) => {
        if (res.success) {
          let ProductionOptions = []
          let selectProductKeys = []
          let factoryOptions = []
          let selectFactoryKeys = []
          for (let i = 0; i < res.result.length; i++) {
            selectProductKeys.push(res.result[i].key)
            selectFactoryKeys.push(res.result[i].key)
            //新增负责部门选择下拉框
            ProductionOptions.push({
            factoryOptions.push({
              value: res.result[i].key,
              label: res.result[i].title
            })
          }

          this.$set(this.model, 'selectedProduction', selectProductKeys.join(','))
          that.nextProductionOptions = ProductionOptions
          this.$set(this.model, 'selectedFactorys', selectFactoryKeys.join(','))
          that.nextFactoryOptions = factoryOptions
        }
      })
      //车间的url
    },
    backDepartInfo(info) {
      this.model.departIds = this.model.selecteddeparts
@@ -610,9 +626,9 @@
        return c
      })
    },
    backProductionInfo(info) {
      this.model.productionIds = this.model.selectedProduction
      this.nextProductionOptions = info.map((item, index, arr) => {
    backFactoryInfo(info) {
      this.model.productionIds = this.model.selectedFactorys
      this.nextFactoryOptions = info.map((item, index, arr) => {
        let c = { label: item.text, value: item.value + '' }
        return c
      })
@@ -621,7 +637,7 @@
    refresh() {
      this.userId = ''
      this.nextDepartOptions = []
      this.nextProductionOptions = []
      this.nextFactoryOptions = []
      this.departIdShow = false
    },
    close() {
@@ -629,7 +645,7 @@
      this.visible = false
      this.disableSubmit = false
      this.nextDepartOptions = []
      this.nextProductionOptions = []
      this.nextFactoryOptions = []
      this.departIdShow = false
      this.$refs.form.resetFields()
    },