yu
/
CostumingPlatform
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

班组管理问题处理 1.13

Browse Source
zhc4dev
zhc077 2 years ago
parent a0bc5dcac6
commit 0fa372d580
10 changed files with 426 additions and 368 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 528
      ant-design-vue-jeecg/src/views/erp/tool/ZyToolListRef.vue
  2. 7
      ant-design-vue-jeecg/src/views/team/GroupxMemberList.vue
  3. 6
      ant-design-vue-jeecg/src/views/team/StationList.vue
  4. 53
      ant-design-vue-jeecg/src/views/team/StationMachineList.vue
  5. 53
      ant-design-vue-jeecg/src/views/team/StationToolList.vue
  6. 2
      ant-design-vue-jeecg/src/views/team/modules/StationToolModal.vue
  7. 137
      ant-design-vue-jeecg/src/views/tool/tool/ZyToolListRef.vue
  8. 2
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/controller/StationToolController.java
  9. 2
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/StationTool.java
  10. 4
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/service/impl/StationServiceImpl.java

528
ant-design-vue-jeecg/src/views/erp/tool/ZyToolListRef.vue
Unescape View File

@ -1,276 +1,276 @@
<template> <!--<template>-->
<a-card :bordered="false"> <!-- <a-card :bordered="false">-->
<!-- 查询区域 --> <!-- &lt;!&ndash; 查询区域 &ndash;&gt;-->
<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 :sm="5"> <!-- <a-col :sm="5">-->
<a-form-model-item label="工具编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="id"> <!-- <a-form-model-item label="工具编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="code">-->
<a-input v-model="queryParam.id" placeholder="请输入工具编号"></a-input> <!-- <a-input v-model="queryParam.code" placeholder="请输入工具编号"></a-input>-->
</a-form-model-item> <!-- </a-form-model-item>-->
</a-col> <!-- </a-col>-->
<a-col :sm="5"> <!-- <a-col :sm="5">-->
<a-form-model-item label="工具名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name"> <!-- <a-form-model-item label="工具名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">-->
<a-input v-model="queryParam.name" placeholder="请输入工具名称"></a-input> <!-- <a-input v-model="queryParam.name" placeholder="请输入工具名称"></a-input>-->
</a-form-model-item> <!-- </a-form-model-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">-->
<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>-->
</span> <!-- </span>-->
</a-col> <!-- </a-col>-->
</a-row> <!-- </a-row>-->
</a-form> <!-- </a-form>-->
</div>
<!-- 操作按钮区域 -->
<!-- <div class="table-operator">-->
<!-- &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
<!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
<!-- </div>--> <!-- </div>-->
<!-- table区域-begin --> <!-- &lt;!&ndash; 操作按钮区域 &ndash;&gt;-->
<div> <!--&lt;!&ndash; <div class="table-operator">&ndash;&gt;-->
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> <!--&lt;!&ndash; &lt;!&ndash; 高级查询区域 &ndash;&gt;&ndash;&gt;-->
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a <!--&lt;!&ndash; <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>&ndash;&gt;-->
style="font-weight: 600">{{ selectedRowKeys.length }}</a>项 <!--&lt;!&ndash; </div>&ndash;&gt;-->
<a style="margin-left: 24px" @click="onClearSelected">清空</a>
</div> <!-- &lt;!&ndash; table区域-begin &ndash;&gt;-->
<!-- <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 <!-- <a-table-->
ref="table" <!-- ref="table"-->
size="middle" <!-- size="middle"-->
bordered <!-- bordered-->
rowKey="id" <!-- rowKey="id"-->
class="j-table-force-nowrap" <!-- class="j-table-force-nowrap"-->
:scroll="{x:true}" <!-- :scroll="{x:true}"-->
: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}"-->
:customRow="clickThenSelect" <!-- :customRow="clickThenSelect"-->
@change="handleTableChange"> <!-- @change="handleTableChange">-->
<!-- <template slot="htmlSlot" slot-scope="text">--> <!-- &lt;!&ndash; <template slot="htmlSlot" slot-scope="text">&ndash;&gt;-->
<!-- <div v-html="text"></div>--> <!-- &lt;!&ndash; <div v-html="text"></div>&ndash;&gt;-->
<!-- </template>--> <!-- &lt;!&ndash; </template>&ndash;&gt;-->
<!-- <template slot="imgSlot" slot-scope="text">--> <!-- &lt;!&ndash; <template slot="imgSlot" slot-scope="text">&ndash;&gt;-->
<!-- <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>--> <!-- &lt;!&ndash; <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>&ndash;&gt;-->
<!-- <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>--> <!-- &lt;!&ndash; <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>&ndash;&gt;-->
<!-- </template>--> <!-- &lt;!&ndash; </template>&ndash;&gt;-->
<!-- <template slot="fileSlot" slot-scope="text">--> <!-- &lt;!&ndash; <template slot="fileSlot" slot-scope="text">&ndash;&gt;-->
<!-- <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>--> <!-- &lt;!&ndash; <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>&ndash;&gt;-->
<!-- <a-button--> <!-- &lt;!&ndash; <a-button&ndash;&gt;-->
<!-- v-else--> <!-- &lt;!&ndash; v-else&ndash;&gt;-->
<!-- :ghost="true"--> <!-- &lt;!&ndash; :ghost="true"&ndash;&gt;-->
<!-- type="primary"--> <!-- &lt;!&ndash; type="primary"&ndash;&gt;-->
<!-- icon="download"--> <!-- &lt;!&ndash; icon="download"&ndash;&gt;-->
<!-- size="small"--> <!-- &lt;!&ndash; size="small"&ndash;&gt;-->
<!-- @click="downloadFile(text)">--> <!-- &lt;!&ndash; @click="downloadFile(text)">&ndash;&gt;-->
<!-- 下载--> <!-- &lt;!&ndash; 下载&ndash;&gt;-->
<!-- </a-button>--> <!-- &lt;!&ndash; </a-button>&ndash;&gt;-->
<!-- </template>--> <!-- &lt;!&ndash; </template>&ndash;&gt;-->
<!-- <span slot="action" slot-scope="text, record">--> <!-- &lt;!&ndash; <span slot="action" slot-scope="text, record">&ndash;&gt;-->
<!-- <a @click="handleEdit(record)">编辑</a>--> <!-- &lt;!&ndash; <a @click="handleEdit(record)">编辑</a>&ndash;&gt;-->
<!-- <a-divider type="vertical" />--> <!-- &lt;!&ndash; <a-divider type="vertical" />&ndash;&gt;-->
<!-- <a-dropdown>--> <!-- &lt;!&ndash; <a-dropdown>&ndash;&gt;-->
<!-- <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>--> <!-- &lt;!&ndash; <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>&ndash;&gt;-->
<!-- <a-menu slot="overlay">--> <!-- &lt;!&ndash; <a-menu slot="overlay">&ndash;&gt;-->
<!-- <a-menu-item>--> <!-- &lt;!&ndash; <a-menu-item>&ndash;&gt;-->
<!-- <a @click="handleDetail(record)">详情</a>--> <!-- &lt;!&ndash; <a @click="handleDetail(record)">详情</a>&ndash;&gt;-->
<!-- </a-menu-item>--> <!-- &lt;!&ndash; </a-menu-item>&ndash;&gt;-->
<!-- <a-menu-item>--> <!-- &lt;!&ndash; <a-menu-item>&ndash;&gt;-->
<!-- <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">--> <!-- &lt;!&ndash; <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">&ndash;&gt;-->
<!-- <a>删除</a>--> <!-- &lt;!&ndash; <a>删除</a>&ndash;&gt;-->
<!-- </a-popconfirm>--> <!-- &lt;!&ndash; </a-popconfirm>&ndash;&gt;-->
<!-- </a-menu-item>--> <!-- &lt;!&ndash; </a-menu-item>&ndash;&gt;-->
<!-- </a-menu>--> <!-- &lt;!&ndash; </a-menu>&ndash;&gt;-->
<!-- </a-dropdown>--> <!-- &lt;!&ndash; </a-dropdown>&ndash;&gt;-->
<!-- </span>--> <!-- &lt;!&ndash; </span>&ndash;&gt;-->
</a-table> <!-- </a-table>-->
</div> <!-- </div>-->
<!-- <zy-tool-modal ref="modalForm" @ok="modalFormOk"></zy-tool-modal>--> <!-- &lt;!&ndash; <zy-tool-modal ref="modalForm" @ok="modalFormOk"></zy-tool-modal>&ndash;&gt;-->
</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 {getAction} from "@api/manage"; <!--import {getAction} from "@api/manage";-->
// import ZyToolModal from './modules/ZyToolModal' <!--// import ZyToolModal from './modules/ZyToolModal'-->
export default { <!--export default {-->
name: 'ZyToolList', <!-- name: 'ZyToolList',-->
mixins: [JeecgListMixin], <!-- mixins: [JeecgListMixin],-->
components: { <!-- components: {-->
// ZyToolModal <!-- // ZyToolModal-->
}, <!-- },-->
data() { <!-- data() {-->
return { <!-- return {-->
description: 'zy_tool管理页面', <!-- description: 'zy_tool管理页面',-->
// 表头 <!-- // 表头-->
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: 'id' <!-- dataIndex: 'code'-->
}, <!-- },-->
{ <!-- {-->
title: '工具名称', <!-- title: '工具名称',-->
align: "center", <!-- align: "center",-->
dataIndex: 'name' <!-- dataIndex: 'name'-->
}, <!-- },-->
{ <!-- {-->
title: '功能', <!-- title: '功能',-->
align: "center", <!-- align: "center",-->
dataIndex: 'function' <!-- dataIndex: 'function'-->
}, <!-- },-->
{ <!-- {-->
title: '规格', <!-- title: '规格',-->
align: "center", <!-- align: "center",-->
dataIndex: 'specs' <!-- dataIndex: 'specs'-->
}, <!-- },-->
// { <!-- // {-->
// title:'适用范围', <!-- // title:'适用范围',-->
// align:"center", <!-- // align:"center",-->
// dataIndex: 'scope' <!-- // dataIndex: 'scope'-->
// }, <!-- // },-->
// { <!-- // {-->
// title:'责人工段', <!-- // title:'责人工段',-->
// align:"center", <!-- // align:"center",-->
// dataIndex: 'workshopSection' <!-- // dataIndex: 'workshopSection'-->
// }, <!-- // },-->
// { <!-- // {-->
// title:'状态 ( 0 在库、1 在用、2 遗失 、3 损坏、4 报废)', <!-- // title:'状态 ( 0 在库、1 在用、2 遗失 、3 损坏、4 报废)',-->
// align:"center", <!-- // align:"center",-->
// dataIndex: 'status' <!-- // dataIndex: 'status'-->
// }, <!-- // },-->
// { <!-- // {-->
// title:'二维码', <!-- // title:'二维码',-->
// align:"center", <!-- // align:"center",-->
// dataIndex: 'qrode' <!-- // dataIndex: 'qrode'-->
// }, <!-- // },-->
// { <!-- // {-->
// 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: "/tool/zyTool/list", <!-- list: "/tool/zyTool/list",-->
delete: "/tool/zyTool/delete", <!-- delete: "/tool/zyTool/delete",-->
deleteBatch: "/tool/zyTool/deleteBatch", <!-- deleteBatch: "/tool/zyTool/deleteBatch",-->
exportXlsUrl: "/tool/zyTool/exportXls", <!-- exportXlsUrl: "/tool/zyTool/exportXls",-->
importExcelUrl: "tool/zyTool/importExcel", <!-- importExcelUrl: "tool/zyTool/importExcel",-->
}, <!-- },-->
dictOptions:{ <!-- dictOptions:{-->
}, <!-- },-->
/* 分页参数 */ <!-- /* 分页参数 */-->
ipagination:{ <!-- ipagination:{-->
current: 1, <!-- current: 1,-->
pageSize: 5, <!-- pageSize: 5,-->
pageSizeOptions: ['5', '10', '50'], <!-- pageSizeOptions: ['5', '10', '50'],-->
showTotal: (total, range) => { <!-- showTotal: (total, range) => {-->
return range[0] + "-" + range[1] + " 共" + total + "条" <!-- return range[0] + "-" + range[1] + " 共" + total + "条"-->
}, <!-- },-->
showQuickJumper: true, <!-- showQuickJumper: true,-->
showSizeChanger: true, <!-- showSizeChanger: true,-->
total: 0 <!-- total: 0-->
}, <!-- },-->
selectedMainId:'', <!-- selectedMainId:'',-->
superFieldList:[], <!-- superFieldList:[],-->
selectedRowKeys: [], <!-- selectedRowKeys: [],-->
} <!-- }-->
}, <!-- },-->
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: {-->
clickThenSelect(record) { <!-- clickThenSelect(record) {-->
return { <!-- return {-->
on: { <!-- on: {-->
click: () => { <!-- click: () => {-->
this.onSelectChange(record.id.split(","), [record]); <!-- this.onSelectChange(record.id.split(","), [record]);-->
} <!-- }-->
} <!-- }-->
} <!-- }-->
}, <!-- },-->
onClearSelected() { <!-- onClearSelected() {-->
this.selectedRowKeys = []; <!-- this.selectedRowKeys = [];-->
this.selectionRows = []; <!-- this.selectionRows = [];-->
this.selectedMainId='' <!-- this.selectedMainId=''-->
}, <!-- },-->
onSelectChange(selectedRowKeys) { <!-- onSelectChange(selectedRowKeys) {-->
console.log('selectedRowKeys changed: ', selectedRowKeys); <!-- console.log('selectedRowKeys changed: ', selectedRowKeys);-->
this.selectedRowKeys = selectedRowKeys; <!-- this.selectedRowKeys = selectedRowKeys;-->
}, <!-- },-->
initDictConfig() { <!-- initDictConfig() {-->
}, <!-- },-->
loadData(arg) { <!-- loadData(arg) {-->
if(!this.url.list){ <!-- if(!this.url.list){-->
this.$message.error("请设置url.list属性!") <!-- this.$message.error("请设置url.list属性!")-->
return <!-- return-->
} <!-- }-->
//加载数据 若传入参数1则加载第一页的内容 <!-- //加载数据 若传入参数1则加载第一页的内容-->
if (arg === 1) { <!-- if (arg === 1) {-->
this.ipagination.current = 1; <!-- this.ipagination.current = 1;-->
} <!-- }-->
this.onClearSelected() <!-- this.onClearSelected()-->
var params = this.getQueryParams();//查询条件 <!-- var params = this.getQueryParams();//查询条件-->
this.loading = true; <!-- this.loading = true;-->
getAction(this.url.list, params).then((res) => { <!-- getAction(this.url.list, params).then((res) => {-->
if (res.success) { <!-- if (res.success) {-->
this.dataSource = res.result.records; <!-- this.dataSource = res.result.records;-->
this.ipagination.total = res.result.total; <!-- this.ipagination.total = res.result.total;-->
} <!-- }-->
if(res.code===510){ <!-- if(res.code===510){-->
this.$message.warning(res.message) <!-- this.$message.warning(res.message)-->
} <!-- }-->
this.loading = false; <!-- this.loading = false;-->
}) <!-- })-->
}, <!-- },-->
getSuperFieldList() { <!-- getSuperFieldList() {-->
let fieldList = []; <!-- let fieldList = [];-->
fieldList.push({type: 'string', value: 'name', text: '工具名称'}) <!-- fieldList.push({type: 'string', value: 'name', text: '工具名称'})-->
fieldList.push({type: 'string', value: 'nums', text: '工具编号'}) <!-- fieldList.push({type: 'string', value: 'nums', text: '工具编号'})-->
fieldList.push({type: 'string', value: 'function', text: '功能'}) <!-- fieldList.push({type: 'string', value: 'function', text: '功能'})-->
fieldList.push({type: 'string', value: 'specs', text: '规格'}) <!-- fieldList.push({type: 'string', value: 'specs', text: '规格'})-->
fieldList.push({type: 'string', value: 'scope', text: '适用范围'}) <!-- fieldList.push({type: 'string', value: 'scope', text: '适用范围'})-->
fieldList.push({type: 'string', value: 'workshopSection', 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: 'status', text: '状态 ( 0 在库、1 在用、2 遗失 、3 损坏、4 报废)'})-->
fieldList.push({type: 'string', value: 'qrode', text: '二维码'}) <!-- fieldList.push({type: 'string', value: 'qrode', text: '二维码'})-->
this.superFieldList = fieldList <!-- this.superFieldList = fieldList-->
} <!-- }-->
} <!-- }-->
} <!--}-->
</script> <!--</script>-->
<style scoped> <!--<style scoped>-->
@import '~@assets/less/common.less'; <!--@import '~@assets/less/common.less';-->
</style> <!--</style>-->

7
ant-design-vue-jeecg/src/views/team/GroupxMemberList.vue
Unescape View File

@ -60,6 +60,7 @@ export default {
}, },
data() { data() {
return { return {
// biaoTi: '',
description: '班组成员表管理管理页面', description: '班组成员表管理管理页面',
// 表头 // 表头
columns: [ columns: [
@ -89,7 +90,7 @@ export default {
dataIndex: 'workNo' dataIndex: 'workNo'
}, },
{ {
title: '成员名称', title: '成员姓名',
align: "center", align: "center",
dataIndex: 'userId' dataIndex: 'userId'
}, },
@ -144,8 +145,8 @@ export default {
this.groupxId = this.$route.query.groupxId; this.groupxId = this.$route.query.groupxId;
this.groupName = this.$route.query.groupName; this.groupName = this.$route.query.groupName;
this.departName = this.$route.query.departName; this.departName = this.$route.query.departName;
// this.biaoTi = this.$route.query.styleNames+"款式面料管理"; // this.biaoTi = this.departName + "车间" + "工位管理";
console.log("*******departName:" + this.departName) // console.log("*******departName:" + this.departName)
this.loadRouteType = true; this.loadRouteType = true;
} }
}, },

6
ant-design-vue-jeecg/src/views/team/StationList.vue
Unescape View File

@ -116,9 +116,9 @@
<a>删除</a> <a>删除</a>
</a-popconfirm> </a-popconfirm>
<a-divider type="vertical"/> <a-divider type="vertical"/>
<a @click="up(record.id)">升序</a> <a @click="up(record.id)">前移</a>
<a-divider type="vertical"/> <a-divider type="vertical"/>
<a @click="down(record.id)">降序</a> <a @click="down(record.id)">后移</a>
</span> </span>
</a-table> </a-table>
</div> </div>
@ -244,6 +244,7 @@ export default {
'stationId': record.id, 'stationId': record.id,
'stationName': record.stationName, 'stationName': record.stationName,
'stationNum': record.stationNum, 'stationNum': record.stationNum,
'departName': record.departName,
}, },
}); });
}, },
@ -254,6 +255,7 @@ export default {
'stationId': record.id, 'stationId': record.id,
'stationName': record.stationName, 'stationName': record.stationName,
'stationNum': record.stationNum, 'stationNum': record.stationNum,
'departName': record.departName,
}, },
}); });
}, },

53
ant-design-vue-jeecg/src/views/team/StationMachineList.vue
Unescape View File

@ -1,56 +1,11 @@
<template> <template>
<a-card :bordered="false"> <a-card :bordered="false">
<p style="font-size: 30px;color:#333; padding-left: 40% ">{{ biaoTi }}</p>
<!-- 查询区域 -->
<!-- <div class="table-page-search-wrapper">-->
<!-- <a-form layout="inline" @keyup.enter.native="searchQuery">-->
<!-- <a-row :gutter="24">-->
<!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
<!-- <a-form-item label="工位ID">-->
<!-- <a-input placeholder="请输入工位ID" v-model="queryParam.stationId"></a-input>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
<!-- <a-form-item label="设备ID">-->
<!-- <a-input placeholder="请输入设备ID" v-model="queryParam.machineId"></a-input>-->
<!-- </a-form-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>-->
<!-- <a @click="handleToggleSearch" style="margin-left: 8px">-->
<!-- {{ toggleSearchStatus ? '收起' : '展开' }}-->
<!-- <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
<!-- </a>-->
<!-- </span>-->
<!-- </a-col>-->
<!-- </a-row>-->
<!-- </a-form>-->
<!-- </div>-->
<!-- 操作按钮区域 --> <!-- 操作按钮区域 -->
<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 @click="zyStyleFabricHandleAdd(stationId)" type="primary" icon="plus">新增</a-button> <a-button @click="zyStyleFabricHandleAdd(stationId)" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('1')">导出</a-button> <a-button type="primary" icon="download" @click="handleExportXls('1')">导出</a-button>
<!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"-->
<!-- @change="handleImportExcel">-->
<!-- <a-button type="primary" icon="import">导入</a-button>-->
<!-- </a-upload>-->
<!-- <a-dropdown v-if="selectedRowKeys.length > 0">-->
<!-- <a-menu slot="overlay">-->
<!-- <a-menu-item key="1" @click="batchDel">-->
<!-- <a-icon type="delete"/>-->
<!-- 删除-->
<!-- </a-menu-item>-->
<!-- </a-menu>-->
<!-- <a-button style="margin-left: 8px"> 批量操作-->
<!-- <a-icon type="down"/>-->
<!-- </a-button>-->
<!-- </a-dropdown>-->
<a-button type="primary" @click="fanHui()">返回</a-button> <a-button type="primary" @click="fanHui()">返回</a-button>
</div> </div>
@ -175,6 +130,8 @@ export default {
stationId: "", stationId: "",
stationName: "", stationName: "",
stationNum: "", stationNum: "",
departName: "",
biaoTi:"",
dictOptions: {}, dictOptions: {},
// superFieldList: [], // superFieldList: [],
} }
@ -205,8 +162,8 @@ export default {
this.stationId = this.$route.query.stationId; this.stationId = this.$route.query.stationId;
this.stationName = this.$route.query.stationName; this.stationName = this.$route.query.stationName;
this.stationNum = this.$route.query.stationNum; this.stationNum = this.$route.query.stationNum;
// this.biaoTi = this.$route.query.styleNames+"款式面料管理"; this.departName = this.$route.query.departName;
// console.log("*******传递的stationId:" + this.stationId) this.biaoTi = this.departName + this.stationName + "设备管理";
this.loadRouteType = true; this.loadRouteType = true;
} }
}, },

53
ant-design-vue-jeecg/src/views/team/StationToolList.vue
Unescape View File

@ -1,43 +1,12 @@
<template> <template>
<a-card :bordered="false"> <a-card :bordered="false">
<p style="font-size: 30px;color:#333; padding-left: 40% ">{{ biaoTi }}</p>
<!-- 查询区域 -->
<!-- <div class="table-page-search-wrapper">-->
<!-- <a-form layout="inline" @keyup.enter.native="searchQuery">-->
<!-- <a-row :gutter="24">-->
<!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
<!-- <a-form-item label="工位ID">-->
<!-- <a-input placeholder="请输入工位ID" v-model="queryParam.stationId"></a-input>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
<!-- <a-form-item label="工具ID">-->
<!-- <a-input placeholder="请输入工具ID" v-model="queryParam.toolsId"></a-input>-->
<!-- </a-form-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>-->
<!-- <a @click="handleToggleSearch" style="margin-left: 8px">-->
<!-- {{ toggleSearchStatus ? '收起' : '展开' }}-->
<!-- <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
<!-- </a>-->
<!-- </span>-->
<!-- </a-col>-->
<!-- </a-row>-->
<!-- </a-form>-->
<!-- </div>-->
<!-- 操作按钮区域 --> <!-- 操作按钮区域 -->
<div class="table-operator"> <div class="table-operator">
<a-button @click="zyStyleFabricHandleAdd(stationId)" type="primary" icon="plus">新增</a-button> <a-button @click="zyStyleFabricHandleAdd(stationId)" type="primary" icon="plus">新增</a-button>
<!-- <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-button type="primary" icon="import">导入</a-button>-->
<!-- </a-upload>-->
<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-menu-item key="1" @click="batchDel">
@ -78,17 +47,6 @@
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a> <a>删除</a>
</a-popconfirm> </a-popconfirm>
<!-- <a-divider type="vertical"/>-->
<!-- <a-dropdown>-->
<!-- <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>-->
<!-- <a-menu slot="overlay">-->
<!-- <a-menu-item>-->
<!-- <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">-->
<!-- <a>删除</a>-->
<!-- </a-popconfirm>-->
<!-- </a-menu-item>-->
<!-- </a-menu>-->
<!-- </a-dropdown>-->
</span> </span>
</a-table> </a-table>
@ -116,6 +74,7 @@ export default {
}, },
data() { data() {
return { return {
biaoTi: '',
description: '工位工具管理页面', description: '工位工具管理页面',
// 表头 // 表头
columns: [ columns: [
@ -147,7 +106,7 @@ export default {
{ {
title: '工具编码', title: '工具编码',
align: "center", align: "center",
dataIndex: 'nums' dataIndex: 'code'
}, },
{ {
title: '工具名称', title: '工具名称',
@ -173,6 +132,7 @@ export default {
stationId: "", stationId: "",
stationName: "", stationName: "",
stationNum: "", stationNum: "",
departName: "",
dictOptions: {}, dictOptions: {},
// superFieldList: [], // superFieldList: [],
} }
@ -203,7 +163,8 @@ export default {
this.stationId = this.$route.query.stationId; this.stationId = this.$route.query.stationId;
this.stationName = this.$route.query.stationName; this.stationName = this.$route.query.stationName;
this.stationNum = this.$route.query.stationNum; this.stationNum = this.$route.query.stationNum;
// this.biaoTi = this.$route.query.styleNames+"款式面料管理"; this.departName = this.$route.query.departName;
this.biaoTi = this.departName + this.stationName + "工位管理";
// console.log("*******传递的stationId:" + this.stationId) // console.log("*******传递的stationId:" + this.stationId)
this.loadRouteType = true; this.loadRouteType = true;
} }

2
ant-design-vue-jeecg/src/views/team/modules/StationToolModal.vue
Unescape View File

@ -23,7 +23,7 @@
<script> <script>
import {httpAction} from '@/api/manage' import {httpAction} from '@/api/manage'
import moment from "moment" import moment from "moment"
import ZyToolListRef from "@views/erp/tool/ZyToolListRef" import ZyToolListRef from "@views/tool/tool/ZyToolListRef"
export default { export default {
name: "StationToolModal", name: "StationToolModal",

137
ant-design-vue-jeecg/src/views/tool/tool/ZyToolListRef.vue
Unescape View File

@ -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>

2
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/controller/StationToolController.java
Unescape View File

@ -76,7 +76,7 @@ public class StationToolController extends JeecgController<StationTool, IStation
if (!ObjectUtils.isEmpty(records)) { if (!ObjectUtils.isEmpty(records)) {
records.forEach(e -> { records.forEach(e -> {
ZyTool zyTool = iZyToolService.getById(e.getToolsId()); ZyTool zyTool = iZyToolService.getById(e.getToolsId());
// e.setNums(StringUtils.isNotBlank(zyTool.getNums()) ? zyTool.getNums() : ""); e.setCode(StringUtils.isNotBlank(zyTool.getCode()) ? zyTool.getCode() : "");
}); });
} }
return Result.OK(pageList); return Result.OK(pageList);

2
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/entity/StationTool.java
Unescape View File

@ -51,7 +51,7 @@ public class StationTool {
@TableField(exist = false) @TableField(exist = false)
@ApiModelProperty(value = "工具编码") @ApiModelProperty(value = "工具编码")
private String nums; private String code;
/** /**
* 创建日期 * 创建日期
*/ */

4
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/service/impl/StationServiceImpl.java
Unescape View File

@ -40,7 +40,7 @@ public class StationServiceImpl extends ServiceImpl<StationMapper, Station> impl
} }
@Override @Override
public void up(String id) { public void down(String id) {
Station entity = this.getById(id); Station entity = this.getById(id);
if (ObjectUtils.isEmpty(entity)) { if (ObjectUtils.isEmpty(entity)) {
throw new JeecgBootException(id + "不存在"); throw new JeecgBootException(id + "不存在");
@ -52,7 +52,7 @@ public class StationServiceImpl extends ServiceImpl<StationMapper, Station> impl
} }
@Override @Override
public void down(String id) { public void up(String id) {
Station entity = this.getById(id); Station entity = this.getById(id);
if (ObjectUtils.isEmpty(entity)) { if (ObjectUtils.isEmpty(entity)) {
throw new JeecgBootException(id + "不存在"); throw new JeecgBootException(id + "不存在");

Write Preview
Loading…
Cancel
Save