commit
2c7ba63eca
66 changed files with 1930 additions and 1081 deletions
@ -1,276 +1,276 @@ |
||||
<template> |
||||
<a-card :bordered="false"> |
||||
<!-- 查询区域 --> |
||||
<div class="table-page-search-wrapper"> |
||||
<a-form layout="inline" @keyup.enter.native="searchQuery"> |
||||
<a-row :gutter="24"> |
||||
<a-col :sm="5"> |
||||
<a-form-model-item label="工具编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="id"> |
||||
<a-input v-model="queryParam.id" placeholder="请输入工具编号"></a-input> |
||||
</a-form-model-item> |
||||
</a-col> |
||||
<a-col :sm="5"> |
||||
<a-form-model-item label="工具名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name"> |
||||
<a-input v-model="queryParam.name" placeholder="请输入工具名称"></a-input> |
||||
</a-form-model-item> |
||||
</a-col> |
||||
<a-col :xl="6" :lg="7" :md="8" :sm="24"> |
||||
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> |
||||
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button> |
||||
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button> |
||||
</span> |
||||
</a-col> |
||||
</a-row> |
||||
</a-form> |
||||
</div> |
||||
|
||||
<!-- 操作按钮区域 --> |
||||
<!-- <div class="table-operator">--> |
||||
<!-- <!– 高级查询区域 –>--> |
||||
<!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>--> |
||||
<!--<template>--> |
||||
<!-- <a-card :bordered="false">--> |
||||
<!-- <!– 查询区域 –>--> |
||||
<!-- <div class="table-page-search-wrapper">--> |
||||
<!-- <a-form layout="inline" @keyup.enter.native="searchQuery">--> |
||||
<!-- <a-row :gutter="24">--> |
||||
<!-- <a-col :sm="5">--> |
||||
<!-- <a-form-model-item label="工具编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="code">--> |
||||
<!-- <a-input v-model="queryParam.code" placeholder="请输入工具编号"></a-input>--> |
||||
<!-- </a-form-model-item>--> |
||||
<!-- </a-col>--> |
||||
<!-- <a-col :sm="5">--> |
||||
<!-- <a-form-model-item label="工具名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">--> |
||||
<!-- <a-input v-model="queryParam.name" placeholder="请输入工具名称"></a-input>--> |
||||
<!-- </a-form-model-item>--> |
||||
<!-- </a-col>--> |
||||
<!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">--> |
||||
<!-- <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">--> |
||||
<!-- <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>--> |
||||
<!-- <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>--> |
||||
<!-- </span>--> |
||||
<!-- </a-col>--> |
||||
<!-- </a-row>--> |
||||
<!-- </a-form>--> |
||||
<!-- </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> |
||||
<!-- <!– 操作按钮区域 –>--> |
||||
<!--<!– <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"> |
||||
<!-- <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>--> |
||||
<!-- <!– <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>--> |
||||
<!-- <!– <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-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> |
||||
<!-- </a-table>--> |
||||
<!-- </div>--> |
||||
|
||||
<!-- <zy-tool-modal ref="modalForm" @ok="modalFormOk"></zy-tool-modal>--> |
||||
</a-card> |
||||
</template> |
||||
<!-- <!– <zy-tool-modal ref="modalForm" @ok="modalFormOk"></zy-tool-modal>–>--> |
||||
<!-- </a-card>--> |
||||
<!--</template>--> |
||||
|
||||
<script> |
||||
<!--<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' |
||||
<!--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: 'id' |
||||
}, |
||||
{ |
||||
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", |
||||
<!--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: 'code'--> |
||||
<!-- },--> |
||||
<!-- {--> |
||||
<!-- 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> |
||||
<!-- },--> |
||||
<!-- 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,137 @@ |
||||
<template> |
||||
<a-card :bordered="false"> |
||||
<!-- 查询区域 --> |
||||
<div class="table-page-search-wrapper"> |
||||
<a-form layout="inline" @keyup.enter.native="searchQuery"> |
||||
<a-row :gutter="24"> |
||||
<a-col :xl="6" :lg="7" :md="8" :sm="24"> |
||||
<a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="code"> |
||||
<a-input v-model="queryParam.code" placeholder="请输入编号" ></a-input> |
||||
</a-form-model-item> |
||||
</a-col> |
||||
<a-col :xl="6" :lg="7" :md="8" :sm="24"> |
||||
<a-form-model-item label="名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name"> |
||||
<a-input v-model="queryParam.name" placeholder="请输入名称"></a-input> |
||||
</a-form-model-item> |
||||
</a-col> |
||||
<a-col :xl="6" :lg="7" :md="8" :sm="24"> |
||||
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> |
||||
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button> |
||||
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button> |
||||
</span> |
||||
</a-col> |
||||
</a-row> |
||||
</a-form> |
||||
</div> |
||||
<!-- 查询区域-END --> |
||||
|
||||
<!-- 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"> |
||||
</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 ZyToolModal from './modules/ZyToolModal' |
||||
|
||||
export default { |
||||
name: 'ZyToolList', |
||||
mixins:[JeecgListMixin, mixinDevice], |
||||
components: { |
||||
ZyToolModal |
||||
}, |
||||
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: 'code' |
||||
}, |
||||
{ |
||||
title:'工具名称', |
||||
align:"center", |
||||
dataIndex: 'name' |
||||
}, |
||||
], |
||||
url: { |
||||
list: "/zytool/zyTool/list", |
||||
delete: "/zytool/zyTool/delete", |
||||
deleteBatch: "/zytool/zyTool/deleteBatch", |
||||
exportXlsUrl: "/zytool/zyTool/exportXls", |
||||
importExcelUrl: "zytool/zyTool/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:'typeCode',text:'类型编号',dictCode:''}) |
||||
fieldList.push({type:'string',value:'brandId',text:'工具品牌',dictCode:''}) |
||||
fieldList.push({type:'string',value:'modelId',text:'工具型号',dictCode:''}) |
||||
fieldList.push({type:'string',value:'code',text:'工具编号',dictCode:''}) |
||||
fieldList.push({type:'string',value:'name',text:'工具名称',dictCode:''}) |
||||
fieldList.push({type:'date',value:'buydate',text:'购买时间'}) |
||||
fieldList.push({type:'sel_user',value:'agent',text:'经办人'}) |
||||
fieldList.push({type:'string',value:'status',text:'工具状态',dictCode:''}) |
||||
fieldList.push({type:'string',value:'qrcode',text:'二维码',dictCode:''}) |
||||
fieldList.push({type:'date',value:'maintenancecycle',text:'维护周期'}) |
||||
fieldList.push({type:'sel_user',value:'administrator',text:'管理人'}) |
||||
fieldList.push({type:'date',value:'maintenancedate',text:'上次维护时间'}) |
||||
fieldList.push({type:'string',value:'img',text:'工具图片',dictCode:''}) |
||||
fieldList.push({type:'string',value:'img3d',text:'3d模型',dictCode:''}) |
||||
this.superFieldList = fieldList |
||||
} |
||||
} |
||||
} |
||||
</script> |
||||
@ -0,0 +1,31 @@ |
||||
package org.jeecg.modules.productplan.entity.vo; |
||||
|
||||
import lombok.Data; |
||||
import org.jeecg.modules.productplan.entity.ZyPlanProcess; |
||||
|
||||
import java.util.List; |
||||
|
||||
@Data |
||||
public class PaiWeiTuVo { |
||||
|
||||
// 订单总件数
|
||||
private Integer goodsNum; |
||||
// 生产人数
|
||||
private Integer memberNum; |
||||
// 客户名称
|
||||
private String user; |
||||
// 制单号
|
||||
private String makerId; |
||||
// 款式号
|
||||
private String style; |
||||
|
||||
// 班组
|
||||
private String teamName; |
||||
|
||||
// 标准工时（分）
|
||||
private Integer duration; |
||||
|
||||
|
||||
private List<ZyPlanProcess> list; |
||||
} |
||||
|
||||
@ -1,18 +1,110 @@ |
||||
package org.jeecg.modules.productplan.service.impl; |
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
||||
import org.apache.commons.lang3.StringUtils; |
||||
import org.jeecg.common.exception.JeecgBootException; |
||||
import org.jeecg.modules.demo.ordergoods.entity.OrderGoods; |
||||
import org.jeecg.modules.demo.ordergoods.service.IOrderGoodsService; |
||||
import org.jeecg.modules.demo.zyorders.entity.ZyOrders; |
||||
import org.jeecg.modules.demo.zyorders.service.IZyOrdersService; |
||||
import org.jeecg.modules.productplan.entity.ZyPlanProcess; |
||||
import org.jeecg.modules.productplan.entity.ZyProductPlan; |
||||
import org.jeecg.modules.productplan.entity.vo.PaiWeiTuVo; |
||||
import org.jeecg.modules.productplan.mapper.ZyProductPlanMapper; |
||||
import org.jeecg.modules.productplan.service.IZyPlanProcessService; |
||||
import org.jeecg.modules.productplan.service.IZyProductPlanService; |
||||
import org.jeecg.modules.system.service.ISysUserService; |
||||
import org.jeecg.modules.team.entity.Groupx; |
||||
import org.jeecg.modules.team.service.IGroupxService; |
||||
import org.jeecg.modules.workorder.entity.WorkOrder; |
||||
import org.jeecg.modules.workorder.service.IWorkOrderService; |
||||
import org.jeecg.modules.zyclothsstyle.entity.ZyClothsStyle; |
||||
import org.jeecg.modules.zyclothsstyle.service.IZyClothsStyleService; |
||||
import org.springframework.beans.factory.annotation.Autowired; |
||||
import org.springframework.stereotype.Service; |
||||
import org.springframework.util.ObjectUtils; |
||||
|
||||
import java.util.Arrays; |
||||
import java.util.List; |
||||
import java.util.concurrent.atomic.AtomicInteger; |
||||
|
||||
/** |
||||
* @Description: 生产计划 |
||||
* @Author: jeecg-boot |
||||
* @Date: 2022-12-12 |
||||
* @Date: 2022-12-12 |
||||
* @Version: V1.0 |
||||
*/ |
||||
@Service |
||||
public class ZyProductPlanServiceImpl extends ServiceImpl<ZyProductPlanMapper, ZyProductPlan> implements IZyProductPlanService { |
||||
|
||||
@Autowired |
||||
private IZyProductPlanService iZyProductPlanService; |
||||
|
||||
@Autowired |
||||
private IZyPlanProcessService iZyPlanProcessService; |
||||
|
||||
// 订单基本信息
|
||||
@Autowired |
||||
private IZyOrdersService iZyOrdersService; |
||||
|
||||
// 工单信息
|
||||
@Autowired |
||||
private IWorkOrderService iWorkOrderService; |
||||
|
||||
//商品订单信息
|
||||
@Autowired |
||||
private IOrderGoodsService iOrderGoodsService; |
||||
|
||||
@Autowired |
||||
private ISysUserService iSysUserService; |
||||
|
||||
@Autowired |
||||
private IZyClothsStyleService iZyClothsStyleService; |
||||
@Autowired |
||||
private IGroupxService iGroupxService; |
||||
|
||||
|
||||
@Override |
||||
public PaiWeiTuVo paiweitu(ZyProductPlan plan) { |
||||
ZyProductPlan productPlan = iZyProductPlanService.getById(plan.getId()); |
||||
if (ObjectUtils.isEmpty(productPlan)) throw new JeecgBootException(plan.getId() + "生产计划不存在"); |
||||
// 工单信息
|
||||
WorkOrder workOrder = iWorkOrderService.getOne(new LambdaQueryWrapper<WorkOrder>().eq(WorkOrder::getProductCode, productPlan.getProductCode())); |
||||
if (ObjectUtils.isEmpty(workOrder)) |
||||
throw new JeecgBootException(productPlan.getProductCode() + "工单信息不存在"); |
||||
|
||||
String ordersId = workOrder.getOrdersId(); |
||||
OrderGoods orderGoods = iOrderGoodsService.getOne(new LambdaQueryWrapper<OrderGoods>().eq(OrderGoods::getOrdersId, ordersId)); |
||||
if (ObjectUtils.isEmpty(orderGoods)) throw new JeecgBootException(ordersId + "订单商品信息不存在"); |
||||
|
||||
ZyOrders zyOrders = iZyOrdersService.getOne(new LambdaQueryWrapper<ZyOrders>().eq(ZyOrders::getId, ordersId)); |
||||
if (ObjectUtils.isEmpty(zyOrders)) throw new JeecgBootException(ordersId + "订单信息不存在"); |
||||
|
||||
PaiWeiTuVo vo = new PaiWeiTuVo(); |
||||
ZyClothsStyle zyClothsStyle = iZyClothsStyleService.getById(orderGoods.getStyleId()); |
||||
vo.setStyle(StringUtils.isNotBlank(zyClothsStyle.getStyleNames()) ? zyClothsStyle.getStyleNames() : ""); |
||||
vo.setGoodsNum(orderGoods.getGoodsNum()); |
||||
// SysUser sysUser = iSysUserService.getById(zyOrders.getUserId());
|
||||
// vo.setUser(StringUtils.isNotBlank(sysUser.getRealname()) ? sysUser.getRealname() : "");
|
||||
vo.setUser(zyOrders.getUserId()); |
||||
AtomicInteger memberNum = new AtomicInteger(0); |
||||
List<ZyPlanProcess> planProcessList = iZyPlanProcessService |
||||
.list(new LambdaQueryWrapper<ZyPlanProcess>() |
||||
.eq(ZyPlanProcess::getPlanId, plan.getId())); |
||||
if (!ObjectUtils.isEmpty(planProcessList)) { |
||||
planProcessList.forEach(e -> { |
||||
if (StringUtils.isNotBlank(e.getUserIds())) { |
||||
List<String> userList = Arrays.asList(e.getUserIds().split(",")); |
||||
memberNum.addAndGet(userList.size()); |
||||
} |
||||
}); |
||||
vo.setList(planProcessList); |
||||
} |
||||
vo.setMemberNum(memberNum.intValue()); |
||||
Groupx groupx = iGroupxService.getById(productPlan.getTeamId()); |
||||
vo.setTeamName(StringUtils.isNotBlank(groupx.getGroupName()) ? groupx.getGroupName() : ""); |
||||
vo.setDuration(productPlan.getDuration()); |
||||
return vo; |
||||
} |
||||
} |
||||
|
||||
@ -0,0 +1,115 @@ |
||||
package org.jeecg.modules.workorder.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: 2023-01-07 |
||||
* @Version: V1.0 |
||||
*/ |
||||
@Data |
||||
@Accessors(chain = true) |
||||
@EqualsAndHashCode(callSuper = false) |
||||
@ApiModel(value="work_order对象", description="工单订单完工") |
||||
public class WorkOrderVo 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; |
||||
/**所属部门*/ |
||||
@ApiModelProperty(value = "所属部门") |
||||
private String sysOrgCode; |
||||
/**工单编号*/ |
||||
@Excel(name = "工单编号", width = 15) |
||||
@ApiModelProperty(value = "工单编号") |
||||
private String productCode; |
||||
// /**订单*/
|
||||
// @Excel(name = "订单", width = 15)
|
||||
// @ApiModelProperty(value = "订单")
|
||||
// private String ordersId;
|
||||
/**原订单id*/ |
||||
@Excel(name = "订单", width = 15) |
||||
@Dict(dictTable = "zy_orders", dicText = "orders_num", dicCode = "id") |
||||
@ApiModelProperty(value = "订单") |
||||
private String ordersId; |
||||
|
||||
/**订单商品*/ |
||||
@Excel(name = "订单商品", width = 15) |
||||
@ApiModelProperty(value = "订单商品") |
||||
private String orderGoodsId; |
||||
|
||||
@ApiModelProperty(value = "订单商品名称") |
||||
private String goodsName; |
||||
|
||||
|
||||
/**商品数量*/ |
||||
@Excel(name = "商品数量", width = 15) |
||||
@ApiModelProperty(value = "商品数量") |
||||
private Integer goodsNum; |
||||
/**下单时间*/ |
||||
@Excel(name = "下单时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") |
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") |
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") |
||||
@ApiModelProperty(value = "下单时间") |
||||
private Date orderTime; |
||||
/**交货期*/ |
||||
@Excel(name = "交货期", width = 15) |
||||
@ApiModelProperty(value = "交货期") |
||||
private Integer deliveryTime; |
||||
/**工单状态*/ |
||||
@Excel(name = "工单状态", width = 15, dicCode = "work_order_status") |
||||
@Dict(dicCode = "work_order_status") |
||||
@ApiModelProperty(value = "工单状态") |
||||
private Integer workOrderStatus; |
||||
|
||||
@ApiModelProperty(value = "工单状态") |
||||
private String workOrderStatusText; |
||||
|
||||
/**企业*/ |
||||
@Excel(name = "企业", width = 15) |
||||
@ApiModelProperty(value = "企业") |
||||
private String enterprisesId; |
||||
|
||||
@ApiModelProperty(value = "客户姓名") |
||||
private String realname; |
||||
|
||||
@ApiModelProperty(value = "企业") |
||||
private String departName; |
||||
|
||||
@ApiModelProperty(value = "订单编号") |
||||
private java.lang.String ordersNum; |
||||
|
||||
} |
||||
Loading…
Reference in new issue