# Conflicts: # ant-design-vue-jeecg/src/views/zystyleaccessories/ZyStyleAccessoriesList.vue # ant-design-vue-jeecg/src/views/zystylefabric/ZyStyleFabricList.vue # ant-design-vue-jeecg/src/views/zystylemodular/ZyStyleModularList.vue # ant-design-vue-jeecg/src/views/zystylemodule/ZyStyleModuleList.vuezhc4dev
commit
3c8f31099c
46 changed files with 3076 additions and 127 deletions
@ -0,0 +1,279 @@ |
||||
<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">--> |
||||
<!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>--> |
||||
<!-- </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" |
||||
bordered |
||||
rowKey="id" |
||||
class="j-table-force-nowrap" |
||||
:scroll="{x:true}" |
||||
:columns="columns" |
||||
:dataSource="dataSource" |
||||
:pagination="ipagination" |
||||
:loading="loading" |
||||
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" |
||||
:customRow="clickThenSelect" |
||||
@change="handleTableChange"> |
||||
|
||||
<!-- <template slot="htmlSlot" slot-scope="text">--> |
||||
<!-- <div v-html="text"></div>--> |
||||
<!-- </template>--> |
||||
<!-- <template slot="imgSlot" slot-scope="text">--> |
||||
<!-- <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>--> |
||||
<!-- <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>--> |
||||
<!-- </template>--> |
||||
<!-- <template slot="imgeSlot" slot-scope="text">--> |
||||
<!-- <img :src="text" height="" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>--> |
||||
<!-- </template>--> |
||||
<!-- <template slot="fileSlot" slot-scope="text">--> |
||||
<!-- <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>--> |
||||
<!-- <a-button--> |
||||
<!-- v-else--> |
||||
<!-- :ghost="true"--> |
||||
<!-- type="primary"--> |
||||
<!-- icon="download"--> |
||||
<!-- size="small"--> |
||||
<!-- @click="downloadFile(text)">--> |
||||
<!-- 下载--> |
||||
<!-- </a-button>--> |
||||
<!-- </template>--> |
||||
|
||||
<!-- <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 @click="openDetail(record.id)">详情</a>--> |
||||
<!-- </a-menu-item>--> |
||||
<!-- <a-menu-item>--> |
||||
<!-- <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">--> |
||||
<!-- <a>删除</a>--> |
||||
<!-- </a-popconfirm>--> |
||||
<!-- </a-menu-item>--> |
||||
<!-- </a-menu>--> |
||||
<!-- </a-dropdown>--> |
||||
<!-- </span>--> |
||||
|
||||
</a-table> |
||||
</div> |
||||
|
||||
<!-- <a-tabs defaultActiveKey="1">--> |
||||
<!-- <a-tab-pane tab="类型参数" key="1" >--> |
||||
<!-- <ZyTypeparametersList :mainId="selectedMainId" />--> |
||||
<!-- </a-tab-pane>--> |
||||
<!-- <a-tab-pane tab="运行参数" key="2" forceRender>--> |
||||
<!-- <ZyOperationparametersList :mainId="selectedMainId" />--> |
||||
<!-- </a-tab-pane>--> |
||||
<!-- </a-tabs>--> |
||||
<!-- <ZyDevicetypeDetail ref="ZyDevicetypeDetail"></ZyDevicetypeDetail>--> |
||||
<!-- <zyDevicetype-modal ref="modalForm" @ok="modalFormOk"></zyDevicetype-modal>--> |
||||
</a-card> |
||||
</template> |
||||
|
||||
<script> |
||||
|
||||
import { JeecgListMixin } from '@/mixins/JeecgListMixin' |
||||
import ZyDevicetypeModal from './modules/ZyDevicetypeModal' |
||||
import { getAction } from '@/api/manage' |
||||
import ZyTypeparametersList from './ZyTypeparametersList' |
||||
import ZyOperationparametersList from './ZyOperationparametersList' |
||||
import '@/assets/less/TableExpand.less' |
||||
import ZyDevicetypeDetail from './modules/ZyDevicetypeDetail' |
||||
export default { |
||||
name: "ZyDevicetypeList", |
||||
mixins:[JeecgListMixin], |
||||
components: { |
||||
ZyTypeparametersList, |
||||
ZyOperationparametersList, |
||||
ZyDevicetypeModal, |
||||
ZyDevicetypeDetail |
||||
}, |
||||
data () { |
||||
return { |
||||
description: '设备类型管理页面', |
||||
// 表头 |
||||
columns: [ |
||||
// { |
||||
// title:'类型编号', |
||||
// align:"center", |
||||
// dataIndex: 'code' |
||||
// }, |
||||
{ |
||||
title:'名称', |
||||
align:"center", |
||||
dataIndex: 'name' |
||||
}, |
||||
// { |
||||
// title:'类型图片', |
||||
// align:"center", |
||||
// dataIndex: 'img', |
||||
// scopedSlots: {customRender: 'imgSlot'} |
||||
// }, |
||||
// { |
||||
// title:"二维码", |
||||
// align:"center", |
||||
// dataIndex: 'erweima', |
||||
// scopedSlots: {customRender: 'imgeSlot'} |
||||
// }, |
||||
{ |
||||
title:'类型品牌', |
||||
align:"center", |
||||
dataIndex: 'brand' |
||||
}, |
||||
// { |
||||
// title:'型号', |
||||
// align:"center", |
||||
// dataIndex: 'model' |
||||
// }, |
||||
{ |
||||
title:'生产厂商', |
||||
align:"center", |
||||
dataIndex: 'manufacturer' |
||||
}, |
||||
{ |
||||
title:'供货商', |
||||
align:"center", |
||||
dataIndex: 'supplier' |
||||
}, |
||||
// { |
||||
// title:'联系人', |
||||
// align:"center", |
||||
// dataIndex: 'contact' |
||||
// }, |
||||
// { |
||||
// title:'产地', |
||||
// align:"center", |
||||
// dataIndex: 'place' |
||||
// }, |
||||
], |
||||
url: { |
||||
list: "/devicetype/zyDevicetype/list", |
||||
delete: "/devicetype/zyDevicetype/delete", |
||||
deleteBatch: "/devicetype/zyDevicetype/deleteBatch", |
||||
exportXlsUrl: "/devicetype/zyDevicetype/exportXls", |
||||
importExcelUrl: "devicetype/zyDevicetype/importExcel", |
||||
}, |
||||
dictOptions:{ |
||||
}, |
||||
/* 分页参数 */ |
||||
ipagination:{ |
||||
current: 1, |
||||
pageSize: 5, |
||||
pageSizeOptions: ['5', '10', '50'], |
||||
showTotal: (total, range) => { |
||||
return range[0] + "-" + range[1] + " 共" + total + "条" |
||||
}, |
||||
showQuickJumper: true, |
||||
showSizeChanger: true, |
||||
total: 0 |
||||
}, |
||||
selectedMainId:'', |
||||
superFieldList:[], |
||||
selectedRowKeys: [], |
||||
} |
||||
}, |
||||
created() { |
||||
this.getSuperFieldList(); |
||||
}, |
||||
computed: { |
||||
importExcelUrl: function(){ |
||||
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`; |
||||
} |
||||
}, |
||||
methods: { |
||||
onSelectChange(selectedRowKeys){ |
||||
console.log('selectedRowKeys changed: ', selectedRowKeys); |
||||
this.selectedRowKeys = selectedRowKeys; |
||||
}, |
||||
initDictConfig(){ |
||||
}, |
||||
clickThenSelect(record) { |
||||
return { |
||||
on: { |
||||
click: () => { |
||||
this.onSelectChange(record.id.split(","), [record]); |
||||
} |
||||
} |
||||
} |
||||
}, |
||||
onClearSelected() { |
||||
this.selectedRowKeys = []; |
||||
this.selectionRows = []; |
||||
this.selectedMainId='' |
||||
}, |
||||
// onSelectChange(selectedRowKeys, selectionRows) { |
||||
// this.selectedMainId=selectedRowKeys[0] |
||||
// this.selectedRowKeys = selectedRowKeys; |
||||
// this.selectionRows = selectionRows; |
||||
// }, |
||||
loadData(arg) { |
||||
if(!this.url.list){ |
||||
this.$message.error("请设置url.list属性!") |
||||
return |
||||
} |
||||
//加载数据 若传入参数1则加载第一页的内容 |
||||
if (arg === 1) { |
||||
this.ipagination.current = 1; |
||||
} |
||||
this.onClearSelected() |
||||
var params = this.getQueryParams();//查询条件 |
||||
this.loading = true; |
||||
getAction(this.url.list, params).then((res) => { |
||||
if (res.success) { |
||||
this.dataSource = res.result.records; |
||||
this.ipagination.total = res.result.total; |
||||
} |
||||
if(res.code===510){ |
||||
this.$message.warning(res.message) |
||||
} |
||||
this.loading = false; |
||||
}) |
||||
}, |
||||
getSuperFieldList(){ |
||||
let fieldList=[]; |
||||
fieldList.push({type:'string',value:'pid',text:'父级节点',dictCode:''}) |
||||
fieldList.push({type:'string',value:'code',text:'类型编号',dictCode:''}) |
||||
fieldList.push({type:'string',value:'name',text:'类型名称',dictCode:''}) |
||||
fieldList.push({type:'string',value:'img',text:'类型图片',dictCode:''}) |
||||
fieldList.push({type:'string',value:'brand',text:'类型品牌',dictCode:''}) |
||||
fieldList.push({type:'string',value:'model',text:'型号',dictCode:''}) |
||||
fieldList.push({type:'string',value:'manufacturer',text:'生产厂商',dictCode:''}) |
||||
fieldList.push({type:'string',value:'supplier',text:'供货商',dictCode:''}) |
||||
fieldList.push({type:'string',value:'contact',text:'联系人',dictCode:''}) |
||||
fieldList.push({type:'string',value:'place',text:'产地',dictCode:''}) |
||||
this.superFieldList = fieldList |
||||
}, |
||||
openDetail(id){ |
||||
this.$refs.ZyDevicetypeDetail.showModal(id) |
||||
|
||||
} |
||||
} |
||||
} |
||||
</script> |
||||
<style scoped> |
||||
@import '~@assets/less/common.less' |
||||
</style> |
||||
@ -0,0 +1,261 @@ |
||||
<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">--> |
||||
<!-- <!– 高级查询区域 –>--> |
||||
<!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>--> |
||||
<!-- </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" |
||||
bordered |
||||
rowKey="id" |
||||
class="j-table-force-nowrap" |
||||
:scroll="{x:true}" |
||||
:columns="columns" |
||||
:dataSource="dataSource" |
||||
:pagination="ipagination" |
||||
:loading="loading" |
||||
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" |
||||
:customRow="clickThenSelect" |
||||
@change="handleTableChange"> |
||||
|
||||
<!-- <template slot="htmlSlot" slot-scope="text">--> |
||||
<!-- <div v-html="text"></div>--> |
||||
<!-- </template>--> |
||||
<!-- <template slot="imgSlot" slot-scope="text">--> |
||||
<!-- <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>--> |
||||
<!-- <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>--> |
||||
<!-- </template>--> |
||||
<!-- <template slot="fileSlot" slot-scope="text">--> |
||||
<!-- <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>--> |
||||
<!-- <a-button--> |
||||
<!-- v-else--> |
||||
<!-- :ghost="true"--> |
||||
<!-- type="primary"--> |
||||
<!-- icon="download"--> |
||||
<!-- size="small"--> |
||||
<!-- @click="downloadFile(text)">--> |
||||
<!-- 下载--> |
||||
<!-- </a-button>--> |
||||
<!-- </template>--> |
||||
|
||||
<!-- <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 @click="handleDetail(record)">详情</a>--> |
||||
<!-- </a-menu-item>--> |
||||
<!-- <a-menu-item>--> |
||||
<!-- <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">--> |
||||
<!-- <a>删除</a>--> |
||||
<!-- </a-popconfirm>--> |
||||
<!-- </a-menu-item>--> |
||||
<!-- </a-menu>--> |
||||
<!-- </a-dropdown>--> |
||||
<!-- </span>--> |
||||
|
||||
</a-table> |
||||
</div> |
||||
|
||||
<!-- <zy-tool-modal ref="modalForm" @ok="modalFormOk"></zy-tool-modal>--> |
||||
</a-card> |
||||
</template> |
||||
|
||||
<script> |
||||
|
||||
import '@/assets/less/TableExpand.less' |
||||
// import {mixinDevice} from '@/utils/mixin' |
||||
import {JeecgListMixin} from '@/mixins/JeecgListMixin' |
||||
import {getAction} from "@api/manage"; |
||||
// import ZyToolModal from './modules/ZyToolModal' |
||||
|
||||
export default { |
||||
name: 'ZyToolList', |
||||
mixins: [JeecgListMixin], |
||||
components: { |
||||
// ZyToolModal |
||||
}, |
||||
data() { |
||||
return { |
||||
description: 'zy_tool管理页面', |
||||
// 表头 |
||||
columns: [ |
||||
// { |
||||
// title: '#', |
||||
// dataIndex: '', |
||||
// key:'rowIndex', |
||||
// width:60, |
||||
// align:"center", |
||||
// customRender:function (t,r,index) { |
||||
// return parseInt(index)+1; |
||||
// } |
||||
// }, |
||||
{ |
||||
title: '工具编号', |
||||
align: "center", |
||||
dataIndex: 'nums' |
||||
}, |
||||
{ |
||||
title: '工具名称', |
||||
align: "center", |
||||
dataIndex: 'name' |
||||
}, |
||||
{ |
||||
title: '功能', |
||||
align: "center", |
||||
dataIndex: 'function' |
||||
}, |
||||
{ |
||||
title: '规格', |
||||
align: "center", |
||||
dataIndex: 'specs' |
||||
}, |
||||
// { |
||||
// title:'适用范围', |
||||
// align:"center", |
||||
// dataIndex: 'scope' |
||||
// }, |
||||
// { |
||||
// title:'责人工段', |
||||
// align:"center", |
||||
// dataIndex: 'workshopSection' |
||||
// }, |
||||
// { |
||||
// title:'状态 ( 0 在库、1 在用、2 遗失 、3 损坏、4 报废)', |
||||
// align:"center", |
||||
// dataIndex: 'status' |
||||
// }, |
||||
// { |
||||
// title:'二维码', |
||||
// align:"center", |
||||
// dataIndex: 'qrode' |
||||
// }, |
||||
// { |
||||
// title: '操作', |
||||
// dataIndex: 'action', |
||||
// align:"center", |
||||
// fixed:"right", |
||||
// width:147, |
||||
// scopedSlots: { customRender: 'action' } |
||||
// } |
||||
], |
||||
url: { |
||||
list: "/tool/zyTool/list", |
||||
delete: "/tool/zyTool/delete", |
||||
deleteBatch: "/tool/zyTool/deleteBatch", |
||||
exportXlsUrl: "/tool/zyTool/exportXls", |
||||
importExcelUrl: "tool/zyTool/importExcel", |
||||
|
||||
}, |
||||
dictOptions:{ |
||||
}, |
||||
/* 分页参数 */ |
||||
ipagination:{ |
||||
current: 1, |
||||
pageSize: 5, |
||||
pageSizeOptions: ['5', '10', '50'], |
||||
showTotal: (total, range) => { |
||||
return range[0] + "-" + range[1] + " 共" + total + "条" |
||||
}, |
||||
showQuickJumper: true, |
||||
showSizeChanger: true, |
||||
total: 0 |
||||
}, |
||||
selectedMainId:'', |
||||
superFieldList:[], |
||||
selectedRowKeys: [], |
||||
} |
||||
}, |
||||
created() { |
||||
this.getSuperFieldList(); |
||||
}, |
||||
computed: { |
||||
importExcelUrl: function () { |
||||
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`; |
||||
}, |
||||
}, |
||||
methods: { |
||||
clickThenSelect(record) { |
||||
return { |
||||
on: { |
||||
click: () => { |
||||
this.onSelectChange(record.id.split(","), [record]); |
||||
} |
||||
} |
||||
} |
||||
}, |
||||
onClearSelected() { |
||||
this.selectedRowKeys = []; |
||||
this.selectionRows = []; |
||||
this.selectedMainId='' |
||||
}, |
||||
onSelectChange(selectedRowKeys) { |
||||
console.log('selectedRowKeys changed: ', selectedRowKeys); |
||||
this.selectedRowKeys = selectedRowKeys; |
||||
}, |
||||
initDictConfig() { |
||||
}, |
||||
loadData(arg) { |
||||
if(!this.url.list){ |
||||
this.$message.error("请设置url.list属性!") |
||||
return |
||||
} |
||||
//加载数据 若传入参数1则加载第一页的内容 |
||||
if (arg === 1) { |
||||
this.ipagination.current = 1; |
||||
} |
||||
this.onClearSelected() |
||||
var params = this.getQueryParams();//查询条件 |
||||
this.loading = true; |
||||
getAction(this.url.list, params).then((res) => { |
||||
if (res.success) { |
||||
this.dataSource = res.result.records; |
||||
this.ipagination.total = res.result.total; |
||||
} |
||||
if(res.code===510){ |
||||
this.$message.warning(res.message) |
||||
} |
||||
this.loading = false; |
||||
}) |
||||
}, |
||||
getSuperFieldList() { |
||||
let fieldList = []; |
||||
fieldList.push({type: 'string', value: 'name', text: '工具名称'}) |
||||
fieldList.push({type: 'string', value: 'nums', text: '工具编号'}) |
||||
fieldList.push({type: 'string', value: 'function', text: '功能'}) |
||||
fieldList.push({type: 'string', value: 'specs', text: '规格'}) |
||||
fieldList.push({type: 'string', value: 'scope', text: '适用范围'}) |
||||
fieldList.push({type: 'string', value: 'workshopSection', text: '责人工段'}) |
||||
fieldList.push({type: 'string', value: 'status', text: '状态 ( 0 在库、1 在用、2 遗失 、3 损坏、4 报废)'}) |
||||
fieldList.push({type: 'string', value: 'qrode', text: '二维码'}) |
||||
this.superFieldList = fieldList |
||||
} |
||||
} |
||||
} |
||||
</script> |
||||
<style scoped> |
||||
@import '~@assets/less/common.less'; |
||||
</style> |
||||
@ -0,0 +1,249 @@ |
||||
<!--<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">--> |
||||
|
||||
<!-- <template slot="htmlSlot" slot-scope="text">--> |
||||
<!-- <div v-html="text"></div>--> |
||||
<!-- </template>--> |
||||
<!-- <template slot="imgSlot" slot-scope="text">--> |
||||
<!-- <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>--> |
||||
<!-- <img v-else :src="getImgView(text)" height="25px" alt=""--> |
||||
<!-- style="max-width:80px;font-size: 12px;font-style: italic;"/>--> |
||||
<!-- </template>--> |
||||
<!-- <template slot="fileSlot" slot-scope="text">--> |
||||
<!-- <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>--> |
||||
<!-- <a-button--> |
||||
<!-- v-else--> |
||||
<!-- :ghost="true"--> |
||||
<!-- type="primary"--> |
||||
<!-- icon="download"--> |
||||
<!-- size="small"--> |
||||
<!-- @click="downloadFile(text)">--> |
||||
<!-- 下载--> |
||||
<!-- </a-button>--> |
||||
<!-- </template>--> |
||||
|
||||
<!-- <span slot="action" slot-scope="text, record">--> |
||||
<!-- <a @click="handleEdit(record)">编辑</a>--> |
||||
<!-- <a-divider type="vertical"/>--> |
||||
<!-- <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">--> |
||||
<!-- <a>删除</a>--> |
||||
<!-- </a-popconfirm>--> |
||||
<!-- <!– <a-dropdown>--> |
||||
<!-- <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>--> |
||||
<!-- <a-menu slot="overlay">--> |
||||
<!-- <a-menu-item>--> |
||||
<!-- <a @click="handleDetail(record)">详情</a>--> |
||||
<!-- </a-menu-item>--> |
||||
<!-- <a-menu-item>--> |
||||
<!-- <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">--> |
||||
<!-- <a>删除</a>--> |
||||
<!-- </a-popconfirm>--> |
||||
<!-- </a-menu-item>--> |
||||
<!-- </a-menu>--> |
||||
<!-- </a-dropdown>–>--> |
||||
<!-- </span>--> |
||||
|
||||
<!-- </a-table>--> |
||||
<!-- </div>--> |
||||
|
||||
<!-- <zy-product-plan-modal ref="modalForm" @ok="modalFormOk"></zy-product-plan-modal>--> |
||||
<!-- </a-card>--> |
||||
<!--</template>--> |
||||
|
||||
<!--<script>--> |
||||
|
||||
<!--import '@/assets/less/TableExpand.less'--> |
||||
<!--import {mixinDevice} from '@/utils/mixin'--> |
||||
<!--import {JeecgListMixin} from '@/mixins/JeecgListMixin'--> |
||||
<!--import ZyProductPlanModal from './modules/ZyProductPlanModal'--> |
||||
|
||||
<!--export default {--> |
||||
<!-- name: 'ZyProductPlanList',--> |
||||
<!-- mixins: [JeecgListMixin, mixinDevice],--> |
||||
<!-- components: {--> |
||||
<!-- ZyProductPlanModal--> |
||||
<!-- },--> |
||||
<!-- data() {--> |
||||
<!-- return {--> |
||||
<!-- description: '生产计划管理页面',--> |
||||
<!-- // 表头--> |
||||
<!-- columns: [--> |
||||
<!-- {--> |
||||
<!-- title: '#',--> |
||||
<!-- dataIndex: '',--> |
||||
<!-- key: 'rowIndex',--> |
||||
<!-- width: 60,--> |
||||
<!-- align: "center",--> |
||||
<!-- customRender: function (t, r, index) {--> |
||||
<!-- return parseInt(index) + 1;--> |
||||
<!-- }--> |
||||
<!-- },--> |
||||
<!-- {--> |
||||
<!-- title: '工单编号',--> |
||||
<!-- align: "center",--> |
||||
<!-- dataIndex: 'productCode'--> |
||||
<!-- },--> |
||||
<!-- {--> |
||||
<!-- title: '车间编号',--> |
||||
<!-- align: "center",--> |
||||
<!-- dataIndex: 'workshopId'--> |
||||
<!-- },--> |
||||
<!-- {--> |
||||
<!-- title: '车间负责人',--> |
||||
<!-- align: "center",--> |
||||
<!-- dataIndex: 'responsiblePerson'--> |
||||
<!-- },--> |
||||
<!-- {--> |
||||
<!-- title: '班组编号',--> |
||||
<!-- align: "center",--> |
||||
<!-- dataIndex: 'teamId'--> |
||||
<!-- },--> |
||||
<!-- {--> |
||||
<!-- title: '组长',--> |
||||
<!-- align: "center",--> |
||||
<!-- dataIndex: 'teamLeader'--> |
||||
<!-- },--> |
||||
<!-- {--> |
||||
<!-- title: '生产开始时间',--> |
||||
<!-- align: "center",--> |
||||
<!-- dataIndex: 'workTime',--> |
||||
<!-- customRender: function (text) {--> |
||||
<!-- return !text ? "" : (text.length > 10 ? text.substr(0, 10) : text)--> |
||||
<!-- }--> |
||||
<!-- },--> |
||||
<!-- {--> |
||||
<!-- title: '生产时长',--> |
||||
<!-- align: "center",--> |
||||
<!-- dataIndex: 'offTime'--> |
||||
<!-- },--> |
||||
<!-- {--> |
||||
<!-- title: '状态',--> |
||||
<!-- align: "center",--> |
||||
<!-- // dataIndex: 'status'--> |
||||
<!-- dataIndex: 'status_dictText'--> |
||||
<!-- },--> |
||||
<!-- {--> |
||||
<!-- title: '是否加急',--> |
||||
<!-- align: "center",--> |
||||
<!-- // dataIndex: 'speedUp'--> |
||||
<!-- dataIndex: 'speedUp_dictText'--> |
||||
<!-- },--> |
||||
<!-- {--> |
||||
<!-- title: '审核人',--> |
||||
<!-- align: "center",--> |
||||
<!-- dataIndex: 'auditBy'--> |
||||
<!-- },--> |
||||
<!-- {--> |
||||
<!-- title: '审核时间',--> |
||||
<!-- align: "center",--> |
||||
<!-- dataIndex: 'auditTimr',--> |
||||
<!-- customRender: function (text) {--> |
||||
<!-- return !text ? "" : (text.length > 10 ? text.substr(0, 10) : text)--> |
||||
<!-- }--> |
||||
<!-- },--> |
||||
<!-- {--> |
||||
<!-- title: '操作',--> |
||||
<!-- dataIndex: 'action',--> |
||||
<!-- align: "center",--> |
||||
<!-- fixed: "right",--> |
||||
<!-- width: 147,--> |
||||
<!-- scopedSlots: {customRender: 'action'}--> |
||||
<!-- }--> |
||||
<!-- ],--> |
||||
<!-- url: {--> |
||||
<!-- list: "/org.jeecg.modules.productplan/zyProductPlan/list",--> |
||||
<!-- delete: "/org.jeecg.modules.productplan/zyProductPlan/delete",--> |
||||
<!-- deleteBatch: "/org.jeecg.modules.productplan/zyProductPlan/deleteBatch",--> |
||||
<!-- exportXlsUrl: "/org.jeecg.modules.productplan/zyProductPlan/exportXls",--> |
||||
<!-- importExcelUrl: "org.jeecg.modules.productplan/zyProductPlan/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: 'productCode', text: '工单编号', dictCode: ''})--> |
||||
<!-- fieldList.push({type: 'string', value: 'workshopId', text: '车间id', dictCode: ''})--> |
||||
<!-- fieldList.push({type: 'string', value: 'responsiblePerson', text: '车间负责人', dictCode: ''})--> |
||||
<!-- fieldList.push({type: 'string', value: 'teamId', text: '班组', dictCode: ''})--> |
||||
<!-- fieldList.push({type: 'string', value: 'teamLeader', text: '组长', dictCode: ''})--> |
||||
<!-- fieldList.push({type: 'date', value: 'workTime', text: '生产开始时间'})--> |
||||
<!-- fieldList.push({type: 'int', value: 'offTime', text: '生产时长', dictCode: ''})--> |
||||
<!-- fieldList.push({type: 'int', value: 'status', text: '状态', dictCode: ''})--> |
||||
<!-- fieldList.push({type: 'int', value: 'speedUp', text: '是否加急', dictCode: ''})--> |
||||
<!-- fieldList.push({type: 'string', value: 'auditBy', text: '审核人', dictCode: ''})--> |
||||
<!-- fieldList.push({type: 'date', value: 'auditTimr', text: '审核时间'})--> |
||||
<!-- this.superFieldList = fieldList--> |
||||
<!-- }--> |
||||
<!-- }--> |
||||
<!--}--> |
||||
<!--</script>--> |
||||
<!--<style scoped>--> |
||||
<!--@import '~@assets/less/common.less';--> |
||||
<!--</style>--> |
||||
@ -0,0 +1,216 @@ |
||||
<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: '工位id', |
||||
align: "center", |
||||
dataIndex: 'stationId' |
||||
}, |
||||
{ |
||||
title: '设备id列表', |
||||
align: "center", |
||||
dataIndex: 'machineIds' |
||||
}, |
||||
{ |
||||
title: '工具id列表', |
||||
align: "center", |
||||
dataIndex: 'toolsIds' |
||||
}, |
||||
{ |
||||
title: '工序id列表', |
||||
align: "center", |
||||
dataIndex: 'processIds' |
||||
}, |
||||
{ |
||||
title: '成员id列表', |
||||
align: "center", |
||||
dataIndex: 'userIds' |
||||
}, |
||||
{ |
||||
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,259 @@ |
||||
<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"> |
||||
|
||||
<template slot="htmlSlot" slot-scope="text"> |
||||
<div v-html="text"></div> |
||||
</template> |
||||
<template slot="imgSlot" slot-scope="text"> |
||||
<span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span> |
||||
<img v-else :src="getImgView(text)" height="25px" alt="" |
||||
style="max-width:80px;font-size: 12px;font-style: italic;"/> |
||||
</template> |
||||
<template slot="fileSlot" slot-scope="text"> |
||||
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span> |
||||
<a-button |
||||
v-else |
||||
:ghost="true" |
||||
type="primary" |
||||
icon="download" |
||||
size="small" |
||||
@click="downloadFile(text)"> |
||||
下载 |
||||
</a-button> |
||||
</template> |
||||
|
||||
<span slot="action" slot-scope="text, record"> |
||||
<a @click="handleEdit(record)">编辑</a> |
||||
<a-divider type="vertical"/> |
||||
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> |
||||
<a>删除</a> |
||||
</a-popconfirm> |
||||
<!-- <a-dropdown> |
||||
<a class="ant-dropdown-link">更多 <a-icon type="down" /></a> |
||||
<a-menu slot="overlay"> |
||||
<a-menu-item> |
||||
<a @click="handleDetail(record)">详情</a> |
||||
</a-menu-item> |
||||
<a-menu-item> |
||||
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> |
||||
<a>删除</a> |
||||
</a-popconfirm> |
||||
</a-menu-item> |
||||
</a-menu> |
||||
</a-dropdown>--> |
||||
</span> |
||||
|
||||
</a-table> |
||||
</div> |
||||
|
||||
<zy-product-plan-modal ref="modalForm" @ok="modalFormOk"></zy-product-plan-modal> |
||||
</a-card> |
||||
</template> |
||||
|
||||
<script> |
||||
|
||||
import '@/assets/less/TableExpand.less' |
||||
import {mixinDevice} from '@/utils/mixin' |
||||
import {JeecgListMixin} from '@/mixins/JeecgListMixin' |
||||
import ZyProductPlanModal from './modules/ZyProductPlanModal' |
||||
|
||||
export default { |
||||
name: 'ZyProductPlanList', |
||||
mixins: [JeecgListMixin, mixinDevice], |
||||
components: { |
||||
ZyProductPlanModal |
||||
}, |
||||
data() { |
||||
return { |
||||
description: '生产计划管理页面', |
||||
// 表头 |
||||
columns: [ |
||||
{ |
||||
title: '#', |
||||
dataIndex: '', |
||||
key: 'rowIndex', |
||||
width: 60, |
||||
align: "center", |
||||
customRender: function (t, r, index) { |
||||
return parseInt(index) + 1; |
||||
} |
||||
}, |
||||
{ |
||||
title: '工单编号', |
||||
align: "center", |
||||
dataIndex: 'productCode' |
||||
}, |
||||
// { |
||||
// title: '车间编号', |
||||
// align: "center", |
||||
// dataIndex: 'workshopId' |
||||
// }, |
||||
{ |
||||
title: '车间名称', |
||||
align: "center", |
||||
dataIndex: 'workshopId_dictText' |
||||
}, |
||||
{ |
||||
title: '车间负责人', |
||||
align: "center", |
||||
dataIndex: 'responsiblePerson' |
||||
}, |
||||
// { |
||||
// title: '班组编号', |
||||
// align: "center", |
||||
// dataIndex: 'teamId' |
||||
// }, |
||||
{ |
||||
title: '班组名称', |
||||
align: "center", |
||||
dataIndex: 'teamId_dictText' |
||||
}, |
||||
{ |
||||
title: '组长', |
||||
align: "center", |
||||
dataIndex: 'teamLeader' |
||||
}, |
||||
{ |
||||
title: '生产开始时间', |
||||
align: "center", |
||||
dataIndex: 'workTime', |
||||
customRender: function (text) { |
||||
return !text ? "" : (text.length > 10 ? text.substr(0, 10) : text) |
||||
} |
||||
}, |
||||
{ |
||||
title: '生产时长', |
||||
align: "center", |
||||
dataIndex: 'offTime' |
||||
}, |
||||
{ |
||||
title: '状态', |
||||
align: "center", |
||||
// dataIndex: 'status' |
||||
dataIndex: 'status_dictText' |
||||
}, |
||||
{ |
||||
title: '是否加急', |
||||
align: "center", |
||||
// dataIndex: 'speedUp' |
||||
dataIndex: 'speedUp_dictText' |
||||
}, |
||||
{ |
||||
title: '审核人', |
||||
align: "center", |
||||
dataIndex: 'auditBy' |
||||
}, |
||||
// { |
||||
// title: '审核时间', |
||||
// align: "center", |
||||
// dataIndex: 'auditTimr', |
||||
// customRender: function (text) { |
||||
// return !text ? "" : (text.length > 10 ? text.substr(0, 10) : text) |
||||
// } |
||||
// }, |
||||
{ |
||||
title: '操作', |
||||
dataIndex: 'action', |
||||
align: "center", |
||||
fixed: "right", |
||||
width: 147, |
||||
scopedSlots: {customRender: 'action'} |
||||
} |
||||
], |
||||
url: { |
||||
list: "/org.jeecg.modules.productplan/zyProductPlan/list", |
||||
delete: "/org.jeecg.modules.productplan/zyProductPlan/delete", |
||||
deleteBatch: "/org.jeecg.modules.productplan/zyProductPlan/deleteBatch", |
||||
exportXlsUrl: "/org.jeecg.modules.productplan/zyProductPlan/exportXls", |
||||
importExcelUrl: "org.jeecg.modules.productplan/zyProductPlan/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: 'productCode', text: '工单编号', dictCode: ''}) |
||||
fieldList.push({type: 'string', value: 'workshopId', text: '车间id', dictCode: ''}) |
||||
fieldList.push({type: 'string', value: 'responsiblePerson', text: '车间负责人', dictCode: ''}) |
||||
fieldList.push({type: 'string', value: 'teamId', text: '班组', dictCode: ''}) |
||||
fieldList.push({type: 'string', value: 'teamLeader', text: '组长', dictCode: ''}) |
||||
fieldList.push({type: 'date', value: 'workTime', text: '生产开始时间'}) |
||||
fieldList.push({type: 'int', value: 'offTime', text: '生产时长', dictCode: ''}) |
||||
fieldList.push({type: 'int', value: 'status', text: '状态', dictCode: ''}) |
||||
fieldList.push({type: 'int', value: 'speedUp', text: '是否加急', dictCode: ''}) |
||||
fieldList.push({type: 'string', value: 'auditBy', text: '审核人', dictCode: ''}) |
||||
fieldList.push({type: 'date', value: 'auditTimr', text: '审核时间'}) |
||||
this.superFieldList = fieldList |
||||
} |
||||
} |
||||
} |
||||
</script> |
||||
<style scoped> |
||||
@import '~@assets/less/common.less'; |
||||
</style> |
||||
@ -0,0 +1,126 @@ |
||||
<template> |
||||
<a-spin :spinning="confirmLoading"> |
||||
<j-form-container :disabled="formDisabled"> |
||||
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail"> |
||||
<a-row> |
||||
<a-col :span="24"> |
||||
<a-form-model-item label="生产计划id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="planId"> |
||||
<a-input v-model="model.planId" placeholder="请选择生产计划"></a-input> |
||||
</a-form-model-item> |
||||
</a-col> |
||||
<a-col :span="24"> |
||||
<a-form-model-item label="工位id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="stationId"> |
||||
<a-input v-model="model.stationId" placeholder="请输入工位id"></a-input> |
||||
</a-form-model-item> |
||||
</a-col> |
||||
<a-col :span="24"> |
||||
<a-form-model-item label="设备id列表" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="machineIds"> |
||||
<a-input v-model="model.machineIds" placeholder="请输入设备id列表"></a-input> |
||||
</a-form-model-item> |
||||
</a-col> |
||||
<a-col :span="24"> |
||||
<a-form-model-item label="工具id列表" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolsIds"> |
||||
<a-input v-model="model.toolsIds" placeholder="请输入工具id列表"></a-input> |
||||
</a-form-model-item> |
||||
</a-col> |
||||
<a-col :span="24"> |
||||
<a-form-model-item label="工序id列表" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processIds"> |
||||
<a-input v-model="model.processIds" placeholder="请输入工序id列表"></a-input> |
||||
</a-form-model-item> |
||||
</a-col> |
||||
<a-col :span="24"> |
||||
<a-form-model-item label="成员id列表" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userIds"> |
||||
<a-input v-model="model.userIds" placeholder="请输入成员id列表"></a-input> |
||||
</a-form-model-item> |
||||
</a-col> |
||||
</a-row> |
||||
</a-form-model> |
||||
</j-form-container> |
||||
</a-spin> |
||||
</template> |
||||
|
||||
<script> |
||||
|
||||
import {httpAction, getAction} from '@/api/manage' |
||||
import {validateDuplicateValue} from '@/utils/util' |
||||
|
||||
export default { |
||||
name: 'ZyPlanProcessForm', |
||||
components: {}, |
||||
props: { |
||||
//表单禁用 |
||||
disabled: { |
||||
type: Boolean, |
||||
default: false, |
||||
required: false |
||||
} |
||||
}, |
||||
data() { |
||||
return { |
||||
model: {}, |
||||
labelCol: { |
||||
xs: {span: 24}, |
||||
sm: {span: 5}, |
||||
}, |
||||
wrapperCol: { |
||||
xs: {span: 24}, |
||||
sm: {span: 16}, |
||||
}, |
||||
confirmLoading: false, |
||||
validatorRules: {}, |
||||
url: { |
||||
add: "/org.jeecg.modules.productplan/zyPlanProcess/add", |
||||
edit: "/org.jeecg.modules.productplan/zyPlanProcess/edit", |
||||
queryById: "/org.jeecg.modules.productplan/zyPlanProcess/queryById" |
||||
} |
||||
} |
||||
}, |
||||
computed: { |
||||
formDisabled() { |
||||
return this.disabled |
||||
}, |
||||
}, |
||||
created() { |
||||
//备份model原始值 |
||||
this.modelDefault = JSON.parse(JSON.stringify(this.model)); |
||||
}, |
||||
methods: { |
||||
add() { |
||||
this.edit(this.modelDefault); |
||||
}, |
||||
edit(record) { |
||||
this.model = Object.assign({}, record); |
||||
this.visible = true; |
||||
}, |
||||
submitForm() { |
||||
const that = this; |
||||
// 触发表单验证 |
||||
this.$refs.form.validate(valid => { |
||||
if (valid) { |
||||
that.confirmLoading = true; |
||||
let httpurl = ''; |
||||
let method = ''; |
||||
if (!this.model.id) { |
||||
httpurl += this.url.add; |
||||
method = 'post'; |
||||
} else { |
||||
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; |
||||
}) |
||||
} |
||||
|
||||
}) |
||||
}, |
||||
} |
||||
} |
||||
</script> |
||||
@ -0,0 +1,107 @@ |
||||
<template> |
||||
<a-spin :spinning="confirmLoading"> |
||||
<j-form-container :disabled="formDisabled"> |
||||
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail"> |
||||
<a-row> |
||||
<a-col :span="24"> |
||||
<a-form-model-item label="生产计划" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="planId"> |
||||
<!-- <a-input v-model="model.planId" placeholder="请选择生产计划"></a-input>--> |
||||
<j-dict-select-tag type="list" v-model="model.planId" dictCode="zy_product_plan,id,id" |
||||
placeholder="请选择生产计划"/> |
||||
</a-form-model-item> |
||||
</a-col> |
||||
</a-row> |
||||
</a-form-model> |
||||
</j-form-container> |
||||
</a-spin> |
||||
</template> |
||||
|
||||
<script> |
||||
|
||||
import {httpAction, getAction} from '@/api/manage' |
||||
import {validateDuplicateValue} from '@/utils/util' |
||||
|
||||
export default { |
||||
name: 'ZyPlanProcessForm', |
||||
components: {}, |
||||
props: { |
||||
//表单禁用 |
||||
disabled: { |
||||
type: Boolean, |
||||
default: false, |
||||
required: false |
||||
} |
||||
}, |
||||
data() { |
||||
return { |
||||
model: {}, |
||||
labelCol: { |
||||
xs: {span: 24}, |
||||
sm: {span: 5}, |
||||
}, |
||||
wrapperCol: { |
||||
xs: {span: 24}, |
||||
sm: {span: 16}, |
||||
}, |
||||
confirmLoading: false, |
||||
validatorRules: { |
||||
planId: [ |
||||
{required: true}, |
||||
], |
||||
}, |
||||
url: { |
||||
add: "/org.jeecg.modules.productplan/zyPlanProcess/add", |
||||
edit: "/org.jeecg.modules.productplan/zyPlanProcess/edit", |
||||
queryById: "/org.jeecg.modules.productplan/zyPlanProcess/queryById" |
||||
} |
||||
} |
||||
}, |
||||
computed: { |
||||
formDisabled() { |
||||
return this.disabled |
||||
}, |
||||
}, |
||||
created() { |
||||
//备份model原始值 |
||||
this.modelDefault = JSON.parse(JSON.stringify(this.model)); |
||||
}, |
||||
methods: { |
||||
add() { |
||||
this.edit(this.modelDefault); |
||||
}, |
||||
edit(record) { |
||||
this.model = Object.assign({}, record); |
||||
this.visible = true; |
||||
}, |
||||
submitForm() { |
||||
const that = this; |
||||
// 触发表单验证 |
||||
this.$refs.form.validate(valid => { |
||||
if (valid) { |
||||
that.confirmLoading = true; |
||||
let httpurl = ''; |
||||
let method = ''; |
||||
if (!this.model.id) { |
||||
httpurl += this.url.add; |
||||
method = 'post'; |
||||
} else { |
||||
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; |
||||
}) |
||||
} |
||||
|
||||
}) |
||||
}, |
||||
} |
||||
} |
||||
</script> |
||||
@ -0,0 +1,60 @@ |
||||
<template> |
||||
<j-modal |
||||
:title="title" |
||||
:width="width" |
||||
:visible="visible" |
||||
switchFullscreen |
||||
@ok="handleOk" |
||||
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }" |
||||
@cancel="handleCancel" |
||||
cancelText="关闭"> |
||||
<zy-plan-process-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></zy-plan-process-form> |
||||
</j-modal> |
||||
</template> |
||||
|
||||
<script> |
||||
|
||||
import ZyPlanProcessForm from './ZyPlanProcessForm' |
||||
export default { |
||||
name: 'ZyPlanProcessModal', |
||||
components: { |
||||
ZyPlanProcessForm |
||||
}, |
||||
data () { |
||||
return { |
||||
title:'', |
||||
width:800, |
||||
visible: false, |
||||
disableSubmit: false |
||||
} |
||||
}, |
||||
methods: { |
||||
add () { |
||||
this.visible=true |
||||
this.$nextTick(()=>{ |
||||
this.$refs.realForm.add(); |
||||
}) |
||||
}, |
||||
edit (record) { |
||||
this.visible=true |
||||
this.$nextTick(()=>{ |
||||
this.$refs.realForm.edit(record); |
||||
}) |
||||
}, |
||||
close () { |
||||
this.$emit('close'); |
||||
this.visible = false; |
||||
}, |
||||
handleOk () { |
||||
this.$refs.realForm.submitForm(); |
||||
}, |
||||
submitCallback(){ |
||||
this.$emit('ok'); |
||||
this.visible = false; |
||||
}, |
||||
handleCancel () { |
||||
this.close() |
||||
} |
||||
} |
||||
} |
||||
</script> |
||||
@ -0,0 +1,60 @@ |
||||
<template> |
||||
<j-modal |
||||
:title="title" |
||||
:width="width" |
||||
:visible="visible" |
||||
switchFullscreen |
||||
@ok="handleOk" |
||||
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }" |
||||
@cancel="handleCancel" |
||||
cancelText="关闭"> |
||||
<zy-plan-process-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></zy-plan-process-form> |
||||
</j-modal> |
||||
</template> |
||||
|
||||
<script> |
||||
|
||||
import ZyPlanProcessForm from './ZyPlanProcessForm2' |
||||
export default { |
||||
name: 'ZyPlanProcessModal', |
||||
components: { |
||||
ZyPlanProcessForm |
||||
}, |
||||
data () { |
||||
return { |
||||
title:'', |
||||
width:800, |
||||
visible: false, |
||||
disableSubmit: false |
||||
} |
||||
}, |
||||
methods: { |
||||
add () { |
||||
this.visible=true |
||||
this.$nextTick(()=>{ |
||||
this.$refs.realForm.add(); |
||||
}) |
||||
}, |
||||
edit (record) { |
||||
this.visible=true |
||||
this.$nextTick(()=>{ |
||||
this.$refs.realForm.edit(record); |
||||
}) |
||||
}, |
||||
close () { |
||||
this.$emit('close'); |
||||
this.visible = false; |
||||
}, |
||||
handleOk () { |
||||
this.$refs.realForm.submitForm(); |
||||
}, |
||||
submitCallback(){ |
||||
this.$emit('ok'); |
||||
this.visible = false; |
||||
}, |
||||
handleCancel () { |
||||
this.close() |
||||
} |
||||
} |
||||
} |
||||
</script> |
||||
@ -0,0 +1,84 @@ |
||||
<template> |
||||
<a-drawer |
||||
:title="title" |
||||
:width="width" |
||||
placement="right" |
||||
:closable="false" |
||||
@close="close" |
||||
destroyOnClose |
||||
:visible="visible"> |
||||
<zy-plan-process-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></zy-plan-process-form> |
||||
<div class="drawer-footer"> |
||||
<a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button> |
||||
<a-button v-if="!disableSubmit" @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button> |
||||
</div> |
||||
</a-drawer> |
||||
</template> |
||||
|
||||
<script> |
||||
|
||||
import ZyPlanProcessForm from './ZyPlanProcessForm' |
||||
|
||||
export default { |
||||
name: 'ZyPlanProcessModal', |
||||
components: { |
||||
ZyPlanProcessForm |
||||
}, |
||||
data () { |
||||
return { |
||||
title:"操作", |
||||
width:800, |
||||
visible: false, |
||||
disableSubmit: false |
||||
} |
||||
}, |
||||
methods: { |
||||
add () { |
||||
this.visible=true |
||||
this.$nextTick(()=>{ |
||||
this.$refs.realForm.add(); |
||||
}) |
||||
}, |
||||
edit (record) { |
||||
this.visible=true |
||||
this.$nextTick(()=>{ |
||||
this.$refs.realForm.edit(record); |
||||
}); |
||||
}, |
||||
close () { |
||||
this.$emit('close'); |
||||
this.visible = false; |
||||
}, |
||||
submitCallback(){ |
||||
this.$emit('ok'); |
||||
this.visible = false; |
||||
}, |
||||
handleOk () { |
||||
this.$refs.realForm.submitForm(); |
||||
}, |
||||
handleCancel () { |
||||
this.close() |
||||
} |
||||
} |
||||
} |
||||
</script> |
||||
|
||||
<style lang="less" scoped> |
||||
/** Button按钮间距 */ |
||||
.ant-btn { |
||||
margin-left: 30px; |
||||
margin-bottom: 30px; |
||||
float: right; |
||||
} |
||||
.drawer-footer{ |
||||
position: absolute; |
||||
bottom: -8px; |
||||
width: 100%; |
||||
border-top: 1px solid #e8e8e8; |
||||
padding: 10px 16px; |
||||
text-align: right; |
||||
left: 0; |
||||
background: #fff; |
||||
border-radius: 0 0 2px 2px; |
||||
} |
||||
</style> |
||||
@ -0,0 +1,185 @@ |
||||
<template> |
||||
<a-spin :spinning="confirmLoading"> |
||||
<j-form-container :disabled="formDisabled"> |
||||
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail"> |
||||
<a-row> |
||||
<a-col :span="24"> |
||||
<!-- <a-form-model-item label="工单编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productCode">--> |
||||
<!-- <a-input v-model="model.productCode" placeholder="请输入工单编号" ></a-input>--> |
||||
<!-- </a-form-model-item>--> |
||||
<a-form-model-item label="工单编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workOrderId"> |
||||
<j-dict-select-tag type="list" v-model="model.productCode" |
||||
dictCode="work_order,work_id,work_code,work_order_status='0'" |
||||
placeholder="请选择工单编号"/> |
||||
</a-form-model-item> |
||||
</a-col> |
||||
<a-col :span="24"> |
||||
<!-- <a-form-model-item label="车间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workshopId">--> |
||||
<!-- <a-input v-model="model.workshopId" placeholder="请输入车间id" ></a-input>--> |
||||
<!-- </a-form-model-item>--> |
||||
<a-form-model-item label="车间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workshopId"> |
||||
<j-select-depart placeholder="请选择车间" v-model="model.workshopId" @change="groupxValChange()"/> |
||||
</a-form-model-item> |
||||
</a-col> |
||||
<a-col :span="24"> |
||||
<a-form-model-item label="车间负责人" :labelCol="labelCol" :wrapperCol="wrapperCol" |
||||
prop="responsiblePerson"> |
||||
<j-select-multi-user placeholder="请选择车间负责人" |
||||
v-model="model.responsiblePerson"></j-select-multi-user> |
||||
</a-form-model-item> |
||||
</a-col> |
||||
<a-col :span="24"> |
||||
<a-form-model-item label="班组" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="teamId"> |
||||
<j-dict-select-tag type="list" v-model="model.teamId" |
||||
placeholder="请先选择所属车间班组" :dict-code="groupxVal" |
||||
:disabled="model.workshopId==null"/> |
||||
</a-form-model-item> |
||||
</a-col> |
||||
<a-col :span="24"> |
||||
<a-form-model-item label="组长" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="teamLeader"> |
||||
<!-- <a-input v-model="model.teamLeader" placeholder="请输入组长"></a-input>--> |
||||
<j-dict-select-tag type="list" v-model="model.teamLeader" |
||||
placeholder="请先选择所属车间班组" :dict-code="groupxVal2" |
||||
:disabled="model.workshopId==null"/> |
||||
</a-form-model-item> |
||||
</a-col> |
||||
<a-col :span="24"> |
||||
<a-form-model-item label="生产开始时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workTime"> |
||||
<j-date placeholder="请选择生产开始时间" v-model="model.workTime" style="width: 100%"/> |
||||
</a-form-model-item> |
||||
</a-col> |
||||
<a-col :span="24"> |
||||
<a-form-model-item label="生产时长" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="offTime"> |
||||
<a-input-number v-model="model.offTime" placeholder="请输入生产时长" style="width: 100%"/> |
||||
</a-form-model-item> |
||||
</a-col> |
||||
<a-col :span="24"> |
||||
<a-form-model-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="statu"> |
||||
<j-dict-select-tag type="list" v-model="model.status" dictCode="productplanStatus" |
||||
placeholder="请选择状态"/> |
||||
</a-form-model-item> |
||||
</a-col> |
||||
<a-col :span="24"> |
||||
<a-form-model-item label="是否加急" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="speedUp"> |
||||
<j-dict-select-tag type="radio" v-model="model.speedUp" dictCode="sfjj" placeholder="请选择是否加急"/> |
||||
</a-form-model-item> |
||||
</a-col> |
||||
<a-col :span="24"> |
||||
<a-form-model-item label="审核人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="auditBy"> |
||||
<!-- <a-input v-model="model.auditBy" placeholder="请输入审核人" ></a-input>--> |
||||
<j-select-multi-user placeholder="请选择审核人" v-model="model.auditBy"></j-select-multi-user> |
||||
</a-form-model-item> |
||||
</a-col> |
||||
<a-col :span="24"> |
||||
<a-form-model-item label="审核时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="auditTimr"> |
||||
<j-date placeholder="请选择审核时间" v-model="model.auditTimr" style="width: 100%"/> |
||||
</a-form-model-item> |
||||
</a-col> |
||||
</a-row> |
||||
</a-form-model> |
||||
</j-form-container> |
||||
</a-spin> |
||||
</template> |
||||
|
||||
<script> |
||||
|
||||
import {httpAction, getAction} from '@/api/manage' |
||||
import {validateDuplicateValue} from '@/utils/util' |
||||
|
||||
export default { |
||||
name: 'ZyProductPlanForm', |
||||
components: {}, |
||||
props: { |
||||
//表单禁用 |
||||
disabled: { |
||||
type: Boolean, |
||||
default: false, |
||||
required: false |
||||
} |
||||
}, |
||||
data() { |
||||
return { |
||||
groupxVal: "", |
||||
groupxVal2: "", |
||||
model: {}, |
||||
labelCol: { |
||||
xs: {span: 24}, |
||||
sm: {span: 5}, |
||||
}, |
||||
wrapperCol: { |
||||
xs: {span: 24}, |
||||
sm: {span: 16}, |
||||
}, |
||||
confirmLoading: false, |
||||
validatorRules: { |
||||
workOrderId: [ |
||||
{required: true,}, |
||||
], |
||||
workshopId: [ |
||||
{required: true,}, |
||||
], teamId: [ |
||||
{required: true,}, |
||||
], |
||||
}, |
||||
url: { |
||||
add: "/org.jeecg.modules.productplan/zyProductPlan/add", |
||||
edit: "/org.jeecg.modules.productplan/zyProductPlan/edit", |
||||
queryById: "/org.jeecg.modules.productplan/zyProductPlan/queryById" |
||||
} |
||||
} |
||||
}, |
||||
computed: { |
||||
formDisabled() { |
||||
return this.disabled |
||||
}, |
||||
}, |
||||
created() { |
||||
//备份model原始值 |
||||
this.modelDefault = JSON.parse(JSON.stringify(this.model)); |
||||
}, |
||||
methods: { |
||||
groupxValChange() { |
||||
// alert("车间选中" + this.model.workshopId); |
||||
// this.basicInfoCode = "py_basic_info,chart_head,id, major_id='" + this.queryParam.majorId + "'"; |
||||
this.groupxVal = "groupx,group_name,id,depart_id='" + this.model.workshopId + "'"; |
||||
this.groupxVal2 = "groupx,enterprises_manager,enterprises_manager,depart_id='" + this.model.workshopId + "'"; |
||||
}, |
||||
add() { |
||||
this.edit(this.modelDefault); |
||||
}, |
||||
edit(record) { |
||||
this.model = Object.assign({}, record); |
||||
this.visible = true; |
||||
}, |
||||
submitForm() { |
||||
const that = this; |
||||
// 触发表单验证 |
||||
this.$refs.form.validate(valid => { |
||||
if (valid) { |
||||
that.confirmLoading = true; |
||||
let httpurl = ''; |
||||
let method = ''; |
||||
if (!this.model.id) { |
||||
httpurl += this.url.add; |
||||
method = 'post'; |
||||
} else { |
||||
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; |
||||
}) |
||||
} |
||||
|
||||
}) |
||||
}, |
||||
} |
||||
} |
||||
</script> |
||||
@ -0,0 +1,60 @@ |
||||
<template> |
||||
<j-modal |
||||
:title="title" |
||||
:width="width" |
||||
:visible="visible" |
||||
switchFullscreen |
||||
@ok="handleOk" |
||||
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }" |
||||
@cancel="handleCancel" |
||||
cancelText="关闭"> |
||||
<zy-product-plan-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></zy-product-plan-form> |
||||
</j-modal> |
||||
</template> |
||||
|
||||
<script> |
||||
|
||||
import ZyProductPlanForm from './ZyProductPlanForm' |
||||
export default { |
||||
name: 'ZyProductPlanModal', |
||||
components: { |
||||
ZyProductPlanForm |
||||
}, |
||||
data () { |
||||
return { |
||||
title:'', |
||||
width:800, |
||||
visible: false, |
||||
disableSubmit: false |
||||
} |
||||
}, |
||||
methods: { |
||||
add () { |
||||
this.visible=true |
||||
this.$nextTick(()=>{ |
||||
this.$refs.realForm.add(); |
||||
}) |
||||
}, |
||||
edit (record) { |
||||
this.visible=true |
||||
this.$nextTick(()=>{ |
||||
this.$refs.realForm.edit(record); |
||||
}) |
||||
}, |
||||
close () { |
||||
this.$emit('close'); |
||||
this.visible = false; |
||||
}, |
||||
handleOk () { |
||||
this.$refs.realForm.submitForm(); |
||||
}, |
||||
submitCallback(){ |
||||
this.$emit('ok'); |
||||
this.visible = false; |
||||
}, |
||||
handleCancel () { |
||||
this.close() |
||||
} |
||||
} |
||||
} |
||||
</script> |
||||
@ -0,0 +1,84 @@ |
||||
<template> |
||||
<a-drawer |
||||
:title="title" |
||||
:width="width" |
||||
placement="right" |
||||
:closable="false" |
||||
@close="close" |
||||
destroyOnClose |
||||
:visible="visible"> |
||||
<zy-product-plan-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></zy-product-plan-form> |
||||
<div class="drawer-footer"> |
||||
<a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button> |
||||
<a-button v-if="!disableSubmit" @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button> |
||||
</div> |
||||
</a-drawer> |
||||
</template> |
||||
|
||||
<script> |
||||
|
||||
import ZyProductPlanForm from './ZyProductPlanForm' |
||||
|
||||
export default { |
||||
name: 'ZyProductPlanModal', |
||||
components: { |
||||
ZyProductPlanForm |
||||
}, |
||||
data () { |
||||
return { |
||||
title:"操作", |
||||
width:800, |
||||
visible: false, |
||||
disableSubmit: false |
||||
} |
||||
}, |
||||
methods: { |
||||
add () { |
||||
this.visible=true |
||||
this.$nextTick(()=>{ |
||||
this.$refs.realForm.add(); |
||||
}) |
||||
}, |
||||
edit (record) { |
||||
this.visible=true |
||||
this.$nextTick(()=>{ |
||||
this.$refs.realForm.edit(record); |
||||
}); |
||||
}, |
||||
close () { |
||||
this.$emit('close'); |
||||
this.visible = false; |
||||
}, |
||||
submitCallback(){ |
||||
this.$emit('ok'); |
||||
this.visible = false; |
||||
}, |
||||
handleOk () { |
||||
this.$refs.realForm.submitForm(); |
||||
}, |
||||
handleCancel () { |
||||
this.close() |
||||
} |
||||
} |
||||
} |
||||
</script> |
||||
|
||||
<style lang="less" scoped> |
||||
/** Button按钮间距 */ |
||||
.ant-btn { |
||||
margin-left: 30px; |
||||
margin-bottom: 30px; |
||||
float: right; |
||||
} |
||||
.drawer-footer{ |
||||
position: absolute; |
||||
bottom: -8px; |
||||
width: 100%; |
||||
border-top: 1px solid #e8e8e8; |
||||
padding: 10px 16px; |
||||
text-align: right; |
||||
left: 0; |
||||
background: #fff; |
||||
border-radius: 0 0 2px 2px; |
||||
} |
||||
</style> |
||||
@ -0,0 +1,156 @@ |
||||
package org.jeecg.modules.productplan.controller; |
||||
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
||||
import io.swagger.annotations.Api; |
||||
import io.swagger.annotations.ApiOperation; |
||||
import lombok.extern.slf4j.Slf4j; |
||||
import org.jeecg.common.api.vo.Result; |
||||
import org.jeecg.common.aspect.annotation.AutoLog; |
||||
import org.jeecg.common.system.base.controller.JeecgController; |
||||
import org.jeecg.common.system.query.QueryGenerator; |
||||
import org.jeecg.modules.productplan.entity.ZyPlanProcess; |
||||
import org.jeecg.modules.productplan.service.IZyPlanProcessService; |
||||
import org.springframework.beans.factory.annotation.Autowired; |
||||
import org.springframework.web.bind.annotation.*; |
||||
import org.springframework.web.servlet.ModelAndView; |
||||
|
||||
import javax.servlet.http.HttpServletRequest; |
||||
import javax.servlet.http.HttpServletResponse; |
||||
import java.util.Arrays; |
||||
|
||||
/** |
||||
* @Description: 生产计划工序 |
||||
* @Author: jeecg-boot |
||||
* @Date: 2022-12-12 |
||||
* @Version: V1.0 |
||||
*/ |
||||
@Api(tags = "生产计划工序") |
||||
@RestController |
||||
@RequestMapping("/org.jeecg.modules.productplan/zyPlanProcess") |
||||
@Slf4j |
||||
public class ZyPlanProcessController extends JeecgController<ZyPlanProcess, IZyPlanProcessService> { |
||||
@Autowired |
||||
private IZyPlanProcessService zyPlanProcessService; |
||||
|
||||
/** |
||||
* 分页列表查询 |
||||
* |
||||
* @param zyPlanProcess |
||||
* @param pageNo |
||||
* @param pageSize |
||||
* @param req |
||||
* @return |
||||
*/ |
||||
@AutoLog(value = "生产计划工序-分页列表查询") |
||||
@ApiOperation(value = "生产计划工序-分页列表查询", notes = "生产计划工序-分页列表查询") |
||||
@GetMapping(value = "/list") |
||||
public Result<?> queryPageList(ZyPlanProcess zyPlanProcess, |
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, |
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, |
||||
HttpServletRequest req) { |
||||
QueryWrapper<ZyPlanProcess> queryWrapper = QueryGenerator.initQueryWrapper(zyPlanProcess, req.getParameterMap()); |
||||
Page<ZyPlanProcess> page = new Page<ZyPlanProcess>(pageNo, pageSize); |
||||
IPage<ZyPlanProcess> pageList = zyPlanProcessService.page(page, queryWrapper); |
||||
return Result.OK(pageList); |
||||
} |
||||
|
||||
/** |
||||
* 添加 |
||||
* |
||||
* @param zyPlanProcess |
||||
* @return |
||||
*/ |
||||
@AutoLog(value = "生产计划工序-添加") |
||||
@ApiOperation(value = "生产计划工序-添加", notes = "生产计划工序-添加") |
||||
@PostMapping(value = "/add") |
||||
public Result<?> add(@RequestBody ZyPlanProcess zyPlanProcess) { |
||||
zyPlanProcessService.save(zyPlanProcess); |
||||
return Result.OK("添加成功！"); |
||||
} |
||||
|
||||
/** |
||||
* 编辑 |
||||
* |
||||
* @param zyPlanProcess |
||||
* @return |
||||
*/ |
||||
@AutoLog(value = "生产计划工序-编辑") |
||||
@ApiOperation(value = "生产计划工序-编辑", notes = "生产计划工序-编辑") |
||||
@PutMapping(value = "/edit") |
||||
public Result<?> edit(@RequestBody ZyPlanProcess zyPlanProcess) { |
||||
zyPlanProcessService.updateById(zyPlanProcess); |
||||
return Result.OK("编辑成功!"); |
||||
} |
||||
|
||||
/** |
||||
* 通过id删除 |
||||
* |
||||
* @param id |
||||
* @return |
||||
*/ |
||||
@AutoLog(value = "生产计划工序-通过id删除") |
||||
@ApiOperation(value = "生产计划工序-通过id删除", notes = "生产计划工序-通过id删除") |
||||
@DeleteMapping(value = "/delete") |
||||
public Result<?> delete(@RequestParam(name = "id", required = true) String id) { |
||||
zyPlanProcessService.removeById(id); |
||||
return Result.OK("删除成功!"); |
||||
} |
||||
|
||||
/** |
||||
* 批量删除 |
||||
* |
||||
* @param ids |
||||
* @return |
||||
*/ |
||||
@AutoLog(value = "生产计划工序-批量删除") |
||||
@ApiOperation(value = "生产计划工序-批量删除", notes = "生产计划工序-批量删除") |
||||
@DeleteMapping(value = "/deleteBatch") |
||||
public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) { |
||||
this.zyPlanProcessService.removeByIds(Arrays.asList(ids.split(","))); |
||||
return Result.OK("批量删除成功!"); |
||||
} |
||||
|
||||
/** |
||||
* 通过id查询 |
||||
* |
||||
* @param id |
||||
* @return |
||||
*/ |
||||
@AutoLog(value = "生产计划工序-通过id查询") |
||||
@ApiOperation(value = "生产计划工序-通过id查询", notes = "生产计划工序-通过id查询") |
||||
@GetMapping(value = "/queryById") |
||||
public Result<?> queryById(@RequestParam(name = "id", required = true) String id) { |
||||
ZyPlanProcess zyPlanProcess = zyPlanProcessService.getById(id); |
||||
if (zyPlanProcess == null) { |
||||
return Result.error("未找到对应数据"); |
||||
} |
||||
return Result.OK(zyPlanProcess); |
||||
} |
||||
|
||||
/** |
||||
* 导出excel |
||||
* |
||||
* @param request |
||||
* @param zyPlanProcess |
||||
*/ |
||||
@RequestMapping(value = "/exportXls") |
||||
public ModelAndView exportXls(HttpServletRequest request, ZyPlanProcess zyPlanProcess) { |
||||
return super.exportXls(request, zyPlanProcess, ZyPlanProcess.class, "生产计划工序"); |
||||
} |
||||
|
||||
/** |
||||
* 通过excel导入数据 |
||||
* |
||||
* @param request |
||||
* @param response |
||||
* @return |
||||
*/ |
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
||||
return super.importExcel(request, response, ZyPlanProcess.class); |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,156 @@ |
||||
package org.jeecg.modules.productplan.controller; |
||||
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
||||
import io.swagger.annotations.Api; |
||||
import io.swagger.annotations.ApiOperation; |
||||
import lombok.extern.slf4j.Slf4j; |
||||
import org.jeecg.common.api.vo.Result; |
||||
import org.jeecg.common.aspect.annotation.AutoLog; |
||||
import org.jeecg.common.system.base.controller.JeecgController; |
||||
import org.jeecg.common.system.query.QueryGenerator; |
||||
import org.jeecg.modules.productplan.entity.ZyProductPlan; |
||||
import org.jeecg.modules.productplan.service.IZyProductPlanService; |
||||
import org.springframework.beans.factory.annotation.Autowired; |
||||
import org.springframework.web.bind.annotation.*; |
||||
import org.springframework.web.servlet.ModelAndView; |
||||
|
||||
import javax.servlet.http.HttpServletRequest; |
||||
import javax.servlet.http.HttpServletResponse; |
||||
import java.util.Arrays; |
||||
|
||||
/** |
||||
* @Description: 生产计划 |
||||
* @Author: jeecg-boot |
||||
* @Date: 2022-12-12 |
||||
* @Version: V1.0 |
||||
*/ |
||||
@Api(tags = "生产计划") |
||||
@RestController |
||||
@RequestMapping("/org.jeecg.modules.productplan/zyProductPlan") |
||||
@Slf4j |
||||
public class ZyProductPlanController extends JeecgController<ZyProductPlan, IZyProductPlanService> { |
||||
@Autowired |
||||
private IZyProductPlanService zyProductPlanService; |
||||
|
||||
/** |
||||
* 分页列表查询 |
||||
* |
||||
* @param zyProductPlan |
||||
* @param pageNo |
||||
* @param pageSize |
||||
* @param req |
||||
* @return |
||||
*/ |
||||
@AutoLog(value = "生产计划-分页列表查询") |
||||
@ApiOperation(value = "生产计划-分页列表查询", notes = "生产计划-分页列表查询") |
||||
@GetMapping(value = "/list") |
||||
public Result<?> queryPageList(ZyProductPlan zyProductPlan, |
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, |
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, |
||||
HttpServletRequest req) { |
||||
QueryWrapper<ZyProductPlan> queryWrapper = QueryGenerator.initQueryWrapper(zyProductPlan, req.getParameterMap()); |
||||
Page<ZyProductPlan> page = new Page<ZyProductPlan>(pageNo, pageSize); |
||||
IPage<ZyProductPlan> pageList = zyProductPlanService.page(page, queryWrapper); |
||||
return Result.OK(pageList); |
||||
} |
||||
|
||||
/** |
||||
* 添加 |
||||
* |
||||
* @param zyProductPlan |
||||
* @return |
||||
*/ |
||||
@AutoLog(value = "生产计划-添加") |
||||
@ApiOperation(value = "生产计划-添加", notes = "生产计划-添加") |
||||
@PostMapping(value = "/add") |
||||
public Result<?> add(@RequestBody ZyProductPlan zyProductPlan) { |
||||
zyProductPlanService.save(zyProductPlan); |
||||
return Result.OK("添加成功！"); |
||||
} |
||||
|
||||
/** |
||||
* 编辑 |
||||
* |
||||
* @param zyProductPlan |
||||
* @return |
||||
*/ |
||||
@AutoLog(value = "生产计划-编辑") |
||||
@ApiOperation(value = "生产计划-编辑", notes = "生产计划-编辑") |
||||
@PutMapping(value = "/edit") |
||||
public Result<?> edit(@RequestBody ZyProductPlan zyProductPlan) { |
||||
zyProductPlanService.updateById(zyProductPlan); |
||||
return Result.OK("编辑成功!"); |
||||
} |
||||
|
||||
/** |
||||
* 通过id删除 |
||||
* |
||||
* @param id |
||||
* @return |
||||
*/ |
||||
@AutoLog(value = "生产计划-通过id删除") |
||||
@ApiOperation(value = "生产计划-通过id删除", notes = "生产计划-通过id删除") |
||||
@DeleteMapping(value = "/delete") |
||||
public Result<?> delete(@RequestParam(name = "id", required = true) String id) { |
||||
zyProductPlanService.removeById(id); |
||||
return Result.OK("删除成功!"); |
||||
} |
||||
|
||||
/** |
||||
* 批量删除 |
||||
* |
||||
* @param ids |
||||
* @return |
||||
*/ |
||||
@AutoLog(value = "生产计划-批量删除") |
||||
@ApiOperation(value = "生产计划-批量删除", notes = "生产计划-批量删除") |
||||
@DeleteMapping(value = "/deleteBatch") |
||||
public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) { |
||||
this.zyProductPlanService.removeByIds(Arrays.asList(ids.split(","))); |
||||
return Result.OK("批量删除成功!"); |
||||
} |
||||
|
||||
/** |
||||
* 通过id查询 |
||||
* |
||||
* @param id |
||||
* @return |
||||
*/ |
||||
@AutoLog(value = "生产计划-通过id查询") |
||||
@ApiOperation(value = "生产计划-通过id查询", notes = "生产计划-通过id查询") |
||||
@GetMapping(value = "/queryById") |
||||
public Result<?> queryById(@RequestParam(name = "id", required = true) String id) { |
||||
ZyProductPlan zyProductPlan = zyProductPlanService.getById(id); |
||||
if (zyProductPlan == null) { |
||||
return Result.error("未找到对应数据"); |
||||
} |
||||
return Result.OK(zyProductPlan); |
||||
} |
||||
|
||||
/** |
||||
* 导出excel |
||||
* |
||||
* @param request |
||||
* @param zyProductPlan |
||||
*/ |
||||
@RequestMapping(value = "/exportXls") |
||||
public ModelAndView exportXls(HttpServletRequest request, ZyProductPlan zyProductPlan) { |
||||
return super.exportXls(request, zyProductPlan, ZyProductPlan.class, "生产计划"); |
||||
} |
||||
|
||||
/** |
||||
* 通过excel导入数据 |
||||
* |
||||
* @param request |
||||
* @param response |
||||
* @return |
||||
*/ |
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
||||
return super.importExcel(request, response, ZyProductPlan.class); |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,99 @@ |
||||
package org.jeecg.modules.productplan.entity; |
||||
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType; |
||||
import com.baomidou.mybatisplus.annotation.TableId; |
||||
import com.baomidou.mybatisplus.annotation.TableName; |
||||
import com.fasterxml.jackson.annotation.JsonFormat; |
||||
import io.swagger.annotations.ApiModel; |
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
import lombok.EqualsAndHashCode; |
||||
import lombok.experimental.Accessors; |
||||
import org.jeecgframework.poi.excel.annotation.Excel; |
||||
import org.springframework.format.annotation.DateTimeFormat; |
||||
|
||||
import java.io.Serializable; |
||||
import java.util.Date; |
||||
|
||||
/** |
||||
* @Description: 生产计划工序 |
||||
* @Author: jeecg-boot |
||||
* @Date: 2022-12-12 |
||||
* @Version: V1.0 |
||||
*/ |
||||
@Data |
||||
@TableName("zy_plan_process") |
||||
@Accessors(chain = true) |
||||
@EqualsAndHashCode(callSuper = false) |
||||
@ApiModel(value = "zy_plan_process对象", description = "生产计划工序") |
||||
public class ZyPlanProcess implements Serializable { |
||||
private static final long serialVersionUID = 1L; |
||||
|
||||
/** |
||||
* 主键 |
||||
*/ |
||||
@TableId(type = IdType.ASSIGN_ID) |
||||
@ApiModelProperty(value = "主键") |
||||
private String id; |
||||
/** |
||||
* 创建人 |
||||
*/ |
||||
@ApiModelProperty(value = "创建人") |
||||
private String createBy; |
||||
/** |
||||
* 创建日期 |
||||
*/ |
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") |
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
||||
@ApiModelProperty(value = "创建日期") |
||||
private Date createTime; |
||||
/** |
||||
* 更新人 |
||||
*/ |
||||
@ApiModelProperty(value = "更新人") |
||||
private String updateBy; |
||||
/** |
||||
* 更新日期 |
||||
*/ |
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") |
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
||||
@ApiModelProperty(value = "更新日期") |
||||
private Date updateTime; |
||||
/** |
||||
* 生产计划id |
||||
*/ |
||||
@Excel(name = "生产计划id", width = 15) |
||||
@ApiModelProperty(value = "生产计划id") |
||||
private String planId; |
||||
/** |
||||
* 工位id |
||||
*/ |
||||
@Excel(name = "工位id", width = 15) |
||||
@ApiModelProperty(value = "工位id") |
||||
private String stationId; |
||||
/** |
||||
* 设备id列表 |
||||
*/ |
||||
@Excel(name = "设备id列表", width = 15) |
||||
@ApiModelProperty(value = "设备id列表") |
||||
private String machineIds; |
||||
/** |
||||
* 工具id列表 |
||||
*/ |
||||
@Excel(name = "工具id列表", width = 15) |
||||
@ApiModelProperty(value = "工具id列表") |
||||
private String toolsIds; |
||||
/** |
||||
* 工序id列表 |
||||
*/ |
||||
@Excel(name = "工序id列表", width = 15) |
||||
@ApiModelProperty(value = "工序id列表") |
||||
private String processIds; |
||||
/** |
||||
* 成员id列表 |
||||
*/ |
||||
@Excel(name = "成员id列表", width = 15) |
||||
@ApiModelProperty(value = "成员id列表") |
||||
private String userIds; |
||||
} |
||||
@ -0,0 +1,137 @@ |
||||
package org.jeecg.modules.productplan.entity; |
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType; |
||||
import com.baomidou.mybatisplus.annotation.TableId; |
||||
import com.baomidou.mybatisplus.annotation.TableName; |
||||
import com.fasterxml.jackson.annotation.JsonFormat; |
||||
import io.swagger.annotations.ApiModel; |
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.Data; |
||||
import lombok.EqualsAndHashCode; |
||||
import lombok.experimental.Accessors; |
||||
import org.jeecg.common.aspect.annotation.Dict; |
||||
import org.jeecgframework.poi.excel.annotation.Excel; |
||||
import org.springframework.format.annotation.DateTimeFormat; |
||||
|
||||
import java.io.Serializable; |
||||
import java.util.Date; |
||||
|
||||
/** |
||||
* @Description: 生产计划 |
||||
* @Author: jeecg-boot |
||||
* @Date: 2022-12-12 |
||||
* @Version: V1.0 |
||||
*/ |
||||
@Data |
||||
@TableName("zy_product_plan") |
||||
@Accessors(chain = true) |
||||
@EqualsAndHashCode(callSuper = false) |
||||
@ApiModel(value = "zy_product_plan对象", description = "生产计划") |
||||
public class ZyProductPlan implements Serializable { |
||||
private static final long serialVersionUID = 1L; |
||||
|
||||
/** |
||||
* 主键 |
||||
*/ |
||||
@TableId(type = IdType.ASSIGN_ID) |
||||
@ApiModelProperty(value = "主键") |
||||
private String id; |
||||
/** |
||||
* 创建人 |
||||
*/ |
||||
@ApiModelProperty(value = "创建人") |
||||
private String createBy; |
||||
/** |
||||
* 创建日期 |
||||
*/ |
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") |
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
||||
@ApiModelProperty(value = "创建日期") |
||||
private Date createTime; |
||||
/** |
||||
* 更新人 |
||||
*/ |
||||
@ApiModelProperty(value = "更新人") |
||||
private String updateBy; |
||||
/** |
||||
* 更新日期 |
||||
*/ |
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") |
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
||||
@ApiModelProperty(value = "更新日期") |
||||
private Date updateTime; |
||||
/** |
||||
* 工单编号 |
||||
*/ |
||||
@Excel(name = "工单编号", width = 15) |
||||
@ApiModelProperty(value = "工单编号") |
||||
private String productCode; |
||||
/** |
||||
* 车间id |
||||
*/ |
||||
@Excel(name = "车间id", width = 15) |
||||
@ApiModelProperty(value = "车间id") |
||||
@Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") |
||||
private String workshopId; |
||||
/** |
||||
* 车间负责人 |
||||
*/ |
||||
@Excel(name = "车间负责人", width = 15) |
||||
@ApiModelProperty(value = "车间负责人") |
||||
private String responsiblePerson; |
||||
/** |
||||
* 班组 |
||||
*/ |
||||
@Excel(name = "班组", width = 15) |
||||
@ApiModelProperty(value = "班组") |
||||
@Dict(dictTable = "station", dicText = "station_name", dicCode = "id") |
||||
private String teamId; |
||||
/** |
||||
* 组长 |
||||
*/ |
||||
@Excel(name = "组长", width = 15) |
||||
@ApiModelProperty(value = "组长") |
||||
private String teamLeader; |
||||
/** |
||||
* 生产开始时间 |
||||
*/ |
||||
@Excel(name = "生产开始时间", width = 15, format = "yyyy-MM-dd") |
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") |
||||
@DateTimeFormat(pattern = "yyyy-MM-dd") |
||||
@ApiModelProperty(value = "生产开始时间") |
||||
private Date workTime; |
||||
/** |
||||
* 生产时长 |
||||
*/ |
||||
@Excel(name = "生产时长", width = 15) |
||||
@ApiModelProperty(value = "生产时长") |
||||
private Integer offTime; |
||||
/** |
||||
* 值：未审核0、已审核1、生产中2、已完成3、已撤销8、异常9，默认0 |
||||
*/ |
||||
@Excel(name = "状态", width = 15) |
||||
@Dict(dicCode = "productplanStatus") |
||||
@ApiModelProperty(value = "状态：未审核0、已审核1、生产中2、已完成3、已撤销8、异常9，默认0") |
||||
private Integer status; |
||||
/** |
||||
* 是否加急 |
||||
*/ |
||||
@Excel(name = "是否加急", width = 15) |
||||
@ApiModelProperty(value = "是否加急") |
||||
@Dict(dicCode = "sfjj") |
||||
private Integer speedUp; |
||||
/** |
||||
* 审核人 |
||||
*/ |
||||
@Excel(name = "审核人", width = 15) |
||||
@ApiModelProperty(value = "审核人") |
||||
private String auditBy; |
||||
/** |
||||
* 审核时间 |
||||
*/ |
||||
@Excel(name = "审核时间", width = 15, format = "yyyy-MM-dd") |
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") |
||||
@DateTimeFormat(pattern = "yyyy-MM-dd") |
||||
@ApiModelProperty(value = "审核时间") |
||||
private Date auditTimr; |
||||
} |
||||
@ -0,0 +1,15 @@ |
||||
package org.jeecg.modules.productplan.mapper; |
||||
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
||||
import org.jeecg.modules.productplan.entity.ZyPlanProcess; |
||||
|
||||
/** |
||||
* @Description: 生产计划工序 |
||||
* @Author: jeecg-boot |
||||
* @Date: 2022-12-12 |
||||
* @Version: V1.0 |
||||
*/ |
||||
public interface ZyPlanProcessMapper extends BaseMapper<ZyPlanProcess> { |
||||
|
||||
} |
||||
@ -0,0 +1,14 @@ |
||||
package org.jeecg.modules.productplan.mapper; |
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
||||
import org.jeecg.modules.productplan.entity.ZyProductPlan; |
||||
|
||||
/** |
||||
* @Description: 生产计划 |
||||
* @Author: jeecg-boot |
||||
* @Date: 2022-12-12 |
||||
* @Version: V1.0 |
||||
*/ |
||||
public interface ZyProductPlanMapper extends BaseMapper<ZyProductPlan> { |
||||
|
||||
} |
||||
@ -0,0 +1,5 @@ |
||||
<?xml version="1.0" encoding="UTF-8"?> |
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
||||
<mapper namespace="org.jeecg.modules.productplan.mapper.ZyPlanProcessMapper"> |
||||
|
||||
</mapper> |
||||
@ -0,0 +1,5 @@ |
||||
<?xml version="1.0" encoding="UTF-8"?> |
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
||||
<mapper namespace="org.jeecg.modules.productplan.mapper.ZyProductPlanMapper"> |
||||
|
||||
</mapper> |
||||
@ -0,0 +1,15 @@ |
||||
package org.jeecg.modules.productplan.service; |
||||
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService; |
||||
import org.jeecg.modules.productplan.entity.ZyPlanProcess; |
||||
|
||||
/** |
||||
* @Description: 生产计划工序 |
||||
* @Author: jeecg-boot |
||||
* @Date: 2022-12-12 |
||||
* @Version: V1.0 |
||||
*/ |
||||
public interface IZyPlanProcessService extends IService<ZyPlanProcess> { |
||||
|
||||
} |
||||
@ -0,0 +1,14 @@ |
||||
package org.jeecg.modules.productplan.service; |
||||
|
||||
import org.jeecg.modules.productplan.entity.ZyProductPlan; |
||||
import com.baomidou.mybatisplus.extension.service.IService; |
||||
|
||||
/** |
||||
* @Description: 生产计划 |
||||
* @Author: jeecg-boot |
||||
* @Date: 2022-12-12 |
||||
* @Version: V1.0 |
||||
*/ |
||||
public interface IZyProductPlanService extends IService<ZyProductPlan> { |
||||
|
||||
} |
||||
@ -0,0 +1,19 @@ |
||||
package org.jeecg.modules.productplan.service.impl; |
||||
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
||||
import org.jeecg.modules.productplan.entity.ZyPlanProcess; |
||||
import org.jeecg.modules.productplan.mapper.ZyPlanProcessMapper; |
||||
import org.jeecg.modules.productplan.service.IZyPlanProcessService; |
||||
import org.springframework.stereotype.Service; |
||||
|
||||
/** |
||||
* @Description: 生产计划工序 |
||||
* @Author: jeecg-boot |
||||
* @Date: 2022-12-12 |
||||
* @Version: V1.0 |
||||
*/ |
||||
@Service |
||||
public class ZyPlanProcessServiceImpl extends ServiceImpl<ZyPlanProcessMapper, ZyPlanProcess> implements IZyPlanProcessService { |
||||
|
||||
} |
||||
@ -0,0 +1,18 @@ |
||||
package org.jeecg.modules.productplan.service.impl; |
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
||||
import org.jeecg.modules.productplan.entity.ZyProductPlan; |
||||
import org.jeecg.modules.productplan.mapper.ZyProductPlanMapper; |
||||
import org.jeecg.modules.productplan.service.IZyProductPlanService; |
||||
import org.springframework.stereotype.Service; |
||||
|
||||
/** |
||||
* @Description: 生产计划 |
||||
* @Author: jeecg-boot |
||||
* @Date: 2022-12-12 |
||||
* @Version: V1.0 |
||||
*/ |
||||
@Service |
||||
public class ZyProductPlanServiceImpl extends ServiceImpl<ZyProductPlanMapper, ZyProductPlan> implements IZyProductPlanService { |
||||
|
||||
} |
||||
Loading…
Reference in new issue