1.提交

loulijun2021

2023-02-12 adb74c51618faf025fe1d46bf6b22db895c2608f

 src/views/jcsz/yhqd.vue

@@ -1,19 +1,23 @@
<template>
  <div>
    <div class="body" :style="{height:mainHeight+'px'}">
      <div class="bodyTopButtonGroup">
        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">新增</el-button>
        <el-button icon="el-icon-menu" @click="workingTramClick">生产班组</el-button>
        <el-button icon="el-icon-download" @click="upload">导入</el-button>
      <div class="bodyTopButtonGroup" style="justify-content: space-between">

        <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">新增</el-button>

        <div style="display: flex">
          <el-button v-waves icon="el-icon-menu" @click="workingTramClick">生产班组</el-button>
          <el-button v-waves icon="el-icon-download" @click="upload">导入</el-button>
        </div>
      </div>

      <div class="bodyTopFormGroup">
        <el-form
          ref="form"
          :model="form"
          label-width="80px"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label="用户编码" style=" display: flex;">
@@ -50,7 +54,7 @@
                />
              </el-select>
            </el-form-item>
            <el-form-item label="在职状态" style=" display: flex;">
            <el-form-item v-show="isExpandForm" label="在职状态" style=" display: flex;">
              <el-select
                v-model="form.Enable"
                :popper-append-to-body="false"
@@ -67,142 +71,224 @@
              </el-select>
            </el-form-item>
          </div>
          <div style="display: flex;align-items: flex-start;margin-top: 3px">
            <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
            class="bodySearchReset"
            :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
          >
            <el-button v-waves type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          </div>
        </el-form>
        <div
          class="bodyTopFormExpand"
        >
          <svg-icon
            v-show="mouseHoverType==='mouseout'"
            style="cursor: pointer"
            :icon-class="!isExpandForm?'doubleDown3':'doubleUp3'"
            @mouseenter="mouseHoverType=$event.type"
          />
          <svg-icon
            v-show="mouseHoverType==='mouseenter'"
            style="cursor: pointer"
            :icon-class="!isExpandForm?'doubleDown':'doubleUp'"
            @click="isExpandForm=!isExpandForm"
            @mouseout="mouseHoverType=$event.type"
          />
        </div>
      </div>

      <div class="elTableDiv">
        <!--        <TableColumnSettings-->
        <!--          :list1="tableColumnSettingsArray"-->
        <!--          @tableColumnUpdate="tableColumnUpdate"-->
        <!--        />-->
        <el-table
          ref="tableDataRef"
          :key="tableTimeStampKey"
          :data="tableData"
          :height="tableHeight+'px'"
          class="tableFixed"
          :height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
          highlight-current-row
          :style="{width: 100+'%',height:tableHeight+'px'}"
          :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+40)+'px',}"
          :header-cell-style="this.$headerCellStyle"
          :row-class-name="tableRowClassName"
          :cell-style="this.$cellStyle"
          border
          @sort-change="sortChange"
        >

          <el-table-column
            v-for="item in tableColumnSettingsArray"
            v-if="item.show"
            :key="item.id"
            :sortable="item.sortable"
            :prop="item.prop"
            :min-width="item.minWidth"
            :label="item.label"
            :width="item.width"
            show-tooltip-when-overflow
            :fixed="item.fixed?(item.fixed==='left'?'left':'right'):false"
          >
            <template slot-scope="{row}">
              <div v-if="row[item.prop]==='1'&&row.wagetype">计时制</div>
              <div v-else-if="row[item.prop]==='2'&&row.wagetype">计件制</div>
              <div v-else-if="row[item.prop]==='Y'&& item.prop==='enable'"><i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />在职</div>
              <div v-else-if="row[item.prop]==='N'&& item.prop==='enable'"><i class="el-icon-info" style="margin-right: 2px" />离职</div>
              <div v-else-if="row[item.prop]==='Y'&& item.prop==='is_role'"><i class="el-icon-share" :style="{color:$store.state.settings.theme}" @click="roleClick({row})" /></div>
              <div v-else-if="row[item.prop]==='N'&& item.prop==='is_role'"><i class="el-icon-share" style="color: rgb(180 ,181, 185)" @click="roleClick({row})" /></div>
              <div v-else-if="!row[item.prop]">/</div>
              <div v-else>{{ row[item.prop] }}</div>
            </template>
          </el-table-column>

          <!--          <el-table-column-->
          <!--            type="selection"-->
          <!--            width="50"-->
          <!--          />-->
          <el-table-column
            prop="RowNum"
            width="50"
            label="序号"
            fixed
          />
          <el-table-column
            prop="usercode"
            label="用户编码"
            min-width="110"
            sortable="custom"
          />
          <el-table-column
            prop="username"
            label="用户名称"
            min-width="110"
            sortable="custom"
          />
          <el-table-column
            prop="password"
            label="用户密码"
            min-width="110"
            sortable="custom"
          />
          <el-table-column
            prop="org_name"
            label="所属组织"
            min-width="110"
            sortable="custom"
          />
          <el-table-column
            prop="group_name"
            label="生产班组"
            min-width="110"
            sortable="custom"
          />
          <el-table-column
            prop="wagetype"
            label="工资类型"
            sortable="custom"
            width="110"
          >
            <template slot-scope="{row}">
              <div v-if="row.wagetype==='1'">计时制</div>
              <div v-if="row.wagetype==='2'">计件制</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="mobile"
            label="联系方式"
            min-width="110"
            sortable="custom"
          >
            <template slot-scope="{row}">
              <div v-if="row.mobile===''">/</div>
              <div v-else>{{ row.mobile }}</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="email"
            label="电子邮箱"
            sortable="custom"
            min-width="110"
          >
            <template slot-scope="{row}">
              <div v-if="row.email===''">/</div>
              <div v-else>{{ row.email }}</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="enable"
            label="在职状态"
            width="110"
            sortable="custom"
          >
            <template slot-scope="{row}">
              <div v-if="row.enable==='Y'">
                <svg-icon icon-class="circleYes" style="margin-right: 2px" />
                在职
              </div>
              <div v-if="row.enable==='N'">
                <svg-icon icon-class="circleNo" style="margin-right: 2px" />
                离职
              </div>
            </template>
          </el-table-column>
          <el-table-column
            prop="lm_user"
            label="创建人员"
            width="110"
            sortable="custom"
          />
          <el-table-column
            prop="lm_date"
            label="创建时间"
            width="160"
            sortable="custom"
          />
          <el-table-column
            prop="is_role"
            label="关联角色"
            width="110"
          >
            <template slot-scope="{row}">
              <i v-if="row.is_role==='Y'" class="el-icon-share" @click="roleClick({row})" />
              <i
                v-if="row.is_role==='N'"
                class="el-icon-share"
                style="color: rgb(180 ,181, 185)"
                @click="roleClick({row})"
              />
            </template>
          </el-table-column>

          <!--          <el-table-column-->
          <!--            prop="RowNum"-->
          <!--            width="50"-->
          <!--            label="序号"-->
          <!--            fixed-->
          <!--          />-->
          <!--          <el-table-column-->
          <!--            prop="usercode"-->
          <!--            label="用户编码"-->
          <!--            show-tooltip-when-overflow-->
          <!--            min-width="110"-->
          <!--            sortable="custom"-->
          <!--          />-->
          <!--          <el-table-column-->
          <!--            prop="username"-->
          <!--            label="用户名称"-->
          <!--            min-width="110"-->
          <!--            sortable="custom"-->
          <!--            show-tooltip-when-overflow-->
          <!--          />-->
          <!--          <el-table-column-->
          <!--            prop="password"-->
          <!--            label="用户密码"-->
          <!--            min-width="110"-->
          <!--            sortable="custom"-->
          <!--            show-tooltip-when-overflow-->
          <!--          />-->
          <!--          <el-table-column-->
          <!--            prop="org_name"-->
          <!--            label="所属组织"-->
          <!--            min-width="110"-->
          <!--            show-tooltip-when-overflow-->
          <!--            sortable="custom"-->
          <!--          >-->
          <!--            <template slot-scope="{row}">-->
          <!--              <div v-if="row.org_name">{{ row.org_name }}</div>-->
          <!--              <div v-else>/</div>-->
          <!--            </template>-->
          <!--          </el-table-column>-->
          <!--          <el-table-column-->
          <!--            prop="group_name"-->
          <!--            label="生产班组"-->
          <!--            show-tooltip-when-overflow-->
          <!--            min-width="110"-->
          <!--            sortable="custom"-->
          <!--          >-->
          <!--            <template slot-scope="{row}">-->
          <!--              <div v-if="row.group_name">{{ row.group_name }}</div>-->
          <!--              <div v-else>/</div>-->
          <!--            </template>-->
          <!--          </el-table-column>-->
          <!--          <el-table-column-->
          <!--            prop="wagetype"-->
          <!--            label="工资类型"-->
          <!--            show-tooltip-when-overflow-->
          <!--            sortable="custom"-->
          <!--            width="110"-->
          <!--          >-->
          <!--            <template slot-scope="{row}">-->
          <!--              <div v-if="row.wagetype==='1'">计时制</div>-->
          <!--              <div v-if="row.wagetype==='2'">计件制</div>-->
          <!--            </template>-->
          <!--          </el-table-column>-->
          <!--          <el-table-column-->
          <!--            prop="mobile"-->
          <!--            label="联系方式"-->
          <!--            show-tooltip-when-overflow-->
          <!--            min-width="110"-->
          <!--            sortable="custom"-->
          <!--          >-->
          <!--            <template slot-scope="{row}">-->
          <!--              <div v-if="row.mobile===''">/</div>-->
          <!--              <div v-else>{{ row.mobile }}</div>-->
          <!--            </template>-->
          <!--          </el-table-column>-->
          <!--          <el-table-column-->
          <!--            prop="email"-->
          <!--            label="电子邮箱"-->
          <!--            sortable="custom"-->
          <!--            show-tooltip-when-overflow-->
          <!--            min-width="110"-->
          <!--          >-->
          <!--            <template slot-scope="{row}">-->
          <!--              <div v-if="row.email===''">/</div>-->
          <!--              <div v-else>{{ row.email }}</div>-->
          <!--            </template>-->
          <!--          </el-table-column>-->
          <!--          <el-table-column-->
          <!--            prop="enable"-->
          <!--            show-tooltip-when-overflow-->
          <!--            label="在职状态"-->
          <!--            width="110"-->
          <!--            sortable="custom"-->
          <!--          >-->
          <!--            <template slot-scope="{row}">-->
          <!--              <div v-if="row.enable==='Y'">-->
          <!--                &lt;!&ndash;                <svg-icon icon-class="circleYes" style="margin-right: 2px" />&ndash;&gt;-->
          <!--                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />-->
          <!--                在职-->
          <!--              </div>-->
          <!--              <div v-if="row.enable==='N'">-->
          <!--                &lt;!&ndash;/*                <svg-icon icon-class="circleNo" style="margin-right: 2px" />*/&ndash;&gt;-->
          <!--                <i class="el-icon-info" style="margin-right: 2px" />-->
          <!--                离职-->
          <!--              </div>-->
          <!--            </template>-->
          <!--          </el-table-column>-->
          <!--          <el-table-column-->
          <!--            prop="lm_user"-->
          <!--            label="创建人员"-->
          <!--            show-tooltip-when-overflow-->
          <!--            width="110"-->
          <!--            sortable="custom"-->
          <!--          />-->
          <!--          <el-table-column-->
          <!--            prop="lm_date"-->
          <!--            label="创建时间"-->
          <!--            show-tooltip-when-overflow-->
          <!--            width="160"-->
          <!--            sortable="custom"-->
          <!--          />-->
          <!--          <el-table-column-->
          <!--            prop="is_role"-->
          <!--            label="关联角色"-->
          <!--            show-tooltip-when-overflow-->
          <!--            width="110"-->
          <!--          >-->
          <!--            <template slot-scope="{row}">-->
          <!--              <i-->
          <!--                v-if="row.is_role==='Y'"-->
          <!--                :style="{color:$store.state.settings.theme}"-->
          <!--                class="el-icon-share"-->
          <!--                @click="roleClick({row})"-->
          <!--              />-->
          <!--              <i-->
          <!--                v-if="row.is_role==='N'"-->
          <!--                class="el-icon-share"-->
          <!--                style="color: rgb(180 ,181, 185)"-->
          <!--                @click="roleClick({row})"-->
          <!--              />-->
          <!--            </template>-->
          <!--          </el-table-column>-->
          <el-table-column
            label="操作"
            fixed="right"
@@ -211,10 +297,14 @@
            <template slot-scope="{row}">
              <div class="operationClass">
                <el-tooltip class="item" effect="dark" content="编辑" placement="top">
                  <i class="el-icon-edit-outline" @click="edit('edit',row)" />
                  <i
                    :style="{color:$store.state.settings.theme}"
                    class="el-icon-edit-outline"
                    @click="edit('edit',row)"
                  />
                </el-tooltip>
                <el-tooltip v-del-tab-index class="item" effect="dark" content="删除" placement="top">
                  <i class="el-icon-delete" @click="del(row.id)" />
                  <i :style="{color:$store.state.settings.theme}" class="el-icon-delete" @click="del(row.id)" />
                </el-tooltip>
              </div>
            </template>
@@ -235,6 +325,7 @@

    <!--    用户清单新增、编辑-->
    <el-dialog
      v-el-drag-dialog
      :title="operation==='add'?'新增':'编辑'"
      :visible.sync="dialogVisible"
      width="800px"
@@ -322,14 +413,21 @@
      </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>
          <el-button v-waves @click="dialogVisibleCancel">取 消</el-button>
          <el-button
            v-waves
            type="primary"
            :loading="$store.state.app.buttonIsDisabled"
            :disabled="$store.state.app.buttonIsDisabled"
            @click="dialogVisibleConfirm"
          >确 定</el-button>
        </div>
      </span>
    </el-dialog>

    <!--    关联角色-->
    <el-dialog
      v-el-drag-dialog
      title="关联角色"
      :visible.sync="dialogVisibleRoles"
      width="800px"
@@ -343,38 +441,50 @@
      <!--      @opened="handleOpenedRoles"-->

      <div>
        <i class="el-icon-s-comment" style="color:#42b983;" /> 用户名称：{{ dialogFormRoles.username }}
        <i class="el-icon-s-comment" :style="{color:$store.state.settings.theme}" /> 用户名称：{{ dialogFormRoles.username }}
      </div>
      <el-divider />
      <div>
        <div style="margin-bottom:20px">
          <i class="el-icon-s-operation" style="color:#42b983;" /> 角色类型集合：
          <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 角色类型集合：
        </div>
        <div class="myCheckboxGroup">
          <div
            v-for="item in dialogFormRoles.rolesArr"
            :key="item.code"
            :style="{border:item.isSelected1?'1px solid #42b983':'1px solid #eee'}"
            :style="{border:item.isSelected1?'1px solid '+ $store.state.settings.theme :'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 }}
            <!--            <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"-->
            <el-checkbox
              :key="item.code"
              v-model="item.isSelected2"
              class="myCheckboxInput"
              :value="item.code"
              :name="item.name"
              :label="item.name"
              :checked="item.isSelected2"
              @change="myCheckboxInputClick(item)"
            />
            <div class="myCheckboxInputLabel">{{ item.name }}</div>

          </div>
        </div>
      </div>
      <el-divider />
      <div>
        <div style="margin-bottom:20px">
          <i class="el-icon-s-operation" style="color:#42b983;" /> 角色：
          <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 角色：
        </div>
        <el-tree
          ref="roleTree"
@@ -382,7 +492,7 @@
          show-checkbox
          node-key="code"
          default-expand-all
          style="height: 300px"
          style="height: 300px;overflow-y: scroll"
          :props="defaultPropsOfRoleTree"
          @check="checkBoxClick"
        />
@@ -391,14 +501,21 @@
      </div>
      <span slot="footer" class="dialog-footer">
        <div class="footerButton">
          <el-button @click="rolesDialogVisibleCancel">取 消</el-button>
          <el-button type="primary" @click="rolesDialogVisibleConfirm">确 定</el-button>
          <el-button v-waves @click="rolesDialogVisibleCancel">取 消</el-button>
          <el-button
            v-waves
            type="primary"
            :loading="$store.state.app.buttonIsDisabled"
            :disabled="$store.state.app.buttonIsDisabled"
            @click="rolesDialogVisibleConfirm"
          >确 定</el-button>
        </div>
      </span>
    </el-dialog>

    <!--    产组按钮对话框-->
    <el-dialog
      v-el-drag-dialog
      title="生产班组"
      :visible.sync="workingDialogVisible"
      width="800px"
@@ -413,7 +530,7 @@
      <!--      </div>-->

      <div style="margin-bottom: 20px;display: flex">
        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="addWorking">新增</el-button>
        <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="addWorking">新增</el-button>
        <!--        <el-button type="primary" icon="el-icon-delete" @click="delSetting">删除</el-button>-->
      </div>
      <el-table
@@ -442,9 +559,15 @@
          prop="group_code"
          label="班组编码"
          sortable="custom"
          show-tooltip-when-overflow
        >
          <template slot-scope="{row}">
            <el-input v-if="row.isVisible===1" v-model="row.group_code" placeholder="请输入" />
            <el-input
              v-if="row.isVisible===1"
              v-model="row.group_code"
              oninput="value=value.replace(/[^0-9a-zA-Z]/g,'')"
              placeholder="请输入"
            />
            <div v-else> {{ row.group_code }}</div>
          </template>
        </el-table-column>
@@ -452,6 +575,7 @@
          prop="group_name"
          label="班组名称"
          sortable="custom"
          show-tooltip-when-overflow
        >
          <template slot-scope="{row}">
            <el-input v-if="row.isVisible===1" v-model="row.group_name" placeholder="请输入" />
@@ -460,6 +584,7 @@
        </el-table-column>
        <el-table-column
          prop="description"
          show-tooltip-when-overflow
          label="班组描述"
          sortable="custom"
        >
@@ -471,9 +596,9 @@
        <el-table-column label="操作">
          <template slot-scope="{row}">
            <div class="operationClass">
              <el-button v-if="row.isVisible===0" type="text" @click="delWorking(row)">删除</el-button>
              <el-button v-if="row.isVisible===1" type="text" @click="saveWorking(row)">保存</el-button>
              <el-button v-if="row.isVisible===1" type="text" @click="cancelWorking(row)">取消</el-button>
              <el-button v-if="row.isVisible===0" v-waves type="text" @click="delWorking(row)">删除</el-button>
              <el-button v-if="row.isVisible===1" v-waves type="text" @click="saveWorking(row)">保存</el-button>
              <el-button v-if="row.isVisible===1" v-waves type="text" @click="cancelWorking(row)">取消</el-button>
            </div>
          </template>
        </el-table-column>
@@ -491,14 +616,21 @@
      />
      <span slot="footer" class="dialog-footer">
        <div class="footerButton">
          <el-button @click="WorkingDialogVisibleCancel">返回</el-button>
          <el-button v-waves @click="WorkingDialogVisibleCancel">返回</el-button>
          <!--          <el-button type="primary" @click="settingDialogVisibleConfirm">确 定</el-button>-->
        </div>
      </span>
    </el-dialog>

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

  </div>
</template>
@@ -506,6 +638,7 @@
<script>
import Pagination from '@/components/Pagination'
import ImportPicker from '@/components/ImportPicker'
import waves from '@/directive/waves/index.js' // 水波纹指令

import {
  AddUpdateUser,
@@ -520,27 +653,18 @@
} from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
import $ from 'jquery'
import clearAllChildren from '@/utils/global'
import clearAllChildren, { validateCode } from '@/utils/global'
import { MesOrderStepReportSelectUserGroup } from '@/api/scgl'
import elDragDialog from '@/directive/el-drag-dialog'
import TableColumnSettings from '@/components/TableColumnSettings'

const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
  name: 'YYQD',
  components: {
    Pagination, ImportPicker
    Pagination, ImportPicker, TableColumnSettings
  },
  directives: { elDragDialog, waves },
  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 validateMobile = (rule, value, callback) => {
      if (!value) {
        callback()
@@ -570,8 +694,9 @@
        }
      }
    }

    return {
      mouseHoverType: 'mouseout',
      isExpandForm: false,
      isIpad: false,
      mainHeight: 0,
      tableHeight: 0,
@@ -600,12 +725,96 @@
      ], // 在职状态
      total: 10,
      tableData: [],

      tableColumnSettingsArray: [
        { minWidth: 50, width: false, prop: 'id', label: 'id', id: 1, show: false, fixed: false, sortable: false },
        { minWidth: 25, width: 50, prop: 'RowNum', label: '序号', id: 2, show: true, fixed: 'left', sortable: false },
        {
          minWidth: 110,
          width: false,
          prop: 'usercode',
          label: '用户编码',
          id: 3,
          show: true,
          fixed: false,
          sortable: true
        },
        {
          minWidth: 110,
          width: false,
          prop: 'username',
          label: '用户名称',
          id: 4,
          show: true,
          fixed: false,
          sortable: true
        },
        { minWidth: 110, width: false, prop: 'password', label: '用户密码', id: 5, show: true, fixed: false, sortable: 'custom' },
        { minWidth: 110, width: false, prop: 'stu_torgcode', label: '组织编码', id: 6, show: false, fixed: false, sortable: 'custom' },
        { minWidth: 110, width: false, prop: 'org_name', label: '所属组织', id: 7, show: true, fixed: false, sortable: 'custom' },
        { minWidth: 110, width: false, prop: 'group_code', label: '班组编码', id: 8, show: false, fixed: false, sortable: 'custom' },
        { minWidth: 110, width: false, prop: 'group_name', label: '生产班组', id: 9, show: true, fixed: false, sortable: 'custom' },
        { minWidth: 110, width: false, prop: 'wagetype', label: '工资类型', id: 10, show: true, fixed: false, sortable: 'custom' },
        { minWidth: 110, width: false, prop: 'mobile', label: '联系方式', id: 11, show: true, fixed: false, sortable: 'custom' },
        {
          minWidth: 110,
          width: false,
          prop: 'email',
          label: '电子邮箱',
          id: 12,
          show: true,
          fixed: false,
          sortable: 'custom'
        },
        {
          minWidth: 110,
          width: false,
          prop: 'enable',
          label: '在职状态',
          id: 13,
          show: true,
          fixed: false,
          sortable: 'custom'
        },
        {
          minWidth: 110,
          width: false,
          prop: 'lm_user',
          label: '创建人员',
          id: 14,
          show: true,
          fixed: false,
          sortable: 'custom'
        },
        {
          minWidth: 160,
          width: false,
          prop: 'lm_date',
          label: '创建时间',
          id: 15,
          show: true,
          fixed: false,
          sortable: 'custom'
        },
        {
          minWidth: 110,
          width: false,
          prop: 'is_role',
          label: '关联角色',
          id: 16,
          show: true,
          fixed: false,
          sortable: false
        }
      ],
      tableTimeStampKey: new Date().getTime(), // 表格key

      dialogVisible: false,
      dialogForm: {
        id: '',
        UserCode: '',
        UserName: '',
        Password: '',
        Password: '123456',
        Enable: 'Y',
        StuOrg: '',
        Mobile: '',
@@ -613,7 +822,7 @@
        groupcode: '',
        Operator: '',
        OperType: '',
        wagetype: ''
        wagetype: '2'
      },
      usergroupArr: [], // 生产班组数组
      wagetypeArr: [
@@ -623,7 +832,7 @@
      operation: '',
      dialogFormRules: {
        UserCode: [
          { required: true, validator: validateName, trigger: ['blur', 'change'] }
          { required: true, validator: validateCode, trigger: ['blur', 'change'] }
        ],
        UserName: [
          { required: true, message: '请输入用户名称', trigger: ['blur', 'change'] }
@@ -697,6 +906,13 @@
    this.getHeight()
  },
  methods: {
    tableColumnUpdate(val, isCopyTrue) {
      if (isCopyTrue) {
        this.tableColumnSettingsArray = val
      }
      this.tableTimeStampKey = new Date().getTime()
      this.$refs.tableDataRef.doLayout()
    },
    handleRequest() {
      this.getUserSearch().then(res => {
        if (res.code === '200') {
@@ -808,6 +1024,9 @@
        DeleteUser({ Userid: id }).then(res => {
          if (res.code === '200') {
            this.$message.success('删除成功!')
            if (this.form.page > 1 && this.tableData.length === 1) {
              this.form.page--
            }
            this.getUserSearch()
          }
        })
@@ -820,14 +1039,14 @@
      this.dialogForm.UserCode = ''
      this.dialogForm.UserCode = ''
      this.dialogForm.UserName = ''
      this.dialogForm.Password = ''
      this.dialogForm.Password = '123456'
      this.dialogForm.Enable = 'Y'
      this.$refs.dialogCascader.checkedValue = ''
      this.dialogForm.StuOrg = ''
      this.dialogForm.Mobile = ''
      this.dialogForm.Email = ''
      this.dialogForm.groupcode = ''
      this.dialogForm.wagetype = ''
      this.dialogForm.wagetype = '2'
      this.$refs.dialogForm.clearValidate()
    },
    // 对话框取消
@@ -838,6 +1057,7 @@
    dialogVisibleConfirm() {
      this.$refs.dialogForm.validate(valid => {
        if (valid) {
          this.$store.state.app.buttonIsDisabled = true
          const data = {
            id: this.dialogForm.id,
            UserCode: this.dialogForm.UserCode,
@@ -855,11 +1075,13 @@
          }
          AddUpdateUser(data).then(res => {
            if (res.code === '200') {
              this.$message.success(this.operation === 'add' ? '添加成功！' : '修改成功！')
              this.dialogVisible = false
              this.$message.success(this.operation === 'add' ? '添加成功！' : '修改成功！')
              this.getUserSearch()
              this.$store.state.app.buttonIsDisabled = false
            } else {
              this.$message.error(this.operation === 'add' ? '添加失败！' : '修改失败！')
              this.$store.state.app.buttonIsDisabled = false
            }
          })
        }
@@ -870,63 +1092,80 @@
      this.$nextTick(() => {
        // this.mainHeight = window.innerHeight - 250
        this.mainHeight = window.innerHeight - 85
        this.tableHeight = this.mainHeight - 200
        this.tableHeight = this.mainHeight - 255
        if (window.innerHeight < 769) {
          this.tableHeight = this.tableHeight - 40
        }
        this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
        this.$refs.tableDataRef.doLayout()
      })
    },
    // 关联角色点击事件
    async roleClick({ row }) {
    roleClick({ row }) {
      const loading = this.$loading({
        lock: true,
        text: '正在加载数据，请稍等...',
        spinner: 'el-icon-loading',
        customClass: 'osloading',
        background: 'rgba(0, 0, 0, 0.7)'
      })

      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
      UserAssociationRole({ usercode: row.usercode }).then(res => {
        if (res.code === '200') {
          setTimeout(() => {
            loading.close()

      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.dialogVisibleRoles = true
            this.rolesAll = res.data.filter(item => item.children.length !== 0)

            const nodeKey = []// 树形回显key
            this.rolesAll.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 })
                }
              }
            })
            this.dialogFormRoles.roleTreeSelectedArr.push({ Code: item.code, Name: item.name, Data: Data })
          }

            this.dialogFormRoles.rolesArr[0].isSelected1 = true// 默认选中第一个

            this.dialogFormRoles.roleTree = this.rolesAll.filter(item => item.code === this.dialogFormRoles.rolesArr[0].code)
            this.dialogFormRoles.roleTree[0].name = '全部'

            this.$nextTick(() => {
              this.$refs.roleTree.setCheckedKeys(nodeKey)
            })
          }, 1000)
        } else {
          loading.close()
        }
      })
      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() {
@@ -939,12 +1178,15 @@
    },
    // 用户关联对话框确认事件
    async rolesDialogVisibleConfirm() {
      console.log(this.dialogFormRoles.roleTreeSelectedArr, 333337)
      this.$store.state.app.buttonIsDisabled = true
      const res = await SaveUserAssoctRole(this.dialogFormRoles.roleTreeSelectedArr, this.dialogFormRoles.usercode)
      if (res.code === '200') {
        this.dialogVisibleRoles = false
        this.$message.success('保存成功！')
        await this.getUserSearch()
        this.dialogVisibleRoles = false
        this.$store.state.app.buttonIsDisabled = false
      } else {
        this.$store.state.app.buttonIsDisabled = false
      }
    },
    // 树形复选框点击事件
@@ -1107,7 +1349,7 @@
    },
    // myCheckBoxInput点击事件  小盒子点击(input)
    myCheckboxInputClick(item) {
      item.isSelected2 = !item.isSelected2
      item.isSelected2 = !!item.isSelected2
      this.dialogFormRoles.rolesArrSelectedArr = [...new Set(this.dialogFormRoles.rolesArrSelectedArr)]// 数组去重
      if (item.isSelected2) { // 从没选中到选中
        console.log('从没选中到选中')
@@ -1205,6 +1447,10 @@
    },
    // 新增
    addWorking() {
      if (this.workingTableData.find(i => i.isVisible === 1)) {
        return this.$message.info('请先保存上一行记录！')
      }

      let number = Math.random() * Math.random()// 作为删除时的标识符
      number = number === 0 ? (10 + Math.random()) : number
      const data = { group_code: '', group_name: '', description: '', isVisible: 1, number: number }
@@ -1220,6 +1466,9 @@
        UserGroupDelete({ UserGrupCode: row.group_code }).then(res => {
          if (res.code === '200') {
            this.$message.success('删除成功!')
            if (this.formWorking.page > 1 && this.workingTableData.length === 1) {
              this.formWorking.page--
            }
            this.getUserGroupSearch()
          }
        })
@@ -1291,12 +1540,20 @@
      margin: 10px 30px 0 0;
      border-radius: 5px;
      cursor: default;
      position: relative;

      .myCheckboxInput {
        margin: 1px 5px 0 0;
        cursor: pointer;
      }

      .myCheckboxInputLabel {
        position: absolute;
        left: 29px;
        padding: 5px;
        top: 6px;
        color: transparent;
      }
    }

    input[type=checkbox] {
@@ -1340,11 +1597,18 @@
<!--公共页面样式-->
<style lang="scss" scoped>
$main_color: #42b983;
.el-icon-share ,.el-icon-delete,.el-icon-edit-outline{

::v-deep .el-button--text {
  font-size: 14px;
  cursor: pointer;
}

.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
  color: $main_color;
  cursor: pointer;
}
.el-icon-edit-outline{

.el-icon-edit-outline {
  margin-right: 15px;
}

@@ -1405,8 +1669,8 @@
  background-color: #f8f8fa;
}

::v-deep .el-table__body .el-table__row.hover-row td{
  background-color: #eaecef ;
::v-deep .el-table__body .el-table__row.hover-row td {
  background-color: #eaecef;
}

::v-deep .el-form--inline .el-form-item__label {
@@ -1423,8 +1687,25 @@
  margin-bottom: 0;
}

.tableFixed {
  ::v-deep .el-table__fixed-right {
    height: 100% !important;
  }

  ::v-deep .el-table__fixed {
    height: 100% !important;
  }
}

</style>
<style>
.osloading {
  font-size: 26px !important;
}

.el-loading-text {
  font-size: 26px !important;
}

.el-table .custom-row {
  background: #f8f8fa;