loulijun2021
2022-06-19 79d7a61569f750719370b83f208d069be7718b2a
1.用户清单关联角色2.角色清单查询
已添加1个文件
已修改8个文件
1576 ■■■■■ 文件已修改
package.json 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/jcsz.js 114 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/layout/components/Sidebar/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/utils/request.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/jcsz/jsqd.vue 520 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/jcsz/yhqd.vue 403 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/jcsz/zzjg.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/template.vue 522 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
vue.config.js 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
package.json
@@ -18,6 +18,7 @@
    "core-js": "3.6.5",
    "echarts": "^5.3.2",
    "element-ui": "2.13.2",
    "jquery": "^3.6.0",
    "js-cookie": "2.2.0",
    "normalize.css": "7.0.0",
    "nprogress": "0.2.0",
src/api/jcsz.js
@@ -76,3 +76,117 @@
    params: data
  })
}
// ç”¨æˆ·æ¸…单关联角色保存
export function SaveUserAssoctRole(data, usercode) {
  return request({
    url: 'BasicSetting/SaveUserAssoctRole?usercode=' + usercode,
    method: 'post',
    data
  })
}
// è§’色类型查询
export function RoleTypeSearch(data) {
  return request({
    url: 'BasicSetting/RoleTypeSearch',
    method: 'get',
    params: data
  })
}
// è§’色类型新增
export function RoleTypeAdd(data) {
  return request({
    url: 'BasicSetting/RoleTypeAdd',
    method: 'post',
    params: data
  })
}
// è§’色类型新增
export function RoleTypeDelete(data) {
  return request({
    url: 'BasicSetting/RoleTypeDelete',
    method: 'post',
    data
  })
}
// è§’色清单查询
export function RoleSearch(data) {
  return request({
    url: 'BasicSetting/RoleSearch',
    method: 'get',
    params: data
  })
}
// è§’色清单新增编辑
export function AddUpdateRole(data) {
  return request({
    url: 'BasicSetting/AddUpdateRole',
    method: 'post',
    data
  })
}
// è§’色清单删除
export function DeleteRole(data) {
  return request({
    url: 'BasicSetting/DeleteRole',
    method: 'post',
    data
  })
}
// è§’色清单关联用户查询
export function RoleAssociationUser(data) {
  return request({
    url: 'BasicSetting/RoleAssociationUser',
    method: 'get',
    params: data
  })
}
// è§’色清单关联用户查询保存
export function SaveRoleAssoctUser(data) {
  return request({
    url: 'BasicSetting/SaveRoleAssoctUser',
    method: 'post',
    data
  })
}
// ç”¨æˆ·æ¸…单关联功能查询
export function RoleAssociationRight(data) {
  return request({
    url: 'BasicSetting/RoleAssociationRight',
    method: 'get',
    params: data
  })
}
// è§’色清单关联功能保存
export function SaveUserAssoctRight(data) {
  return request({
    url: 'BasicSetting/SaveUserAssoctRight',
    method: 'post',
    data
  })
}
// å¾€æ¥å•位查询
export function CurrentUnitSearch(data) {
  return request({
    url: 'BasicSetting/CurrentUnitSearch',
    method: 'get',
    params: data
  })
}
// å¾€æ¥å•位新增编辑
export function AddUpdateCurrentUnit(data) {
  return request({
    url: 'BasicSetting/AddUpdateCurrentUnit',
    method: 'post',
    data
  })
}
// å¾€æ¥å•位删除
export function DeleteCurrentUnit(data) {
  return request({
    url: 'BasicSetting/DeleteCurrentUnit',
    method: 'get',
    params: data
  })
}
src/layout/components/Sidebar/index.vue
@@ -101,6 +101,7 @@
        }
      })
      return arr2
      // return arr
    },
    activeMenu() {
      const route = this.$route
src/utils/request.js
@@ -55,7 +55,7 @@
      Message({
        message: res.Message || 'Error',
        type: 'error',
        duration: 5 * 1000
        duration: 10 * 1000
      })
      // 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired;
@@ -81,7 +81,7 @@
    Message({
      message: error.message,
      type: 'error',
      duration: 5 * 1000
      duration: 10 * 1000
    })
    return Promise.reject(error)
  }
src/views/jcsz/jsqd.vue
@@ -1,13 +1,529 @@
<template>
  <div>
    <div class="body" style="background-color: #ffffff;  padding: 20px 10px 0 20px;" :style="{height:mainHeight+'px'}">
      <div style="height: 50px;">
        <el-form
          ref="form"
          :model="form"
          label-width="80px"
          inline
          style="display: flex;justify-content: space-between"
        >
          <div style="display: flex;justify-content: space-around;width: 85%">
            <el-form-item label="角色编码" style=" display: flex;">
              <el-input v-model="form.RoleCode" placeholder="请输入" style="width: calc(100%-30px)" />
            </el-form-item>
            <el-form-item label="角色名称" style=" display: flex;">
              <el-input v-model="form.RoleName" placeholder="请输入" style="width: calc(100%-30px)" />
            </el-form-item>
            <el-form-item label="角色类型" style=" display: flex;">
              <el-select v-model="form.RoleTypeCode" style="width: calc(100%-30px)" placeholder="请选择">
                <el-option
                  v-for="item in RoleTypeCodeArr"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value"
                />
              </el-select>
            </el-form-item>
            <el-form-item label="创建人员" style=" display: flex;">
              <el-input v-model="form.UserName" style="width: calc(100%-30px)" placeholder="请输入" />
            </el-form-item>
          </div>
          <div style="display: flex;align-items: start;margin-top: 5px;">
            <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          </div>
        </el-form>
      </div>
      <div style="margin-bottom: 20px;display: flex">
        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">新增</el-button>
        <el-button type="primary" icon="el-icon-setting" @click="">设置</el-button>
        <el-button type="primary" icon="el-icon-upload2" @click="upload">导入</el-button>
      </div>
      <div style="display: flex;border: 1px solid #eee">
        <el-table
          :data="tableData"
          border
          highlight-current-row
          :style="{width: 100+'%',height:tableHeight+'px'}"
          :header-cell-style="this.$headerCellStyle"
          :cell-style="this.$cellStyle"
          @sort-change="sortChange"
        >
          <!--          <el-table-column-->
          <!--            type="selection"-->
          <!--            width="50"-->
          <!--          />-->
          <!--          <el-table-column-->
          <!--            prop="id"-->
          <!--            width="50"-->
          <!--            label="序号"-->
          <!--          />-->
          <el-table-column
            prop="RowNum"
            width="50"
            label="序号"
          />
          <el-table-column
            prop="role_code"
            label="角色编码"
            sortable="custom"
          />
          <el-table-column
            prop="role_name"
            label="角色名称"
            sortable="custom"
          />
          <el-table-column
            prop="roletype_name"
            label="角色类型"
            sortable="custom"
          />
          <el-table-column
            prop="lm_user"
            label="创建人员"
            sortable="custom"
          />
          <el-table-column
            prop="lm_date"
            label="创建时间"
            sortable="custom"
          />
          <el-table-column
            prop="lm_date"
            label="关联用户"
            sortable="custom"
          >
            <template slot-scope="{row}">
              <i class="el-icon-user-solid" />
            </template>
          </el-table-column>
          <el-table-column
            prop="lm_date"
            label="分配权限"
            sortable="custom"
          >
            <template slot-scope="{row}">
              <i class="el-icon-share" />
            </template>
          </el-table-column>
          <el-table-column
            label="操作"
          >
            <template slot-scope="{row}">
              <div class="operationClass">
                <el-button type="text" @click="edit('edit',row)">修改</el-button>
                <el-button type="text" @click="del(row.id)">删除</el-button>
              </div>
            </template>
          </el-table-column>
        </el-table>
      </div>
      <!--分页-->
      <pagination
        v-show="total>0"
        :total="total"
        :page.sync="form.page"
        :limit.sync="form.rows"
        align="right"
        layout="prev, pager, next,sizes"
        popper-class="select_bottom"
        @pagination="getRoleSearch"
      />
    </div>
    <!--    æ–°å¢žä¿®æ”¹å¯¹è¯æ¡†-->
    <el-dialog
      :title="operation==='add'?'添加':'修改'"
      :visible.sync="dialogVisible"
      width="50%"
      top="15vh"
      @closed="handleClose"
      @close="handleClose"
    >
      <el-form ref="dialogForm" :rules="dialogFormRules" :model="dialogForm" label-width="80px">
        <el-form-item label="组织类型" prop="OrgType">
          <el-radio-group
            v-model="dialogForm.OrgType"
            style="display: flex;align-items: end;height: 29px;"
            @change="changeRadio"
          >
            <el-radio
              v-for="item in OrgTypeArr"
              :key="item.value"
              :value="item.value"
              :label="item.label"
            />
          </el-radio-group>
        </el-form-item>
        <el-form-item label="组织编码" prop="OrgCode">
          <el-input v-model="dialogForm.OrgCode" :disabled="operation!=='add'" style="width: 220px" />
        </el-form-item>
        <el-form-item label="组织名称" prop="OrgName">
          <el-input v-model="dialogForm.OrgName" style="width: 220px" />
        </el-form-item>
        <el-form-item v-if="dialogFormOrgTypeSelected!=='F'" prop="SupUnit" label="上级单位">
          <el-select
            v-model="dialogForm.SupUnit"
            style="width: 220px"
            placeholder="请选择"
          >
            <el-option
              v-for="item in SupUnitArr"
              :label="item.org_name"
              :value="item.id"
            />
          </el-select>
        </el-form-item>
      </el-form>
      <span slot="footer" class="dialog-footer">
        <div class="footerButton">
          <el-button @click="dialogVisibleCancel">取 æ¶ˆ</el-button>
          <el-button type="primary" @click="dialogVisibleConfirm">ç¡® å®š</el-button>
        </div>
      </span>
    </el-dialog>
    <!--    è®¾ç½®æŒ‰é’®å¯¹è¯æ¡†-->
    <!--    å…³è”用户对话框-->
    <!--    åˆ†é…å…¨é€‰å¯¹è¯æ¡†-->
  </div>
</template>
<script>
import Pagination from '@/components/Pagination'
import {
  AddUpdateOrganization,
  DeleteOrganization,
  OrganizationSearch,
  PrentOrganization,
  RoleSearch,
  RoleTypeDelete
} from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
  name: "jsqd"
  name: 'Zzjg',
  components: {
    Pagination
  },
  data() {
    const validateName = (rule, value, callback) => {
      if (!value) {
        return callback(new Error('请输入编码'))
      } else {
        if (SER_HZ.test(value)) {
          return callback(new Error('编码不能为中文'))
        } else {
          callback()
        }
      }
    }
    const validateTypeCode = (rule, value, callback) => {
      if (!value) {
        return callback(new Error('请选择上级'))
      } else {
        callback()
      }
    }
    return {
      mainHeight: 0,
      tableHeight: 0,
      form: {
        RoleCode: '', // è§’色编码
        RoleName: '', // è§’色名称
        RoleTypeCode: '', // è§’色类型编码
        CreateUser: '', // åˆ›å»ºäººå‘˜
        prop: 'lm_date', // æŽ’序字段
        order: 'desc', // æŽ’序字段
        page: 1, // ç¬¬å‡ é¡µ
        rows: 10 // æ¯é¡µå¤šå°‘条
      },
      RoleTypeCodeArr: [], // è§’色类型编码数组
      total: 10,
      tableData: [],
      dialogVisible: false,
      dialogForm: {
        OrgType: '',
        OrgCode: '',
        OrgName: '',
        SupUnit: ''// ä¸Šçº§å•位
      },
      SupUnitArr: [],
      dialogFormOrgTypeSelected: '',
      operation: '',
      dialogFormRules: {
        OrgType: [
          { required: true, message: '请输入选择类型', trigger: ['blur', 'change'] }
        ],
        OrgCode: [
          { required: true, validator: validateName, trigger: ['blur', 'change'] }
        ],
        OrgName: [
          { required: true, message: '请输入名称', trigger: ['blur', 'change'] }
        ],
        SupUnit: [
          { required: true, validator: validateTypeCode, trigger: ['blur', 'change'] }
        ]
      }
    }
  },
  created() {
    this.getRoleSearch()
  },
  mounted() {
    window.addEventListener('resize', this.getHeight)
    this.getHeight()
  },
  methods: {
    async getRoleSearch() {
      const res = await RoleSearch(this.form)
      this.tableData = res.data
      this.total = res.count
    },
    // æŽ’序改变时
    sortChange({ column, prop, order }) {
      if (order === 'descending') {
        order = 'desc'
      } else if (order === 'ascending') {
        order = 'asc'
      } else {
        order = 'desc'
      }
      this.form.order = order
      this.form.prop = prop
      this.getRoleSearch()
    },
    // æŸ¥è¯¢
    search() {
      this.getRoleSearch()
    },
    // é‡ç½®
    reset() {
      this.form.RoleCode = ''
      this.form.RoleName = ''
      this.form.RoleTypeCode = ''
      this.form.CreateUser = ''
      this.getRoleSearch()
    },
    // å•选框改变时
    // async changeRadio(val) {
    //   if (val.length > 1) {
    //     this.OrgTypeArr.forEach(item => {
    //       if (item.label === val) {
    //         this.dialogFormOrgTypeSelected = item.value
    //       }
    //     })
    //     this.dialogForm.SupUnit = ''
    //   } else {
    //     this.dialogFormOrgTypeSelected = val
    //   }
    //   if (this.dialogFormOrgTypeSelected !== 'F') {
    //     const { data: res } = await PrentOrganization({ orgcode: this.dialogFormOrgTypeSelected })
    //     this.SupUnitArr = res
    //   }
    // },
    // æ–°å¢žæŒ‰é’®
    add(operation) {
      this.operation = operation
      this.dialogVisible = true
    },
    // ä¿®æ”¹æŒ‰é’®
    edit(operation, row) {
      this.operation = operation
      this.dialogVisible = true
      this.$nextTick(() => {
        this.changeRadio(this.dialogForm.OrgType)
        this.dialogForm.OrgCode = row.org_code
        this.dialogForm.OrgName = row.org_name
        this.dialogForm.SupUnit = row.parent_id
      })
    },
    // åˆ é™¤æŒ‰é’®
    async del(id) {
      this.$confirm('是否确认删除?', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
        // RoleTypeDelete({ RoleTypeCode: id }).then(res => {
        //   if (res.code === '200') {
        //     this.$message.success('删除成功!')
        //     this.getRoleSearch()
        //   }
        // })
      }).catch(() => {
        this.$message.info('已取消删除')
      })
    },
    // å¯¹è¯æ¡†å…³é—­äº‹ä»¶
    handleClose() {
      this.dialogForm.OrgType = ''
      this.dialogForm.OrgCode = ''
      this.dialogForm.OrgName = ''
      this.dialogForm.SupUnit = ''
      this.$refs.dialogForm.clearValidate()
    },
    // å¯¹è¯æ¡†å–消
    dialogVisibleCancel() {
      this.dialogVisible = false
    },
    // å¯¹è¯æ¡†ç¡®è®¤
    dialogVisibleConfirm() {
      this.$refs.dialogForm.validate(valid => {
        if (valid) {
          const data = {
            OrganType: this.dialogFormOrgTypeSelected,
            OrganCode: this.dialogForm.OrgCode,
            OrganName: this.dialogForm.OrgName,
            SupUnit: this.dialogFormOrgTypeSelected === 'F' ? '0' : this.dialogForm.SupUnit,
            OperType: this.operation === 'add' ? 'Add' : 'Update',
            Operator: getCookie('admin')
          }
          AddUpdateOrganization(data).then(res => {
            if (res.code === '200') {
              this.$message.success(this.operation === 'add' ? '添加成功!' : '修改成功!')
              this.getRoleSearch()
            } else {
              this.$message.error(this.operation === 'add' ? '添加失败!' : '修改失败!')
            }
          })
          this.dialogVisible = false
        }
      })
    },
    // èŽ·å–é¡µé¢é«˜åº¦
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 200
        this.tableHeight = this.mainHeight - 100
      })
    }
  }
}
</script>
<style scoped>
<style lang="scss" scoped>
$main_color: #42b983;
::v-deep .el-button--primary {
  background-color: $main_color !important;
  height: 30px;
  display: flex;
  align-items: center;
}
::v-deep .el-button--info {
  //background-color: $main_color !important;
  height: 30px;
  display: flex;
  align-items: center;
}
::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
  background-color: $main_color !important;
}
.footerButton {
  display: flex;
  justify-content: end;
}
::v-deep .el-button--default {
  background-color: #ffffff !important;
  height: 30px;
  display: flex;
  align-items: center;
}
::v-deep .el-button--default:hover {
  color: #606266;
}
::v-deep .el-dialog__body {
  padding: 20px 100px !important;
}
::v-deep .el-radio__input.is-checked .el-radio__inner {
  background-color: $main_color;
  border-color: $main_color;
}
::v-deep .el-radio__input.is-checked + .el-radio__label {
  color: $main_color !important;
}
::v-deep .el-checkbox__input.is-checked .el-checkbox__inner {
  border-color: $main_color;
  background-color: $main_color;
}
::v-deep .el-input__inner {
  height: 30px
}
::v-deep .el-table .caret-wrapper {
  //float: right;
  transform: scale(0.8);
}
::v-deep .cell {
  display: flex !important;
  align-items: center !important;
  justify-content: space-between !important;
}
::v-deep .el-button--text {
  color: $main_color;
  font-size: 14px;
  cursor: pointer;
}
.operationClass {
  height: 23px;
  display: flex;
  justify-content: space-between;
  align-items: center;
}
.el-icon-share ,.el-icon-user-solid{
  color: $main_color;
  cursor: pointer;
}
.el-checkbox.is-bordered.is-checked {
  border-color: $main_color;
}
::v-deep .el-radio__input.is-checked .el-radio__inner {
  border-color: $main_color;
  background: $main_color;
}
::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner{
  border-color: $main_color;
  background: $main_color;
}
::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {
  color: $main_color !important;
}
::v-deep .el-checkbox.is-bordered+.el-checkbox.is-bordered{
  margin: 10px 30px 0px 0;
}
::v-deep .el-radio__input.is-checked + .el-radio__label {
  color: $main_color;
}
::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
  margin: 10px 30px 0px 0;
}
</style>
src/views/jcsz/yhqd.vue
@@ -176,6 +176,7 @@
      width="50%"
      top="15vh"
      @closed="handleClose"
      @close="handleClose"
    >
      <el-form ref="dialogForm" :rules="dialogFormRules" inline :model="dialogForm" label-width="80px">
        <el-form-item label="用户编码" prop="UserCode">
@@ -248,8 +249,11 @@
      :visible.sync="dialogVisibleRoles"
      width="50%"
      top="15vh"
      class="dialogVisibleRoles"
      @closed="handleCloseRoles"
      @close="handleCloseRoles"
    >
      <!--      @opened="handleOpenedRoles"-->
      <div>
        <i class="el-icon-s-comment" style="color:#42b983;" /> ç”¨æˆ·åç§°ï¼š{{ dialogFormRoles.username }}
@@ -259,15 +263,26 @@
        <div style="margin-bottom:20px">
          <i class="el-icon-s-operation" style="color:#42b983;" /> è§’色类型集合:
        </div>
        <el-checkbox-group v-model="dialogFormRoles.rolesArrSelectedArr" @change="dialogCheckboxChange">
          <el-checkbox
        <div class="myCheckboxGroup">
          <div
            v-for="item in dialogFormRoles.rolesArr"
            :key="item.code"
            :label="item.name"
            border
            size="medium"
          />
        </el-checkbox-group>
            :style="{border:item.isSelected1?'1px solid #42b983':'1px solid #eee'}"
            class="myCheckbox"
            @click="myCheckboxClick(item)"
          >
            <input
              class="myCheckboxInput"
              type="checkbox"
              :value="item.code"
              :name="item.name"
              :style="{color:item.isSelected2?'#42b983':'#fff'}"
              @click="myCheckboxInputClick(item)"
            >{{ item.name }}
            <!--            çˆ¶å­ç‚¹å‡»äº‹ä»¶ä¸å½±å“-->
            <!--            onClick="event.cancelBubble = true"-->
          </div>
        </div>
      </div>
      <el-divider />
      <div>
@@ -281,7 +296,10 @@
          node-key="code"
          default-expand-all
          :props="defaultPropsOfRoleTree"
          @check="checkBoxClick"
        />
        <!--        @check-change="checkChange"-->
      </div>
      <span slot="footer" class="dialog-footer">
        <div class="footerButton">
@@ -297,11 +315,12 @@
import Pagination from '@/components/Pagination'
import {
  AddUpdateUser,
  DeleteUser, UserAssociationRole,
  DeleteUser, SaveUserAssoctRole, UserAssociationRole,
  UserOrganization,
  UserSearch
} from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
import $ from 'jquery'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
@@ -387,17 +406,16 @@
          { required: true, message: '请选择工资类型', trigger: ['blur', 'change'] }
        ]
      },
      // cascaderKey: 0, // çº§è”选择器key
      dialogVisibleRoles: false,
      dialogFormRoles: {
        username: '', // ç”¨æˆ·åç§°
        usercode: '', // ç”¨æˆ·ç¼–码
        rolesArrSelectedArr: [], // è§’色类型数组选中
        rolesArrSelected: [], // è§’色类型选中
        rolesArr: [], // è§’色类型集合
        roleTree: [], // è§’色树
        rolesAll: []// è§’色所有
        roleTreeSelectedArr: [] // è§’色树选中
      },
      rolesAll: [], // è§’色所有
      defaultPropsOfRoleTree: {
        value: 'code',
        label: 'name',
@@ -534,7 +552,7 @@
            Password: this.dialogForm.Password,
            Enable: this.dialogForm.Enable,
            // StuOrg: this.dialogForm.StuOrg,
            StuOrg: this.$refs.dialogCascader.checkedValue[this.$refs.dialogCascader.checkedValue.length - 1].length === 4 ? this.$refs.dialogCascader.checkedValue[this.$refs.dialogCascader.checkedValue.length - 1] : this.$refs.dialogCascader.checkedValue,
            StuOrg: Array.isArray(this.$refs.dialogCascader.checkedValue) ? this.$refs.dialogCascader.checkedValue[this.$refs.dialogCascader.checkedValue.length - 1] : this.$refs.dialogCascader.checkedValue,
            Mobile: this.dialogForm.Mobile,
            Email: this.dialogForm.Email,
            wagetype: this.dialogForm.wagetype,
@@ -562,32 +580,285 @@
    },
    // å…³è”角色点击事件
    async roleClick({ row }) {
      this.dialogFormRoles.rolesArrSelectedArr = []
      this.dialogFormRoles.rolesArr = []
      this.dialogFormRoles.roleTreeSelectedArr = []
      this.dialogVisibleRoles = true
      this.dialogFormRoles.username = row.username
      this.dialogFormRoles.usercode = row.usercode
      const { data: res } = await UserAssociationRole({ usercode: row.usercode })
      this.rolesAll = res
      res.forEach(item => {
        this.dialogFormRoles.rolesArr.push({ code: item.code, name: item.name, flag: item.flag })
      const nodeKey = []// æ ‘形回显key
      res.forEach((item, index) => {
        this.dialogFormRoles.rolesArr.push({
          code: item.code,
          name: item.name,
          flag: item.flag,
          isSelected1: false,
          isSelected2: false
        })
        if (item.flag === 'Y') {
          this.dialogFormRoles.rolesArr[index].isSelected2 = true
          this.$nextTick(() => {
            // $('input:checkbox').eq(index).attr('checked', true)// è‡ªå®šä¹‰å•选框回显
            $('input:checkbox').eq(index).prop('checked', true)// è‡ªå®šä¹‰å•选框回显
          })
          this.dialogFormRoles.rolesArrSelectedArr.push(item.name)
          if (item.children && item.children.length > 0) {
            const Data = []
            item.children.forEach(it => {
              if (it.flag === 'Y') {
                nodeKey.push(it.code)
                Data.push(it.code)
              }
            })
            this.dialogFormRoles.roleTreeSelectedArr.push({ Code: item.code, Name: item.name, Data: Data })
          }
        }
      })
    },
    dialogCheckboxChange(val, aa) {
      // this.dialogFormRoles.rolesArrSelectedArr = ['管理人员']
      this.dialogFormRoles.rolesArrSelected = val[val.length - 1]
      this.dialogFormRoles.roleTree = this.rolesAll.filter(item => item.name === this.dialogFormRoles.rolesArrSelected)
      console.log(this.dialogFormRoles.roleTreeSelectedArr, 11)
      console.log(this.dialogFormRoles.rolesArr, 888)
      this.dialogFormRoles.rolesArr[0].isSelected1 = true// é»˜è®¤é€‰ä¸­ç¬¬ä¸€ä¸ª
      // this.dialogFormRoles.rolesArr[0].name = '全部'
      this.dialogFormRoles.roleTree = this.rolesAll.filter(item => item.code === this.dialogFormRoles.rolesArr[0].code)
      this.dialogFormRoles.roleTree[0].name = '全部'
      // this.dialogFormRoles.rolesArr
      console.log(nodeKey, 1)
      this.$refs.roleTree.setCheckedKeys(nodeKey)
    },
    // å¤„理用户关联对话框关闭事件
    handleCloseRoles() {
      this.$refs.roleTree.setCheckedKeys([])
      this.dialogFormRoles.rolesArrSelectedArr = []
    },
    // ç”¨æˆ·å…³è”对话框取消事件
    rolesDialogVisibleCancel() {
      this.dialogVisibleRoles = false
    },
    // ç”¨æˆ·å…³è”对话框确认事件
    rolesDialogVisibleConfirm() {
      this.dialogVisibleRoles = false
    async rolesDialogVisibleConfirm() {
      console.log(this.dialogFormRoles.roleTreeSelectedArr, 333337)
      const res = await SaveUserAssoctRole(this.dialogFormRoles.roleTreeSelectedArr, this.dialogFormRoles.usercode)
      if (res.code === '200') {
        this.$message.success('保存成功!')
        this.dialogVisibleRoles = false
      }
    },
    // æ ‘形复选框点击事件
    checkBoxClick(obj, { checkedNodes, checkedKeys, halfCheckedNodes, halfCheckedKeys }) {
      // console.log(obj, checkedNodes, checkedKeys, halfCheckedNodes, halfCheckedKeys, 78787878)
      // æ‰¾åˆ° checkedFatherCode  çˆ¶code值
      // å½“halfCheckedKeys不等等零的时候
      // let checkedFatherCode = halfCheckedKeys.length !== 0 ? halfCheckedKeys[0] : checkedKeys[0]
      let checkedFatherCode = '' // æ‰¾åˆ° checkedFatherCode  çˆ¶code值
      // if (checkedFatherCode === undefined) {
      // console.log(this.rolesAll, 66666)
      this.rolesAll.forEach((item, index) => {
        if (item.code === obj.code) {
          checkedFatherCode = item.code
        }
        if (item.children && item.children.length > 0) {
          item.children.forEach((it, ind) => {
            if (it.code === obj.code) {
              checkedFatherCode = item.code
            }
          })
        }
      })
      // }
      console.log(checkedFatherCode, 8)
      // 1.第一种情况当树形   åŠå¶ ä¸ä¸ºé›¶   å…¨å¶ ä¸ä¸ºé›¶
      if (halfCheckedKeys.length !== 0 && checkedKeys.length !== 0) {
        this.dialogFormRoles.rolesArr.forEach((item, index) => {
          if (item.code === checkedFatherCode) {
            console.log('1.第一种情况当树形   åŠå¶ ä¸ä¸ºé›¶   å…¨å¶ ä¸ä¸ºé›¶')
            this.dialogFormRoles.rolesArr[index].isSelected2 = true
            this.$nextTick(() => {
              // $('input:checkbox').eq(index).attr('checked', true)// è‡ªå®šä¹‰å•选框回显
              $('input:checkbox').eq(index).prop('checked', true)// è‡ªå®šä¹‰å•选框回显
            })
            const temp = this.rolesAll.filter(it => it.code === checkedFatherCode)// è¿‡æ»¤å‡ºæ¯æ¬¡é€‰ä¸­çš„大项
            temp.forEach(it => {
              const a = []
              it.children.forEach(it => {
                if (it.code === obj.code) {
                  a.push(it.code)
                }
              })
              // console.log(!this.dialogFormRoles.roleTreeSelectedArr.some(i => i.Code === checkedFatherCode))
              if (!this.dialogFormRoles.roleTreeSelectedArr.some(i => i.Code === checkedFatherCode)) { // å½“直接选父code时执行
                this.dialogFormRoles.roleTreeSelectedArr.push({
                  Code: it.code,
                  Name: it.name,
                  Data: a
                })
              } else {
                this.dialogFormRoles.roleTreeSelectedArr.forEach((i, ind) => { // å½“选子code时执行
                  if (i.Code === checkedFatherCode) {
                    this.dialogFormRoles.roleTreeSelectedArr[ind].Data.forEach((i1, ind2) => {
                      if (i1 === a[0]) {
                        this.dialogFormRoles.roleTreeSelectedArr[ind].Data.splice(ind2, 1)// å½“子code与现在的code相同时执行
                      } else {
                        this.dialogFormRoles.roleTreeSelectedArr[ind].Data.push(a[0])// //当子code与现在的code不相同时执行
                      }
                    })
                    // this.dialogFormRoles.roleTreeSelectedArr[ind].Data.filter((i1, ind2) => i1 !== a[0])// è¿‡æ»¤æŽ‰é€‰ä¸­ç›¸åŒçš„
                  }
                })
              }
            })
          }
        })
      }
      console.log(this.dialogFormRoles.roleTreeSelectedArr, 11)
      // 2.第二种情况当树形   åŠå¶ ä¸ºé›¶   å…¨å¶ ä¸ºé›¶
      if (halfCheckedKeys.length === 0 && checkedKeys.length === 0) {
        this.dialogFormRoles.rolesArr.forEach((item, index) => {
          if (item.code === checkedFatherCode) {
            console.log('2.第二种情况当树形   åŠå¶ ä¸ºé›¶   å…¨å¶ ä¸ºé›¶')
            this.dialogFormRoles.rolesArr[index].isSelected2 = false
            this.$nextTick(() => {
              // console.log($('input:checkbox').eq(1).attr('checked', false), 88888)
              $('input:checkbox').eq(index).prop('checked', false)// è‡ªå®šä¹‰å•选框回显
            })
            this.dialogFormRoles.roleTreeSelectedArr.forEach((it, ind) => {
              if (it.Code === checkedFatherCode) {
                console.log(it.Code, 9)
                console.log(this.dialogFormRoles.roleTreeSelectedArr.splice(ind, 1), 7)
              }
            })
            this.dialogFormRoles.rolesArrSelectedArr.forEach((i, i1) => {
              if (i === checkedFatherCode) {
                console.log(this.dialogFormRoles.rolesArrSelectedArr.splice(i1, 1), 8)
              }
            })
          }
        })
      }
      console.log(this.dialogFormRoles.roleTreeSelectedArr, 22)
      // 3.第三种种情况当树形   åŠå¶ ä¸ºé›¶   å…¨å¶ ä¸ä¸ºé›¶
      if (halfCheckedKeys.length === 0 && checkedKeys.length !== 0) {
        // this.dialogFormRoles.roleTreeSelectedArr = []
        this.dialogFormRoles.rolesArr.forEach((item, index) => {
          if (item.code === checkedFatherCode) {
            console.log(' 3.第三种种情况当树形   åŠå¶ ä¸ºé›¶   å…¨å¶ ä¸ä¸ºé›¶')
            this.dialogFormRoles.rolesArr[index].isSelected2 = true
            this.$nextTick(() => {
              // $('input:checkbox').eq(index).attr('checked', true)// è‡ªå®šä¹‰å•选框回显
              $('input:checkbox').eq(index).prop('checked', true)// è‡ªå®šä¹‰å•选框回显
            })
          }
        })
        const temp = this.rolesAll.filter(it => it.code === checkedFatherCode)// è¿‡æ»¤å‡ºæ¯æ¬¡é€‰ä¸­çš„大项
        // console.log(!this.dialogFormRoles.roleTreeSelectedArr.some(i => i.Code === checkedFatherCode))
        if (!this.dialogFormRoles.roleTreeSelectedArr.some(i => i.Code === checkedFatherCode)) { // å½“父类为全叶时
          temp.forEach(it => {
            this.dialogFormRoles.roleTreeSelectedArr.push({
              Code: it.code,
              Name: it.name,
              Data: it.children.map(i => i.code)
            })
          })
        } else { // å½“父类由半叶变为全叶时
          this.dialogFormRoles.roleTreeSelectedArr.forEach((i1, ind) => {
            if (i1.Code === checkedFatherCode) { // i1没找对
              console.log(i1, this.dialogFormRoles.roleTreeSelectedArr.splice(ind, 1), 8)
              temp.forEach(it => {
                this.dialogFormRoles.roleTreeSelectedArr.push({
                  Code: it.code,
                  Name: it.name,
                  Data: it.children.map(i => i.code)
                })
              })
            }
          })
        }
      }
    },
    // myCheckBox点击事件    å¤§ç›’子点击
    myCheckboxClick(item) {
      console.log(this.dialogFormRoles.rolesArr, 7)
      this.dialogFormRoles.rolesArr.forEach(it => {
        it.isSelected1 = it.code === item.code
      })
      this.dialogFormRoles.roleTree = this.rolesAll.filter(it => it.code === item.code)
      this.dialogFormRoles.roleTree[0].name = '全部'
      if (this.dialogFormRoles.roleTree[0].children.length < 1) {
        this.dialogFormRoles.roleTree = ''
      }
      const temp = this.dialogFormRoles.roleTreeSelectedArr.filter(it => it.Code === item.code)
      console.log(temp, 33)
      if (temp.length > 0) {
        this.$refs.roleTree.setCheckedKeys(temp[0].Data)// æ ‘形选中回显
      } else {
        this.$refs.roleTree.setCheckedKeys([])// å½“长度为零时置空
      }
    },
    // myCheckBoxInput点击事件  å°ç›’子点击(input)
    myCheckboxInputClick(item) {
      item.isSelected2 = !item.isSelected2
      this.dialogFormRoles.rolesArrSelectedArr = [...new Set(this.dialogFormRoles.rolesArrSelectedArr)]// æ•°ç»„去重
      if (item.isSelected2) { // ä»Žæ²¡é€‰ä¸­åˆ°é€‰ä¸­
        console.log('从没选中到选中')
        this.dialogFormRoles.rolesArr.forEach(it => {
          if (it.code === item.code && item.isSelected2) {
            this.dialogFormRoles.rolesArrSelectedArr.push(it.code)
          }
        })
        const temp = this.rolesAll.filter(it => it.code === item.code)// è¿‡æ»¤å‡ºæ¯æ¬¡é€‰ä¸­çš„大项
        temp.forEach(it => {
          this.dialogFormRoles.roleTreeSelectedArr.push({
            Code: it.code,
            Name: it.name,
            Data: it.children.map(i => i.code)
          })
        })
      }
      if (!item.isSelected2) { // ä»Žé€‰ä¸­åˆ°æ²¡é€‰ä¸­
        console.log('从选中到没选中')
        this.dialogFormRoles.rolesArr.forEach((it, ind) => {
          if (it.code === item.code && !item.isSelected2) {
            console.log('进来了')
            console.log(this.dialogFormRoles.rolesArrSelectedArr, 78)
            this.dialogFormRoles.rolesArrSelectedArr.forEach((i, i1) => {
              if (i === it.code) {
                console.log(this.dialogFormRoles.rolesArrSelectedArr.splice(i1, 1), 6664)
              }
            })
            this.dialogFormRoles.roleTreeSelectedArr.forEach((i, i1) => {
              if (i.Code === it.code) {
                console.log(i1, this.dialogFormRoles.roleTreeSelectedArr.splice(i1, 1), 6665)
              }
            })
          }
        })
      }
      this.$refs.roleTree.setCheckedKeys(this.dialogFormRoles.rolesArrSelectedArr)
      // this.$refs.roleTree.getCheckedKeys()//只能获取到第一个树形
      this.dialogFormRoles.rolesArrSelectedArr = [...new Set(this.dialogFormRoles.rolesArrSelectedArr)]// æ•°ç»„去重
      // æ•°ç»„中对象相同的去重
      // this.dialogFormRoles.roleTreeSelectedArr = this.dialogFormRoles.roleTreeSelectedArr.filter((currentValue, currentIndex, selfArr) => {
      //   return selfArr.findIndex(item => item.code === currentValue.Code) === currentIndex
      // })
      console.log(this.dialogFormRoles.rolesArrSelectedArr, 6666)
      console.log(this.dialogFormRoles.roleTreeSelectedArr, 6777)
    }
  }
}
</script>
@@ -682,16 +953,100 @@
.el-checkbox.is-bordered.is-checked {
  border-color: $main_color;
}
::v-deep .el-radio__input.is-checked .el-radio__inner {
  border-color: $main_color;
  background: $main_color;
}
::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner{
::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner {
  border-color: $main_color;
  background: $main_color;
}
::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {
  color: $main_color !important;
}
::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered {
  margin: 10px 30px 0px 0;
  //cursor: default !important;
}
::v-deep .el-radio__input.is-checked + .el-radio__label {
  color: $main_color;
}
::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
  margin: 10px 30px 0px 0;
}
.dialogVisibleRoles {
  //::v-deep .el-checkbox.is-bordered.el-checkbox--medium{
  // pointer-events: none;
  //}
  //::v-deep .el-checkbox__label{
  //  pointer-events: none !important;
  //  color: red;
  //}
  .myCheckboxGroup {
    display: flex;
    flex-wrap: wrap;
    .myCheckbox {
      //border: 1px solid $main_color;
      border: 1px solid #eee;
      display: flex;
      min-width: 100px;
      padding: 10px;
      margin: 10px 30px 0 0;
      border-radius: 5px;
      cursor: default;
      .myCheckboxInput {
        margin: 1px 5px 0 0;
        cursor: pointer;
      }
    }
    //.myCheckbox{
    //  border: 1px solid $main_color;
    //}
    input[type=checkbox] {
      cursor: pointer;
      position: relative;
      width: 14px;
      height: 14px;
      font-size: 14px;
    }
    input[type=checkbox]::after {
      position: absolute;
      top: 0;
      //color: rgb(130, 35, 35);
      color: $main_color;
      width: 14px;
      height: 14px;
      display: inline-block;
      visibility: visible;
      padding-left: 0px;
      text-align: center;
      content: ' ';
      border-radius: 3px
    }
    input[type=checkbox]:checked::after {
      content: "✓";
      //content: "√";
      color: #fff;
      font-size: 12px;
      font-weight: bold;
      background-color: $main_color;
    }
  }
}
</style>
src/views/jcsz/zzjg.vue
@@ -130,6 +130,7 @@
      width="50%"
      top="15vh"
      @closed="handleClose"
      @close="handleClose"
    >
      <el-form ref="dialogForm" :rules="dialogFormRules" :model="dialogForm" label-width="80px">
        <el-form-item label="组织类型" prop="OrgType">
src/views/template.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,522 @@
<template>
  <div>
    <div class="body" style="background-color: #ffffff;  padding: 20px 10px 0 20px;" :style="{height:mainHeight+'px'}">
      <div style="height: 50px;">
        <el-form
          ref="form"
          :model="form"
          label-width="80px"
          inline
          style="display: flex;justify-content: space-between"
        >
          <div style="display: flex;justify-content: space-around;width: 85%">
            <el-form-item label="组织编码" style=" display: flex;">
              <el-input v-model="form.OrgCode" placeholder="请输入" style="width: calc(100%-30px)" />
            </el-form-item>
            <el-form-item label="组织名称" style=" display: flex;">
              <el-input v-model="form.OrgName" placeholder="请输入" style="width: calc(100%-30px)" />
            </el-form-item>
            <el-form-item label="组织类型" style=" display: flex;">
              <el-select v-model="form.OrgType" style="width: calc(100%-30px)" placeholder="请选择">
                <el-option
                  v-for="item in OrgTypeArr"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value"
                />
              </el-select>
            </el-form-item>
            <el-form-item label="创建人员" style=" display: flex;">
              <el-input v-model="form.UserName" style="width: calc(100%-30px)" placeholder="请输入" />
            </el-form-item>
          </div>
          <div style="display: flex;align-items: start;margin-top: 5px;">
            <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          </div>
        </el-form>
      </div>
      <div style="margin-bottom: 20px;display: flex">
        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">新增</el-button>
        <!--        <el-button type="primary" icon="el-icon-edit" @click="edit('edit')">修改</el-button>-->
        <!--        <el-button type="primary" icon="el-icon-delete" @click="del">批量删除</el-button>-->
      </div>
      <div style="display: flex;border: 1px solid #eee">
        <el-table
          :data="tableData"
          border
          highlight-current-row
          :style="{width: 100+'%',height:tableHeight+'px'}"
          :header-cell-style="this.$headerCellStyle"
          :cell-style="this.$cellStyle"
          @sort-change="sortChange"
        >
          <!--          <el-table-column-->
          <!--            type="selection"-->
          <!--            width="50"-->
          <!--          />-->
          <el-table-column
            prop="id"
            width="50"
            label="序号"
          />
          <el-table-column
            prop="org_code"
            label="组织编码"
            sortable="custom"
          />
          <el-table-column
            prop="org_name"
            label="组织名称"
            sortable="custom"
          />
          <el-table-column
            prop="description"
            label="组织类型"
            sortable="custom"
          >
            <template slot-scope="{row}">
              <div v-if="row.description==='F'">工厂</div>
              <div v-if="row.description==='D'">部门</div>
              <div v-if="row.description==='W'">车间</div>
              <div v-if="row.description==='K'">科室</div>
              <div v-if="row.description==='L'">生产线</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="parentorg_name"
            label="上级单位"
            sortable="custom"
          />
          <el-table-column
            prop="lm_user"
            label="创建人员"
            sortable="custom"
          />
          <el-table-column
            prop="lm_date"
            label="创建时间"
            sortable="custom"
          />
          <el-table-column
            label="操作"
          >
            <template slot-scope="{row}">
              <div class="operationClass">
                <el-button type="text" @click="edit('edit',row)">修改</el-button>
                <el-button type="text" @click="del(row.id)">删除</el-button>
              </div>
            </template>
          </el-table-column>
        </el-table>
      </div>
      <!--分页-->
      <pagination
        v-show="total>0"
        :total="total"
        :page.sync="form.page"
        :limit.sync="form.rows"
        align="right"
        layout="prev, pager, next,sizes"
        popper-class="select_bottom"
        @pagination="getOrganizationSearch"
      />
    </div>
    <el-dialog
      :title="operation==='add'?'添加':'修改'"
      :visible.sync="dialogVisible"
      width="50%"
      top="15vh"
      @closed="handleClose"
      @close="handleClose"
    >
      <el-form ref="dialogForm" :rules="dialogFormRules" :model="dialogForm" label-width="80px">
        <el-form-item label="组织类型" prop="OrgType">
          <el-radio-group
            v-model="dialogForm.OrgType"
            style="display: flex;align-items: end;height: 29px;"
            @change="changeRadio"
          >
            <el-radio
              v-for="item in OrgTypeArr"
              :key="item.value"
              :value="item.value"
              :label="item.label"
            />
          </el-radio-group>
        </el-form-item>
        <el-form-item label="组织编码" prop="OrgCode">
          <el-input v-model="dialogForm.OrgCode" :disabled="operation!=='add'" style="width: 220px" />
        </el-form-item>
        <el-form-item label="组织名称" prop="OrgName">
          <el-input v-model="dialogForm.OrgName" style="width: 220px" />
        </el-form-item>
        <el-form-item v-if="dialogFormOrgTypeSelected!=='F'" prop="SupUnit" label="上级单位">
          <el-select
            v-model="dialogForm.SupUnit"
            style="width: 220px"
            placeholder="请选择"
          >
            <el-option
              v-for="item in SupUnitArr"
              :label="item.org_name"
              :value="item.id"
            />
          </el-select>
        </el-form-item>
      </el-form>
      <span slot="footer" class="dialog-footer">
        <div class="footerButton">
          <el-button @click="dialogVisibleCancel">取 æ¶ˆ</el-button>
          <el-button type="primary" @click="dialogVisibleConfirm">ç¡® å®š</el-button>
        </div>
      </span>
    </el-dialog>
  </div>
</template>
<script>
import Pagination from '@/components/Pagination'
import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
  name: 'Zzjg',
  components: {
    Pagination
  },
  data() {
    const validateName = (rule, value, callback) => {
      if (!value) {
        return callback(new Error('请输入编码'))
      } else {
        if (SER_HZ.test(value)) {
          return callback(new Error('编码不能为中文'))
        } else {
          callback()
        }
      }
    }
    const validateTypeCode = (rule, value, callback) => {
      if (!value) {
        return callback(new Error('请选择上级'))
      } else {
        callback()
      }
    }
    return {
      mainHeight: 0,
      tableHeight: 0,
      form: {
        OrgCode: '', // ç»„织架构代码
        OrgName: '', // ç»„织架构名称
        OrgType: '', // ç»„织类型
        UserName: '', // åˆ›å»ºäººå‘˜
        prop: 'lm_date', // æŽ’序字段
        order: 'desc', // æŽ’序字段
        page: 1, // ç¬¬å‡ é¡µ
        rows: 10 // æ¯é¡µå¤šå°‘条
      },
      OrgTypeArr: [
        { label: '工厂', value: 'F' },
        { label: '部门', value: 'D' },
        { label: '车间', value: 'W' },
        { label: '科室', value: 'K' },
        { label: '生产线', value: 'L' }
      ],
      total: 10,
      tableData: [],
      dialogVisible: false,
      dialogForm: {
        OrgType: '',
        OrgCode: '',
        OrgName: '',
        SupUnit: ''// ä¸Šçº§å•位
      },
      SupUnitArr: [],
      dialogFormOrgTypeSelected: '',
      operation: '',
      dialogFormRules: {
        OrgType: [
          { required: true, message: '请输入选择类型', trigger: ['blur', 'change'] }
        ],
        OrgCode: [
          { required: true, validator: validateName, trigger: ['blur', 'change'] }
        ],
        OrgName: [
          { required: true, message: '请输入名称', trigger: ['blur', 'change'] }
        ],
        SupUnit: [
          { required: true, validator: validateTypeCode, trigger: ['blur', 'change'] }
        ]
      }
    }
  },
  created() {
    this.getOrganizationSearch()
  },
  mounted() {
    window.addEventListener('resize', this.getHeight)
    this.getHeight()
  },
  methods: {
    async getOrganizationSearch() {
      const res = await OrganizationSearch(this.form)
      this.tableData = res.data
      this.total = res.count
    },
    // æŽ’序改变时
    sortChange({ column, prop, order }) {
      if (order === 'descending') {
        order = 'desc'
      } else if (order === 'ascending') {
        order = 'asc'
      } else {
        order = 'desc'
      }
      this.form.order = order
      this.form.prop = prop
      this.getOrganizationSearch()
    },
    // æŸ¥è¯¢
    search() {
      this.getOrganizationSearch()
    },
    // é‡ç½®
    reset() {
      this.form.OrgCode = ''
      this.form.OrgName = ''
      this.form.OrgType = ''
      this.form.UserName = ''
      this.getOrganizationSearch()
    },
    // å•选框改变时
    async changeRadio(val) {
      if (val.length > 1) {
        this.OrgTypeArr.forEach(item => {
          if (item.label === val) {
            this.dialogFormOrgTypeSelected = item.value
          }
        })
        this.dialogForm.SupUnit = ''
      } else {
        this.dialogFormOrgTypeSelected = val
      }
      if (this.dialogFormOrgTypeSelected !== 'F') {
        const { data: res } = await PrentOrganization({ orgcode: this.dialogFormOrgTypeSelected })
        this.SupUnitArr = res
      }
    },
    // æ–°å¢žæŒ‰é’®
    add(operation) {
      this.operation = operation
      this.dialogVisible = true
    },
    // ä¿®æ”¹æŒ‰é’®
    edit(operation, row) {
      this.operation = operation
      this.dialogVisible = true
      if (row.description === 'F') {
        this.dialogForm.OrgType = '工厂'
      } else if (row.description === 'D') {
        this.dialogForm.OrgType = '部门'
      } else if (row.description === 'W') {
        this.dialogForm.OrgType = '车间'
      } else if (row.description === 'K') {
        this.dialogForm.OrgType = '科室'
      } else if (row.description === 'L') {
        this.dialogForm.OrgType = '生产线'
      }
      this.$nextTick(() => {
        this.changeRadio(this.dialogForm.OrgType)
        this.dialogForm.OrgCode = row.org_code
        this.dialogForm.OrgName = row.org_name
        this.dialogForm.SupUnit = row.parent_id
      })
    },
    // åˆ é™¤æŒ‰é’®
    async del(id) {
      this.$confirm('是否确认删除?', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
        DeleteOrganization({ orgid: id }).then(res => {
          if (res.code === '200') {
            this.$message.success('删除成功!')
            this.getOrganizationSearch()
          }
        })
      }).catch(() => {
        this.$message.info('已取消删除')
      })
    },
    // å¯¹è¯æ¡†å…³é—­äº‹ä»¶
    handleClose() {
      this.dialogForm.OrgType = ''
      this.dialogForm.OrgCode = ''
      this.dialogForm.OrgName = ''
      this.dialogForm.SupUnit = ''
      this.$refs.dialogForm.clearValidate()
    },
    // å¯¹è¯æ¡†å–消
    dialogVisibleCancel() {
      this.dialogVisible = false
    },
    // å¯¹è¯æ¡†ç¡®è®¤
    dialogVisibleConfirm() {
      this.$refs.dialogForm.validate(valid => {
        if (valid) {
          const data = {
            OrganType: this.dialogFormOrgTypeSelected,
            OrganCode: this.dialogForm.OrgCode,
            OrganName: this.dialogForm.OrgName,
            SupUnit: this.dialogFormOrgTypeSelected === 'F' ? '0' : this.dialogForm.SupUnit,
            OperType: this.operation === 'add' ? 'Add' : 'Update',
            Operator: getCookie('admin')
          }
          AddUpdateOrganization(data).then(res => {
            if (res.code === '200') {
              this.$message.success(this.operation === 'add' ? '添加成功!' : '修改成功!')
              this.getOrganizationSearch()
            } else {
              this.$message.error(this.operation === 'add' ? '添加失败!' : '修改失败!')
            }
          })
          this.dialogVisible = false
        }
      })
    },
    // èŽ·å–é¡µé¢é«˜åº¦
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 200
        this.tableHeight = this.mainHeight - 100
      })
    }
  }
}
</script>
<style lang="scss" scoped>
$main_color: #42b983;
::v-deep .el-button--primary {
  background-color: $main_color !important;
  height: 30px;
  display: flex;
  align-items: center;
}
::v-deep .el-button--info {
  //background-color: $main_color !important;
  height: 30px;
  display: flex;
  align-items: center;
}
::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
  background-color: $main_color !important;
}
.footerButton {
  display: flex;
  justify-content: end;
}
::v-deep .el-button--default {
  background-color: #ffffff !important;
  height: 30px;
  display: flex;
  align-items: center;
}
::v-deep .el-button--default:hover {
  color: #606266;
}
::v-deep .el-dialog__body {
  padding: 20px 100px !important;
}
::v-deep .el-radio__input.is-checked .el-radio__inner {
  background-color: $main_color;
  border-color: $main_color;
}
::v-deep .el-radio__input.is-checked + .el-radio__label {
  color: $main_color !important;
}
::v-deep .el-checkbox__input.is-checked .el-checkbox__inner {
  border-color: $main_color;
  background-color: $main_color;
}
::v-deep .el-input__inner {
  height: 30px
}
::v-deep .el-table .caret-wrapper {
  //float: right;
  transform: scale(0.8);
}
::v-deep .cell {
  display: flex !important;
  align-items: center !important;
  justify-content: space-between !important;
}
::v-deep .el-button--text {
  color: $main_color;
  font-size: 14px;
  cursor: pointer;
}
.operationClass {
  height: 23px;
  display: flex;
  justify-content: space-between;
  align-items: center;
}
.el-icon-share {
  color: $main_color;
  cursor: pointer;
}
.el-checkbox.is-bordered.is-checked {
  border-color: $main_color;
}
::v-deep .el-radio__input.is-checked .el-radio__inner {
  border-color: $main_color;
  background: $main_color;
}
::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner{
  border-color: $main_color;
  background: $main_color;
}
::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {
  color: $main_color !important;
}
::v-deep .el-checkbox.is-bordered+.el-checkbox.is-bordered{
  margin: 10px 30px 0px 0;
}
::v-deep .el-radio__input.is-checked + .el-radio__label {
  color: $main_color;
}
::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
  margin: 10px 30px 0px 0;
}
</style>
vue.config.js
@@ -1,7 +1,7 @@
'use strict'
const path = require('path')
const defaultSettings = require('./src/settings.js')
const webpack = require('webpack')
function resolve(dir) {
  return path.join(__dirname, dir)
}
@@ -55,7 +55,13 @@
      alias: {
        '@': resolve('src')
      }
    }
    },
    plugins: [
      new webpack.ProvidePlugin({
        jQuery: 'jquery',
        $: 'jquery'
      })
    ]
  },
  chainWebpack(config) {
    // it can improve the speed of the first screen, it is recommended to turn on preload