修改登陆时传PC参数

loulijun2021

2022-08-11 f3335e01ea71614db9fa6aedf1d35e1202c3b12f

 src/views/jcsz/yhqd.vue

@@ -1,7 +1,13 @@
<template>
  <div>
    <div class="body" :style="{height:mainHeight+'px'}">
      <div style="padding: 10px 5px 0 0">
      <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>

      <div class="bodyTopFormGroup">
        <el-form
          ref="form"
          :model="form"
@@ -29,7 +35,13 @@

            </el-form-item>
            <el-form-item label="工资类型" style=" display: flex;">
              <el-select v-model="form.wagetype" :popper-append-to-body="false" filterable style="width: 200px" placeholder="请选择">
              <el-select
                v-model="form.wagetype"
                :popper-append-to-body="false"
                filterable
                style="width: 200px"
                placeholder="请选择"
              >
                <el-option
                  v-for="item in wagetypeArr"
                  :key="item.value"
@@ -39,7 +51,13 @@
              </el-select>
            </el-form-item>
            <el-form-item label="在职状态" style=" display: flex;">
              <el-select v-model="form.Enable" :popper-append-to-body="false" filterable style="width: 200px" placeholder="请选择">
              <el-select
                v-model="form.Enable"
                :popper-append-to-body="false"
                filterable
                style="width: 200px"
                placeholder="请选择"
              >
                <el-option
                  v-for="item in EnableArr"
                  :key="item.value"
@@ -49,29 +67,23 @@
              </el-select>
            </el-form-item>
          </div>
          <div style="display: flex;align-items: start;margin-top: 5px;">
          <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>
        </el-form>
      </div>
      <el-divider />
      <div style="margin-left: 10px;display: flex">
        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">新增</el-button>
        <el-button type="primary" icon="el-icon-menu" @click="workingTramClick">生产班组</el-button>
        <el-button type="primary" icon="el-icon-upload2" @click="upload">导入</el-button>
      </div>
      <el-divider />

      <div class="elTableDiv">
        <el-table
          :data="tableData"
          border
          stripe
          :height="tableHeight+'px'"
          highlight-current-row
          :style="{width: 100+'%',height:tableHeight+'px'}"
          :header-cell-style="this.$headerCellStyle"
          :row-class-name="tableRowClassName"
          :cell-style="this.$cellStyle"
          border
          @sort-change="sortChange"
        >
          <!--          <el-table-column-->
@@ -82,36 +94,43 @@
            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>
@@ -121,6 +140,7 @@
          <el-table-column
            prop="mobile"
            label="联系方式"
            min-width="110"
            sortable="custom"
          >
            <template slot-scope="{row}">
@@ -132,6 +152,7 @@
            prop="email"
            label="电子邮箱"
            sortable="custom"
            min-width="110"
          >
            <template slot-scope="{row}">
              <div v-if="row.email===''">/</div>
@@ -139,41 +160,62 @@
            </template>
          </el-table-column>
          <el-table-column
            prop=""
            prop="enable"
            label="在职状态"
            width="110"
            sortable="custom"
          >
            <template slot-scope="{row}">
              <div v-if="row.enable==='Y'">在职</div>
              <div v-if="row.enable==='N'">离职</div>
              <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="200"
            width="160"
            sortable="custom"
          />
          <el-table-column
            prop="is_role"
            label="关联角色"
            width="110"
          >
            <template slot-scope="{row}">
              <i class="el-icon-share" @click="roleClick({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
            label="操作"
            fixed="right"
            width="120"
          >
            <template slot-scope="{row}">
              <div class="operationClass">
                <el-button type="text" @click="edit('edit',row)">编辑</el-button>
                <el-button type="text" @click="del(row.id)">删除</el-button>
                <el-tooltip class="item" effect="dark" content="编辑" placement="top">
                  <i 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)" />
                </el-tooltip>
              </div>
            </template>
          </el-table-column>
@@ -186,7 +228,7 @@
        :page.sync="form.page"
        :limit.sync="form.rows"
        align="right"
        layout="prev, pager, next,sizes"
        layout="total ,prev, pager, next,sizes"
        popper-class="select_bottom"
        @pagination="getUserSearch"
      />
@@ -292,8 +334,8 @@
      title="关联角色"
      :visible.sync="dialogVisibleRoles"
      width="800px"
      top="15vh"
      :fullscreen="isFullscreen"
      :top="isIpad?'3vh':'15vh'"
      :fullscreen="isIpad"
      :close-on-click-modal="false"
      class="dialogVisibleRoles"
      @closed="handleCloseRoles"
@@ -366,17 +408,24 @@
      class="workingDialogVisible"
      @close="handleCloseWorking"
    >
      <!--      <div style="margin-bottom: 10px; padding: 10px 0; background-color: #f8f8fa; display: flex">-->
      <!--        <el-button style="margin-left: 10px;" type="primary" icon="el-icon-circle-plus-outline" @click="addWorking">新增</el-button>-->
      <!--        &lt;!&ndash;        <el-button type="primary" icon="el-icon-delete" @click="delSetting">删除</el-button>&ndash;&gt;-->
      <!--      </div>-->

      <div style="margin-bottom: 20px;display: flex">
        <el-button 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
        ref="workingTableData"
        :data="workingTableData"
        border
        height="300"
        height="377"
        highlight-current-row
        :header-cell-style="this.$headerCellStyle"
        :cell-style="this.$cellStyle"
        :row-class-name="tableRowClassName"
        @sort-change="sortChangeOfWorking"
      >
        <!--        :style="{width: 100+'%',height:tableHeight-300+'px'}"-->
@@ -437,7 +486,8 @@
        :page.sync="formWorking.page"
        :limit.sync="formWorking.rows"
        align="right"
        layout="prev, pager, next,sizes"
        style="margin-top: 10px"
        layout="total,prev, pager, next,sizes"
        popper-class="select_bottom"
        @pagination="getUserGroupSearch"
      />
@@ -448,16 +498,20 @@
        </div>
      </span>
    </el-dialog>

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

  </div>
</template>

<script>
import Pagination from '@/components/Pagination'
import ImportPicker from '@/components/ImportPicker'

import {
  AddUpdateUser,
  DeleteUser,
  RoleTypeAdd,
  RoleTypeDelete,
  SaveUserAssoctRole,
  UserAssociationRole,
  UserGroupAdd,
@@ -475,7 +529,7 @@
export default {
  name: 'YYQD',
  components: {
    Pagination
    Pagination, ImportPicker
  },
  data() {
    const validateName = (rule, value, callback) => {
@@ -520,7 +574,7 @@
    }

    return {
      isFullscreen: false,
      isIpad: false,
      mainHeight: 0,
      tableHeight: 0,
      form: {
@@ -554,7 +608,7 @@
        UserCode: '',
        UserName: '',
        Password: '',
        Enable: '',
        Enable: 'Y',
        StuOrg: '',
        Mobile: '',
        Email: '',
@@ -622,23 +676,43 @@
        page: 1,
        prop: 'group_code',
        order: 'desc'
      },

      title_value: '数据导入 / 用户清单',
      code: '2',
      shows: false
    }
  },
  watch: {
    shows() {
      if (!this.shows) {
        this.getUserSearch()
      }
    }
  },
  created() {
    this.getUserSearch()
    this.getUserOrganization()
    this.handleRequest()
  },

  mounted() {
    window.addEventListener('resize', this.getHeight)
    this.getHeight()
  },
  methods: {
    handleRequest() {
      this.getUserSearch().then(res => {
        if (res.code === '200') {
          this.getUserOrganization()
        }
      })
    },

    // 获取用户清单
    async getUserSearch() {
      const res = await UserSearch(this.form)
      this.tableData = res.data
      this.total = res.count
      return { code: res.code }
    },
    // 获取所属组织
    async getUserOrganization() {
@@ -646,13 +720,17 @@
      this.StuOrgArr = clearAllChildren(res)
    },
    // 获取所属组织对话框
    async  getUserOrganization2() {
    async getUserOrganization2() {
      const { data: res } = await UserOrganization()
      this.StuOrgArr2 = clearAllChildren(res)
    },
    // 导入按钮
    upload() {

      this.shows = true
      this.$refs.importPickerFunc.newDataFunc()
    },
    colos() {
      this.shows = false
    },
    // 排序改变时
    sortChange({ column, prop, order }) {
@@ -676,7 +754,7 @@
      this.form.UserCode = ''
      this.form.UserName = ''
      this.form.StuOrg = ''
      this.form.Enable = ''
      this.form.Enable = 'Y'
      this.form.wagetype = ''
      this.$refs.cascader.checkedValue = ''// 级联选择器的清空
      this.getUserSearch()
@@ -689,7 +767,7 @@
      this.dialogForm.StuOrg = val[val.length - 1]
    },
    // 获取下拉生产班组
    async  getMesOrderStepReportSelectUserGroup() {
    async getMesOrderStepReportSelectUserGroup() {
      const { data: res } = await MesOrderStepReportSelectUserGroup()
      this.usergroupArr = res
    },
@@ -745,7 +823,7 @@
      this.dialogForm.UserCode = ''
      this.dialogForm.UserName = ''
      this.dialogForm.Password = ''
      this.dialogForm.Enable = ''
      this.dialogForm.Enable = 'Y'
      this.$refs.dialogCascader.checkedValue = ''
      this.dialogForm.StuOrg = ''
      this.dialogForm.Mobile = ''
@@ -791,15 +869,14 @@
    },
    // 获取页面高度
    getHeight() {
      console.log(window.innerHeight)
      console.log(window.innerWidth)
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 250
        this.tableHeight = this.mainHeight - 100
        // this.isFullscreen = window.innerHeight < 800
        if (window.innerHeight < 800) {
          this.tableHeight = this.tableHeight - 50
        // this.mainHeight = window.innerHeight - 250
        this.mainHeight = window.innerHeight - 85
        this.tableHeight = this.mainHeight - 200
        if (window.innerHeight < 769) {
          this.tableHeight = this.tableHeight - 40
        }
        this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
      })
    },
    // 关联角色点击事件
@@ -868,6 +945,7 @@
      const res = await SaveUserAssoctRole(this.dialogFormRoles.roleTreeSelectedArr, this.dialogFormRoles.usercode)
      if (res.code === '200') {
        this.$message.success('保存成功！')
        await this.getUserSearch()
        this.dialogVisibleRoles = false
      }
    },
@@ -927,7 +1005,8 @@
                  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相同时执行
                        // this.dialogFormRoles.roleTreeSelectedArr[ind].Data.splice(ind2, 1)// 当子code与现在的code相同时执行
                        this.dialogFormRoles.roleTreeSelectedArr[ind].Data = this.dialogFormRoles.roleTreeSelectedArr[ind].Data.filter(i2 => i2 !== a[0])
                      } else {
                        this.dialogFormRoles.roleTreeSelectedArr[ind].Data.push(a[0])// //当子code与现在的code不相同时执行
                      }
@@ -1090,6 +1169,10 @@
    workingTramClick() {
      this.workingDialogVisible = true
      this.getUserGroupSearch()
      // 页面加载完后重新渲染表格
      this.$nextTick(() => {
        this.$refs.workingTableData.doLayout()
      })
    },
    // 生产班组对话框关闭事件
    handleCloseWorking() {
@@ -1114,7 +1197,7 @@
      this.getUserGroupSearch()
    },
    // 获取生产班组列表
    async  getUserGroupSearch() {
    async getUserGroupSearch() {
      const res = await UserGroupSearch(this.formWorking)
      this.workingTableData = res.data
      this.workingTableDataLength = res.count
@@ -1147,16 +1230,16 @@
      })
    },
    // 保存
    async  saveWorking(row) {
    async saveWorking(row) {
      if (row.group_code.trim().length < 1) {
        return this.$message.info('班组编码不能为空！')
      }
      if (row.group_name.trim().length < 1) {
        return this.$message.info('班组名称不能为空！')
      }
      if (row.description.trim().length < 1) {
        return this.$message.info('班组描述不能为空！')
      }
      // if (row.description.trim().length < 1) {
      //   return this.$message.info('班组描述不能为空！')
      // }
      const data = {
        code: row.group_code,
        name: row.group_name,
@@ -1179,144 +1262,23 @@
    // 生产班组返回按钮
    WorkingDialogVisibleCancel() {
      this.workingDialogVisible = false
    },
    tableRowClassName({ row, rowIndex }) {
      // console.log(row, rowIndex, 12)
      // if (rowIndex === 1) {
      //   return 'warning-row'
      // } else if (rowIndex === 3) {
      //   return 'success-row'
      // }
      return 'custom-row'
    }

  }
}
</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;
  //border: 1px solid $main_color;
  border: none;
  padding: 0 20px;
}
::v-deep .el-button--primary:hover {
  border: none;
}

::v-deep .el-button--info {
  //background-color: $main_color !important;
  height: 30px;
  display: flex;
  align-items: center;
  padding: 0 20px;
}

::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
  background-color: $main_color !important;
}

::v-deep .el-dialog__footer {
  display: flex;
  justify-content: flex-end;
}

.footerButton {
  display: flex;
  justify-content: end;
}

::v-deep .el-button--default {
  background-color: #ffffff !important;
  height: 30px;
  display: flex;
  align-items: center;
  padding: 0 20px;
}

::v-deep .el-button--default:hover {
  color: #606266;
}

::v-deep .el-dialog__body {
  padding: 20px 100px !important;
}

.workingDialogVisible ::v-deep .el-dialog__body{
  padding: 20px 20px !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;
  line-height: 30px;
}

::v-deep .el-table .caret-wrapper {
  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;
}

.dialogVisibleRoles {
  .myCheckboxGroup {
@@ -1372,6 +1334,87 @@
  }
}

.workingDialogVisible ::v-deep .el-dialog__body {
  padding: 20px 20px !important;
}
</style>

<!--公共页面样式-->
<style lang="scss" scoped>
$main_color: #42b983;
.el-icon-share ,.el-icon-delete,.el-icon-edit-outline{
  color: $main_color;
  cursor: pointer;
}
.el-icon-edit-outline{
  margin-right: 15px;
}

::v-deep .el-button--primary, .el-button--default, .el-button--info {
  height: 34px;
  display: flex;
  align-items: center;
  padding: 0 15px;
}

::v-deep .el-button--primary {
  //background-color: $main_color !important;
}

::v-deep .el-button--default {
  background-color: #f8f8fa;
  border: none;
}

::v-deep .el-input__inner {
  height: 34px;
  line-height: 34px;
  //color: #a7a7a7;
}

::v-deep .el-dialog__body {
  padding: 20px 100px !important;
}

::v-deep .dialogVisibleRoles .el-dialog__body {
  padding: 20px 20px !important;
}

::v-deep .importPickerClass .el-dialog__body {
  padding: 20px 20px !important;
}

::v-deep .el-dialog__footer {
  display: flex;
  justify-content: flex-end;
}

::v-deep .el-table .caret-wrapper {
  transform: scale(0.8);
}

::v-deep .cell {
  display: flex;
  align-items: center;
  justify-content: space-between;
}

::v-deep .el-table::before {
  height: 0;
}

::v-deep .el-table__body-wrapper {
  background-color: #f8f8fa;
}

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

::v-deep .el-form--inline .el-form-item__label {
  color: #a7a7a7;
}

.body ::v-deep .el-divider {
  border: 1px solid #eee;
  width: 99%;
@@ -1382,45 +1425,10 @@
  margin-bottom: 0;
}

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

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

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

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

//::v-deep   .el-cascader:not(.is-disabled):hover .el-input__inner:focus {
//  border-color: #42b983 !important;
//}
</style>
<style lang="scss">
.elCascader {
  //.el-cascader-node.in-active-path, .el-cascader-node.is-active, .el-cascader-node.is-selectable.in-checked-path {
  //  color: #42b983 ;
  //}
  .el-cascader-node.is-selectable.in-checked-path {
    color: #42b983;
  }
<style>

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

.el-table .custom-row {
  background: #f8f8fa;
}
</style>