|
|
@ -87,8 +87,8 @@
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="所属产线" align="center" prop="productionLineCode" />
|
|
|
|
<el-table-column label="所属产线" align="center" prop="productionLineCode" />
|
|
|
|
<el-table-column label="负责人" align="center" prop="teamLeaderName" />
|
|
|
|
<el-table-column label="班组负责人" align="center" prop="teamLeaderName" />
|
|
|
|
<el-table-column label="班组组成人员" align="center" prop="teamMembers" />
|
|
|
|
<!-- <el-table-column label="班组组成人员" align="center" prop="teamMembers" /> -->
|
|
|
|
<el-table-column label="创建人" align="center" prop="createBy" />
|
|
|
|
<el-table-column label="创建人" align="center" prop="createBy" />
|
|
|
|
<el-table-column label="创建时间" align="center" prop="createDate" />
|
|
|
|
<el-table-column label="创建时间" align="center" prop="createDate" />
|
|
|
|
<el-table-column prop="active" label="是否启用" align="center">
|
|
|
|
<el-table-column prop="active" label="是否启用" align="center">
|
|
|
@ -216,6 +216,22 @@
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
</el-row>
|
|
|
|
</el-row>
|
|
|
|
</el-form>
|
|
|
|
</el-form>
|
|
|
|
|
|
|
|
<!-- <el-divider></el-divider>
|
|
|
|
|
|
|
|
<el-card>
|
|
|
|
|
|
|
|
<div style="text-align: center">
|
|
|
|
|
|
|
|
<template>
|
|
|
|
|
|
|
|
<el-transfer
|
|
|
|
|
|
|
|
filterable
|
|
|
|
|
|
|
|
filter-placeholder="请输入班组人员名称"
|
|
|
|
|
|
|
|
:titles="['可选班组人员', '当前班组人员']"
|
|
|
|
|
|
|
|
:data="leftList"
|
|
|
|
|
|
|
|
v-model="rightList"
|
|
|
|
|
|
|
|
style="text-align: left"
|
|
|
|
|
|
|
|
>
|
|
|
|
|
|
|
|
</el-transfer>
|
|
|
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
</el-card> -->
|
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
|
<el-button type="primary" @click="submitForm">确 定</el-button>
|
|
|
|
<el-button type="primary" @click="submitForm">确 定</el-button>
|
|
|
|
<el-button @click="cancel">取 消</el-button>
|
|
|
|
<el-button @click="cancel">取 消</el-button>
|
|
|
@ -225,7 +241,7 @@
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
|
|
|
|
|
|
|
|
<script>
|
|
|
|
<script>
|
|
|
|
import { listTeam, getTeam, delTeam, addTeam, updateTeam } from "@/api/wms/team";
|
|
|
|
import { listTeam, getTeam, delTeam, addTeam, updateTeam ,listTeamMembers} from "@/api/wms/team";
|
|
|
|
|
|
|
|
|
|
|
|
export default {
|
|
|
|
export default {
|
|
|
|
name: "Team",
|
|
|
|
name: "Team",
|
|
|
@ -246,6 +262,11 @@ export default {
|
|
|
|
total: 0,
|
|
|
|
total: 0,
|
|
|
|
// 班组表格数据
|
|
|
|
// 班组表格数据
|
|
|
|
teamList: [],
|
|
|
|
teamList: [],
|
|
|
|
|
|
|
|
teamMembersList:[],
|
|
|
|
|
|
|
|
// // 可选(左边)
|
|
|
|
|
|
|
|
// leftList: [],
|
|
|
|
|
|
|
|
// // 已选(右边,只需要key)
|
|
|
|
|
|
|
|
// rightList: [],
|
|
|
|
// 弹出层标题
|
|
|
|
// 弹出层标题
|
|
|
|
title: "",
|
|
|
|
title: "",
|
|
|
|
// 是否显示弹出层
|
|
|
|
// 是否显示弹出层
|
|
|
@ -302,12 +323,31 @@ export default {
|
|
|
|
},
|
|
|
|
},
|
|
|
|
created() {
|
|
|
|
created() {
|
|
|
|
this.getList();
|
|
|
|
this.getList();
|
|
|
|
|
|
|
|
this.getTeamMembers();
|
|
|
|
},
|
|
|
|
},
|
|
|
|
methods: {
|
|
|
|
methods: {
|
|
|
|
// 生成表头序号
|
|
|
|
// 生成表头序号
|
|
|
|
indexMethod(index) {
|
|
|
|
indexMethod(index) {
|
|
|
|
return index + 1;
|
|
|
|
return index + 1;
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
|
|
|
// getTeamMembers() {
|
|
|
|
|
|
|
|
// // 调用查询课程列表接口
|
|
|
|
|
|
|
|
// listTeamMembers(this.queryParams).then(response => {
|
|
|
|
|
|
|
|
// for(let i in response.rows){
|
|
|
|
|
|
|
|
// // 将返回的列表赋值于穿梭框左边列表
|
|
|
|
|
|
|
|
// this.leftList.push({
|
|
|
|
|
|
|
|
// key: response.rows[i].userId,
|
|
|
|
|
|
|
|
// label: response.rows[i].userName
|
|
|
|
|
|
|
|
// })
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// for(let i in response.selected){
|
|
|
|
|
|
|
|
// // 将返回的列表赋值于穿梭框左边列表
|
|
|
|
|
|
|
|
// this.rightList.push(response.selected[i].key);
|
|
|
|
|
|
|
|
// this.form.rightData = this.rightList;
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// this.loading = false;
|
|
|
|
|
|
|
|
// });
|
|
|
|
|
|
|
|
// },
|
|
|
|
/** 查询班组列表 */
|
|
|
|
/** 查询班组列表 */
|
|
|
|
getList() {
|
|
|
|
getList() {
|
|
|
|
this.loading = true;
|
|
|
|
this.loading = true;
|
|
|
@ -348,6 +388,7 @@ export default {
|
|
|
|
teamProperties: null,
|
|
|
|
teamProperties: null,
|
|
|
|
attendanceQuantity: null,
|
|
|
|
attendanceQuantity: null,
|
|
|
|
assignedQuantity: null
|
|
|
|
assignedQuantity: null
|
|
|
|
|
|
|
|
// rightData: null
|
|
|
|
};
|
|
|
|
};
|
|
|
|
this.resetForm("form");
|
|
|
|
this.resetForm("form");
|
|
|
|
},
|
|
|
|
},
|
|
|
@ -388,7 +429,9 @@ export default {
|
|
|
|
this.$refs["form"].validate(valid => {
|
|
|
|
this.$refs["form"].validate(valid => {
|
|
|
|
if (valid) {
|
|
|
|
if (valid) {
|
|
|
|
if (this.form.teamId != null) {
|
|
|
|
if (this.form.teamId != null) {
|
|
|
|
|
|
|
|
this.form.rightData = this.rightList;
|
|
|
|
updateTeam(this.form).then(response => {
|
|
|
|
updateTeam(this.form).then(response => {
|
|
|
|
|
|
|
|
console.log("打印1",this.rightList,"打印2",this.form.rightData);
|
|
|
|
this.$modal.msgSuccess("修改成功");
|
|
|
|
this.$modal.msgSuccess("修改成功");
|
|
|
|
this.open = false;
|
|
|
|
this.open = false;
|
|
|
|
this.getList();
|
|
|
|
this.getList();
|
|
|
|