parent
1f7dda1573
commit
89ae331599
9 changed files with 379 additions and 242 deletions
@ -1,4 +1,4 @@ |
|||||||
NODE_ENV=production |
NODE_ENV=production |
||||||
VUE_APP_API_BASE_URL=http://182.92.169.222:10085/jeecg-boot |
VUE_APP_API_BASE_URL=http://10.100.200.112:10085/jeecg-boot |
||||||
VUE_APP_CAS_BASE_URL=http://182.92.169.222:10085/jeecg-boot/cas |
VUE_APP_CAS_BASE_URL=http://10.100.200.112:10085/jeecg-boot/cas |
||||||
VUE_APP_ONLINE_BASE_URL=http://182.92.169.222:8012 |
VUE_APP_ONLINE_BASE_URL=http://10.100.200.112:8012 |
||||||
|
|||||||
@ -1,231 +1,231 @@ |
|||||||
<template> |
<template> |
||||||
<a-card :bordered="false"> |
<a-card :bordered="false"> |
||||||
<!-- 查询区域 --> |
<!-- 查询区域 --> |
||||||
<div class="table-page-search-wrapper"> |
<div class="table-page-search-wrapper"> |
||||||
<a-form layout="inline" @keyup.enter.native="searchQuery"> |
<a-form layout="inline" @keyup.enter.native="searchQuery"> |
||||||
<a-row :gutter="24"> |
<a-row :gutter="24"> |
||||||
<a-col :xl="6" :lg="7" :md="8" :sm="24"> |
<a-col :xl="6" :lg="7" :md="8" :sm="24"> |
||||||
<a-form-item label="工位"> |
<a-form-item label="工位"> |
||||||
<j-search-select-tag placeholder="请选择工位" v-model="queryParam.stationId" dict="station,station_name,id"/> |
<j-search-select-tag placeholder="请选择工位" v-model="queryParam.stationId" dict="station,station_name,id"/> |
||||||
</a-form-item> |
</a-form-item> |
||||||
</a-col> |
</a-col> |
||||||
<a-col :xl="6" :lg="7" :md="8" :sm="24"> |
<a-col :xl="6" :lg="7" :md="8" :sm="24"> |
||||||
<a-form-item label="工单编号"> |
<a-form-item label="工单编号"> |
||||||
<j-popup placeholder="请选择工单编号" v-model="queryParam.orderCode" code="findgdbh" org-fields="id,orders_num" dest-fields="order_id,order_code" :field="getPopupField('order_id,order_code')" :multi="true"/> |
<j-popup placeholder="请选择工单编号" v-model="queryParam.orderCode" code="findgdbh" org-fields="id,orders_num" dest-fields="order_id,order_code" :field="getPopupField('order_id,order_code')" :multi="true"/> |
||||||
</a-form-item> |
</a-form-item> |
||||||
</a-col> |
</a-col> |
||||||
<template v-if="toggleSearchStatus"> |
<template v-if="toggleSearchStatus"> |
||||||
<a-col :xl="6" :lg="7" :md="8" :sm="24"> |
<a-col :xl="6" :lg="7" :md="8" :sm="24"> |
||||||
<a-form-item label="状态"> |
<a-form-item label="状态"> |
||||||
<j-dict-select-tag placeholder="请选择状态" v-model="queryParam.status" dictCode="cgqzt"/> |
<j-dict-select-tag placeholder="请选择状态" v-model="queryParam.status" dictCode="cgqzt"/> |
||||||
</a-form-item> |
</a-form-item> |
||||||
</a-col> |
</a-col> |
||||||
</template> |
</template> |
||||||
<a-col :xl="6" :lg="7" :md="8" :sm="24"> |
<a-col :xl="6" :lg="7" :md="8" :sm="24"> |
||||||
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> |
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> |
||||||
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button> |
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button> |
||||||
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button> |
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button> |
||||||
<a @click="handleToggleSearch" style="margin-left: 8px"> |
<a @click="handleToggleSearch" style="margin-left: 8px"> |
||||||
{{ toggleSearchStatus ? '收起' : '展开' }} |
{{ toggleSearchStatus ? '收起' : '展开' }} |
||||||
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/> |
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/> |
||||||
</a> |
</a> |
||||||
</span> |
</span> |
||||||
</a-col> |
</a-col> |
||||||
</a-row> |
</a-row> |
||||||
</a-form> |
</a-form> |
||||||
</div> |
</div> |
||||||
<!-- 查询区域-END --> |
<!-- 查询区域-END --> |
||||||
|
|
||||||
<!-- 操作按钮区域 --> |
<!-- 操作按钮区域 --> |
||||||
<div class="table-operator"> |
<div class="table-operator"> |
||||||
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> |
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> |
||||||
<a-button type="primary" icon="download" @click="handleExportXls('生产记录表')">导出</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-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel"> |
||||||
<a-button type="primary" icon="import">导入</a-button> |
<a-button type="primary" icon="import">导入</a-button> |
||||||
</a-upload> |
</a-upload> |
||||||
<!-- 高级查询区域 --> |
<!-- 高级查询区域 --> |
||||||
<j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query> |
<j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query> |
||||||
<a-dropdown v-if="selectedRowKeys.length > 0"> |
<a-dropdown v-if="selectedRowKeys.length > 0"> |
||||||
<a-menu slot="overlay"> |
<a-menu slot="overlay"> |
||||||
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item> |
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item> |
||||||
</a-menu> |
</a-menu> |
||||||
<a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button> |
<a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button> |
||||||
</a-dropdown> |
</a-dropdown> |
||||||
</div> |
</div> |
||||||
|
|
||||||
<!-- table区域-begin --> |
<!-- table区域-begin --> |
||||||
<div> |
<div> |
||||||
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> |
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> |
||||||
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项 |
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项 |
||||||
<a style="margin-left: 24px" @click="onClearSelected">清空</a> |
<a style="margin-left: 24px" @click="onClearSelected">清空</a> |
||||||
</div> |
</div> |
||||||
|
|
||||||
<a-table |
<a-table |
||||||
ref="table" |
ref="table" |
||||||
size="middle" |
size="middle" |
||||||
:scroll="{x:true}" |
:scroll="{x:true}" |
||||||
bordered |
bordered |
||||||
rowKey="id" |
rowKey="id" |
||||||
:columns="columns" |
:columns="columns" |
||||||
:dataSource="dataSource" |
:dataSource="dataSource" |
||||||
:pagination="ipagination" |
:pagination="ipagination" |
||||||
:loading="loading" |
:loading="loading" |
||||||
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" |
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" |
||||||
class="j-table-force-nowrap" |
class="j-table-force-nowrap" |
||||||
@change="handleTableChange"> |
@change="handleTableChange"> |
||||||
|
|
||||||
<template slot="htmlSlot" slot-scope="text"> |
<template slot="htmlSlot" slot-scope="text"> |
||||||
<div v-html="text"></div> |
<div v-html="text"></div> |
||||||
</template> |
</template> |
||||||
<template slot="imgSlot" slot-scope="text"> |
<template slot="imgSlot" slot-scope="text"> |
||||||
<span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span> |
<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;"/> |
<img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/> |
||||||
</template> |
</template> |
||||||
<template slot="fileSlot" slot-scope="text"> |
<template slot="fileSlot" slot-scope="text"> |
||||||
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span> |
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span> |
||||||
<a-button |
<a-button |
||||||
v-else |
v-else |
||||||
:ghost="true" |
:ghost="true" |
||||||
type="primary" |
type="primary" |
||||||
icon="download" |
icon="download" |
||||||
size="small" |
size="small" |
||||||
@click="downloadFile(text)"> |
@click="downloadFile(text)"> |
||||||
下载 |
下载 |
||||||
</a-button> |
</a-button> |
||||||
</template> |
</template> |
||||||
|
|
||||||
<span slot="action" slot-scope="text, record"> |
<span slot="action" slot-scope="text, record"> |
||||||
<a @click="handleEdit(record)">编辑</a> |
<a @click="handleEdit(record)">编辑</a> |
||||||
|
|
||||||
<a-divider type="vertical" /> |
<a-divider type="vertical" /> |
||||||
<a-dropdown> |
<a-dropdown> |
||||||
<a class="ant-dropdown-link">更多 <a-icon type="down" /></a> |
<a class="ant-dropdown-link">更多 <a-icon type="down" /></a> |
||||||
<a-menu slot="overlay"> |
<a-menu slot="overlay"> |
||||||
<a-menu-item> |
<a-menu-item> |
||||||
<a @click="handleDetail(record)">详情</a> |
<a @click="handleDetail(record)">详情</a> |
||||||
</a-menu-item> |
</a-menu-item> |
||||||
<a-menu-item> |
<a-menu-item> |
||||||
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> |
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> |
||||||
<a>删除</a> |
<a>删除</a> |
||||||
</a-popconfirm> |
</a-popconfirm> |
||||||
</a-menu-item> |
</a-menu-item> |
||||||
</a-menu> |
</a-menu> |
||||||
</a-dropdown> |
</a-dropdown> |
||||||
</span> |
</span> |
||||||
|
|
||||||
</a-table> |
</a-table> |
||||||
</div> |
</div> |
||||||
|
|
||||||
<product-record-modal ref="modalForm" @ok="modalFormOk"></product-record-modal> |
<product-record-modal ref="modalForm" @ok="modalFormOk"></product-record-modal> |
||||||
</a-card> |
</a-card> |
||||||
</template> |
</template> |
||||||
|
|
||||||
<script> |
<script> |
||||||
|
|
||||||
import '@/assets/less/TableExpand.less' |
import '@/assets/less/TableExpand.less' |
||||||
import { mixinDevice } from '@/utils/mixin' |
import { mixinDevice } from '@/utils/mixin' |
||||||
import { JeecgListMixin } from '@/mixins/JeecgListMixin' |
import { JeecgListMixin } from '@/mixins/JeecgListMixin' |
||||||
import ProductRecordModal from './modules/ProductRecordModal' |
import ProductRecordModal from './modules/ProductRecordModal' |
||||||
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' |
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' |
||||||
|
|
||||||
export default { |
export default { |
||||||
name: 'ProductRecordList', |
name: 'ProductRecordList', |
||||||
mixins:[JeecgListMixin, mixinDevice], |
mixins:[JeecgListMixin, mixinDevice], |
||||||
components: { |
components: { |
||||||
ProductRecordModal |
ProductRecordModal |
||||||
}, |
}, |
||||||
data () { |
data () { |
||||||
return { |
return { |
||||||
description: '生产记录表管理页面', |
description: '生产记录表管理页面', |
||||||
// 表头 |
// 表头 |
||||||
columns: [ |
columns: [ |
||||||
{ |
{ |
||||||
title: '#', |
title: '#', |
||||||
dataIndex: '', |
dataIndex: '', |
||||||
key:'rowIndex', |
key:'rowIndex', |
||||||
width:60, |
width:60, |
||||||
align:"center", |
align:"center", |
||||||
customRender:function (t,r,index) { |
customRender:function (t,r,index) { |
||||||
return parseInt(index)+1; |
return parseInt(index)+1; |
||||||
} |
} |
||||||
}, |
}, |
||||||
{ |
{ |
||||||
title:'工位', |
title:'工位', |
||||||
align:"center", |
align:"center", |
||||||
dataIndex: 'stationId_dictText' |
dataIndex: 'stationId_dictText' |
||||||
}, |
}, |
||||||
{ |
{ |
||||||
title:'工单编号', |
title:'工单编号', |
||||||
align:"center", |
align:"center", |
||||||
dataIndex: 'orderId_dictText' |
dataIndex: 'orderCode' |
||||||
}, |
}, |
||||||
{ |
{ |
||||||
title:'生产开始时间', |
title:'生产开始时间', |
||||||
align:"center", |
align:"center", |
||||||
dataIndex: 'workTime' |
dataIndex: 'workTime' |
||||||
}, |
}, |
||||||
{ |
{ |
||||||
title:'生产结束时间', |
title:'生产结束时间', |
||||||
align:"center", |
align:"center", |
||||||
dataIndex: 'offTime' |
dataIndex: 'offTime' |
||||||
}, |
}, |
||||||
{ |
{ |
||||||
title:'时长', |
title:'时长', |
||||||
align:"center", |
align:"center", |
||||||
dataIndex: 'duration' |
dataIndex: 'duration' |
||||||
}, |
}, |
||||||
{ |
{ |
||||||
title:'状态', |
title:'状态', |
||||||
align:"center", |
align:"center", |
||||||
dataIndex: 'status_dictText' |
dataIndex: 'status_dictText' |
||||||
}, |
}, |
||||||
{ |
{ |
||||||
title: '操作', |
title: '操作', |
||||||
dataIndex: 'action', |
dataIndex: 'action', |
||||||
align:"center", |
align:"center", |
||||||
fixed:"right", |
fixed:"right", |
||||||
width:147, |
width:147, |
||||||
scopedSlots: { customRender: 'action' } |
scopedSlots: { customRender: 'action' } |
||||||
} |
} |
||||||
], |
], |
||||||
url: { |
url: { |
||||||
list: "/productrecord/productRecord/list", |
list: "/productrecord/productRecord/list", |
||||||
delete: "/productrecord/productRecord/delete", |
delete: "/productrecord/productRecord/delete", |
||||||
deleteBatch: "/productrecord/productRecord/deleteBatch", |
deleteBatch: "/productrecord/productRecord/deleteBatch", |
||||||
exportXlsUrl: "/productrecord/productRecord/exportXls", |
exportXlsUrl: "/productrecord/productRecord/exportXls", |
||||||
importExcelUrl: "productrecord/productRecord/importExcel", |
importExcelUrl: "productrecord/productRecord/importExcel", |
||||||
|
|
||||||
}, |
}, |
||||||
dictOptions:{}, |
dictOptions:{}, |
||||||
superFieldList:[], |
superFieldList:[], |
||||||
} |
} |
||||||
}, |
}, |
||||||
created() { |
created() { |
||||||
this.getSuperFieldList(); |
this.getSuperFieldList(); |
||||||
}, |
}, |
||||||
computed: { |
computed: { |
||||||
importExcelUrl: function(){ |
importExcelUrl: function(){ |
||||||
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`; |
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`; |
||||||
}, |
}, |
||||||
}, |
}, |
||||||
methods: { |
methods: { |
||||||
initDictConfig(){ |
initDictConfig(){ |
||||||
}, |
}, |
||||||
getSuperFieldList(){ |
getSuperFieldList(){ |
||||||
let fieldList=[]; |
let fieldList=[]; |
||||||
fieldList.push({type:'sel_search',value:'stationId',text:'工位',dictTable:'station', dictText:'station_name', dictCode:'id'}) |
fieldList.push({type:'sel_search',value:'stationId',text:'工位',dictTable:'station', dictText:'station_name', dictCode:'id'}) |
||||||
fieldList.push({type:'popup',value:'stationName',text:'工位', popup:{code:'findgw',field:'id',orgFields:'id',destFields:'station_id'}}) |
fieldList.push({type:'popup',value:'stationName',text:'工位', popup:{code:'findgw',field:'id',orgFields:'id',destFields:'station_id'}}) |
||||||
fieldList.push({type:'popup',value:'orderCode',text:'工单编号', popup:{code:'findgdbh',field:'id',orgFields:'id',destFields:'order_id'}}) |
fieldList.push({type:'popup',value:'orderCode',text:'工单编号', popup:{code:'findgdbh',field:'id',orgFields:'id',destFields:'order_id'}}) |
||||||
fieldList.push({type:'sel_search',value:'orderId',text:'工单编号',dictTable:'work_order', dictText:'product_code', dictCode:'id'}) |
fieldList.push({type:'sel_search',value:'orderId',text:'工单编号',dictTable:'work_order', dictText:'product_code', dictCode:'id'}) |
||||||
fieldList.push({type:'datetime',value:'workTime',text:'生产开始时间'}) |
fieldList.push({type:'datetime',value:'workTime',text:'生产开始时间'}) |
||||||
fieldList.push({type:'datetime',value:'offTime',text:'生产结束时间'}) |
fieldList.push({type:'datetime',value:'offTime',text:'生产结束时间'}) |
||||||
fieldList.push({type:'string',value:'duration',text:'时长',dictCode:''}) |
fieldList.push({type:'string',value:'duration',text:'时长',dictCode:''}) |
||||||
fieldList.push({type:'string',value:'status',text:'状态',dictCode:'cgqzt'}) |
fieldList.push({type:'string',value:'status',text:'状态',dictCode:'cgqzt'}) |
||||||
this.superFieldList = fieldList |
this.superFieldList = fieldList |
||||||
} |
} |
||||||
} |
} |
||||||
} |
} |
||||||
</script> |
</script> |
||||||
<style scoped> |
<style scoped> |
||||||
@import '~@assets/less/common.less'; |
@import '~@assets/less/common.less'; |
||||||
</style> |
</style> |
||||||
@ -0,0 +1,41 @@ |
|||||||
|
package org.jeecg.modules.largeScreen.vo; |
||||||
|
|
||||||
|
import io.swagger.annotations.ApiModelProperty; |
||||||
|
import lombok.Data; |
||||||
|
import org.jeecg.modules.demo.customermeasure.entity.CustomerMeasure; |
||||||
|
import org.jeecg.modules.demo.ordergoods.entity.OrderGoods; |
||||||
|
import org.jeecg.modules.demo.zyorders.entity.ZyOrders; |
||||||
|
import org.jeecg.modules.system.entity.SysUser; |
||||||
|
import org.jeecg.modules.zystylemodule.entity.NewStyleModule; |
||||||
|
import org.jeecgframework.poi.excel.annotation.Excel; |
||||||
|
|
||||||
|
import java.io.Serializable; |
||||||
|
import java.util.List; |
||||||
|
|
||||||
|
@Data |
||||||
|
public class LargeOrderVo implements Serializable { |
||||||
|
private static final long serialVersionUID = 1L; |
||||||
|
|
||||||
|
//订单用户
|
||||||
|
private SysUser user; |
||||||
|
|
||||||
|
//订单
|
||||||
|
private ZyOrders orders; |
||||||
|
|
||||||
|
//商品
|
||||||
|
private OrderGoods orderGoods; |
||||||
|
|
||||||
|
//测体
|
||||||
|
private CustomerMeasure customerMeasure; |
||||||
|
|
||||||
|
//模块
|
||||||
|
private List<NewStyleModule> moduleList; |
||||||
|
|
||||||
|
//商品图片
|
||||||
|
private List<String> pictureList; |
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
} |
||||||
Loading…
Reference in new issue