java_project
/
logpm_page
4
1
Fork 0
Code Issues Pull Requests Activity
Browse Source

Squashed commit of the following: 

commit 905bffef83
Merge: f40f2ec 08b1e3c
Author: big-y <804609860@qq.com>
Date:   Wed Aug 30 15:12:10 2023 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit f40f2ec43b
Author: big-y <804609860@qq.com>
Date:   Wed Aug 30 15:11:51 2023 +0800

    产品包配置回显问题已调整完成

commit 08b1e3c369
Merge: bdcb96d 1db8162
Author: caoyizhong <1270296080@qq.com>
Date:   Wed Aug 30 14:35:59 2023 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit bdcb96d90c
Author: caoyizhong <1270296080@qq.com>
Date:   Wed Aug 30 14:35:52 2023 +0800

    添加全部订单记录

commit 1db8162b7e
Author: 0.0 <1092404103.qq.com>
Date:   Wed Aug 30 11:04:35 2023 +0800

    1.仓库权限

commit e20a7de5db
Author: pref_mail@163.com <123456>
Date:   Tue Aug 29 22:30:16 2023 +0800

    修复预约

commit ec972fcd59
Author: kilo <wan.ren@foxmail.com>
Date:   Tue Aug 29 21:41:01 2023 +0800

    页面调整

commit 357d9cebd7
Author: caoyizhong <1270296080@qq.com>
Date:   Tue Aug 29 17:31:04 2023 +0800

    添加订单可空格查询

commit 7d75a1cf64
Author: pref_mail@163.com <123456>
Date:   Tue Aug 29 17:14:26 2023 +0800

    修改运单显示字段

commit 21771e8699
Author: 0.0 <1092404103.qq.com>
Date:   Tue Aug 29 17:08:25 2023 +0800

    1.禁用

commit d52dccc927
Merge: 42ee206 ea10e1c
Author: caoyizhong <1270296080@qq.com>
Date:   Tue Aug 29 11:15:07 2023 +0800

    Merge remote-tracking branch 'origin/dev' into dev

commit 42ee2067e0
Author: caoyizhong <1270296080@qq.com>
Date:   Tue Aug 29 11:14:32 2023 +0800

    修改班组人员添加

# Conflicts:
#	src/views/basicdata/team/basicdataTeamStaff.vue
fix_bug_pro20231227
zhangsiyu 2 years ago
parent
0afad7e38a
commit
aaad6afced
1 changed files with 352 additions and 310 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 246
      src/views/basicdata/team/basicdataTeamStaff.vue

246
src/views/basicdata/team/basicdataTeamStaff.vue
Unescape View File

@ -4,11 +4,11 @@
<el-row :hidden="!search" style="padding: 6px 18px">
<!-- 查询模块 -->
<el-form :inline="true" :model="query">
<el-form-item label="仓库名称:">
<el-input v-model="query.warehouseName" placeholder="请输入仓库名称"></el-input>
</el-form-item>
<el-form-item label="班组名称:">
<el-input v-model="query.teamGroupName" placeholder="请输入班组名称"></el-input>
<!-- <el-form-item label="仓库名称:">-->
<!-- <el-input v-model="query.warehouseName" placeholder="请输入仓库名称"></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="人员名称:">
<el-input v-model="query.name" placeholder="请输入人员名称"></el-input>
</el-form-item>
<!-- 查询按钮 -->
@ -23,7 +23,9 @@
<!-- 头部左侧按钮模块 -->
<div class="avue-crud__left">
<el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
<el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>
<el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain
>删 除</el-button
>
</div>
<!-- 头部右侧按钮模块 -->
<div class="avue-crud__right">
@ -54,7 +56,8 @@
<el-row>
<div class="avue-crud__pagination" style="width: 100%">
<!-- 分页模块 -->
<el-pagination align="right"
<el-pagination
align="right"
background
@size-change="sizeChange"
@current-change="currentChange"
@ -62,19 +65,22 @@
:page-sizes="[10, 20, 30, 40, 50, 100]"
:page-size="page.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="page.total">
:total="page.total"
>
</el-pagination>
</div>
</el-row>
<!-- 表单模块 -->
<el-dialog :title="title"
<el-dialog
:title="title"
v-model="box"
width="40%"
:before-close="beforeClose"
append-to-body>
append-to-body
>
<el-form :disabled="view" ref="form" :rules="rules" :model="form" label-width="80px">
<el-form-item label="仓库" prop="warehouseId">
<!-- <el-input v-model="form.staffId" placeholder="请输入员工表ID"/>-->
<!--<el-form-item label="仓库" prop="warehouseId">
&lt;!&ndash; <el-input v-model="form.staffId" placeholder="请输入员工表ID"/>&ndash;&gt;
<el-select v-model="form.warehouseId" clearable placeholder="请选择仓库" @change="clickDept($event)" style="width: 80%">
<el-option
v-for="item in warehouseList"
@ -84,10 +90,10 @@
</el-option>
</el-select>
</el-form-item>
</el-form-item>-->
<!-- 表单字段 -->
<el-form-item label="班组" prop="teamGroupId">
<!-- <el-input v-model="form.teamGroupId" placeholder="请输入班组ID"/>-->
<!-- <el-form-item label="班组" prop="teamGroupId">
&lt;!&ndash; <el-input v-model="form.teamGroupId" placeholder="请输入班组ID"/>&ndash;&gt;
<el-select v-model="form.teamGroupId" clearable placeholder="请选择班组" @change="clickTeamGroup($event,1)" style="width: 80%">
<el-option
v-for="item in teamGroupList"
@ -97,15 +103,22 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="人员" prop="staffId">
</el-form-item>-->
<el-form-item label="人员" prop="staffIds">
<!-- <el-input v-model="form.staffId" placeholder="请输入姓名"/>-->
<el-select v-model="form.staffId" clearable placeholder="请选择人员" @change="clickTeamGroup($event,2)" style="width: 80%">
<el-select
v-model="form.staffIds"
multiple
clearable
placeholder="请选择人员"
style="width: 80%"
>
<el-option
v-for="item in staffList"
:key="item.id"
:label="item.name"
:value="item.id">
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
@ -113,7 +126,9 @@
<!-- 表单按钮 -->
<template #footer>
<span v-if="!view" class="dialog-footer">
<el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit('form')">提 交</el-button>
<el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit('form')"
>提 交</el-button
>
<el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>
</span>
</template>
@ -129,9 +144,10 @@
</template>
<script>
import { getList, getDetail, add, update, remove } from "@/api/basicdata/basicdataTeamStaff";
import option from "@/option/basicdata/basicdataTeamStaff";
import { mapGetters } from "vuex";
import { getList, getDetail, add, update, remove } from '@/api/basicdata/basicdataTeamStaff';
import { getDetail as getDetailGroup } from '@/api/basicdata/basicdataTeamGroup';
import option from '@/option/basicdata/basicdataTeamStaff';
import { mapGetters } from 'vuex';
import { getListUser } from '@/api/distribution/distributionStockup';
import { getUserDetail } from '@/api/system/user';
import { getDept, getLazyList } from '@/api/system/dept';
@ -160,7 +176,7 @@ export default {
width: '150',
checkarr: [],
fixed: false,
sortable: true
sortable: true,
// head: true,
},
{
@ -171,7 +187,7 @@ export default {
width: '150',
checkarr: [],
fixed: false,
sortable: true
sortable: true,
// head: true,
},
{
@ -182,7 +198,7 @@ export default {
width: '150',
checkarr: [],
fixed: false,
sortable: true
sortable: true,
},
{
prop: 'warehouseName',
@ -192,7 +208,7 @@ export default {
width: '180',
checkarr: [],
fixed: false,
sortable: true
sortable: true,
},
{
@ -203,8 +219,8 @@ export default {
width: '150',
checkarr: [],
fixed: 'right',
sortable: false
}
sortable: false,
},
// 更多列的配置...
],
height: 0,
@ -224,7 +240,7 @@ export default {
page: {
currentPage: 1,
pageSize: 10,
total: 40
total: 40,
},
// 表单数据
form: {},
@ -240,18 +256,25 @@ export default {
deptId: '',
warehouId: '',
rules: {
warehouseId: [
{ required: true, message: '请选择仓库', trigger: 'change' }
],
teamGroupId: [
{ required: true, message: '请选择班组', trigger: 'change' }
],
staffId: [
{ required: true, message: '请选择人员', trigger: 'change' }
],
}
warehouseId: [{ required: true, message: '请选择仓库', trigger: 'change' }],
teamGroupId: [{ required: true, message: '请选择班组', trigger: 'change' }],
staffIds: [{ required: true, message: '请选择人员', trigger: 'change' }],
},
groupEntity: {},
};
},
watch: {
'$route.query.id': {
handler(newVal, oldVal) {
console.log(newVal, oldVal);
if (!!this.$route.query.id) {
this.onLoad(this.page);
}
},
deep: true,
immediate: true,
},
},
mounted() {
this.init();
this.onLoad(this.page);
@ -328,14 +351,14 @@ export default {
}
},
computed: {
...mapGetters(["permission"]),
...mapGetters(['permission']),
ids() {
let ids = [];
this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
}
return ids.join(',');
},
},
methods: {
showdrawer(value) {
@ -357,7 +380,6 @@ export default {
this.columnList = newarr;
this.$functions.setStorage(window.location.pathname + 'sortlist', headarr);
}
},
selectionsc(value) {
console.log('进来了>>>>>>>>>>>>>', value);
@ -365,9 +387,9 @@ export default {
},
//点击部门
async clickDept(row) {
// console.log("进发了部门",row);
console.log('进发了部门', row);
if (this.form.warehouId != row) {
let id = "";
let id = '';
if (!!this.form.id) {
id = this.form.id;
}
@ -381,7 +403,9 @@ export default {
this.form.warehouseId = a.id;
this.warehouId = a.id;
//查询班组
let sd = await getTeamGroupList(this.page.currentPage,this.page.pageSize,{belongTo: a.id});
let sd = await getTeamGroupList(this.page.currentPage, this.page.pageSize, {
belongTo: a.id,
});
// console.log("sdsd班组",sd);
this.teamGroupList = sd.data.data.records;
//查询人员
@ -396,14 +420,14 @@ export default {
case 1:
//班组
let a = this.teamGroupList.find(i => i.id == row);
console.log("aa",a);
console.log('aa', a);
this.form.teamGroupName = a.groupName;
break;
case 2:
//人员
let b = this.staffList.find(i => i.id == row);
this.form.name = b.name;
console.log("bb",b);
console.log('bb', b);
break;
}
},
@ -422,69 +446,84 @@ export default {
this.onLoad(this.page);
},
handleSubmit(formName) {
this.$refs[formName].validate((valid) => {
this.$refs[formName].validate(valid => {
if (valid) {
if (!this.form.id) {
console.log("添加",this.form);
this.form.department = this.groupEntity.department;
this.form.departmentName = this.groupEntity.departmentName;
this.form.teamGroupId = this.$route.query.id;
this.form.teamGroupName = this.groupEntity.groupName;
this.form.warehouseId = this.groupEntity.belongTo;
this.form.warehouseName = this.groupEntity.warehouseName;
console.log('添加', this.form);
add(this.form).then(() => {
this.box = false;
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
type: 'success',
message: '操作成功!',
});
});
} else {
console.log("修改",this.form);
console.log('修改', this.form);
update(this.form).then(() => {
this.box = false;
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
type: 'success',
message: '操作成功!',
});
});
})
}
}
})
});
},
handleAdd() {
this.title = '新增'
this.form = {}
this.title = '新增';
this.form = {};
this.box = true;
this.getWarehouseList();
},
async getWarehouseList() {
let userDept = await getListUser();
this.deptId = userDept.data.data.deptId;
let sole = await getUserDetail(userDept.data.data.userId);
// console.log("名称11",sole.data.data.roleName);
if(sole.data.data.roleName == '管理员'){
let deptW = await getDeptWarehouse({tenantId: userDept.data.data.tenantId });
// console.log("全部仓库",deptW);
this.warehouseList = deptW.data.data;
}else{
//有部门
let dept = await getDept(this.deptId);
const da = dept.data.data;
if(!!da.parentId && da.parentId != '0'){
//有部门的信息 查询仓库
let deptW = await getDeptWarehouse({department: da.id});
this.warehouseList = deptW.data.data;
}
}
let group = await getDetailGroup(this.$route.query.id);
console.log('_+_+_+_+_+', group.data.data.department);
this.groupEntity = group.data.data;
//查询人员
this.staffList = [];
let user = await getListOwn({ deptId: this.groupEntity.department });
// console.log("查询人员》》》",user);
this.staffList = user.data.data;
// let userDept = await getListUser();
// this.deptId = userDept.data.data.deptId;
// let sole = await getUserDetail(userDept.data.data.userId);
// // console.log("名称11",sole.data.data.roleName);
// if(sole.data.data.roleName == '管理员'){
// let deptW = await getDeptWarehouse({tenantId: userDept.data.data.tenantId });
// // console.log("全部仓库",deptW);
// this.warehouseList = deptW.data.data;
// }else{
// //有部门
// let dept = await getDept(this.deptId);
// const da = dept.data.data;
// if(!!da.parentId && da.parentId != '0'){
// //有部门的信息 查询仓库
// let deptW = await getDeptWarehouse({department: da.id});
// this.warehouseList = deptW.data.data;
// }
// }
},
async handleEdit(row) {
await this.getWarehouseList();
this.title = '编辑'
this.box = true
this.title = '编辑';
this.box = true;
getDetail(row.id).then(async res => {
this.form = res.data.data;
console.log("返回数据。。。",this.form);
console.log('返回数据。。。', this.form);
//查询班组
let sd = await getTeamGroupList(this.page.currentPage,this.page.pageSize,{belongTo: res.data.data.warehouseId});
let sd = await getTeamGroupList(this.page.currentPage, this.page.pageSize, {
belongTo: res.data.data.warehouseId,
});
this.teamGroupList = sd.data.data.records;
//查询人员
let user = await getListOwn({ deptId: this.deptId });
@ -493,13 +532,15 @@ export default {
},
async handleView(row) {
await this.getWarehouseList();
this.title = '查看'
this.title = '查看';
this.view = true;
this.box = true;
getDetail(row.id).then(async res => {
this.form = res.data.data;
//查询班组
let sd = await getTeamGroupList(this.page.currentPage,this.page.pageSize,{belongTo: res.data.data.warehouseId});
let sd = await getTeamGroupList(this.page.currentPage, this.page.pageSize, {
belongTo: res.data.data.warehouseId,
});
this.teamGroupList = sd.data.data.records;
//查询人员
let user = await getListOwn({ deptId: this.deptId });
@ -508,13 +549,13 @@ export default {
},
handleDelete() {
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据");
this.$message.warning('请选择至少一条数据');
return;
}
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
return remove(this.ids);
@ -523,16 +564,16 @@ export default {
this.selectionClear();
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
type: 'success',
message: '操作成功!',
});
});
},
rowDel(row) {
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
return remove(row.id);
@ -540,13 +581,13 @@ export default {
.then(() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
type: 'success',
message: '操作成功!',
});
});
},
beforeClose(done) {
done()
done();
this.form = {};
this.view = false;
},
@ -567,6 +608,7 @@ export default {
},
onLoad(page, params = {}) {
this.loading = true;
this.query.teamGroupId = this.$route.query.id;
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
this.page.total = data.total;
@ -574,7 +616,7 @@ export default {
this.loading = false;
this.selectionClear();
});
}
}
},
},
};
</script>

Write Preview
Loading…
Cancel
Save