1.项目页面修改2.生产管理工单页面开发

loulijun2021

2022-07-07 f791db88d83a7ed851b9412d9797ed16b345fe79

 src/views/jcsz/yhqd.vue

@@ -1,8 +1,7 @@
<template>
  <div>
    <!--    <div class="body" style="background-color: #ffffff;  padding: 20px 10px 0 20px;">-->
    <div class="body" style="background-color: #ffffff;  padding: 20px 10px 0 20px;" :style="{height:mainHeight+'px'}">
      <div>
    <div class="body" :style="{height:mainHeight+'px'}">
      <div style="padding: 10px 5px 0 0">
        <el-form
          ref="form"
          :model="form"
@@ -10,25 +9,27 @@
          inline
          style="display: flex;justify-content: space-between"
        >
          <div style="display: flex;justify-content: space-around;width: 85%">
          <div class="elForm">
            <el-form-item label="用户编码" style=" display: flex;">
              <el-input v-model="form.UserCode" placeholder="请输入" style="width: calc(100%-30px)" />
              <el-input v-model="form.UserCode" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="用户名称" style=" display: flex;">
              <el-input v-model="form.UserName" placeholder="请输入" style="width: calc(100%-30px)" />
              <el-input v-model="form.UserName" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="所属组织" style=" display: flex;">
              <el-cascader
                ref="cascader"
                filterable
                popper-class="elCascader"
                :options="StuOrgArr"
                :props="defaultProps"
                @change="cascaderChange"
              />
            </el-form-item>
            <el-form-item label="工资类型" style=" display: flex;">
              <el-select v-model="form.wagetype" filterable style="width: calc(100%-30px)" 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"
                  :label="item.label"
@@ -37,7 +38,7 @@
              </el-select>
            </el-form-item>
            <el-form-item label="在职状态" style=" display: flex;">
              <el-select v-model="form.Enable" filterable style="width: calc(100%-30px)" 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"
@@ -53,14 +54,19 @@
          </div>
        </el-form>
      </div>
      <div style="margin-bottom: 20px;display: flex;z-index: 2">
      <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>
      <div style="display: flex;border: 1px solid #eee">
      <el-divider />
      <div class="elTableDiv">
        <el-table
          :data="tableData"
          border
          stripe
          :height="tableHeight"
          highlight-current-row
          :style="{width: 100+'%',height:tableHeight+'px'}"
          :header-cell-style="this.$headerCellStyle"
@@ -97,8 +103,13 @@
            sortable="custom"
          />
          <el-table-column
            prop="group_name"
            label="生产班组"
            sortable="custom"
          />
          <el-table-column
            prop="wagetype"
            label="所属组织"
            label="工资类型"
            sortable="custom"
          >
            <template slot-scope="{row}">
@@ -135,7 +146,6 @@
            prop="lm_date"
            label="创建时间"
            width="200"
            show-overflow-tooltip
            sortable="custom"
          />
          <el-table-column
@@ -151,7 +161,7 @@
          >
            <template slot-scope="{row}">
              <div class="operationClass">
                <el-button type="text" @click="edit('edit',row)">修改</el-button>
                <el-button type="text" @click="edit('edit',row)">编辑</el-button>
                <el-button type="text" @click="del(row.id)">删除</el-button>
              </div>
            </template>
@@ -171,30 +181,32 @@
      />
    </div>

    <!--    用户清单新增、修改-->
    <!--    用户清单新增、编辑-->
    <el-dialog
      :title="operation==='add'?'添加':'修改'"
      :title="operation==='add'?'新增':'编辑'"
      :visible.sync="dialogVisible"
      width="50%"
      width="800px"
      :close-on-click-modal="false"
      top="15vh"
      @closed="handleClose"
      @close="handleClose"
    >
      <el-form ref="dialogForm" :rules="dialogFormRules" inline :model="dialogForm" label-width="80px">
        <el-form-item label="用户编码" prop="UserCode">
          <el-input v-model="dialogForm.UserCode" :disabled="operation!=='add'" style="width: 220px" />
          <el-input v-model="dialogForm.UserCode" :disabled="operation!=='add'" style="width: 200px" />
        </el-form-item>
        <el-form-item label="用户名称" prop="UserName">
          <el-input v-model="dialogForm.UserName" style="width: 220px" />
          <el-input v-model="dialogForm.UserName" style="width: 200px" />
        </el-form-item>
        <el-form-item label="用户密码" prop="Password">
          <el-input v-model="dialogForm.Password" style="width: 220px" />
          <el-input v-model="dialogForm.Password" style="width: 200px" />
        </el-form-item>
        <el-form-item label="在职状态" prop="Enable">
          <el-select
            v-model="dialogForm.Enable"
            :popper-append-to-body="false"
            filterable
            style="width: 220px"
            style="width: 200px"
            placeholder="请选择"
          >
            <el-option
@@ -205,39 +217,40 @@
            />
          </el-select>
        </el-form-item>
        <div style="display: flex">
          <el-form-item label="所属组织" prop="StuOrg" style="display: flex">
            <el-cascader
              ref="dialogCascader"
              key="cascaderKey"
              filterable
              :options="StuOrgArr"
              :props="defaultProps"
              style="width: 220px;"
              @change="dialogCascaderChange"
        <el-form-item label="所属组织" prop="StuOrg" style="display: flex;float: left">
          <el-cascader
            ref="dialogCascader"
            key="cascaderKey"
            filterable
            popper-class="elCascader"
            :options="StuOrgArr"
            :props="defaultProps"
            style="width: 200px;"
            @change="dialogCascaderChange"
          />
        </el-form-item>
        <el-form-item label="工资类型" prop="wagetype">
          <el-select
            v-model="dialogForm.wagetype"
            :popper-append-to-body="false"
            filterable
            style="width: 200px"
            placeholder="请选择"
          >
            <el-option
              v-for="item in wagetypeArr"
              :key="item.value"
              :label="item.label"
              :value="item.value"
            />
          </el-form-item>
          <el-form-item label="工资类型" prop="wagetype">
            <el-select
              v-model="dialogForm.wagetype"
              filterable
              style="width: 220px"
              placeholder="请选择"
            >
              <el-option
                v-for="item in wagetypeArr"
                :key="item.value"
                :label="item.label"
                :value="item.value"
              />
            </el-select>
          </el-form-item>
        </div>
          </el-select>
        </el-form-item>

        <el-form-item label="联系方式">
          <el-input v-model="dialogForm.Mobile" style="width: 220px" />
          <el-input v-model="dialogForm.Mobile" style="width: 200px" />
        </el-form-item>
        <el-form-item label="电子邮箱">
          <el-input v-model="dialogForm.Email" style="width: 220px" />
          <el-input v-model="dialogForm.Email" style="width: 200px" />
        </el-form-item>
      </el-form>
      <span slot="footer" class="dialog-footer">
@@ -252,8 +265,10 @@
    <el-dialog
      title="关联角色"
      :visible.sync="dialogVisibleRoles"
      width="50%"
      width="800px"
      top="15vh"
      :fullscreen="isFullscreen"
      :close-on-click-modal="false"
      class="dialogVisibleRoles"
      @closed="handleCloseRoles"
      @close="handleCloseRoles"
@@ -300,6 +315,7 @@
          show-checkbox
          node-key="code"
          default-expand-all
          style="height: 300px"
          :props="defaultPropsOfRoleTree"
          @check="checkBoxClick"
        />
@@ -313,6 +329,99 @@
        </div>
      </span>
    </el-dialog>

    <!--    产组按钮对话框-->
    <el-dialog
      title="生产班组"
      :visible.sync="workingDialogVisible"
      width="800px"
      top="15vh"
      :close-on-click-modal="false"
      class="workingDialogVisible"
      @close="handleCloseWorking"
    >
      <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
        :data="workingTableData"
        border
        height="300"
        highlight-current-row
        :header-cell-style="this.$headerCellStyle"
        :cell-style="this.$cellStyle"
        @sort-change="sortChangeOfWorking"
      >
        <!--        :style="{width: 100+'%',height:tableHeight-300+'px'}"-->

        <!--        <el-table-column-->
        <!--          type="selection"-->
        <!--          width="50"-->
        <!--        />-->
        <el-table-column
          width="50"
          label="序号"
          prop="RowNum"
        />
        <el-table-column
          prop="group_code"
          label="班组编码"
          sortable="custom"
        >
          <template slot-scope="{row}">
            <el-input v-if="row.isVisible===1" v-model="row.group_code" placeholder="请输入" />
            <div v-else> {{ row.group_code }}</div>
          </template>
        </el-table-column>
        <el-table-column
          prop="group_name"
          label="班组名称"
          sortable="custom"
        >
          <template slot-scope="{row}">
            <el-input v-if="row.isVisible===1" v-model="row.group_name" placeholder="请输入" />
            <div v-else> {{ row.group_name }}</div>
          </template>
        </el-table-column>
        <el-table-column
          prop="description"
          label="班组描述"
          sortable="custom"
        >
          <template slot-scope="{row}">
            <el-input v-if="row.isVisible===1" v-model="row.description" placeholder="请输入" />
            <div v-else> {{ row.description }}</div>
          </template>
        </el-table-column>
        <el-table-column label="操作">
          <template slot-scope="{row}">
            <div class="operationClass">
              <el-button v-if="row.isVisible===0" type="text" @click="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>
            </div>
          </template>
        </el-table-column>
      </el-table>
      <!--分页-->
      <pagination
        v-show="workingTableDataLength>0"
        :total="workingTableDataLength"
        :page.sync="formWorking.page"
        :limit.sync="formWorking.rows"
        align="right"
        layout="prev, pager, next,sizes"
        popper-class="select_bottom"
        @pagination="getUserGroupSearch"
      />
      <span slot="footer" class="dialog-footer">
        <div class="footerButton">
          <el-button @click="WorkingDialogVisibleCancel">返回</el-button>
          <!--          <el-button type="primary" @click="settingDialogVisibleConfirm">确 定</el-button>-->
        </div>
      </span>
    </el-dialog>
  </div>
</template>

@@ -320,7 +429,14 @@
import Pagination from '@/components/Pagination'
import {
  AddUpdateUser,
  DeleteUser, SaveUserAssoctRole, UserAssociationRole,
  DeleteUser,
  RoleTypeAdd,
  RoleTypeDelete,
  SaveUserAssoctRole,
  UserAssociationRole,
  UserGroupAdd,
  UserGroupDelete,
  UserGroupSearch,
  UserOrganization,
  UserSearch
} from '@/api/jcsz'
@@ -346,6 +462,7 @@
      }
    }
    return {
      isFullscreen: false,
      mainHeight: 0,
      tableHeight: 0,
      form: {
@@ -387,8 +504,8 @@
        wagetype: ''
      },
      wagetypeArr: [
        { value: '1', label: '计件制' },
        { value: '2', label: '计时制' }
        { value: '2', label: '计件制' },
        { value: '1', label: '计时制' }
      ],
      operation: '',
      dialogFormRules: {
@@ -425,8 +542,16 @@
        value: 'code',
        label: 'name',
        children: 'children'
      },
      workingDialogVisible: false,
      workingTableData: [],
      workingTableDataLength: 0,
      formWorking: {
        rows: 10,
        page: 1,
        prop: 'group_code',
        order: 'desc'
      }

    }
  },
  created() {
@@ -578,9 +703,15 @@
    },
    // 获取页面高度
    getHeight() {
      console.log(window.innerHeight)
      console.log(window.innerWidth)
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 200
        this.mainHeight = window.innerHeight - 250
        this.tableHeight = this.mainHeight - 100
        this.isFullscreen = window.innerHeight < 800
        if (window.innerHeight < 800) {
          this.tableHeight = this.tableHeight - 50
        }
      })
    },
    // 关联角色点击事件
@@ -737,12 +868,12 @@
            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.roleTreeSelectedArr.splice(ind, 1)
              }
            })
            this.dialogFormRoles.rolesArrSelectedArr.forEach((i, i1) => {
              if (i === checkedFatherCode) {
                console.log(this.dialogFormRoles.rolesArrSelectedArr.splice(i1, 1), 8)
                this.dialogFormRoles.rolesArrSelectedArr.splice(i1, 1)
              }
            })
          }
@@ -777,7 +908,7 @@
        } else { // 当父类由半叶变为全叶时
          this.dialogFormRoles.roleTreeSelectedArr.forEach((i1, ind) => {
            if (i1.Code === checkedFatherCode) { // i1没找对
              console.log(i1, this.dialogFormRoles.roleTreeSelectedArr.splice(ind, 1), 8)
              this.dialogFormRoles.roleTreeSelectedArr.splice(ind, 1)
              temp.forEach(it => {
                this.dialogFormRoles.roleTreeSelectedArr.push({
                  Code: it.code,
@@ -840,12 +971,12 @@
            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.rolesArrSelectedArr.splice(i1, 1)
              }
            })
            this.dialogFormRoles.roleTreeSelectedArr.forEach((i, i1) => {
              if (i.Code === it.code) {
                console.log(i1, this.dialogFormRoles.roleTreeSelectedArr.splice(i1, 1), 6665)
                this.dialogFormRoles.roleTreeSelectedArr.splice(i1, 1)
              }
            })
          }
@@ -862,8 +993,105 @@
      // })
      console.log(this.dialogFormRoles.rolesArrSelectedArr, 6666)
      console.log(this.dialogFormRoles.roleTreeSelectedArr, 6777)
    }
    },

    /*
      生产班组模块
   */
    // 生产班组按钮点击
    workingTramClick() {
      this.workingDialogVisible = true
      this.getUserGroupSearch()
    },
    // 生产班组对话框关闭事件
    handleCloseWorking() {
      this.workingTableData.forEach((item, index) => {
        if (item.isVisible === 1) {
          this.workingTableData.splice(index, 1)
        }
      })
      // this.getUserGroupSearch()
    },
    // 生产班组排序
    sortChangeOfWorking({ 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.getUserGroupSearch()
    },
    // 获取生产班组列表
    async  getUserGroupSearch() {
      const res = await UserGroupSearch(this.formWorking)
      this.workingTableData = res.data
      this.workingTableDataLength = res.count
      this.workingTableData.forEach(item => {
        item.isVisible = 0
      })
    },
    // 新增
    addWorking() {
      let number = Math.random() * Math.random()// 作为删除时的标识符
      number = number === 0 ? (10 + Math.random()) : number
      const data = { group_code: '', group_name: '', description: '', isVisible: 1, number: number }
      this.workingTableData.unshift(data)
    },
    // 删除
    delWorking(row) {
      this.$confirm('是否确认删除?', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
        UserGroupDelete({ UserGrupCode: row.group_code }).then(res => {
          if (res.code === '200') {
            this.$message.success('删除成功!')
            this.getUserGroupSearch()
          }
        })
      }).catch(() => {
        this.$message.info('已取消删除')
      })
    },
    // 保存
    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('班组描述不能为空！')
      }
      const data = {
        code: row.group_code,
        name: row.group_name,
        flag: row.description
      }
      const res = await UserGroupAdd([data])
      if (res.code === '200') {
        this.$message.success('保存成功！')
        await this.getUserGroupSearch()
      }
    },
    // 取消
    cancelWorking(row) {
      this.workingTableData.forEach((item, index) => {
        if (item.isVisible === 1 && item.number === row.number) {
          this.workingTableData.splice(index, 1)
        }
      })
    },
    // 生产班组返回按钮
    WorkingDialogVisibleCancel() {
      this.workingDialogVisible = false
    }
  }
}
</script>
@@ -875,6 +1103,12 @@
  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 {
@@ -882,10 +1116,16 @@
  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 {
@@ -898,6 +1138,7 @@
  height: 30px;
  display: flex;
  align-items: center;
  padding: 0 20px;
}

::v-deep .el-button--default:hover {
@@ -906,6 +1147,10 @@

::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 {
@@ -924,11 +1169,10 @@

::v-deep .el-input__inner {
  height: 30px;
  line-height:30px;
  line-height: 30px;
}

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

@@ -976,7 +1220,6 @@

::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 {
@@ -988,20 +1231,11 @@
}

.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;
@@ -1017,10 +1251,6 @@

    }

    //.myCheckbox{
    //  border: 1px solid $main_color;
    //}

    input[type=checkbox] {
      cursor: pointer;
      position: relative;
@@ -1032,13 +1262,12 @@
    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;
      padding-left: 0;
      text-align: center;
      content: ' ';
      border-radius: 3px
@@ -1053,6 +1282,57 @@
      background-color: $main_color;
    }
  }
}

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

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

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

::v-deep .el-select .el-input__inner:focus{
  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;
  }

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

}
</style>