From 9f292ba3d97960fb02bbe94a8e276743b44021b2 Mon Sep 17 00:00:00 2001 From: mors <3067699729@qq.com> Date: Tue, 14 Feb 2023 17:32:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=A8=A1=E5=9D=97=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productModule/ProductModuleList.vue | 65 ++++++++++++++----- .../src/views/zyWorkProduct/ZyProductList.vue | 16 +++-- .../controller/ZyClothsTypeController.java | 12 ++++ .../productModule/entity/ProductModule.java | 4 +- 4 files changed, 71 insertions(+), 26 deletions(-) diff --git a/ant-design-vue-jeecg/src/views/product/productModule/ProductModuleList.vue b/ant-design-vue-jeecg/src/views/product/productModule/ProductModuleList.vue index fbce5ab8..a8f1e04f 100644 --- a/ant-design-vue-jeecg/src/views/product/productModule/ProductModuleList.vue +++ b/ant-design-vue-jeecg/src/views/product/productModule/ProductModuleList.vue @@ -1,9 +1,29 @@ - 编辑 + 详情 @@ -100,6 +114,8 @@ data () { return { description: '工单管理下面的产品模块管理页面', + biaoTi:'', + loadRouteType: false, // 表头 columns: [ { @@ -118,12 +134,13 @@ dataIndex: 'productId' }, { - title:'款式模块id', + // title:'款式模块id', + title:'模块编号', align:"center", dataIndex: 'styleModuleId' }, { - title:'模块id', + title:'模块名称', align:"center", dataIndex: 'moduleId' }, @@ -159,7 +176,8 @@ } }, created() { - this.getSuperFieldList(); + // this.getSuperFieldList(); + this.loadParameter(); }, computed: { importExcelUrl: function(){ @@ -167,6 +185,19 @@ }, }, methods: { + fanHui(){ + this.$router.push({ + /*返回产品*/ + path: '/WorkProduct',/*在引号中填写返回vue*/ + }); + }, + loadParameter() { + if (this.loadRouteType === false) { + this.biaoTi=this.$route.query.productName+" 产品模块管理"; + console.log("***********",this.$route.query.productName) + this.loadRouteType = true; + } + }, initDictConfig(){ }, getSuperFieldList(){ diff --git a/ant-design-vue-jeecg/src/views/zyWorkProduct/ZyProductList.vue b/ant-design-vue-jeecg/src/views/zyWorkProduct/ZyProductList.vue index 8a3ad848..788fc37b 100644 --- a/ant-design-vue-jeecg/src/views/zyWorkProduct/ZyProductList.vue +++ b/ant-design-vue-jeecg/src/views/zyWorkProduct/ZyProductList.vue @@ -121,7 +121,9 @@ 工序 - 模块 + + + 模块 面料 @@ -335,7 +337,7 @@ deleteBatch: "/zyproduct/zyProduct/deleteBatch", exportXlsUrl: "/zyproduct/zyProduct/exportXls", importExcelUrl: "zyproduct/zyProduct/importExcel", - + }, dictOptions:{}, superFieldList:[], @@ -366,14 +368,14 @@ }); }, //跳转-模块 - jumpModules(record) - { + jumpModules(record) { this.$router.push({ - path: '/src/views/product/productModule/ProductModuleList', - // query: { // 路由携带参数 + path: '/product/productModule/ProductModuleList', + query: { // 路由携带参数 + 'productName': record.productName, // 'pid': record.id, // 'tname': record.name, - // } + } }); }, //跳转-面料 diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsTypeController.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsTypeController.java index 1f798db9..bdb48468 100644 --- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsTypeController.java +++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyClothsTypeController.java @@ -72,6 +72,18 @@ public class ZyClothsTypeController extends JeecgController getTypeNameById(@RequestParam(name = "id", required = true)String id){ + ZyClothsType zyClothsType = zyClothsTypeService.getById(id); + return Result.OK(zyClothsType.getTypeName()); + } + /** * 添加 * diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/productModule/entity/ProductModule.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/productModule/entity/ProductModule.java index 9b01717d..534f93ce 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/productModule/entity/ProductModule.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/productModule/entity/ProductModule.java @@ -63,9 +63,9 @@ public class ProductModule implements Serializable { @ApiModelProperty(value = "款式模块id") private String styleModuleId; /**模块id*/ - @Excel(name = "模块id", width = 15) + @Excel(name = "模块名称", width = 15) @Dict(dictTable = "zy_cloths_modular ", dicText = "modular_name", dicCode = "id") - @ApiModelProperty(value = "模块id") + @ApiModelProperty(value = "模块名称") private String moduleId; /**部位*/ @Excel(name = "部位", width = 15)