commit
84b53db98c
14 changed files with 667 additions and 132 deletions
@ -0,0 +1,217 @@ |
||||
<template> |
||||
<a-card :bordered="false"> |
||||
<!-- 查询区域 --> |
||||
<div class="table-page-search-wrapper"> |
||||
<a-form layout="inline" @keyup.enter.native="searchQuery"> |
||||
<a-row :gutter="24"> |
||||
</a-row> |
||||
</a-form> |
||||
</div> |
||||
<!-- 查询区域-END --> |
||||
|
||||
<!-- 操作按钮区域 --> |
||||
<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>--> |
||||
<!-- 高级查询区域 --> |
||||
<j-super-query :fieldList="superFieldList" ref="superQueryModal" |
||||
@handleSuperQuery="handleSuperQuery"></j-super-query> |
||||
<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> |
||||
</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>项 |
||||
<a style="margin-left: 24px" @click="onClearSelected">清空</a> |
||||
</div> |
||||
|
||||
<a-table |
||||
ref="table" |
||||
size="middle" |
||||
:scroll="{x:true}" |
||||
bordered |
||||
rowKey="id" |
||||
:columns="columns" |
||||
:dataSource="dataSource" |
||||
:pagination="ipagination" |
||||
:loading="loading" |
||||
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" |
||||
class="j-table-force-nowrap" |
||||
@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-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> |
||||
<a>删除</a> |
||||
</a-popconfirm> |
||||
<a-divider type="vertical"/> |
||||
<a @click="jumpPage1(record)">制定计划详情</a> |
||||
</span> |
||||
|
||||
</a-table> |
||||
</div> |
||||
|
||||
<zy-plan-process-modal ref="modalForm" @ok="modalFormOk"></zy-plan-process-modal> |
||||
</a-card> |
||||
</template> |
||||
|
||||
<script> |
||||
|
||||
import '@/assets/less/TableExpand.less' |
||||
import {mixinDevice} from '@/utils/mixin' |
||||
import {JeecgListMixin} from '@/mixins/JeecgListMixin' |
||||
import ZyPlanProcessModal from './modules/ZyPlanProcessModal2' |
||||
|
||||
export default { |
||||
name: 'ZyPlanProcessList', |
||||
mixins: [JeecgListMixin, mixinDevice], |
||||
components: { |
||||
ZyPlanProcessModal |
||||
}, |
||||
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: 'planId' |
||||
}, |
||||
{ |
||||
title: '车间名称', |
||||
align: "center", |
||||
dataIndex: 'teamName' |
||||
}, |
||||
{ |
||||
title: '工单编号', |
||||
align: "center", |
||||
dataIndex: 'productCode' |
||||
}, |
||||
{ |
||||
title: '产品名称', |
||||
align: "center", |
||||
dataIndex: 'productCode2' |
||||
}, |
||||
{ |
||||
title:'工序名称', |
||||
align:"center", |
||||
dataIndex: 'processId_dictText' |
||||
}, |
||||
{ |
||||
title:'序号', |
||||
align:"center", |
||||
dataIndex: 'number' |
||||
}, |
||||
{ |
||||
title: '操作', |
||||
dataIndex: 'action', |
||||
align: "center", |
||||
fixed: "right", |
||||
width: 147, |
||||
scopedSlots: {customRender: 'action'} |
||||
} |
||||
], |
||||
url: { |
||||
list: "/org.jeecg.modules.productplan/zyPlanProcess/list", |
||||
productPlanlist: "/org.jeecg.modules.productplan/zyProductPlan/list", |
||||
delete: "/org.jeecg.modules.productplan/zyPlanProcess/delete", |
||||
deleteBatch: "/org.jeecg.modules.productplan/zyPlanProcess/deleteBatch", |
||||
exportXlsUrl: "/org.jeecg.modules.productplan/zyPlanProcess/exportXls", |
||||
importExcelUrl: "org.jeecg.modules.productplan/zyPlanProcess/importExcel", |
||||
|
||||
}, |
||||
dictOptions: {}, |
||||
superFieldList: [], |
||||
} |
||||
}, |
||||
created() { |
||||
this.getSuperFieldList(); |
||||
}, |
||||
computed: { |
||||
importExcelUrl: function () { |
||||
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`; |
||||
}, |
||||
}, |
||||
methods: { |
||||
initDictConfig() { |
||||
}, |
||||
getSuperFieldList() { |
||||
let fieldList = []; |
||||
fieldList.push({type: 'string', value: 'planId', text: '生产计划id', dictCode: ''}) |
||||
fieldList.push({type: 'string', value: 'stationId', text: '工位id', dictCode: ''}) |
||||
fieldList.push({type: 'string', value: 'machineIds', text: '设备id列表', dictCode: ''}) |
||||
fieldList.push({type: 'string', value: 'toolsIds', text: '工具id列表', dictCode: ''}) |
||||
fieldList.push({type: 'string', value: 'processIds', text: '工序id列表', dictCode: ''}) |
||||
fieldList.push({type: 'string', value: 'userIds', text: '成员id列表', dictCode: ''}) |
||||
this.superFieldList = fieldList |
||||
}, |
||||
jumpPage1(record) { |
||||
this.$router.push({ |
||||
path: '/productplan/ZyProductPlanList', |
||||
|
||||
// query: { // 路由携带参数 |
||||
// 'stationId': record.id, |
||||
// 'stationName': record.stationName, |
||||
// }, |
||||
}); |
||||
}, |
||||
// pf(record) { |
||||
// this.$router.push({ |
||||
// path: '/productplan/ZyPlanProcessAddList', |
||||
// query: { // 路由携带参数 |
||||
// } |
||||
// }); |
||||
|
||||
// getAction("productPlanlist", {id: record.id}).then((res) => { |
||||
// if (res.success) { |
||||
// this.$router.push({ |
||||
// path: '/src/views/processassessment/assessmentCourse/ClassOpeningTaskList', |
||||
// query: { // 路由携带参数 |
||||
// } |
||||
// }); |
||||
// } else { |
||||
// this.$message.error(res.message) |
||||
// } |
||||
// }); |
||||
// }, |
||||
} |
||||
} |
||||
</script> |
||||
<style scoped> |
||||
@import '~@assets/less/common.less'; |
||||
</style> |
||||
@ -0,0 +1,27 @@ |
||||
package org.jeecg.modules.productplan.entity.vo; |
||||
|
||||
import lombok.Data; |
||||
import org.jeecg.common.aspect.annotation.Dict; |
||||
import org.jeecg.modules.team.entity.Station; |
||||
|
||||
import java.util.List; |
||||
|
||||
@Data |
||||
public class ProcessDataVo { |
||||
|
||||
//工单id
|
||||
private String workOrderId; |
||||
|
||||
//产品id
|
||||
private String productId; |
||||
|
||||
//车间
|
||||
private String departId; |
||||
|
||||
//工位
|
||||
private List<Station> stationList; |
||||
|
||||
// @Dict("")
|
||||
//产品工序id
|
||||
private String productProcessId; |
||||
} |
||||
Loading…
Reference in new issue