From 2492a1935574c07a0cceaff200e4268a5a51b3d9 Mon Sep 17 00:00:00 2001 From: shenyuan Date: Sat, 10 Dec 2022 16:49:03 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=88=B6=E8=A1=A3=E9=83=A8=E4=BB=B6?= =?UTF-8?q?=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../process/modules/ZyClothsComponentForm.vue | 82 ++++++++++++++----- 1 file changed, 62 insertions(+), 20 deletions(-) diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue index 5ae1cd1a..4d2a95b8 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue @@ -3,46 +3,88 @@ - + - - - - - - + + + - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + @@ -84,7 +126,7 @@ }, labelCol: { xs: { span: 24 }, - sm: { span: 5 }, + sm: { span: 4 }, }, wrapperCol: { xs: { span: 24 }, From e9dd035b758584fae994fffdee044bba503ae944 Mon Sep 17 00:00:00 2001 From: shenyuan Date: Sat, 10 Dec 2022 16:56:59 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/process/modules/ZyClothsComponentForm.vue | 7 ++++++- .../src/views/process/modules/ZyClothsModularForm.vue | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue index 4d2a95b8..dc5f966a 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentForm.vue @@ -206,4 +206,9 @@ }, } } - \ No newline at end of file + + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularForm.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularForm.vue index 6a197d96..e6699a8e 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularForm.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularForm.vue @@ -183,4 +183,9 @@ }, } } - \ No newline at end of file + + \ No newline at end of file From 50a690b3b8d60746e83592f6045a8e052aba1c6e Mon Sep 17 00:00:00 2001 From: shenyuan Date: Sat, 10 Dec 2022 17:11:15 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=88=B6=E8=A1=A3=E9=83=A8=E4=BB=B6?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/process/ZyClothsComponentList.vue | 9 +- .../modules/ZyClothsComponentListDetail.vue | 125 ++++++++++++++++++ 2 files changed, 132 insertions(+), 2 deletions(-) create mode 100644 ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentListDetail.vue diff --git a/ant-design-vue-jeecg/src/views/process/ZyClothsComponentList.vue b/ant-design-vue-jeecg/src/views/process/ZyClothsComponentList.vue index 711921fa..67c2036d 100644 --- a/ant-design-vue-jeecg/src/views/process/ZyClothsComponentList.vue +++ b/ant-design-vue-jeecg/src/views/process/ZyClothsComponentList.vue @@ -100,6 +100,7 @@ + @@ -111,14 +112,15 @@ import ZyClothsComponentModal from './modules/ZyClothsComponentModal' import ZyProcessComponentList from "@views/process/ZyProcessComponentList" import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'; - +import ZyClothsComponentListDetail from './modules/ZyClothsComponentListDetail' export default { name: 'ZyClothsComponentList', mixins:[JeecgListMixin, mixinDevice], components: { ZyProcessComponentList, - ZyClothsComponentModal + ZyClothsComponentModal, + ZyClothsComponentListDetail }, data () { return { @@ -239,6 +241,9 @@ fieldList.push({type:'string',value:'modularId',text:'模块',dictCode:'zy_cloths_modular,modular_name,id'}) fieldList.push({type:'string',value:'enterpriseId',text:'企业',dictCode:''}) this.superFieldList = fieldList + }, + handleDetail(record){ + this.$refs.ZyClothsComponentListDetail.showModal(record) } } } diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentListDetail.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentListDetail.vue new file mode 100644 index 00000000..fc44ff34 --- /dev/null +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentListDetail.vue @@ -0,0 +1,125 @@ + + + \ No newline at end of file From 13d71039f3639b8a1b821cab031086fa70ab7434 Mon Sep 17 00:00:00 2001 From: shenyuan Date: Sat, 10 Dec 2022 17:13:55 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=88=B6=E8=A1=A3=E9=83=A8=E4=BB=B6?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/ZyClothsComponentListDetail.vue | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentListDetail.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentListDetail.vue index fc44ff34..a10bb3fd 100644 --- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentListDetail.vue +++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentListDetail.vue @@ -69,20 +69,13 @@ partsName:'是', createTime:'2022-12-06 19:00:07' }, - { - key: '2', - nums:'aaff', - modularId_dictText:'1-3合后育克', - partsName:'否', - createTime:'2022-12-06 18:30:49' - }, - { - key: '3', - nums:'test01', - modularId_dictText:'1-3合后育克', - partsName:'否', - createTime:'2022-12-06 09:07:05' - } + // { + // key: '2', + // nums:'aaff', + // modularId_dictText:'1-3合后育克', + // partsName:'否', + // createTime:'2022-12-06 18:30:49' + // } ] export default { name: 'ZyClothsComponentListDetail',//此处填组件名称 From 31e10f04f99f96c7858d49519570eec5835df4e7 Mon Sep 17 00:00:00 2001 From: zhc077 <565291854> Date: Sat, 10 Dec 2022 17:56:55 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=95=86=E5=93=81=E8=A1=A8=20=E5=95=86?= =?UTF-8?q?=E5=93=81=E7=BC=96=E5=8F=B7=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/gdmlb/ZyProductionTypesettingList.vue | 2 +- .../src/views/gdmlb/modules/ZyProductionTypesettingForm.vue | 4 ++-- ant-design-vue-jeecg/src/views/team/GroupxMemberList.vue | 3 ++- ant-design-vue-jeecg/src/views/team/StationMachineList.vue | 2 +- ant-design-vue-jeecg/src/views/team/StationToolList.vue | 2 +- .../modules/demo/gdmlb/entity/ZyProductionTypesetting.java | 4 ++-- .../main/java/org/jeecg/modules/demo/mall/entity/ZyGoods.java | 2 +- .../modules/zyworkorder/controller/ZyWorkOrderController.java | 2 +- 8 files changed, 11 insertions(+), 10 deletions(-) diff --git a/ant-design-vue-jeecg/src/views/gdmlb/ZyProductionTypesettingList.vue b/ant-design-vue-jeecg/src/views/gdmlb/ZyProductionTypesettingList.vue index d72b387d..4ccb6b98 100644 --- a/ant-design-vue-jeecg/src/views/gdmlb/ZyProductionTypesettingList.vue +++ b/ant-design-vue-jeecg/src/views/gdmlb/ZyProductionTypesettingList.vue @@ -257,7 +257,7 @@ getSuperFieldList(){ let fieldList=[]; fieldList.push({type:'string',value:'workOrderId',text:'工单编号',dictCode:'zy_work_order,code,id'}) - fieldList.push({type:'string',value:'goodsId',text:'商品',dictCode:'zy_goods,goods_num,id'}) + fieldList.push({type:'string',value:'goodsId',text:'商品',dictCode:'zy_goods,goods_code,id'}) fieldList.push({type:'string',value:'workshopId',text:'车间',dictCode:''}) fieldList.push({type:'string',value:'factory',text:'工厂',dictCode:''}) fieldList.push({type:'string',value:'teamId',text:'班组',dictCode:''}) diff --git a/ant-design-vue-jeecg/src/views/gdmlb/modules/ZyProductionTypesettingForm.vue b/ant-design-vue-jeecg/src/views/gdmlb/modules/ZyProductionTypesettingForm.vue index aee7bfc8..3cda2d2f 100644 --- a/ant-design-vue-jeecg/src/views/gdmlb/modules/ZyProductionTypesettingForm.vue +++ b/ant-design-vue-jeecg/src/views/gdmlb/modules/ZyProductionTypesettingForm.vue @@ -10,7 +10,7 @@ - + @@ -151,7 +151,7 @@ that.confirmLoading = false; }) } - + }) }, } diff --git a/ant-design-vue-jeecg/src/views/team/GroupxMemberList.vue b/ant-design-vue-jeecg/src/views/team/GroupxMemberList.vue index 68b1a873..b2a0f564 100644 --- a/ant-design-vue-jeecg/src/views/team/GroupxMemberList.vue +++ b/ant-design-vue-jeecg/src/views/team/GroupxMemberList.vue @@ -178,7 +178,8 @@ export default { methods: { fanHui() { this.$router.push({ - path: '/src/views/team/GroupxList', + //这里的路径是要返回的对应菜单的路由配置地址 + path: '/team/GroupxList', }); }, // initDictConfig() { diff --git a/ant-design-vue-jeecg/src/views/team/StationMachineList.vue b/ant-design-vue-jeecg/src/views/team/StationMachineList.vue index 71ed4218..dae8deff 100644 --- a/ant-design-vue-jeecg/src/views/team/StationMachineList.vue +++ b/ant-design-vue-jeecg/src/views/team/StationMachineList.vue @@ -179,7 +179,7 @@ export default { methods: { fanHui() { this.$router.push({ - path: '/src/views/team/StationList', + path: '/team/StationList', // path: '/src/views/zyclothsstyle/ZyClothsStyleList', }); }, diff --git a/ant-design-vue-jeecg/src/views/team/StationToolList.vue b/ant-design-vue-jeecg/src/views/team/StationToolList.vue index 0ab1b756..0162e70f 100644 --- a/ant-design-vue-jeecg/src/views/team/StationToolList.vue +++ b/ant-design-vue-jeecg/src/views/team/StationToolList.vue @@ -177,7 +177,7 @@ export default { methods: { fanHui() { this.$router.push({ - path: '/src/views/team/StationList', + path: '/team/StationList', // path: '/src/views/zyclothsstyle/ZyClothsStyleList', }); }, diff --git a/jeecg-boot/jeecg-boot-module-gdnk/src/main/java/org/jeecg/modules/demo/gdmlb/entity/ZyProductionTypesetting.java b/jeecg-boot/jeecg-boot-module-gdnk/src/main/java/org/jeecg/modules/demo/gdmlb/entity/ZyProductionTypesetting.java index cab4b708..605d90de 100644 --- a/jeecg-boot/jeecg-boot-module-gdnk/src/main/java/org/jeecg/modules/demo/gdmlb/entity/ZyProductionTypesetting.java +++ b/jeecg-boot/jeecg-boot-module-gdnk/src/main/java/org/jeecg/modules/demo/gdmlb/entity/ZyProductionTypesetting.java @@ -40,8 +40,8 @@ public class ZyProductionTypesetting implements Serializable { @ApiModelProperty(value = "工单编号") private String workOrderId; /**商品*/ - @Excel(name = "商品", width = 15, dictTable = "zy_goods", dicText = "goods_num", dicCode = "id") - @Dict(dictTable = "zy_goods", dicText = "goods_num", dicCode = "id") + @Excel(name = "商品", width = 15, dictTable = "zy_goods", dicText = "goods_code", dicCode = "id") + @Dict(dictTable = "zy_goods", dicText = "goods_code", dicCode = "id") @ApiModelProperty(value = "商品") private String goodsId; /**车间*/ diff --git a/jeecg-boot/jeecg-boot-module-mall/src/main/java/org/jeecg/modules/demo/mall/entity/ZyGoods.java b/jeecg-boot/jeecg-boot-module-mall/src/main/java/org/jeecg/modules/demo/mall/entity/ZyGoods.java index e70574bb..46598b32 100644 --- a/jeecg-boot/jeecg-boot-module-mall/src/main/java/org/jeecg/modules/demo/mall/entity/ZyGoods.java +++ b/jeecg-boot/jeecg-boot-module-mall/src/main/java/org/jeecg/modules/demo/mall/entity/ZyGoods.java @@ -32,7 +32,7 @@ public class ZyGoods implements Serializable { /**商品编号*/ @Excel(name = "商品编号", width = 15) @ApiModelProperty(value = "商品编号") - private java.lang.String goodsNum; + private java.lang.String goodsCode; /**商品来源*/ @Excel(name = "商品来源", width = 15) @ApiModelProperty(value = "商品来源") diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyworkorder/controller/ZyWorkOrderController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyworkorder/controller/ZyWorkOrderController.java index 5b8c18fb..e236aca1 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyworkorder/controller/ZyWorkOrderController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyworkorder/controller/ZyWorkOrderController.java @@ -107,7 +107,7 @@ public class ZyWorkOrderController extends JeecgController