1.提交

loulijun2021

2023-02-12 adb74c51618faf025fe1d46bf6b22db895c2608f

 src/views/jcsz/yhqd.vue

@@ -3,11 +3,11 @@
    <div class="body" :style="{height:mainHeight+'px'}">
      <div class="bodyTopButtonGroup" style="justify-content: space-between">

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

        <div style="display: flex">
          <el-button icon="el-icon-menu" @click="workingTramClick">生产班组</el-button>
          <el-button icon="el-icon-download" @click="upload">导入</el-button>
          <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>

@@ -17,10 +17,10 @@
          :model="form"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label-width="70px" label="用户编码" style=" display: flex;">
            <el-form-item label="用户编码" style=" display: flex;">
              <el-input v-model="form.UserCode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="用户名称" style=" display: flex;">
@@ -54,7 +54,7 @@
                />
              </el-select>
            </el-form-item>
            <el-form-item v-show="isExpandForm" label-width="70px" 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"
@@ -71,9 +71,12 @@
              </el-select>
            </el-form-item>
          </div>
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
            <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
@@ -96,8 +99,13 @@
      </div>

      <div class="elTableDiv">
        <!--        <TableColumnSettings-->
        <!--          :list1="tableColumnSettingsArray"-->
        <!--          @tableColumnUpdate="tableColumnUpdate"-->
        <!--        />-->
        <el-table
          ref="tableDataRef"
          :key="tableTimeStampKey"
          :data="tableData"
          class="tableFixed"
          :height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
@@ -109,152 +117,178 @@
          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="用户编码"
            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'">
                <!--                <svg-icon icon-class="circleYes" style="margin-right: 2px" />-->
                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
                在职
              </div>
              <div v-if="row.enable==='N'">
                <!--/*                <svg-icon icon-class="circleNo" style="margin-right: 2px" />*/-->
                <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-->
          <!--            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"
@@ -291,6 +325,7 @@

    <!--    用户清单新增、编辑-->
    <el-dialog
      v-el-drag-dialog
      :title="operation==='add'?'新增':'编辑'"
      :visible.sync="dialogVisible"
      width="800px"
@@ -378,8 +413,9 @@
      </el-form>
      <span slot="footer" class="dialog-footer">
        <div class="footerButton">
          <el-button @click="dialogVisibleCancel">取 消</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"
@@ -391,6 +427,7 @@

    <!--    关联角色-->
    <el-dialog
      v-el-drag-dialog
      title="关联角色"
      :visible.sync="dialogVisibleRoles"
      width="800px"
@@ -464,8 +501,9 @@
      </div>
      <span slot="footer" class="dialog-footer">
        <div class="footerButton">
          <el-button @click="rolesDialogVisibleCancel">取 消</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"
@@ -477,6 +515,7 @@

    <!--    产组按钮对话框-->
    <el-dialog
      v-el-drag-dialog
      title="生产班组"
      :visible.sync="workingDialogVisible"
      width="800px"
@@ -491,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
@@ -557,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>
@@ -577,7 +616,7 @@
      />
      <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>
@@ -599,6 +638,7 @@
<script>
import Pagination from '@/components/Pagination'
import ImportPicker from '@/components/ImportPicker'
import waves from '@/directive/waves/index.js' // 水波纹指令

import {
  AddUpdateUser,
@@ -615,12 +655,15 @@
import $ from 'jquery'
import clearAllChildren, { validateCode } from '@/utils/global'
import { MesOrderStepReportSelectUserGroup } from '@/api/scgl'
import elDragDialog from '@/directive/el-drag-dialog'
import TableColumnSettings from '@/components/TableColumnSettings'

export default {
  name: 'YYQD',
  components: {
    Pagination, ImportPicker
    Pagination, ImportPicker, TableColumnSettings
  },
  directives: { elDragDialog, waves },
  data() {
    const validateMobile = (rule, value, callback) => {
      if (!value) {
@@ -682,6 +725,90 @@
      ], // 在职状态
      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: '',
@@ -779,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') {
@@ -1313,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 }