1.做适应平板显示的内容大小

loulijun2021

2022-08-05 d33eacc1f85ac3a736b33ba4713a19aae466d711

 src/views/jcsz/jsqd.vue

@@ -17,7 +17,14 @@
              <el-input v-model="form.RoleName" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="角色类型" style=" display: flex;">
              <el-select v-model="form.RoleTypeCode" :popper-append-to-body="false" filterable style="width: 200px" placeholder="请选择">
              <el-select
                v-model="form.RoleTypeCode"
                :popper-append-to-body="false"
                filterable
                style="width: 200px"
                placeholder="请选择"
              >
                <!--                @focus="getRoleTypeSearch2"-->
                <el-option
                  v-for="item in RoleTypeCodeArr2"
                  :key="item.roletype_code"
@@ -48,8 +55,8 @@
          :data="tableData"
          border
          stripe
          :height="tableHeight"
          :style="{width: 100+'%',height:tableHeight+'px'}"
          :height="tableHeight+'px'"
          :style="{width: 100+'%',height: tableHeight+'px'}"
          highlight-current-row
          :header-cell-style="this.$headerCellStyle"
          :cell-style="this.$cellStyle"
@@ -64,65 +71,74 @@
            prop="RowNum"
            width="50"
            label="序号"
            fixed
          />
          <el-table-column
            prop="role_code"
            label="角色编码"
            sortable="custom"
            min-width="110"
          />
          <el-table-column
            prop="role_name"
            label="角色名称"
            sortable="custom"
            min-width="110"
          />
          <el-table-column
            prop="roletype_name"
            label="角色类型"
            sortable="custom"
            min-width="110"
          />
          <el-table-column
            prop="description"
            min-width="160"
            label="角色描述"
            show-overflow-tooltip
            sortable="custom"
          />
          <el-table-column
            prop="lm_user"
            label="创建人员"
            sortable="custom"
            width="110"
          />
          <el-table-column
            prop="lm_date"
            label="创建时间"
            min-width="160"
            sortable="custom"
            show-overflow-tooltip
          />
          <el-table-column
            prop="lm_date"
            prop="is_user"
            label="关联用户"
            width="120"
            sortable="custom"
          >
            <template slot-scope="{row}">
              <i class="el-icon-user-solid" @click="userClick(row)" />
              <i v-if="row.is_user==='Y'" class="el-icon-user-solid" @click="userClick(row)" />
              <i v-if="row.is_user==='N'" class="el-icon-user-solid" style="color: rgb(180 ,181, 185)" @click="userClick(row)" />
            </template>
          </el-table-column>
          <el-table-column
            prop="lm_date"
            prop="is_right"
            label="分配权限"
            sortable="custom"
            width="120"
          >
            <template slot-scope="{row}">
              <i class="el-icon-share" @click="rightClick(row)" />
              <i v-if="row.is_right==='Y'" class="el-icon-share" @click="rightClick(row)" />
              <i v-if="row.is_right==='N'" class="el-icon-share" style="color: rgb(180 ,181, 185)" @click="rightClick(row)" />
            </template>
          </el-table-column>
          <el-table-column
            label="操作"
            fixed="right"
            width="120"
          >
            <template slot-scope="{row}">
              <div class="operationClass">
                <el-button type="text" @click="edit('edit',row)">修改</el-button>
                <el-button type="text" @click="edit('edit',row)">编辑</el-button>
                <el-button type="text" @click="del(row)">删除</el-button>
              </div>
            </template>
@@ -144,26 +160,27 @@

    <!--    新增修改对话框-->
    <el-dialog
      :title="operation==='add'?'新增':'修改'"
      :title="operation==='add'?'新增':'编辑'"
      :visible.sync="dialogVisible"
      width="50%"
      width="800px"
      top="15vh"
      :close-on-click-modal="false"
      @closed="handleClose"
      @close="handleClose"
    >
      <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
        <el-form-item label="角色编码" prop="RoleCode">
          <el-input v-model="dialogForm.RoleCode" :disabled="operation!=='add'" style="width: 220px" />
          <el-input v-model="dialogForm.RoleCode" :disabled="operation!=='add'" style="width: 200px" />
        </el-form-item>
        <el-form-item label="角色名称" prop="RoleName">
          <el-input v-model="dialogForm.RoleName" style="width: 220px" />
          <el-input v-model="dialogForm.RoleName" style="width: 200px" />
        </el-form-item>
        <el-form-item prop="RoleTypeCode" label="角色类型">
          <el-select
            v-model="dialogForm.RoleTypeCode"
            filterable
            :popper-append-to-body="false"
            style="width: 220px"
            style="width: 200px"
            placeholder="请选择"
          >
            <el-option
@@ -175,7 +192,7 @@
          </el-select>
        </el-form-item>
        <el-form-item label="角色描述" prop="description">
          <el-input v-model="dialogForm.description" type="textarea" style="width: 220px" />
          <el-input v-model="dialogForm.description" type="textarea" style="width: 200px" />
        </el-form-item>
      </el-form>
      <span slot="footer" class="dialog-footer">
@@ -187,10 +204,11 @@
    </el-dialog>
    <!--    设置按钮对话框-->
    <el-dialog
      title="角色类型"
      title="设置"
      :visible.sync="settingDialogVisible"
      width="50%"
      width="800px"
      top="15vh"
      :close-on-click-modal="false"
      class="settingDialogVisible"
      @close="handleCloseSetting"
    >
@@ -201,12 +219,14 @@
      <el-table
        :data="RoleTypeCodeArr"
        border
        height="300"
        highlight-current-row
        :style="{width: 100+'%',height:tableHeight-300+'px'}"
        :header-cell-style="this.$headerCellStyle"
        :cell-style="this.$cellStyle"
        @sort-change="sortChangeOfSetting"
      >
        <!--        :style="{width: 100+'%',height:tableHeight-300+'px'}"-->

        <!--        <el-table-column-->
        <!--          type="selection"-->
        <!--          width="50"-->
@@ -237,7 +257,6 @@
          </template>
        </el-table-column>
        <el-table-column label="操作">

          <template slot-scope="{row}">
            <div class="operationClass">
              <el-button v-if="row.isVisible===0" type="text" @click="delSetting(row)">删除</el-button>
@@ -245,12 +264,6 @@
              <el-button v-if="row.isVisible===1" type="text" @click="formSettingCancel(row)">取消</el-button>
            </div>
          </template>
          <!--          <template v-for="item in RoleTypeCodeArr" slot-scope="{row}">-->
          <!--            <div :key="item.roletype_code" class="operationClass">-->
          <!--              <el-button v-if="item.isVisible" type="text" @click="formSettingSave(row)">保存</el-button>-->
          <!--              <el-button v-if="item.isVisible" type="text" @click="formSettingCancel(row)">取消</el-button>-->
          <!--            </div>-->
          <!--          </template>-->
        </el-table-column>
      </el-table>
      <!--分页-->
@@ -275,8 +288,10 @@
    <el-dialog
      title="角色关联用户"
      :visible.sync="userDialogVisible"
      width="80%"
      width="900px"
      :close-on-click-modal="false"
      top="15vh"
      :fullscreen="isIpad"
      class="userDialogVisible"
      @closed="handleCloseUser"
      @close="handleCloseUser"
@@ -291,33 +306,39 @@
      <div style="display: flex;min-height: 50px">
        <el-form ref="dialogFormUser" inline :model="dialogFormUser" label-width="80px">
          <el-form-item label="用户编码">
            <el-input v-model="dialogFormUser.usercode" class="userDialogVisibleInput" style="width: 220px" />
            <el-input
              v-model="dialogFormUser.usercode"
              :style="{width:isIpad? '180px':'200px'}"
            />
          </el-form-item>
          <el-form-item label="用户名称">
            <el-input v-model="dialogFormUser.username" class="userDialogVisibleInput" style="width: 220px" />
            <el-input
              v-model="dialogFormUser.username"
              :style="{width:isIpad? '180px':'200px'}"
            />
          </el-form-item>
          <el-form-item label="所属组织">
            <el-cascader
              ref="dialogCascaderUser"
              key="cascaderKey"
              filterable
              popper-class="elCascader"
              :append-to-body="false"
              :options="StuOrgArr"
              :props="defaultProps"
              class="userDialogVisibleInput"
              style="width: 220px;"
              :style="{width:isIpad? '180px':'200px'}"

              @change="dialogCascaderChange"
            />

            <!--            @focus="getUserOrganization"-->
          </el-form-item>
          <el-form-item label="关联角色">
            <el-select
              v-model="dialogFormUser.isrole"
              filterable
              :popper-append-to-body="false"
              style="width: 220px"
              :style="{width:isIpad? '180px':'200px'}"
              placeholder="请选择"
              class="userDialogVisibleInput"
            >
              <el-option
                v-for="item in roleArr"
@@ -348,7 +369,7 @@
        :data="dialogFormUserTable"
        border
        highlight-current-row
        :style="{width: 100+'%',height:tableHeight-300+'px'}"
        height="370"
        :header-cell-style="this.$headerCellStyle"
        :cell-style="this.$cellStyle"
        :row-key="getRowKey"
@@ -417,8 +438,10 @@
    <el-dialog
      title="角色关联权限"
      :visible.sync="dialogVisibleRight"
      width="50%"
      width="800px"
      top="15vh"
      :fullscreen="isIpad"
      :close-on-click-modal="false"
      class="dialogVisibleRight"
      @closed="handleCloseRight"
      @close="handleCloseRight"
@@ -488,11 +511,16 @@
        </div>
      </span>
    </el-dialog>

    <!--导入组件-->
    <import-picker ref="importPickerFunc" :shows.sync="shows" :title="title_value" :colos="colos" :code="code" />

  </div>
</template>

<script>
import Pagination from '@/components/Pagination'
import ImportPicker from '@/components/ImportPicker'
import {
  AddUpdateRole,
  DeleteRole, RoleAssociationRight,
@@ -502,12 +530,13 @@
} from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
import $ from 'jquery'
import clearAllChildren from '@/utils/global'

const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
  name: 'Zzjg',
  name: 'JSQD',
  components: {
    Pagination
    Pagination, ImportPicker
  },
  data() {
    const validateName = (rule, value, callback) => {
@@ -521,14 +550,8 @@
        }
      }
    }
    // const validateTypeCode = (rule, value, callback) => {
    //   if (!value) {
    //     return callback(new Error('请选择上级'))
    //   } else {
    //     callback()
    //   }
    // }
    return {
      isIpad: false,
      mainHeight: 0,
      tableHeight: 0,
      form: {
@@ -622,24 +645,44 @@
        children: 'children',
        label: 'name',
        value: 'code'
      },
      PCTrue: false, // 是否展示
      APPTrue: false, // 是否展示

      title_value: '数据导入 / 角色清单',
      code: '1',
      shows: false
    }
  },
  watch: {
    shows() {
      if (!this.shows) {
        this.getRoleSearch()
      }
    }
  },
  created() {
    this.getRoleSearch()
    this.getRoleTypeSearch2()
    this.getUserOrganization()
    this.handleRequest()
  },
  mounted() {
    window.addEventListener('resize', this.getHeight)
    this.getHeight()
  },
  methods: {
    handleRequest() {
      this.getRoleSearch().then(res => {
        if (res.code === '200') {
          this.getRoleTypeSearch2()
          this.getUserOrganization()
        }
      })
    },
    // 获取角色清单
    async getRoleSearch() {
      const res = await RoleSearch(this.form)
      this.tableData = res.data
      this.total = res.count
      return { code: res.code }
    },
    // 获取用户类型
    async getRoleTypeSearch() {
@@ -661,7 +704,7 @@
    // 获取所属组织
    async getUserOrganization() {
      const { data: res } = await UserOrganization()
      this.StuOrgArr = res
      this.StuOrgArr = clearAllChildren(res)
    },
    // 排序改变时
    sortChange({ column, prop, order }) {
@@ -687,10 +730,6 @@
      this.formSetting.order = order
      this.formSetting.prop = prop
      this.getRoleTypeSearch()
    },

    upload() {

    },
    // 查询
    search() {
@@ -782,7 +821,12 @@
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 250
        this.tableHeight = this.mainHeight - 100
        this.tableHeight = this.mainHeight - 50
        if (window.innerHeight < 769) {
          this.tableHeight = this.tableHeight - 50
        }

        this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
      })
    },
    /* 设置模块*/
@@ -804,7 +848,9 @@
    },
    // 添加按钮
    addSetting() {
      const data = { roletype_code: '', roletype_name: '', isVisible: 1 }
      let number = Math.random() * Math.random()// 作为删除时的标识符
      number = number === 0 ? (10 + Math.random()) : number
      const data = { roletype_code: '', roletype_name: '', isVisible: 1, number: number }
      this.RoleTypeCodeArr.unshift(data)
    },
    // 删除按钮
@@ -838,14 +884,14 @@
      }
      const res = await RoleTypeAdd([data])
      if (res.code === '200') {
        this.$message.success('添加成功！')
        this.$message.success('保存成功！')
        await this.getRoleTypeSearch()
      }
    },
    // 设置表单取消事件
    formSettingCancel(row) {
      this.RoleTypeCodeArr.forEach((item, index) => {
        if (item.isVisible === 1 && item.roletype_code === row.roletype_code) {
        if (item.isVisible === 1 && item.number === row.number) {
          this.RoleTypeCodeArr.splice(index, 1)
        }
      })
@@ -927,6 +973,7 @@
      const res = await SaveRoleAssoctUser(userMultipleArr, this.dialogFormUser.rolecode)
      if (res.code === '200') {
        this.$message.success('保存成功！')
        await this.getRoleSearch()
        this.userDialogVisible = false
      }
    },
@@ -941,6 +988,7 @@
      this.dialogFormUser.orgcode = ''
      this.dialogFormUser.isrole = ''
      this.$refs.dialogCascaderUser.checkedValue = ''
      this.getRoleAssociationUser()
    },

    /* 角色关联权限对话框部分*/
@@ -955,97 +1003,206 @@
        type: ''
      }
      const { data: res } = await RoleAssociationRight(data)// 接口获取数据
      this.dialogFormRight.rightPCArr = res[0]
      this.dialogFormRight.rightAPPArr = res[1]

      this.dialogFormRight.rightPCArr = res[0][0].is_delete === '0' ? res[0] : []
      this.dialogFormRight.rightAPPArr = res[1][0].is_delete === '0' ? res[1] : []

      this.PCTrue = res[0][0].is_delete === '0'
      this.APPTrue = res[1][0].is_delete === '0'
      // '0'显示  '1' 不显示   过滤出相对应的菜单
      if (this.PCTrue) {
        this.dialogFormRight.rightPCArr[0].children = this.dialogFormRight.rightPCArr[0].children.filter(item => item.is_delete === '0')
        this.dialogFormRight.rightPCArr[0].children.forEach(item => {
          item.children = item.children.filter(it => it.is_delete === '0')
        })
      }

      if (this.APPTrue) {
        this.dialogFormRight.rightAPPArr[0].children = this.dialogFormRight.rightAPPArr[0].children.filter(item => item.is_delete === '0')
        this.dialogFormRight.rightAPPArr[0].children.forEach(item => {
          item.children = item.children.filter(it => it.is_delete === '0')
        })
      }

      // 判断哪个是高亮
      let pcIsSelected1 = false
      let pcIsSelected2 = false
      let appIsSelected1 = false
      let appIsSelected2 = false
      const rightPCArrFlag = res[0][0].flag
      const rightAPPArrFlag = res[1][0].flag
      let rightPCArrFlag
      let rightAPPArrFlag

      // 1.第一种情况PC和APP都一次都没选中时    PC未选中，APP未选中
      if (rightPCArrFlag === 'N' && rightAPPArrFlag === 'N') {
        pcIsSelected1 = true
        this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightPCArr[0].code
      if (this.PCTrue) {
        rightPCArrFlag = this.dialogFormRight.rightPCArr[0].flag
      }
      // 2.第二种情况PC已选中，APP未选中
      if (rightPCArrFlag === 'Y' && rightAPPArrFlag === 'N') {
        pcIsSelected1 = true
        pcIsSelected2 = true
        setTimeout(() => {
          this.$nextTick(() => {
            $('input:checkbox').eq(0).prop('checked', true)// 自定义单选框回显
          })
        }, 100)
        this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightPCArr[0].code
      if (this.APPTrue) {
        rightAPPArrFlag = this.dialogFormRight.rightAPPArr[0].flag
      }
      // 3.第三种情况PC未选中，APP已选中
      if (rightPCArrFlag === 'N' && rightAPPArrFlag === 'Y') {
        appIsSelected1 = true
        appIsSelected2 = true
        setTimeout(() => {
          this.$nextTick(() => {
            $('input:checkbox').eq(1).prop('checked', true)// 自定义单选框回显
          })
        }, 100)
        this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightAPPArr[0].code
      }
      // 4.第四种情况PC已选中，APP已选中
      if (rightPCArrFlag === 'Y' && rightAPPArrFlag === 'Y') {
        pcIsSelected1 = true
        pcIsSelected2 = true
        appIsSelected1 = false
        appIsSelected2 = true
        setTimeout(() => {
          this.$nextTick(() => {
            $('input:checkbox').eq(0).prop('checked', true)// 自定义单选框回显
            $('input:checkbox').eq(1).prop('checked', true)// 自定义单选框回显
          })
        }, 100)
        this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightPCArr[0].code
      }
      this.dialogFormRight.rightOperationArr.push({
        isSelected1: pcIsSelected1,
        isSelected2: pcIsSelected2,
        code: this.dialogFormRight.rightPCArr[0].code,
        flag: rightPCArrFlag,
        name: this.dialogFormRight.rightPCArr[0].name
      }, {
        isSelected1: appIsSelected1,
        isSelected2: appIsSelected2,
        code: this.dialogFormRight.rightAPPArr[0].code,
        flag: rightAPPArrFlag,
        name: this.dialogFormRight.rightAPPArr[0].name
      })

      this.dialogFormRight.rightPCArr[0].name = '全部'
      this.dialogFormRight.rightAPPArr[0].name = '全部'
      let waitFlag = false// 回显等待是否放行

      this.dialogFormRight.rightPCArr[0].children.forEach(item => {
        if (item.children && item.children.length > 0 && item.flag === 'Y') {
          item.children.forEach(it => {
            if (it.flag === 'Y') {
              this.dialogFormRight.rightPCArrSelected.push(it.code)
            }
          })
        } else if (item.children && item.children.length === 0 && item.flag === 'Y') {
          this.dialogFormRight.rightPCArrSelected.push(item.code)
      if (this.PCTrue && this.APPTrue) {
        // 1.第一种情况PC和APP都一次都没选中时    PC未选中，APP未选中
        if (rightPCArrFlag === 'N' && rightAPPArrFlag === 'N') {
          pcIsSelected1 = true
          this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightPCArr[0].code
        }
      })
      this.dialogFormRight.rightAPPArr[0].children.forEach(item => {
        if (item.children && item.children.length > 0 && item.flag === 'Y') {
          item.children.forEach(it => {
            if (it.flag === 'Y') {
              this.dialogFormRight.rightAPPArrSelected.push(it.code)
        // 2.第二种情况PC已选中，APP未选中
        if (rightPCArrFlag === 'Y' && rightAPPArrFlag === 'N') {
          pcIsSelected1 = true
          pcIsSelected2 = true

          const interval = setInterval(() => {
            if ($("input[name='PC']").length > 0) {
              waitFlag = true
            }
          })
        } else if (item.children && item.children.length === 0 && item.flag === 'Y') {
          this.dialogFormRight.rightAPPArrSelected.push(item.code)
            if (waitFlag) {
              clearInterval(interval)
              this.$nextTick(() => {
                $("input[name='PC']").eq(0).prop('checked', true)// 自定义单选框回显
              })
            }
          }, 100)

          this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightPCArr[0].code
        }
      })
        // 3.第三种情况PC未选中，APP已选中
        if (rightPCArrFlag === 'N' && rightAPPArrFlag === 'Y') {
          appIsSelected1 = true
          appIsSelected2 = true

          const interval = setInterval(() => {
            if ($("input[name='APP']").length > 0) {
              waitFlag = true
            }
            if (waitFlag) {
              clearInterval(interval)
              this.$nextTick(() => {
                $("input[name='APP']").eq(0).prop('checked', true)// 自定义单选框回显
              })
            }
          }, 100)

          this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightAPPArr[0].code
        }
        // 4.第四种情况PC已选中，APP已选中
        if (rightPCArrFlag === 'Y' && rightAPPArrFlag === 'Y') {
          pcIsSelected1 = true
          pcIsSelected2 = true
          appIsSelected1 = false
          appIsSelected2 = true

          const interval = setInterval(() => {
            if ($("input[name='PC']").length > 0) {
              waitFlag = true
            }
            if (waitFlag) {
              clearInterval(interval)
              this.$nextTick(() => {
                $("input[name='PC']").eq(0).prop('checked', true)// 自定义单选框回显
                $("input[name='APP']").eq(0).prop('checked', true)// 自定义单选框回显
              })
            }
          }, 100)

          this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightPCArr[0].code
        }
      }

      if (this.PCTrue && !this.APPTrue) {
        if (rightPCArrFlag === 'Y') {
          pcIsSelected1 = true
          pcIsSelected2 = true

          const interval = setInterval(() => {
            if ($("input[name='PC']").length > 0) {
              waitFlag = true
            }
            if (waitFlag) {
              clearInterval(interval)
              this.$nextTick(() => {
                $("input[name='PC']").eq(0).prop('checked', true)// 自定义单选框回显
              })
            }
          }, 100)

          this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightPCArr[0].code
        }
      }

      if (!this.PCTrue && this.APPTrue) {
        if (rightAPPArrFlag === 'Y') {
          appIsSelected1 = true
          appIsSelected2 = true

          const interval = setInterval(() => {
            if ($("input[name='APP']").length > 0) {
              waitFlag = true
            }
            if (waitFlag) {
              clearInterval(interval)
              this.$nextTick(() => {
                $("input[name='APP']").eq(0).prop('checked', true)// 自定义单选框回显
              })
            }
          }, 100)

          this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightAPPArr[0].code
        }
      }

      if (this.PCTrue) {
        this.dialogFormRight.rightOperationArr.push({
          isSelected1: pcIsSelected1,
          isSelected2: pcIsSelected2,
          code: this.dialogFormRight.rightPCArr[0].code,
          flag: rightPCArrFlag,
          name: this.dialogFormRight.rightPCArr[0].name
        })
      }
      if (this.APPTrue) {
        this.dialogFormRight.rightOperationArr.push({
          isSelected1: appIsSelected1,
          isSelected2: appIsSelected2,
          code: this.dialogFormRight.rightAPPArr[0].code,
          flag: rightAPPArrFlag,
          name: this.dialogFormRight.rightAPPArr[0].name
        })
      }
      if (this.PCTrue) {
        this.dialogFormRight.rightPCArr[0].name = '全部'
      }
      if (this.APPTrue) {
        this.dialogFormRight.rightAPPArr[0].name = '全部'
      }

      // 树形回显部分
      if (this.PCTrue) {
        this.dialogFormRight.rightPCArr[0].children.forEach(item => {
          if (item.children && item.children.length > 0 && item.flag === 'Y') {
            item.children.forEach(it => {
              if (it.flag === 'Y') {
                this.dialogFormRight.rightPCArrSelected.push(it.code)
              }
            })
          } else if (item.children && item.children.length === 0 && item.flag === 'Y') {
            this.dialogFormRight.rightPCArrSelected.push(item.code)
          }
        })
      }
      if (this.APPTrue) {
        this.dialogFormRight.rightAPPArr[0].children.forEach(item => {
          if (item.children && item.children.length > 0 && item.flag === 'Y') {
            item.children.forEach(it => {
              if (it.flag === 'Y') {
                this.dialogFormRight.rightAPPArrSelected.push(it.code)
              }
            })
          } else if (item.children && item.children.length === 0 && item.flag === 'Y') {
            this.dialogFormRight.rightAPPArrSelected.push(item.code)
          }
        })
      }
      this.$nextTick(() => {
        if (this.$refs.rightPCRef) {
          this.$refs.rightPCRef.setCheckedKeys(this.dialogFormRight.rightPCArrSelected)
@@ -1068,6 +1225,8 @@
      if (this.$refs.rightAPPRef) {
        this.$refs.rightAPPRef.setCheckedKeys([])
      }
      this.PCTrue = false
      this.APPTrue = false
    },
    // 权限对话框取消事件
    rightDialogVisibleCancel() {
@@ -1077,46 +1236,49 @@
    async rightDialogVisibleConfirm() {
      const rightPCArrSelected = []// 保存提交树选中 PC
      const rightAPPArrSelected = []// 保存提交树选中 APP

      this.dialogFormRight.rightPCArr[0].children.forEach(item => {
        if (item.children && item.children.length > 0) {
          const children = []
          let flag = false // 表示children里有值push进去了
          item.children.forEach(it => {
            if (this.dialogFormRight.rightPCArrSelected.includes(it.code) || this.dialogFormRight.rightPCArrSelected.includes('PC')) {
              flag = true
              children.push(
                { code: it.code, name: it.name, flag: 'Y' }
              )
            }
          })
          if (flag) {
            rightPCArrSelected.push({
              code: item.code, name: item.name, flag: 'Y', children: children
      if (this.PCTrue) {
        this.dialogFormRight.rightPCArr[0].children.forEach(item => {
          if (item.children && item.children.length > 0) {
            const children = []
            let flag = false // 表示children里有值push进去了
            item.children.forEach(it => {
              if (this.dialogFormRight.rightPCArrSelected.includes(it.code) || this.dialogFormRight.rightPCArrSelected.includes('PC')) {
                flag = true
                children.push(
                  { code: it.code, name: it.name, flag: 'Y' }
                )
              }
            })
          }
        }
      })
      this.dialogFormRight.rightAPPArr[0].children.forEach(item => {
        if (item.children && item.children.length > 0) {
          const children = []
          let flag = false // 表示children里有值push进去了
          item.children.forEach(it => {
            if (this.dialogFormRight.rightAPPArrSelected.includes(it.code) || this.dialogFormRight.rightAPPArrSelected.includes('APP')) {
              flag = true
              children.push(
                { code: it.code, name: it.name, flag: 'Y' }
              )
            if (flag) {
              rightPCArrSelected.push({
                code: item.code, name: item.name, flag: 'Y', children: children
              })
            }
          })
          if (flag) {
            rightAPPArrSelected.push({
              code: item.code, name: item.name, flag: 'Y', children: children
            })
          }
        }
      })
        })
      }

      if (this.APPTrue) {
        this.dialogFormRight.rightAPPArr[0].children.forEach(item => {
          if (item.children && item.children.length > 0) {
            const children = []
            let flag = false // 表示children里有值push进去了
            item.children.forEach(it => {
              if (this.dialogFormRight.rightAPPArrSelected.includes(it.code) || this.dialogFormRight.rightAPPArrSelected.includes('APP')) {
                flag = true
                children.push(
                  { code: it.code, name: it.name, flag: 'Y' }
                )
              }
            })
            if (flag) {
              rightAPPArrSelected.push({
                code: item.code, name: item.name, flag: 'Y', children: children
              })
            }
          }
        })
      }
      // 最终要提交的数据
      let rightSubmit = []

@@ -1145,6 +1307,7 @@
      const res = await SaveUserAssoctRight(rightSubmit, rolecode, usercode)
      if (res.code === '200') {
        this.$message.success('保存成功！')
        await this.getRoleSearch()
        this.dialogVisibleRight = false
      }
    },
@@ -1212,12 +1375,20 @@
      const currentCode = this.dialogFormRight.rightCurrentCode// 权限操作端code
      // 1.第一种情况  半叶为零  全叶为零
      if (checkedKeys.length === 0 && halfCheckedKeys.length === 0) {
        console.log('1.第一种情况  半叶为零  全叶为零')
        console.log('1.第一种情况  半叶为零  全叶为零1111')
        this.dialogFormRight.rightOperationArr.forEach((item, index) => {
          if (item.code === currentCode) {
            item.isSelected2 = false

            this.$nextTick(() => {
              $('input:checkbox').eq(index).prop('checked', false)// 自定义单选框回显
              if (item.name === 'PC') {
                $("input[name='PC']").eq(0).prop('checked', false)// 自定义单选框回显
              }
              if (item.name === 'APP') {
                $("input[name='APP']").eq(0).prop('checked', false)// 自定义单选框回显
              }
              // $("input[name='APP']").eq(0).prop('checked', false)// 自定义单选框回显
              // $('input:checkbox').eq(index).prop('checked', false)// 自定义单选框回显
            })
          }
        })
@@ -1236,7 +1407,13 @@
          if (item.code === currentCode) {
            item.isSelected2 = true
            this.$nextTick(() => {
              $('input:checkbox').eq(index).prop('checked', true)// 自定义单选框回显
              if (item.name === 'PC') {
                $("input[name='PC']").eq(0).prop('checked', true)// 自定义单选框回显
              }
              if (item.name === 'APP') {
                $("input[name='APP']").eq(0).prop('checked', true)// 自定义单选框回显
              }
              // $('input:checkbox').eq(index).prop('checked', true)// 自定义单选框回显
            })
          }
        })
@@ -1256,7 +1433,13 @@
          if (item.code === currentCode) {
            item.isSelected2 = true
            this.$nextTick(() => {
              $('input:checkbox').eq(index).prop('checked', true)// 自定义单选框回显
              if (item.name === 'PC') {
                $("input[name='PC']").eq(0).prop('checked', true)// 自定义单选框回显
              }
              if (item.name === 'APP') {
                $("input[name='APP']").eq(0).prop('checked', true)// 自定义单选框回显
              }
              // $('input:checkbox').eq(index).prop('checked', true)// 自定义单选框回显
            })
          }
        })
@@ -1268,6 +1451,14 @@
          this.dialogFormRight.rightAPPArrSelected = ['APP']
        }
      }
    },
    // 导入按钮
    upload() {
      this.shows = true
      this.$refs.importPickerFunc.newDataFunc()
    },
    colos() {
      this.shows = false
    }

  }
@@ -1285,11 +1476,12 @@
  border: none;
  padding: 0 20px;
}

::v-deep .el-button--primary:hover {
  border: none;
}

::v-deep .el-button--info{
::v-deep .el-button--info {
  //background-color: $main_color !important;
  height: 30px;
  display: flex;
@@ -1383,24 +1575,14 @@
    }

    input[type=checkbox]:checked::after {
      content: "✓";
      //content: "√";
      //content: "✓";
      content: "√";
      color: #fff;
      font-size: 12px;
      font-weight: bold;
      background-color: $main_color;
    }
  }
}

.userDialogVisible {
  ::v-deep .userDialogVisibleInput {
    //width:calc(100% - 30px) !important;
  }

  //::v-deep  .el-form-item {
  //  width:calc(100% - 30px) !important;
  //}
}

::v-deep .el-radio__input.is-checked .el-radio__inner {
@@ -1421,6 +1603,7 @@
  height: 30px;
  line-height: 30px;
}

::v-deep .el-input__inner:focus {
  border-color: $main_color;
}
@@ -1483,28 +1666,55 @@
::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
  margin: 10px 30px 0px 0;
}
.body ::v-deep .el-divider{

.body ::v-deep .el-divider {
  border: 1px solid #eee;
  width: 99%;
  margin: 10px auto;
}
.body ::v-deep .el-form-item{

.body ::v-deep .el-form-item {
  margin-bottom: 0;
}

::v-deep .el-input__inner:focus {
  border-color: $main_color;
}

::v-deep .el-select .el-input__inner:focus{
::v-deep .el-select .el-input__inner:focus {
  border-color: $main_color;
}

::v-deep .el-select-dropdown__item.selected{
::v-deep .el-select-dropdown__item.selected {
  color: $main_color;
}

::v-deep .el-textarea__inner:focus{
::v-deep .el-textarea__inner:focus {
  border-color: $main_color;
}

</style>
<style lang="scss">
.elCascader {
  //.el-cascader-node.in-active-path, .el-cascader-node.is-active, .el-cascader-node.is-selectable.in-checked-path {
  //  color: #42b983 ;
  //}
  .el-cascader-node.is-selectable.in-checked-path {
    color: #42b983;
  }

  .el-radio__input.is-checked .el-radio__inner {
    background-color: #42b983;
    border-color: #42b983;
  }

  .el-radio__input.is-checked .el-radio__inner:hover {
    border-color: #42b983;
  }

  .el-input__inner {
    border-color: #42b983 !important;
  }

}
</style>