From 31bc1b9b9d3b621e007c40462a2c73a41a566962 Mon Sep 17 00:00:00 2001 From: YTD <1158283261@qq.com> Date: Tue, 8 Nov 2022 11:09:30 +0800 Subject: [PATCH] =?UTF-8?q?2022-11-08=E8=A7=A3=E5=86=B3=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/sample/ZyComponentSampleList.vue | 4 ++-- .../sample/modules/ZyComponentSampleForm.vue | 6 +++--- .../sample/modules/ZyModuleSampleForm.vue | 18 ++++++++++-------- .../views/zyclothsample/ZyClothSampleList.vue | 2 +- .../modules/ZyClothSampleForm.vue | 2 +- .../sample/entity/ZyComponentSample.java | 5 +++-- .../modules/sample/entity/ZyModuleSample.java | 4 ++-- .../zyclothsample/entity/ZyClothSample.java | 2 +- 8 files changed, 23 insertions(+), 20 deletions(-) diff --git a/ant-design-vue-jeecg/src/views/sample/ZyComponentSampleList.vue b/ant-design-vue-jeecg/src/views/sample/ZyComponentSampleList.vue index c5507bc0..0c3a1231 100644 --- a/ant-design-vue-jeecg/src/views/sample/ZyComponentSampleList.vue +++ b/ant-design-vue-jeecg/src/views/sample/ZyComponentSampleList.vue @@ -157,7 +157,7 @@ { title:'款式名称', align:"center", - dataIndex: 'styleName' + dataIndex: 'styleName_dictText' }, { title:'部件名称', @@ -210,7 +210,7 @@ deleteBatch: "/sample/zyComponentSample/deleteBatch", exportXlsUrl: "/sample/zyComponentSample/exportXls", importExcelUrl: "sample/zyComponentSample/importExcel", - + }, dictOptions:{}, superFieldList:[], diff --git a/ant-design-vue-jeecg/src/views/sample/modules/ZyComponentSampleForm.vue b/ant-design-vue-jeecg/src/views/sample/modules/ZyComponentSampleForm.vue index 8c6c6875..fa14f94b 100644 --- a/ant-design-vue-jeecg/src/views/sample/modules/ZyComponentSampleForm.vue +++ b/ant-design-vue-jeecg/src/views/sample/modules/ZyComponentSampleForm.vue @@ -8,13 +8,13 @@ + dict-code="zy_cloths_style,style_names,id"> - + @@ -165,7 +165,7 @@ that.confirmLoading = false; }) } - + }) }, } diff --git a/ant-design-vue-jeecg/src/views/sample/modules/ZyModuleSampleForm.vue b/ant-design-vue-jeecg/src/views/sample/modules/ZyModuleSampleForm.vue index 5b561a89..b37fc7a1 100644 --- a/ant-design-vue-jeecg/src/views/sample/modules/ZyModuleSampleForm.vue +++ b/ant-design-vue-jeecg/src/views/sample/modules/ZyModuleSampleForm.vue @@ -7,16 +7,16 @@ + dict-code="zy_cloths_style,style_names,id"> - - - - - + + + + + + @@ -87,6 +87,7 @@ data () { return { model:{ + clothId:'', }, labelCol: { xs: { span: 24 }, @@ -131,6 +132,7 @@ }, created () { //备份model原始值 + this.model.clothId=this.$route.query.id; this.modelDefault = JSON.parse(JSON.stringify(this.model)); }, methods: { @@ -167,7 +169,7 @@ that.confirmLoading = false; }) } - + }) }, } diff --git a/ant-design-vue-jeecg/src/views/zyclothsample/ZyClothSampleList.vue b/ant-design-vue-jeecg/src/views/zyclothsample/ZyClothSampleList.vue index 9ea54f3f..57d22e83 100644 --- a/ant-design-vue-jeecg/src/views/zyclothsample/ZyClothSampleList.vue +++ b/ant-design-vue-jeecg/src/views/zyclothsample/ZyClothSampleList.vue @@ -193,7 +193,7 @@ export default { { title: '款式', align: "center", - dataIndex: 'styleId', + dataIndex: 'styleId_dictText', }, { title: '型号', diff --git a/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue b/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue index 9a619203..935aac1b 100644 --- a/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue +++ b/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue @@ -13,7 +13,7 @@ + dict-code="zy_cloths_style,style_names,id"> diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/sample/entity/ZyComponentSample.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/sample/entity/ZyComponentSample.java index e309078b..0313edd1 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/sample/entity/ZyComponentSample.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/sample/entity/ZyComponentSample.java @@ -42,6 +42,7 @@ public class ZyComponentSample implements Serializable { /**款式名称*/ @Excel(name = "款式名称", width = 15) @ApiModelProperty(value = "款式名称") + @Dict(dicCode = "id",dictTable = "zy_cloths_style",dicText = "style_names") private String styleName; /**部件名称*/ @Excel(name = "部件名称", width = 15) @@ -57,8 +58,8 @@ public class ZyComponentSample implements Serializable { @ApiModelProperty(value = "图片") private String url; /**模块*/ - @Excel(name = "模块", width = 15, dictTable = "zy_module_sample", dicText = "module_name", dicCode = "id") - @Dict(dictTable = "zy_module_sample", dicText = "module_name", dicCode = "id") + @Excel(name = "模块", width = 15) + @Dict(dictTable = "zy_cloths_modular", dicText = "modular_name", dicCode = "id") @ApiModelProperty(value = "模块") private String moduleId; /**用户*/ diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/sample/entity/ZyModuleSample.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/sample/entity/ZyModuleSample.java index 42bf1378..187b99f6 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/sample/entity/ZyModuleSample.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/sample/entity/ZyModuleSample.java @@ -47,7 +47,7 @@ public class ZyModuleSample implements Serializable { /**款式名称*/ @Excel(name = "款式名称", width = 15) @ApiModelProperty(value = "款式名称") - //@Dict(dicCode = "id",dictTable = "zy_cloths_modular",dicText = "modular_name") + @Dict(dicCode = "id",dictTable = "zy_cloths_style",dicText = "style_names") private String styleNames; /**描述*/ @Excel(name = "描述", width = 15) @@ -59,7 +59,7 @@ public class ZyModuleSample implements Serializable { private String url; /**成衣*/ @Excel(name = "成衣", width = 15, dictTable = "zy_cloth_sample", dicText = "cloth_name", dicCode = "id") - @Dict(dictTable = "zy_cloth_sample", dicText = "cloth_name", dicCode = "id") + @Dict(dictTable = "zy_cloth_sample", dicText = "descr", dicCode = "id") @ApiModelProperty(value = "成衣") private String clothId; /**用户*/ diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/entity/ZyClothSample.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/entity/ZyClothSample.java index 778b5474..fad0c2f7 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/entity/ZyClothSample.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsample/entity/ZyClothSample.java @@ -47,7 +47,7 @@ public class ZyClothSample implements Serializable { */ @Excel(name = "款式", width = 15) @ApiModelProperty(value = "款式") - //@Dict(dicCode = "id",dictTable = "zy_cloths_style",dicText = "style_names") + @Dict(dicCode = "id",dictTable = "zy_cloths_style",dicText = "style_names") private String styleId; /**型号*/ @Excel(name = "型号", width = 15)