机台管理模块 修改员工为下拉搜索的交互样式+列表联调+添加机台联调+编辑机台联调+

haoxuan

2024-04-23 bcb82edd902b2e45c8da004cbf86e203ea496fa8

机台管理模块 修改员工为下拉搜索的交互样式+列表联调+添加机台联调+编辑机台联调+

 src/api/employeeSalary/machineManage.js

New file
@@ -0,0 +1,34 @@
import request from "@/common/untils/request.js"

// 机台列表
export function getWorkerPositionList(data) {
  return request({
    url: "/api-jl/v1/workerPosition/getWorkerPositionList",
    method: "post",
    data
  })
}
// 删除机台
export function deleteWorkerPositionInfo(data) {
  return request({
    url: "/api-jl/v1/workerPosition/deleteWorkerPositionInfo/"+data.id,
    method: "delete",
    data
  })
}
// 添加机台
export function createWorkerPositionInfo(data) {
  return request({
    url: "/api-jl/v1/workerPosition/createWorkerPositionInfo",
    method: "post",
    data
  })
}
// 更新机台
export function updateWorkerPositionInfo(data) {
  return request({
    url: "/api-jl/v1/workerPosition/updateWorkerPositionInfo",
    method: "post",
    data
  })
}

 src/api/productManage/silkRegisterForm.js

@@ -44,7 +44,7 @@
export function getWorkshopManageList(data) {
  return request({
    url: "/api-jl/v1/system/getWorkshopManageList",
    method: "get",
    method: "post",
    data
  })
}

 src/api/systemSetting/workshopManage.js

@@ -3,8 +3,8 @@
// 车间列表
export function getWorkshopManageList(data) {
  return request({
    url: "/api-jl/v1/system/getWorkshopManageList?page="+ data.page+"&pageSize="+data.pageSize+"&keyWord="+data.keyWord,
    method: "get",
    url: "/api-jl/v1/system/getWorkshopManageList",
    method: "post",
    data
  })
}

 src/views/employeeManage/employeeInfo/components/AddEmployee.vue

@@ -19,7 +19,7 @@
          </el-date-picker>
        </el-form-item>
        <el-form-item label="车间：" prop="shopNameObj">
          <el-select v-model="form.shopNameObj" filterable placeholder="请选择" style="width: 100%" @change='getGroupNumber'>
          <el-select v-model="form.shopNameObj" filterable placeholder="请选择" style="width: 100%" @change="getGroupNumber(false,'shopNameObj')">
            <el-option v-for="item in shopList" :key="item.number"
                  :label="item.name"
                  :value="{ value: item.number, label: item.name }">
@@ -27,7 +27,10 @@
          </el-select>
        </el-form-item>
        <el-form-item label="组别：" prop="groupNumber">
          <el-select v-model="form.groupNumber" filterable placeholder="请选择" style="width: 100%">
          <el-select v-model="form.groupNumber" filterable 
          placeholder="请先选择车间"
          no-data-text="请先选择车间"
          style="width: 100%">
            <el-option v-for="item in groupNumberList" :key="item" :label="item" :value="item">
            </el-option>
          </el-select>
@@ -144,7 +147,10 @@
        })
      }
    },
    getGroupNumber(val){
    getGroupNumber(val,name){
      if (name == "shopNameObj") {
        this.form.groupNumber=''
      }
      // shopName
      if(this.form.shopNameObj.value){
        //组别
@@ -156,21 +162,15 @@
                for(let i in groupNumberList){
                  this.groupNumberList.push(groupNumberList[i])
                }
                this.form.shopName=''
                // 编辑
                if(val){
                  setTimeout(()=>{
                    this.$set(this.form,'shopName',this.form.shopName)
                  },200)
                }
                
              }
            }else{
              this.groupNumberList=[]
              this.form.shopName=''
              this.form.groupNumber=''
            }
          });
      }else{
        this.workshopGroupList =[]
        this.groupNumberList =[]
      }
    },
    getSelectDataList() {

 src/views/employeeSalary/apprenticeshipManage/components/addDialog.vue

@@ -2,7 +2,7 @@
  <div class="add_wordshop">
    <el-dialog
      :visible.sync="islook"
      width="40rem" 
      width="38rem" 
      @close="cancelMethod">
      <div slot="title" class="tac drawerHeader">{{ editRow.title }}人员</div>
      <el-form  label-position="right" label-width="120px" style="width: 100%;" :model="form" :rules="rules" ref="form" >
@@ -187,8 +187,10 @@
</script>

<style scoped lang="scss">
::v-deep .el-form-item__content{
  width: 70% !important;
.el-form{
  margin-bottom:50px;
  width:94%;
  margin: 0 auto;
}
::v-deep{
  .el-form{

 src/views/employeeSalary/apprenticeshipManage/index.vue

@@ -4,7 +4,7 @@
      <CommonSearch ref="searchRef" :show-add="false" :amount-view="false" placeholder="请输入关键词" @searchClick="onFilterSearch">
        <template slot="leftButton">
          <el-button size="small" type="primary" @click="addBtnClick" >新增</el-button>
          <el-button size="small" type="primary" @click="exportClick">导入</el-button>
          <!-- <el-button size="small" type="primary" @click="exportClick">导入</el-button> -->
        </template>
      </CommonSearch>
    </div>

 src/views/employeeSalary/machineManage/index.vue

@@ -4,8 +4,7 @@
      <CommonSearch ref="searchRef" :show-add="false" :amount-view="false" placeholder="请输入关键词" @searchClick="onFilterSearch">
        <template slot="leftButton">
          <el-button size="small" type="primary" @click="addBtnClick" >新增</el-button>
          <el-button size="small" type="primary" @click="refreshClick">刷新</el-button>
          <el-button size="small" type="primary" @click="printClick">打印</el-button>
          <!-- <el-button size="small" type="primary" @click="exportClick">导入</el-button> -->
        </template>
      </CommonSearch>
    </div>
@@ -14,15 +13,13 @@
        <TableCommonView
          :table-list="tableList"
          @selTableCol="selTableCol"
          @handleShow="handleShow"
          @tableRowClick="tableRowClick"
        >
          <template slot="tableButton">
            <el-table-column label="操作" width="180">
            <el-table-column label="操作" width="160" fixed='right'>
              <template slot-scope="scope">
                <el-button @click.stop="handleClick(scope.row, '查看')" type="text" size="small">查看</el-button>
                <el-button @click.stop="handleClick(scope.row, '修改')" type="text" size="small">修改</el-button>
                <el-button @click.stop="handleClick(scope.row, '删除')" type="text" size="small">删除</el-button>
                <el-button @click.stop="delClick(scope.row)" type="text" size="small">删除</el-button>
                
              </template>
            </el-table-column>
@@ -30,7 +27,8 @@
        </TableCommonView>
      </div>
      <AddDialog 
        :editDiaConfig="editConfig"
      ref="add"
        :editRow="editRow"  @refresh="refreshClick"
      />
      <div class="btn-pager">
        <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
@@ -40,8 +38,11 @@
</template>

<script>
import { getWorkerPositionList, deleteWorkerPositionInfo } from "@/api/employeeSalary/machineManage.js"
import AddDialog from "@/views/employeeSalary/machineManage/components/addDialog.vue"
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
import Date from "@/api/date";
const { formatDate2 } = Date;
export default {
  name: "machineManage",
  props: {},
@@ -51,23 +52,20 @@
  data() {
    return {
      tableList: {},
      showCol: ["车间", "组别", "开始车号", "结束车号", "半车标志", "备注"],
      showCol: ["日期", "工种", "员工编码", "员工姓名", "车间", "组别", "机台号", "添加时间", "添加人"],
      tableColumn: [
        // { label: "车间", prop: "workshopNumber",iconRight:"el-icon-setting"},
        { label: "车间", prop: "workshopNumber",},
        { label: "组别", prop: "groupNumber", },
        { label: "开始车号", prop: "startCarNumber" },
        { label: "结束车号", prop: "endCarNumber" },
        { label: "半车标志", prop: "carFlag",isCallMethod: true, getCallMethod: this.getStatusCarFlag },
        { label: "备注", prop: "notes", },
        { label: "日期", prop: "date",min:180},
        { label: "工种", prop: "workType",min:110 },
        { label: "员工编码", prop: "workerId",min:110 },
        { label: "员工姓名", prop: "name",min:110 },
        { label: "车间", prop: "workshopName",min:110 },
        { label: "组别", prop: "workshopGroup",min:110 },
        { label: "机台号", prop: "workerPosition",min:110 },
        { label: "添加时间", prop: "created_at",min:120 },
        { label: "添加人", prop: "creator",min:110 },
      ],
      editConfig:{
        visible:false,
        infomitton:{
          TabsIndex:0,
          workshopId:null,
        }
      },
      editRow:{},
      loading: false,
      getDataParams: {
        keyWord: '',
      },
@@ -75,6 +73,7 @@
  },
  created() {
    this.setTable()
    this.getData(this.getDataParams.keyWord)
  },
  methods: {
    setTable() {
@@ -109,30 +108,97 @@
      this.showcol = val
      this.tableList.tableColumn = this.setColumnVisible(val, this.tableColumn)
    },
     // 请求数据
     async getData() {
      this.loading = true
      await getWorkerPositionList({
        keyword:this.getDataParams.keyWord,
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize
      })
        .then((res) => {
          if (res.code === 200) {
            if (res.data) {
              const list = res.data.map(item=>{
                return {
                  ...item,
                  date:item.StartDate?item.StartDate+'/'+item.EndDate:'',
                  workType:item.worker?item.worker.workType:'',
                  name:item.worker?item.worker.name:'',
                  workerPosition:item.startWorkerPosition?item.startWorkerPosition+'-'+item.endWorkerPosition:'',
                  created_at:item.CreatedAt?formatDate2(item.CreatedAt).split(' ')[0]:''
                }
              })
              this.tableList.tableInfomation = list || []
              this.pagerOptions.totalCount = res.total
            } else {
              this.tableList.tableInfomation = []
            }
          } else {
            this.tableList.tableInfomation = []
          }
          this.loading = false
        })
        .catch((err) => {
          console.log(err)
          this.tableList.tableInfomation = []
          this.loading = false
        })
    },
    // 新增
    addBtnClick() {
      this.editConfig.infomitton={}
      this.editConfig.dialogTitle="新增"
      this.editConfig.visible=true
      this.editRow = { title:'新建',type:'add' }
      this.$refs.add.islook = true;
    },
    // 搜索
    onFilterSearch(searchText) {
      this.getDataParams.keyWord = searchText,
      this.pagerOptions.currPage = 1
        this.getData()
    },
    // 刷新
    refreshClick() {
      this.getDataParams.keyWord = ""
      this.pagerOptions.currPage = 1
      this.pagerOptions.pageSize = 15
      // this.$refs.searchRef.searchInput = ""
      this.getData()
    },
    // 打印
    printClick() { },
    // 组别
    handleShow() {

    exportClick() { },
    // 编辑
    handleClick(row) {
      let config=JSON.parse(JSON.stringify(row));
      this.editRow = { 
        ...config, 
        title:'编辑',
        type:'edit',
        id:config.ID,
        date:config.StartDate?[config.StartDate,config.EndDate]:[],
        workshopObj:{
          value:config.workshop,
          label:config.workshopName,
        },      
        name:config.worker?config.worker.name:'',
        workerPosition:{
          value:config.startWorkerPosition?config.startWorkerPosition+'-'+config.endWorkerPosition:'',
          label:config.startWorkerPosition?config.startWorkerPosition+'-'+config.endWorkerPosition:'',
        }, 
      }
      this.$refs.add.islook = true;
    },
    // 删除
    delClick(row) {
      this.$confirm("是否确认删除?", "警告", {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
        type: "warning"
      })
        .then(() => {
          deleteWorkerPositionInfo({ id: row.ID }).then((response) => {
            if (response.code === 200) {
              this.$message.success("删除成功")
              this.getData()
            }
          })
        })
        .catch(() => {})
    },
    // 表格行点击
    tableRowClick(row) {