Merge remote-tracking branch 'origin/master'
commit
fa267e7da1
@ -0,0 +1,412 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
||||
<!-- <el-form-item label="班组编号" prop="teamCode">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.teamCode"-->
|
||||
<!-- placeholder="请输入班组编号"-->
|
||||
<!-- clearable-->
|
||||
<!-- @keyup.enter.native="handleQuery"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>-->
|
||||
<el-form-item label="班次" prop="classes">
|
||||
<el-select v-model="queryParams.classes" placeholder="请选择班次">
|
||||
<el-option
|
||||
v-for="dict in dict.type.classes"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="班组名称" prop="teamName">
|
||||
<el-input
|
||||
v-model="queryParams.teamName"
|
||||
placeholder="请输入班组名称"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="所属产线" prop="productLineCode">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.productLineCode"-->
|
||||
<!-- placeholder="请输入所属产线"-->
|
||||
<!-- clearable-->
|
||||
<!-- @keyup.enter.native="handleQuery"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>-->
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<!-- <el-col :span="1.5">-->
|
||||
<!-- <el-button-->
|
||||
<!-- type="primary"-->
|
||||
<!-- plain-->
|
||||
<!-- icon="el-icon-plus"-->
|
||||
<!-- size="mini"-->
|
||||
<!-- @click="handleAdd"-->
|
||||
<!-- v-hasPermi="['base:teamMembers:add']"-->
|
||||
<!-- >新增-->
|
||||
<!-- </el-button>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-col :span="1.5">-->
|
||||
<!-- <el-button-->
|
||||
<!-- type="success"-->
|
||||
<!-- plain-->
|
||||
<!-- icon="el-icon-edit"-->
|
||||
<!-- size="mini"-->
|
||||
<!-- :disabled="single"-->
|
||||
<!-- @click="handleUpdate"-->
|
||||
<!-- v-hasPermi="['base:teamMembers:edit']"-->
|
||||
<!-- >修改-->
|
||||
<!-- </el-button>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-col :span="1.5">-->
|
||||
<!-- <el-button-->
|
||||
<!-- type="danger"-->
|
||||
<!-- plain-->
|
||||
<!-- icon="el-icon-delete"-->
|
||||
<!-- size="mini"-->
|
||||
<!-- :disabled="multiple"-->
|
||||
<!-- @click="handleDelete"-->
|
||||
<!-- v-hasPermi="['base:teamMembers:remove']"-->
|
||||
<!-- >删除-->
|
||||
<!-- </el-button>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-col :span="1.5">-->
|
||||
<!-- <el-button-->
|
||||
<!-- type="warning"-->
|
||||
<!-- plain-->
|
||||
<!-- icon="el-icon-download"-->
|
||||
<!-- size="mini"-->
|
||||
<!-- @click="handleExport"-->
|
||||
<!-- v-hasPermi="['base:teamMembers:export']"-->
|
||||
<!-- >导出-->
|
||||
<!-- </el-button>-->
|
||||
<!-- </el-col>-->
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<el-table v-loading="loading" :data="teamMembersList" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center"/>
|
||||
<el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
|
||||
<el-table-column label="班组编号" align="center" prop="teamCode" v-if="columns[1].visible"/>
|
||||
<el-table-column label="班组名称" align="center" prop="teamName" v-if="columns[2].visible"/>
|
||||
<el-table-column label="班次" align="center" prop="classes" v-if="columns[13].visible">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.classes" :value="scope.row.classes"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="班组负责人" align="center" prop="teamHead" v-if="columns[3].visible"/>
|
||||
<el-table-column label="用户名称" align="center" prop="nickName" v-if="columns[2].visible"/>
|
||||
<el-table-column label="所属产线/工位" align="center" prop="productLineName" v-if="columns[4].visible"/>
|
||||
<el-table-column label="开始时间" align="center" prop="startTime" v-if="columns[10].visible"/>
|
||||
<el-table-column label="结束时间" align="center" prop="endTime" v-if="columns[11].visible"/>
|
||||
<el-table-column label="休息时间" align="center" prop="dineTime" v-if="columns[12].visible"/>
|
||||
<el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[5].visible">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="创建人" align="center" prop="createdBy" v-if="columns[6].visible"/>
|
||||
<el-table-column label="创建时间" align="center" prop="createdTime" width="180" v-if="columns[7].visible">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="更新人" align="center" prop="updatedBy" v-if="columns[8].visible"/>
|
||||
<el-table-column label="更新时间" align="center" prop="updatedTime" width="180" v-if="columns[9].visible">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <el-button-->
|
||||
<!-- size="mini"-->
|
||||
<!-- type="text"-->
|
||||
<!-- icon="el-icon-edit"-->
|
||||
<!-- @click="handleUpdate(scope.row)"-->
|
||||
<!-- v-hasPermi="['base:teamMembers:edit']"-->
|
||||
<!-- >修改-->
|
||||
<!-- </el-button>-->
|
||||
<!-- <el-button-->
|
||||
<!-- size="mini"-->
|
||||
<!-- type="text"-->
|
||||
<!-- icon="el-icon-delete"-->
|
||||
<!-- @click="handleDelete(scope.row)"-->
|
||||
<!-- v-hasPermi="['base:teamMembers:remove']"-->
|
||||
<!-- >删除-->
|
||||
<!-- </el-button>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
v-show="total>0"
|
||||
:total="total"
|
||||
:page.sync="queryParams.pageNum"
|
||||
:limit.sync="queryParams.pageSize"
|
||||
@pagination="getList"
|
||||
/>
|
||||
|
||||
<!-- 添加或修改班组信息对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
|
||||
<el-form-item label="班组编号" prop="teamCode">
|
||||
<el-input v-model="form.teamCode" placeholder="请输入班组编号"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="班组名称" prop="teamName">
|
||||
<el-input v-model="form.teamName" placeholder="请输入班组名称"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="班组负责人" prop="teamHead">
|
||||
<el-input v-model="form.teamHead" placeholder="请输入班组负责人"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="所属产线/工位">
|
||||
<el-select v-model="form.productLineCode" placeholder="请选择所属产线/工位">
|
||||
<el-option
|
||||
v-for="item in productLineList"
|
||||
:key="item.productLineCode"
|
||||
:label="item.productLineName"
|
||||
:value="item.productLineCode"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="班次" prop="classes">
|
||||
<el-radio-group v-model="form.classes">
|
||||
<el-radio
|
||||
v-for="dict in dict.type.classes"
|
||||
:key="dict.value"
|
||||
:label="parseInt(dict.value)"
|
||||
>{{ dict.label }}
|
||||
</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item label="开始时间" prop="startTime">
|
||||
<el-time-select
|
||||
v-model="form.startTime"
|
||||
:picker-options="{ start: '00:00', step: '00:10', end: '23:50'}"
|
||||
placeholder="请选择开始时间"
|
||||
>
|
||||
</el-time-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="结束时间" prop="endTime">
|
||||
<el-time-select
|
||||
v-model="form.endTime"
|
||||
:picker-options="{ start: '00:00', step: '00:10', end: '23:50'}"
|
||||
placeholder="请选择结束时间"
|
||||
>
|
||||
</el-time-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="启用标识" prop="isFlag">
|
||||
<el-radio-group v-model="form.isFlag">
|
||||
<el-radio
|
||||
v-for="dict in dict.type.is_flag"
|
||||
:key="dict.value"
|
||||
:label="parseInt(dict.value)"
|
||||
>{{ dict.label }}
|
||||
</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||
<el-button @click="cancel">取 消</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {
|
||||
teamUserList,
|
||||
getTeamMembers,
|
||||
delTeamMembers,
|
||||
addTeamMembers,
|
||||
updateTeamMembers
|
||||
} from '@/api/base/teamMembers'
|
||||
import { findProductLineList } from '@//api/base/productLine'
|
||||
|
||||
export default {
|
||||
name: 'TeamMembers',
|
||||
dicts: ['is_flag','classes'],
|
||||
data() {
|
||||
return {
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
// 选中数组
|
||||
ids: [],
|
||||
// 非单个禁用
|
||||
single: true,
|
||||
// 非多个禁用
|
||||
multiple: true,
|
||||
// 显示搜索条件
|
||||
showSearch: true,
|
||||
// 总条数
|
||||
total: 0,
|
||||
// 班组信息表格数据
|
||||
teamMembersList: [],
|
||||
// 弹出层标题
|
||||
title: '',
|
||||
// 是否显示弹出层
|
||||
open: false,
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
teamCode: null,
|
||||
teamName: null,
|
||||
teamHead: null,
|
||||
productLineCode: null,
|
||||
isFlag: null,
|
||||
createdBy: null,
|
||||
createdTime: null,
|
||||
updatedBy: null,
|
||||
updatedTime: null,
|
||||
startTime: null,
|
||||
endTime: null,
|
||||
dineTime: null,
|
||||
classes: null
|
||||
},
|
||||
// 表单参数
|
||||
form: {},
|
||||
// 表单校验
|
||||
rules: {},
|
||||
columns: [
|
||||
{ key: 0, label: `主键标识`, visible: false },
|
||||
{ key: 1, label: `班组编号`, visible: true },
|
||||
{ key: 2, label: `班组名称`, visible: true },
|
||||
{ key: 3, label: `班组负责人`, visible: false },
|
||||
{ key: 4, label: `所属产线/工位`, visible: true },
|
||||
{ key: 5, label: `启用标识`, visible: false },
|
||||
{ key: 6, label: `创建人`, visible: false },
|
||||
{ key: 7, label: `创建时间`, visible: false },
|
||||
{ key: 8, label: `更新人`, visible: false },
|
||||
{ key: 9, label: `更新时间`, visible: false },
|
||||
{ key: 10, label: `开始时间`, visible: false },
|
||||
{ key: 11, label: `结束时间`, visible: false },
|
||||
{ key: 12, label: `休息时间`, visible: false },
|
||||
{ key: 13, label: `班次`, visible: true }
|
||||
],
|
||||
// 产线选项
|
||||
productLineList: []
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.getList()
|
||||
findProductLineList().then(response => {
|
||||
this.productLineList = response.data
|
||||
})
|
||||
|
||||
},
|
||||
methods: {
|
||||
/** 查询班组信息列表 */
|
||||
getList() {
|
||||
this.loading = true
|
||||
teamUserList(this.queryParams).then(response => {
|
||||
this.teamMembersList = response.rows
|
||||
this.total = response.total
|
||||
this.loading = false
|
||||
})
|
||||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
this.open = false
|
||||
this.reset()
|
||||
},
|
||||
// 表单重置
|
||||
reset() {
|
||||
this.form = {
|
||||
objId: null,
|
||||
teamCode: null,
|
||||
teamName: null,
|
||||
teamHead: null,
|
||||
productLineCode: null,
|
||||
isFlag: 0,
|
||||
createdBy: null,
|
||||
createdTime: null,
|
||||
updatedBy: null,
|
||||
updatedTime: null,
|
||||
startTime: null,
|
||||
endTime: null,
|
||||
dineTime: null,
|
||||
classes: 1
|
||||
}
|
||||
this.resetForm('form')
|
||||
},
|
||||
/** 搜索按钮操作 */
|
||||
handleQuery() {
|
||||
this.queryParams.pageNum = 1
|
||||
this.getList()
|
||||
},
|
||||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
this.resetForm('queryForm')
|
||||
this.handleQuery()
|
||||
},
|
||||
// 多选框选中数据
|
||||
handleSelectionChange(selection) {
|
||||
this.ids = selection.map(item => item.objId)
|
||||
this.single = selection.length !== 1
|
||||
this.multiple = !selection.length
|
||||
},
|
||||
/** 新增按钮操作 */
|
||||
handleAdd() {
|
||||
this.reset()
|
||||
this.open = true
|
||||
this.title = '添加班组信息'
|
||||
},
|
||||
/** 修改按钮操作 */
|
||||
handleUpdate(row) {
|
||||
this.reset()
|
||||
const objId = row.objId || this.ids
|
||||
getTeamMembers(objId).then(response => {
|
||||
this.form = response.data
|
||||
this.open = true
|
||||
this.title = '修改班组信息'
|
||||
})
|
||||
},
|
||||
/** 提交按钮 */
|
||||
submitForm() {
|
||||
this.$refs['form'].validate(valid => {
|
||||
if (valid) {
|
||||
if (this.form.objId != null) {
|
||||
updateTeamMembers(this.form).then(response => {
|
||||
this.$modal.msgSuccess('修改成功')
|
||||
this.open = false
|
||||
this.getList()
|
||||
})
|
||||
} else {
|
||||
addTeamMembers(this.form).then(response => {
|
||||
this.$modal.msgSuccess('新增成功')
|
||||
this.open = false
|
||||
this.getList()
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
const objIds = row.objId || this.ids
|
||||
this.$modal.confirm('是否确认删除班组信息编号为"' + objIds + '"的数据项?').then(function() {
|
||||
return delTeamMembers(objIds)
|
||||
}).then(() => {
|
||||
this.getList()
|
||||
this.$modal.msgSuccess('删除成功')
|
||||
}).catch(() => {
|
||||
})
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
this.download('base/teamMembers/export', {
|
||||
...this.queryParams
|
||||
}, `teamMembers_${new Date().getTime()}.xlsx`)
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
Loading…
Reference in New Issue