diff --git a/ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessDataList.vue b/ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessDataList.vue index 5f1a6293..8e00eb7a 100644 --- a/ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessDataList.vue +++ b/ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessDataList.vue @@ -10,36 +10,36 @@ -
- 新增 - 导出 - - - - - - - - - - - 删除 - - - 批量操作 - - - -
+ + + + + + + + + + + + + + + + + + + + + +
-
- 已选择 {{ selectedRowKeys.length }}项 - 清空 -
+ + + + + 编辑--> - + 删除 - - 制定计划详情 + +
- + @@ -85,6 +85,8 @@ import '@/assets/less/TableExpand.less' import {mixinDevice} from '@/utils/mixin' import {JeecgListMixin} from '@/mixins/JeecgListMixin' import ZyPlanProcessModal from './modules/ZyPlanProcessModal2' +import {getAction} from "@api/manage"; +import {filterObj} from "@/utils/util"; export default { name: 'ZyPlanProcessList', @@ -94,7 +96,7 @@ export default { }, data() { return { - description: '计划工序制定数据列表', + description: '生产计划工序管理页面', // 表头 columns: [ { @@ -108,34 +110,48 @@ export default { } }, { - title: '生产计划id', + title: '计划id', align: "center", dataIndex: 'planId' }, { - title: '车间名称', + title: '工单编号', align: "center", - dataIndex: 'teamName' + dataIndex: 'workOrderId' }, { - title: '工单编号', + title: '产品id', + align: "center", + dataIndex: 'productId' + }, { + title: '车间', align: "center", - dataIndex: 'productCode' + dataIndex: 'departId' }, { - title: '产品名称', + title: '工序id', align: "center", - dataIndex: 'productCode2' + dataIndex: 'productProcessId' }, { - title:'工序名称', - align:"center", - dataIndex: 'processId_dictText' + title: '工位list', + align: "center", + dataIndex: 'stationList.stationName' + }, + { + title: '工具id列表', + align: "center", + dataIndex: 'toolsIds' + }, + { + title: '工序id列表', + align: "center", + dataIndex: 'processIds' }, { - title:'序号', - align:"center", - dataIndex: 'number' + title: '成员id列表', + align: "center", + dataIndex: 'userIds' }, { title: '操作', @@ -147,20 +163,25 @@ export default { } ], url: { - list: "/org.jeecg.modules.productplan/zyPlanProcess/list", - productPlanlist: "/org.jeecg.modules.productplan/zyProductPlan/list", + list: "/org.jeecg.modules.productplan/zyPlanProcess/getProcessDatalist", + // 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", - + // deleteBatch: "/org.jeecg.modules.productplan/zyPlanProcess/deleteBatch", + // exportXlsUrl: "/org.jeecg.modules.productplan/zyPlanProcess/exportXls", + // importExcelUrl: "org.jeecg.modules.productplan/zyPlanProcess/importExcel", }, + loadRouteType: false, + planId: "", dictOptions: {}, superFieldList: [], } }, + // mounted() { + // this.loadData() + // }, created() { this.getSuperFieldList(); + // this.loadParameter(); }, computed: { importExcelUrl: function () { @@ -168,8 +189,66 @@ export default { }, }, methods: { - initDictConfig() { + // valueChange(value) { + // if (value) this.loadData() + // }, + //加载传递参数 + loadParameter() { + if (this.loadRouteType === false) { + this.planId = this.$route.query.planId; + // this.biaoTi = this.$route.query.styleNames+"款式面料管理"; + console.log("*******传递的planId:" + this.planId) + this.loadRouteType = true; + } + }, + loadData(arg) { + if (!this.url.list) { + this.$message.error("请设置url.list属性!") + return + } + //加载数据 若传入参数1则加载第一页的内容 + if (arg === 1) { + this.ipagination.current = 1; + } + this.loadParameter(); + var params = this.getQueryParams();//查询条件 + this.loading = true; + console.log("----------------the params:", params); + getAction(this.url.list, params).then((res) => { + if (res.success) { + this.dataSource = res.result.records || res.result; + if (res.result.total) { + this.ipagination.total = res.result.total; + } else { + this.ipagination.total = 0; + } + } else { + this.$message.warning(res.message) + } + }).finally(() => { + // this.dataSource.forEach(item => { + // item['stationName'] = this.stationName; + // item['stationNum'] = this.stationNum; + // }) + this.loading = false + }) + }, + getQueryParams() { + //获取查询条件 + let sqp = {} + if (this.superQueryParams) { + sqp['superQueryParams'] = encodeURI(this.superQueryParams) + sqp['superQueryMatchType'] = this.superQueryMatchType + } + var param = Object.assign(sqp, this.queryParam, this.isorter, this.filters); + param.field = this.getQueryField(); + param.pageNo = this.ipagination.current; + param.pageSize = this.ipagination.pageSize; + param.planId = this.planId; + return filterObj(param); }, + // initDictConfig() { + // }, getSuperFieldList() { let fieldList = []; fieldList.push({type: 'string', value: 'planId', text: '生产计划id', dictCode: ''}) @@ -180,16 +259,17 @@ export default { 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, - // }, - }); - }, + // jumpPage1(record) { + // this.$router.push({ + // // path: '/productplan/ZyProductPlanList', + // path: '/productplan/ZyPlanProcessDataList', + // + // // query: { // 路由携带参数 + // // 'stationId': record.id, + // // 'stationName': record.stationName, + // // }, + // }); + // }, // pf(record) { // this.$router.push({ // path: '/productplan/ZyPlanProcessAddList', @@ -197,17 +277,17 @@ export default { // } // }); - // 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) - // } - // }); + // 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) + // } + // }); // }, } } diff --git a/ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessList.vue b/ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessList.vue index f63c30b1..18569ec4 100644 --- a/ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessList.vue +++ b/ant-design-vue-jeecg/src/views/productplan/ZyPlanProcessList.vue @@ -181,12 +181,11 @@ export default { }, jumpPage1(record) { this.$router.push({ - path: '/productplan/ZyProductPlanList', - - // query: { // 路由携带参数 - // 'stationId': record.id, - // 'stationName': record.stationName, - // }, + path: '/productplan/ZyPlanProcessDataList', + query: { // 路由携带参数 + 'planId': record.planId, + // 'stationName': record.stationName, + }, }); }, // pf(record) { diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/controller/ZyPlanProcessController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/controller/ZyPlanProcessController.java index 1340be1d..66741e14 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/controller/ZyPlanProcessController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/controller/ZyPlanProcessController.java @@ -3,6 +3,7 @@ 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.core.metadata.PageList; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -68,9 +69,10 @@ public class ZyPlanProcessController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(zyPlanProcess, req.getParameterMap()); Page page = new Page(pageNo, pageSize); -// IPage pageList = zyPlanProcessService.getProcessDatalist(page, queryWrapper); - List pageList = zyPlanProcessService.getProcessDatalist(zyPlanProcess); - return Result.OK(pageList); + List processDatalist = zyPlanProcessService.getProcessDatalist(zyPlanProcess); + PageList processDataVos = new PageList<>(processDatalist, processDatalist.size()); + + return Result.OK(processDatalist); } /** diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java index 5af4f5c4..e1295ef4 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java @@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.LinkedList; import java.util.List; import java.util.Optional; @@ -47,9 +48,10 @@ public class ZyPlanProcessServiceImpl extends ServiceImpl result = new LinkedList<>(); //根据产品id获取产品工序列表 - List productProcessesList = iZyProductProcessService.list(new LambdaQueryWrapper().eq(ZyProductProcess::getProductId, "产品id")); +// List productProcessesList = iZyProductProcessService.list(new LambdaQueryWrapper().eq(ZyProductProcess::getProductId, "产品id")); + List productProcessesList = iZyProductProcessService.list(new LambdaQueryWrapper().eq(ZyProductProcess::getProductId, "1")); Optional.ofNullable(productProcessesList).orElse(new ArrayList<>()).forEach(e -> { ProcessDataVo vo = new ProcessDataVo(); vo.setProductProcessId(e.getProcessId()); @@ -57,8 +59,9 @@ public class ZyPlanProcessServiceImpl extends ServiceImpl().eq(Station::getDepartId, departId))); + result.add(vo); }); - return null; + return result; } }