2022-11-08解决错误

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:[],

ant-design-vue-jeecg/src/views/sample/modules/ZyComponentSampleForm.vue

@@ -8,13 +8,13 @@
           <a-col :span="24">
             <a-form-model-item label="款式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="styleName">
               <j-dict-select-tag v-model="model.styleName" placeholder="请输入款式"
-                                 dict-code="zy_cloths_style,style_names,style_names"></j-dict-select-tag>
+                                 dict-code="zy_cloths_style,style_names,id"></j-dict-select-tag>
             </a-form-model-item>
           </a-col>
 
           <a-col :span="24">
             <a-form-model-item label="模块" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="moduleId">
-              <j-dict-select-tag type="list" v-model="model.moduleId" dictCode="zy_module_sample,module_name,id" placeholder="请选择模块" />
+              <j-dict-select-tag type="list" v-model="model.moduleId" dictCode="zy_cloths_modular,modular_name,id" placeholder="请选择模块" />
             </a-form-model-item>
           </a-col>
 
@@ -165,7 +165,7 @@
               that.confirmLoading = false;
             })
           }
-         
+
         })
       },
     }

ant-design-vue-jeecg/src/views/sample/modules/ZyModuleSampleForm.vue

@@ -7,16 +7,16 @@
           <a-col :span="24">
             <a-form-model-item label="款式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="styleNames">
               <j-dict-select-tag v-model="model.styleNames" placeholder="请输入款式"
-                                 dict-code="zy_cloths_style,style_names,style_names"></j-dict-select-tag>
+                                 dict-code="zy_cloths_style,style_names,id"></j-dict-select-tag>
             </a-form-model-item>
           </a-col>
 
-          <a-col :span="24">
-            <a-form-model-item label="成衣样板" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="clothId">
-              <j-dict-select-tag v-model="model.clothId" placeholder="请选择成衣样板"
-                                 dict-code="zy_cloth_sample,cloth_name,id"></j-dict-select-tag>
-            </a-form-model-item>
-          </a-col>
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="成衣样板" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="clothId">-->
+<!--              <j-dict-select-tag v-model="model.clothId" placeholder="请选择成衣样板"-->
+<!--                                 dict-code="zy_cloth_sample,cloth_name,id"></j-dict-select-tag>-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
 
           <a-col :span="24">
             <a-form-model-item label="模块" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="moduleName">
@@ -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;
             })
           }
-         
+
         })
       },
     }

ant-design-vue-jeecg/src/views/zyclothsample/ZyClothSampleList.vue

@@ -193,7 +193,7 @@ export default {
         {
           title: '款式',
           align: "center",
-          dataIndex: 'styleId',
+          dataIndex: 'styleId_dictText',
         },
         {
           title: '型号',

ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue

@@ -13,7 +13,7 @@
           <a-col :span="24">
             <a-form-model-item label="款式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="styleId">
               <j-dict-select-tag v-model="model.styleId" placeholder="请输入款式"
-                                 dict-code="zy_cloths_style,style_names,style_names"></j-dict-select-tag>
+                                 dict-code="zy_cloths_style,style_names,id"></j-dict-select-tag>
             </a-form-model-item>
           </a-col>
 

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;
 	/**用户*/

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;
 	/**用户*/

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)