产品结构树： 1、实现文档批量删除功能 2、实现文档列表的排序以及筛选功能 设备结构树： 1、新增权限配置弹窗，提交后由后端测试

zhaowei

2025-02-14 08e52db54ce1e7563f1efe402a3f6c3931188013

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

@@ -23,14 +23,13 @@
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item label="统一编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentId">
              <a-input-search :readOnly="true"
                              v-model="model.equipmentId"
                              :disabled="disSearch"   @search="deviceSearch" enter-button placeholder='请选择统一编码' />
              <a-input-search v-model="model.equipmentId" :disabled="disableSubmit" @search="deviceSearch" enter-button
                              placeholder='请选择统一编码'/>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="设备名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input :disabled="disSearch" :readOnly="disableSubmit" allow-clear placeholder="请输入设备名称"
              <a-input :disabled="disableSubmit" allow-clear placeholder="请输入设备名称"
                       v-model="model.equipmentName"/>
            </a-form-model-item>
          </a-col>
@@ -38,12 +37,15 @@

        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item  v-if="isDepartType == 0" label="部门分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
              <j-select-equipment-depart :disabled="disableSubmit" v-model="model.selectedDeparts" :multi="false" @back="backDepartInfo" :backDepart="true" :treeOpera="true"></j-select-equipment-depart>
            <a-form-model-item v-if="isDepartType == 0" label="部门分配" :labelCol="labelCol" :wrapperCol="wrapperCol"
                               v-show="!departDisabled">
              <j-select-equipment-depart :disabled="disableSubmit" v-model="model.selectedDeparts" :multi="false"
                                         @back="backDepartInfo" :backDepart="true"
                                         :treeOpera="true"></j-select-equipment-depart>
            </a-form-model-item>

            <a-form-model-item v-if="isDepartType == -1" label="设备类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-select :disabled="disableSubmit" :readOnly="disableSubmit" placeholder="请选择设备类型"
              <a-select :disabled="disableSubmit" placeholder="请选择设备类型"
                        :triggerChange="true"
                        v-model="model.equipmentType">
                <a-select-option v-for='item in selectList' :key='item.id' :value='item.equipmentTypeName'>
@@ -53,9 +55,12 @@
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="车间分配" :labelCol="labelCol" :wrapperCol="wrapperCol"  v-show="!productionDisabled" ref="selectedProduction"  prop="selectedProduction">
            <a-form-model-item label="车间分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!productionDisabled"
                               ref="selectedProduction" prop="selectedProduction">
              <!--<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-production :disabled="disableSubmit" v-model="model.selectedProduction" :multi="false"
                                             @back="backProductionInfo" :backProduction="true"
                                             :treeProductOpera="true"></j-select-equipment-production>
            </a-form-model-item>

          </a-col>
@@ -63,11 +68,11 @@
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item v-if="isDepartType == -1" label="系统版本号" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input :disabled="disableSubmit" :readOnly="disableSubmit" allow-clear placeholder="请输入系统版本号"
              <a-input :disabled="disableSubmit" allow-clear placeholder="请输入系统版本号"
                       v-model="model.systemVersion"/>
            </a-form-model-item>
            <a-form-model-item v-if="isDepartType == 0" label="设备类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
            <a-select :disabled="disableSubmit" :readOnly="disableSubmit" placeholder="请选择设备类型"
              <a-select :disabled="disableSubmit" placeholder="请选择设备类型"
              :triggerChange="true"
                      v-model="model.equipmentType">
              <a-select-option v-for='item in selectList' :key='item.id' :value='item.equipmentTypeName'>
@@ -79,7 +84,7 @@
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="设备功率(kw)" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input :disabled="disableSubmit" :readOnly="disableSubmit" allow-clear placeholder="请输入设备功率"
              <a-input :disabled="disableSubmit" allow-clear placeholder="请输入设备功率"
                       v-model="model.devicePower"/>
            </a-form-model-item>
          </a-col>
@@ -88,13 +93,13 @@
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item label="机床IP" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input :disabled="true" :readOnly="disableSubmit" placeholder="请输入机床IP"
              <a-input :disabled="true"  placeholder="请输入机床IP"
                       v-model="model.equipmentIp"/>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="机床端口" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input :disabled="true" :readOnly="disableSubmit" placeholder="请输入机床端口"
              <a-input :disabled="true" placeholder="请输入机床端口"
                       v-model="model.dataPort"/>
            </a-form-model-item>
          </a-col>
@@ -103,14 +108,14 @@
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item label="驱动类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <j-dict-select-tag :disabled="true" :readOnly="disableSubmit" placeholder="请选择驱动类型"
              <j-dict-select-tag :disabled="true" placeholder="请选择驱动类型"
                                 :triggerChange="true" dictCode="mdc_driveType"
                                 v-model="model.driveType" allow-clear/>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="设备型号" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input :disabled="true" :readOnly="disableSubmit" allow-clear placeholder="请输入设备型号"
              <a-input :disabled="true"  allow-clear placeholder="请输入设备型号"
                       v-model="model.equipmentModel"/>
            </a-form-model-item>
          </a-col>
@@ -119,12 +124,13 @@
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item label="系统类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <j-dict-select-tag  placeholder="请选择系统类型" :triggerChange="true" dictCode="system_type" v-model="model.systemType" allow-clear/>
              <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="设备级别" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <j-dict-select-tag placeholder="请选择设备级别" dictCode="device_level" v-model="model.deviceLevel" allow-clear/>
              <j-dict-select-tag placeholder="请选择设备级别" dictCode="device_level" v-model="model.deviceLevel" :disabled="disableSubmit" allow-clear/>
            </a-form-model-item>
          </a-col>
        </a-row>
@@ -132,7 +138,8 @@
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item label="设备种类" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <j-dict-select-tag placeholder="请选择设备种类" dictCode="device_category" v-model="model.deviceCategory" allow-clear/>
              <j-dict-select-tag placeholder="请选择设备种类" dictCode="device_category" v-model="model.deviceCategory" :disabled="disableSubmit"
                                 allow-clear/>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
@@ -145,8 +152,8 @@

        <a-row :gutter="24" v-if="systemType">
            <a-col :span='24'>
              <a-form-model-item label="系统类型" :labelCol="{span:3}" :wrapperCol="{span:21}">
                <a-radio-group name="radioGroup" v-model="systemValue">
            <a-form-model-item label="系统类型" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
              <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>
@@ -167,7 +174,7 @@

        <a-row :gutter="24">
          <a-col :span="24">
            <a-form-model-item :labelCol="{span:3}" :wrapperCol="{span:21}" label="备注">
            <a-form-model-item :labelCol="labelColLong" :wrapperCol="wrapperColLong" label="备注">
              <a-textarea :disabled="disableSubmit" :readOnly="disableSubmit" placeholder="请输入备注"
                          v-model="model.remark"/>
            </a-form-model-item>
@@ -192,18 +199,19 @@
  import pick from 'lodash.pick'
  import moment from 'moment'
  import Vue from 'vue'
  import { ACCESS_TOKEN } from "@/store/mutation-types"
  import { ACCESS_TOKEN } from '@/store/mutation-types'
  import { getAction } from '@/api/manage'
  import { addEquipment,editEquipment} from '@/api/api'
  import { disabledAuthFilter } from "@/utils/authFilter"
  import { disabledAuthFilter } from '@/utils/authFilter'
  import { duplicateCheck } from '@/api/api'
  import JSelectEquipmentProduction from '../../../../../components/jeecgbiz/JSelectEquipmentProduction'
  import JSelectProduction from '../../../../../components/jeecgbiz/JSelectProduction'
  import DeviceListModel from './DeviceListModal'
  import JSelectEquipmentDepart from '../../../../../components/jeecgbiz/JSelectEquipmentDepart'
  import {mapActions} from 'vuex'

  export default {
    name: "UserModal",
    name: 'UserModal',
    components: {
      JSelectProduction,
      JSelectEquipmentDepart,
@@ -212,7 +220,6 @@
    },
    data () {
      return {
        disSearch:false,
        departDisabled: false, //是否是我的部门调用该页面
        productionDisabled: false, //是否是我的车间调用该页面
        roleDisabled: false, //是否是角色维护调用该页面
@@ -220,10 +227,10 @@
        drawerWidth:700,
        modalToggleFlag:true,
        confirmDirty: false,
        userId:"", //保存用户id
        userId: '', //保存用户id
        // disableSubmit:false,
        disableSubmit: true,
        dateFormat:"YYYY-MM-DD",
        dateFormat: 'YYYY-MM-DD',
        form: this.$form.createForm(this),

        validatorRules:{
@@ -232,7 +239,7 @@
            [
              {
              required: true, message: '请选择设备编号!'
              },
              }
              // {
              // validator: this.validatequipmentId
              // }
@@ -248,41 +255,49 @@

        },
        departIdShow:false,
        title:"操作",
        title: '操作',
        visible: false,
        model: {
          equipmentId: "",
          equipmentName: "",
          equipmentModel: "",
          equipmentIp: "",
          dataPort: "",
          driveType: "",
          systemType: "",
          deviceLevel: "",
          deviceCategory: "",
          deviceTypeDnc:"",
          deviceTypeMdc:"",
          equipmentId: '',
          equipmentName: '',
          equipmentModel: '',
          equipmentIp: '',
          dataPort: '',
          driveType: '',
          systemType: '',
          deviceLevel: '',
          deviceCategory: '',
          deviceTypeDnc: '',
          deviceTypeMdc: ''
        },
        labelCol: {
          xs: { span: 24 },
          sm: { span: 8 },
          sm: { span: 8 }
        },
        wrapperCol: {
          xs: { span: 24 },
          sm: { span: 15 },
          sm: { span: 14 }
        },
        labelColLong: {
          xs: { span: 24 },
          sm: { span: 4 }
        },
        wrapperColLong: {
          xs: { span: 24 },
          sm: { span: 19 }
        },
        uploadLoading:false,
        confirmLoading: false,
        headers:{},
        systemType:false,
        systemValue:"3",
        systemValue: '3',
        url: {
          fileUpload: window._CONFIG['domianURL']+"/sys/common/upload",
          userWithDepart: "/mdc/mdcEquipment/equipmentDepartList", // 引入为指定用户查看部门信息需要的url
          fileUpload: window._CONFIG['domianURL'] + '/sys/common/upload',
          userWithDepart: '/mdc/mdcEquipment/equipmentDepartList', // 引入为指定用户查看部门信息需要的url
          //引入为指定用户查看车间信息需要的url
          userProductionList: '/mdc/mdcEquipment/equipmentProductionList',
          userId:"/sys/user/generateUserId", // 引入生成添加用户情况下的url
          syncUserByUserName:"/act/process/extActProcess/doSyncUserByUserName",//同步用户到工作流
          userId: '/sys/user/generateUserId', // 引入生成添加用户情况下的url
          syncUserByUserName: '/act/process/extActProcess/doSyncUserByUserName',//同步用户到工作流
          queryTenantList: '/sys/tenant/queryList',
          check:'/sys/duplicate/check',
          queryEquipmentType:'/mdc/mdcEquipmentType/queryEquipmentType'
@@ -296,17 +311,17 @@
      }
    },
    created () {
      const token = Vue.ls.get(ACCESS_TOKEN);
      this.headers = {"X-Access-Token":token}
      const token = Vue.ls.get(ACCESS_TOKEN)
      this.headers = { 'X-Access-Token': token }
      this.queryGroup()
      this.queryTreeData()
      this.getAppPlatformName();
      this.getAppPlatformName()
      // this.initRoleList()
      // this.initTenantList()
    },
    computed:{
      uploadAction:function () {
        return this.url.fileUpload;
        return this.url.fileUpload
      }
    },
    methods: {
@@ -320,7 +335,7 @@
            this.$notification.warning({
              message:'消息',
              description:res.message
            });
            })
          }
        }).finally(() =>{
        })
@@ -328,7 +343,7 @@
      getAppPlatformName(){
        getAction(`/system/sysParams/query/by/settingKey?settingKey=system_type`).then(res=>{
          if(res.success){
            this.systemType = res.result.settingValue === '0';
            this.systemType = res.result.settingValue === '0'
          }
        })
      },
@@ -344,7 +359,7 @@
            this.$notification.warning({
              message:'消息',
              description:res.message
            });
            })
          }
        }).finally(() => {
          this.loading = false
@@ -370,23 +385,34 @@
        this.$refs.deviceListModel.disableSubmit = false
      },
      add () {
        this.refresh();
        this.edit({activitiSync:'1',userIdentity:1,equipmentId:"",equipmentName:"",equipmentModel:"",equipmentIp:'',dataPort:"",driveType:"",controlSystem:"",saveTableName:""});
        this.refresh()
        this.edit({
          activitiSync: '1',
          userIdentity: 1,
          equipmentId: '',
          equipmentName: '',
          equipmentModel: '',
          equipmentIp: '',
          dataPort: '',
          driveType: '',
          controlSystem: '',
          saveTableName: ''
        })
      },
      edit (record) {
        let that = this;
        that.visible = true;
        let that = this
        that.visible = true
        //根据屏幕宽度自适应抽屉宽度
        this.resetScreenSize();
        this.resetScreenSize()

        // that.userId = record.id;
        // console.log(record)
        if (record.systemValue!=null){
          this.systemValue=record.systemValue;
          this.systemValue = record.systemValue
        }else {
          this.systemValue="3"
          this.systemValue = '3'
        }
        that.model = Object.assign({}, record);
        that.model = Object.assign({}, record)
        // that.model = Object.assign({},{selectedroles:'',selectedProduction:''}, record);
        // this.model = Object.assign({}, record)

@@ -394,43 +420,43 @@
          this.form.setFieldsValue(pick(that.model, 'selectedDeparts', 'selectedProduction', 'equipmentId', 'equipmentName', 'equipmentModel', 'equipmentType', 'equipmentIp', 'dataPort',
            'driveType', 'sortNo', 'remark','systemVersion','devicePower','controlSystem','saveTableName','systemValue'))
        })
        if(record.hasOwnProperty("id")){
        if (record.hasOwnProperty('id')) {
          // that.getUserRoles(record.id);
          that.getUserDeparts(record.id);
          that.getUserDeparts(record.id)
        }
        // console.log('that.model=',that.model)
      },
      isDisabledAuth(code){
        return disabledAuthFilter(code);
        return disabledAuthFilter(code)
      },
      //窗口最大化切换
      toggleScreen(){
        if(this.modalToggleFlag){
          this.modalWidth = window.innerWidth;
          this.modalWidth = window.innerWidth
        }else{
          this.modalWidth = 800;
          this.modalWidth = 800
        }
        this.modalToggleFlag = !this.modalToggleFlag;
        this.modalToggleFlag = !this.modalToggleFlag
      },
      // 根据屏幕变化,设置抽屉尺寸
      resetScreenSize(){
        let screenWidth = document.body.clientWidth;
        let screenWidth = document.body.clientWidth
        if(screenWidth < 500){
          this.drawerWidth = screenWidth;
          this.drawerWidth = screenWidth
        }else{
          this.drawerWidth = 700;
          this.drawerWidth = 700
        }
      },
      getUserDeparts(userid){
        let that = this;
        let that = this
        //部门的url
        getAction(that.url.userWithDepart,{equipmentId:userid}).then((res)=>{
          if(res.success){
            // console.log(res.result)
            let departOptions=[];
            let departOptions = []
            let selectDepartKeys=[]
            for (let i = 0; i < res.result.length; i++) {
              selectDepartKeys.push(res.result[i].key);
              selectDepartKeys.push(res.result[i].key)
              //新增负责部门选择下拉框
              departOptions.push({
                value: res.result[i].key,
@@ -438,10 +464,10 @@
              })
            }

            that.model.selectedDeparts = selectDepartKeys.join(",")
            that.model.selectedDeparts = selectDepartKeys.join(',')
            // that.model.selectedProduction = selectDepartKeys.join(",")

            that.nextDepartOptions=departOptions;
            that.nextDepartOptions = departOptions
            // console.log('that.nextDepartOptions=',that.nextDepartOptions)
          }
        })
@@ -449,11 +475,11 @@
        getAction(that.url.userProductionList,{equipmentId:userid}).then((res)=>{
          if(res.success){
            // console.log(res.result)
            let ProductionOptions=[];
            let ProductionOptions = []
            let selectProductKeys=[]
            // console.log(res.result)
            for (let i = 0; i < res.result.length; i++) {
              selectProductKeys.push(res.result[i].key);
              selectProductKeys.push(res.result[i].key)
              //新增负责部门选择下拉框
              ProductionOptions.push({
                value: res.result[i].key,
@@ -461,9 +487,9 @@
              })
            }

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

            that.nextProductionOptions=ProductionOptions;
            that.nextProductionOptions = ProductionOptions
            // console.log('that.nextProductionOptions=',that.nextProductionOptions)
          }
        })
@@ -471,90 +497,90 @@
      },
      backDepartInfo(info) {
        // console.log(info)
        this.model.departIds = this.model.selectedDeparts;
        this.model.departIds = this.model.selectedDeparts
        this.nextDepartOptions = info.map((item,index,arr)=>{
          let c = {label:item.text, value: item.value+""}
          return c;
          let c = { label: item.text, value: item.value + '' }
          return c
        })
      },
      backProductionInfo(info) {
        // console.log(info)
        this.model.productionIds = this.model.selectedProduction;
        this.model.productionIds = this.model.selectedProduction
        this.nextProductionOptions = info.map((item,index,arr)=>{
          let c = {label:item.text, value: item.value+""}
          return c;
          let c = { label: item.text, value: item.value + '' }
          return c
        })
      },

      refresh () {
        this.userId=""
        this.nextDepartOptions=[];
        this.nextProductionOptions = [];
        this.departIdShow=false;
        this.userId = ''
        this.nextDepartOptions = []
        this.nextProductionOptions = []
        this.departIdShow = false
      },
      close () {
        this.$emit('close');
        this.visible = false;
        this.disableSubmit = false;
        this.nextDepartOptions=[];
        this.$emit('close')
        this.visible = false
        this.disableSubmit = false
        this.nextDepartOptions = []
        this.nextProductionOptions = []
        this.departIdShow=false;
        this.departIdShow = false
        // this.$refs.form.resetFields();
      },
      moment,
      handleSubmit () {
        const that = this;
        const that = this
        // 触发表单验证
        this.$refs.form.validate(valid => {
          if (valid) {
            that.confirmLoading = true;
            that.confirmLoading = true
            //如果是上级择传入departIds,否则为空
            // if(this.model.userIdentity!==2){
            //   this.model.departIds="";
            // }
            let obj;
            let obj
            if(!this.model.id){
              this.model.id = this.userId;
              this.model.systemValue=this.systemValue;
              obj=addEquipment(this.model);
              this.model.id = this.userId
              this.model.systemValue = this.systemValue
              obj = addEquipment(this.model)
            }else{
              this.model.systemValue=this.systemValue;
              this.model.systemValue = this.systemValue
              obj=editEquipment(this.model,{
                        id: this.model.id
                      });
              })
            }
            obj.then((res)=>{
              if(res.success){
                that.$notification.success({
                  message:'消息',
                  description:res.message
                });
                that.$emit('ok');
                })
                that.$emit('ok')
              }else{
                that.$notification.warning({
                  message:'消息',
                  description:res.message
                });
                })
              }
            }).finally(() => {
              that.confirmLoading = false;
              that.close();
              that.confirmLoading = false
              that.close()
            })
          }else{
            return false;
            return false
          }
        })
      },

      handleConfirmBlur(e) {
        const value = e.target.value;
        const value = e.target.value
        this.confirmDirty = this.confirmDirty || !!value
      },
      identityChange(e){
        if(e.target.value===1){
          this.departIdShow=false;
          this.departIdShow = false
        }else{
          this.departIdShow=true;
          this.departIdShow = true
        }
      },
      /**
@@ -563,7 +589,7 @@
      removeValidate(){
        this.$refs.form.clearValidate()
      }
    },
    }

  }
</script>
@@ -573,6 +599,7 @@
    width:104px;
    height:104px;
  }

  .ant-upload-select-picture-card i {
    font-size: 49px;
    color: #999;