班给管理修改 12.7

zhc4dev
zhc077 2 years ago
parent ab0f6f0b80
commit 1b4aa086a6
  1. 95
      ant-design-vue-jeecg/src/views/team/GroupxList.vue
  2. 313
      ant-design-vue-jeecg/src/views/team/GroupxMemberList.vue
  3. 2
      ant-design-vue-jeecg/src/views/team/StationList.vue
  4. 61
      ant-design-vue-jeecg/src/views/team/modules/GroupxMemberModal.vue

@ -47,14 +47,16 @@
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('班组')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
@change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
<!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"-->
<!-- @change="handleImportExcel">-->
<!-- <a-button type="primary" icon="import">导入</a-button>-->
<!-- </a-upload>-->
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel">
<a-icon type="delete"/>删除</a-menu-item>
<a-icon type="delete"/>
删除
</a-menu-item>
</a-menu>
<a-button style="margin-left: 8px"> 批量操作
<a-icon type="down"/>
@ -83,20 +85,19 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="action1" slot-scope="text, record">
<a @click="jumpPage1(record)">班组成员管理</a>
<!-- <a-divider type="vertical"/>-->
<!-- <a @click="jumpPage2(record)">工位工具管理</a>-->
</span>
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">编辑</a>
<!-- <a-divider type="vertical"/>-->
<!-- <a @click="handleDetail(record)">详情</a>-->
<a-divider type="vertical"/>
<a-dropdown>
<a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
<a-menu slot="overlay">
<a-menu-item>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
</a-menu-item>
</a-menu>
</a-dropdown>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete2(record.id)">
<a>删除</a>
</a-popconfirm>
</span>
</a-table>
@ -114,6 +115,7 @@ import GroupxModal from './modules/GroupxModal'
import {JeecgListMixin} from '@/mixins/JeecgListMixin'
import JDictSelectTag from '@/components/dict/JDictSelectTag'
import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
import {deleteAction, getAction} from "@api/manage";
export default {
name: "GroupxList",
@ -158,15 +160,25 @@ export default {
align: "center",
dataIndex: 'mobile'
},
{
title: '管理模块',
dataIndex: 'action1',
align: "center",
// fixed: "right",
width: 80,
scopedSlots: {customRender: 'action1'}
},
{
title: '操作',
dataIndex: 'action',
align: "center",
width: 60,
scopedSlots: {customRender: 'action'},
}
],
url: {
list: "/groupx/list",
groupxMemberList: "/groupxMember/list",
delete: "/groupx/delete",
deleteBatch: "/groupx/deleteBatch",
exportXlsUrl: "/groupx/exportXls",
@ -179,7 +191,56 @@ export default {
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
}
},
methods: {}
methods: {
//
jumpPage1(record) {
this.$router.push({
path: '/team/GroupxMemberList',
query: { //
'groupxId': record.id,
'groupName': record.groupName,
},
});
},
handleDelete2: function (id) {
if (!this.url.groupxMemberList) {
this.$message.error("请设置url.delete属性!")
return
}
let dataTotal = 0;
let param = {
groupxId: id
}
getAction(this.url.groupxMemberList, param).then((res) => {
console.log(JSON.stringify(res));
if (res.success) {
dataTotal = res.result.total;
console.log("the listSize=",dataTotal);
if (dataTotal > 0) {
// alert("nononon");
that.$message.warning("不能删除!");
return;
}
}
})
// debugger;
// if (dataTotal > 0) {
// alert("nononon");
// that.$message.warning("!");
// }
var that = this;
deleteAction(that.url.delete, {id: id}).then((res) => {
if (res.success) {
//
that.reCalculatePage(1)
that.$message.success(res.message);
that.loadData();
} else {
that.$message.warning(res.message);
}
});
},
}
}
</script>
<style scoped>

@ -2,63 +2,72 @@
<a-card :bordered="false">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<!-- <div class="table-page-search-wrapper">-->
<!-- <a-form layout="inline" @keyup.enter.native="searchQuery">-->
<!-- <a-row :gutter="24">-->
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="班组ID">
<a-input placeholder="请输入班组ID" v-model="queryParam.groupxId"></a-input>
<!-- <j-search-select-tag placeholder="请选择班组" v-model="queryParam.jcmcid" dict="groupx,group_name,id"/>-->
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="用户ID">
<a-input placeholder="请输入用户ID" v-model="queryParam.userId"></a-input>
</a-form-item>
</a-col>
<template v-if="toggleSearchStatus">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="加入时间">
<!-- <a-input placeholder="请输入加入时间" v-model="queryParam.joinTime"></a-input>-->
<a-date-picker showTime valueFormat='YYYY-MM-DD HH:mm:ss' v-model="queryParam.joinTime"/>
</a-form-item>
</a-col>
</template>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</span>
</a-col>
<!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
<!-- <a-form-item label="班组">-->
<!--&lt;!&ndash; <a-input placeholder="请输入班组ID" v-model="queryParam.groupxId"></a-input>&ndash;&gt;-->
<!-- <j-search-select-tag placeholder="请选择班组" v-model="queryParam.groupxId" dict="groupx,group_name,id"/>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
<!-- <a-form-item label="用户ID">-->
<!-- <a-input placeholder="请输入用户ID" v-model="queryParam.userId"></a-input>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<!--&lt;!&ndash; <template v-if="toggleSearchStatus">&ndash;&gt;-->
<!--&lt;!&ndash; <a-col :xl="6" :lg="7" :md="8" :sm="24">&ndash;&gt;-->
<!--&lt;!&ndash; <a-form-item label="加入时间">&ndash;&gt;-->
<!--&lt;!&ndash; &lt;!&ndash; <a-input placeholder="请输入加入时间" v-model="queryParam.joinTime"></a-input>&ndash;&gt;&ndash;&gt;-->
<!--&lt;!&ndash; <a-date-picker showTime valueFormat='YYYY-MM-DD HH:mm:ss' v-model="queryParam.joinTime"/>&ndash;&gt;-->
<!--&lt;!&ndash; </a-form-item>&ndash;&gt;-->
<!--&lt;!&ndash; </a-col>&ndash;&gt;-->
<!--&lt;!&ndash; </template>&ndash;&gt;-->
<!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
<!-- <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">-->
<!-- <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>-->
<!-- <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>-->
<!--&lt;!&ndash; <a @click="handleToggleSearch" style="margin-left: 8px">&ndash;&gt;-->
<!--&lt;!&ndash; {{ toggleSearchStatus ? '收起' : '展开' }}&ndash;&gt;-->
<!--&lt;!&ndash; <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>&ndash;&gt;-->
<!--&lt;!&ndash; </a>&ndash;&gt;-->
<!-- </span>-->
<!-- </a-col>-->
</a-row>
</a-form>
</div>
<!-- </a-row>-->
<!-- </a-form>-->
<!-- </div>-->
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('班组成员表管理')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
</a-menu>
<a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
</a-dropdown>
<!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
<a-button @click="zyStyleFabricHandleAdd(groupxId)" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('班组成员管理')">导出</a-button>
<!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"-->
<!-- @change="handleImportExcel">-->
<!-- <a-button type="primary" icon="import">导入</a-button>-->
<!-- </a-upload>-->
<!-- <a-dropdown v-if="selectedRowKeys.length > 0">-->
<!-- <a-menu slot="overlay">-->
<!-- <a-menu-item key="1" @click="batchDel">-->
<!-- <a-icon type="delete"/>-->
<!-- 删除-->
<!-- </a-menu-item>-->
<!-- </a-menu>-->
<!-- <a-button style="margin-left: 8px"> 批量操作-->
<!-- <a-icon type="down"/>-->
<!-- </a-button>-->
<!-- </a-dropdown>-->
<a-button type="primary" @click="fanHui()">返回</a-button>
</div>
<!-- table区域-begin -->
<div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a
style="font-weight: 600">{{ selectedRowKeys.length }}</a>
<a style="margin-left: 24px" @click="onClearSelected">清空</a>
</div>
@ -76,19 +85,10 @@
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" />
<a-dropdown>
<a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
<a-menu slot="overlay">
<a-menu-item>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
</a-menu-item>
</a-menu>
</a-dropdown>
<!-- <a @click="handleEdit(record)">编辑</a>-->
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
</span>
</a-table>
@ -96,77 +96,154 @@
<!-- table区域-end -->
<!-- 表单区域 -->
<groupxMember-modal ref="modalForm" @ok="modalFormOk"></groupxMember-modal>
<groupxMember-modal @valueChange="valueChange" ref="modalForm" @ok="modalFormOk"></groupxMember-modal>
</a-card>
</template>
<script>
import '@assets/less/TableExpand.less'
import GroupxMemberModal from './modules/GroupxMemberModal'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import '@assets/less/TableExpand.less'
import GroupxMemberModal from './modules/GroupxMemberModal'
import {JeecgListMixin} from '@/mixins/JeecgListMixin'
import {deleteAction, getAction} from "@api/manage";
import {filterObj} from "@/utils/util";
export default {
name: "GroupxMemberList",
mixins:[JeecgListMixin],
components: {
GroupxMemberModal
},
data () {
return {
description: '班组成员表管理管理页面',
//
columns: [
{
title: '#',
dataIndex: '',
key:'rowIndex',
width:60,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
},
{
title: '班组ID',
align:"center",
dataIndex: 'groupxId'
},
{
title: '用户ID',
align:"center",
dataIndex: 'userId'
},
{
title: '加入时间',
align:"center",
dataIndex: 'joinTime'
},
{
title: '操作',
dataIndex: 'action',
align:"center",
scopedSlots: { customRender: 'action' },
export default {
name: "GroupxMemberList",
mixins: [JeecgListMixin],
components: {
GroupxMemberModal
},
data() {
return {
description: '班组成员表管理管理页面',
//
columns: [
{
title: '#',
dataIndex: '',
key: 'rowIndex',
width: 60,
align: "center",
customRender: function (t, r, index) {
return parseInt(index) + 1;
}
],
url: {
list: "/groupxMember/list",
delete: "/groupxMember/delete",
deleteBatch: "/groupxMember/deleteBatch",
exportXlsUrl: "/groupxMember/exportXls",
importExcelUrl: "/groupxMember/importExcel",
},
},
{
title: '班组ID',
align: "center",
dataIndex: 'groupxId'
},
{
title: '班组名称',
align: "center",
dataIndex: 'groupName'
},
{
title: '成员ID',
align: "center",
dataIndex: 'userId'
},
{
title: '加入时间',
align: "center",
dataIndex: 'joinTime'
},
{
title: '操作',
dataIndex: 'action',
align: "center",
scopedSlots: {customRender: 'action'},
}
],
url: {
list: "/groupxMember/list",
delete: "/groupxMember/delete",
deleteBatch: "/groupxMember/deleteBatch",
exportXlsUrl: "/groupxMember/exportXls",
importExcelUrl: "/groupxMember/importExcel",
},
//
loadRouteType: false,
groupxId: "",
groupName: "",
dictOptions: {},
// superFieldList: [],
}
},
computed: {
importExcelUrl: function(){
importExcelUrl: function () {
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
}
},
methods: {
}
methods: {
fanHui() {
this.$router.push({
path: '/src/views/team/GroupxList',
});
},
// initDictConfig() {
// },
valueChange(value) {
if (value) this.loadData()
},
//
loadParameter() {
if (this.loadRouteType === false) {
this.groupxId = this.$route.query.groupxId;
this.groupName = this.$route.query.groupName;
// this.biaoTi = this.$route.query.styleNames+"";
// console.log("*******groupxId:" + this.groupxId)
this.loadRouteType = true;
}
},
loadData(arg) {
if (!this.url.list) {
this.$message.error("请设置url.list属性!")
return
}
// 1
if (arg === 1) {
this.ipagination.current = 1;
}
this.loadParameter();
var params = this.getQueryParams();//
this.loading = true;
console.log("----------------the params:", params);
getAction(this.url.list, params).then((res) => {
if (res.success) {
this.dataSource = res.result.records || res.result;
if (res.result.total) {
this.ipagination.total = res.result.total;
} else {
this.ipagination.total = 0;
}
} else {
this.$message.warning(res.message)
}
}).finally(() => {
this.dataSource.forEach(item => {
item['groupName'] = this.groupName;
})
this.loading = false
})
},
getQueryParams() {
//
let sqp = {}
if (this.superQueryParams) {
sqp['superQueryParams'] = encodeURI(this.superQueryParams)
sqp['superQueryMatchType'] = this.superQueryMatchType
}
var param = Object.assign(sqp, this.queryParam, this.isorter, this.filters);
param.field = this.getQueryField();
param.pageNo = this.ipagination.current;
param.pageSize = this.ipagination.pageSize;
param.groupxId = this.groupxId;
return filterObj(param);
},
}
}
</script>
<style scoped>
@import '~@assets/less/common.less';
@import '~@assets/less/common.less';
</style>

@ -187,7 +187,7 @@ export default {
//
jumpPage1(record) {
this.$router.push({
path: '/team/stationMachineList',
path: '/team/StationMachineList',
query: { //
'stationId': record.id,
'stationName': record.stationName,

@ -12,13 +12,14 @@
<a-spin :spinning="confirmLoading">
<a-form-model ref="form" :model="model" :rules="validatorRules">
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="groupxId" label="请选择班组">
<!-- <a-input placeholder="请选择班组" v-model="model.groupxId" />-->
<j-search-select-tag placeholder="请选择班组" v-model="model.groupxId" dict="groupx,group_name,id"/>
</a-form-model-item>
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId" label="请选择用户">
<a-input placeholder="请选择用户" v-model="model.userId"/>
</a-form-model-item>
<!-- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="groupxId" label="请选择班组">-->
<!-- &lt;!&ndash; <a-input placeholder="请选择班组" v-model="model.groupxId" />&ndash;&gt;-->
<!-- <j-search-select-tag placeholder="请选择班组" v-model="model.groupxId" dict="groupx,group_name,id"/>-->
<!-- </a-form-model-item>-->
<a-form-item :label-col="labelCol" :wrapper-col="wrapperCol" label="班组成员">
<!-- <j-select-user-by-dep v-model="model.userId" :multi="false"></j-select-user-by-dep>-->
<j-select-multi-user placeholder="请选择成员" v-model="model.userId"></j-select-multi-user>
</a-form-item>
<a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="joinTime" label="加入时间">
<a-date-picker showTime valueFormat='YYYY-MM-DD HH:mm:ss' v-model="model.joinTime"/>
</a-form-model-item>
@ -38,7 +39,9 @@ export default {
return {
title: "操作",
visible: false,
model: {},
model: {
groupxId: '',
},
labelCol: {
xs: {span: 24},
sm: {span: 5},
@ -50,12 +53,10 @@ export default {
confirmLoading: false,
validatorRules: {
groupxId: [
{required: true},
],
userId: [
{required: true},
], joinTime: [
],
joinTime: [
{required: true},
]
},
@ -69,12 +70,18 @@ export default {
created() {
},
methods: {
add() {
//
this.edit({});
add(groupxId) {
this.model.groupxId = groupxId;
console.log("Modal层接收到上级参数-groupxId:" + this.model.groupxId);
this.edit(this.model);
},
// add () {
// //
// this.edit({});
// },
edit(record) {
this.model = Object.assign({}, record);
// console.log("edit()model:----------",this.model);
this.visible = true;
},
close() {
@ -97,17 +104,19 @@ export default {
httpurl += this.url.edit;
method = 'put';
}
httpAction(httpurl, this.model, method).then((res) => {
if (res.success) {
that.$message.success(res.message);
that.$emit('ok');
} else {
that.$message.warning(res.message);
}
}).finally(() => {
that.confirmLoading = false;
that.close();
})
console.log("----------the add() model:", this.model);
this.model.stationId =
httpAction(httpurl, this.model, method).then((res) => {
if (res.success) {
that.$message.success(res.message);
that.$emit('ok');
} else {
that.$message.warning(res.message);
}
}).finally(() => {
that.confirmLoading = false;
that.close();
})
} else {
return false;
}

Loading…
Cancel
Save