From 096a8f739c706ce6073be48cf8ca0f17d43a8524 Mon Sep 17 00:00:00 2001
From: YTD <1158283261@qq.com>
Date: Sat, 5 Nov 2022 11:03:15 +0800
Subject: [PATCH] =?UTF-8?q?2022-11-05=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/accessories/modules/ZyAccessoriesForm.vue  | 12 ++++++++----
 .../src/views/erp/fabric/ZyFabricList.vue          |  4 ++--
 .../src/views/sample/ZyModuleSampleList.vue        |  5 +++--
 .../src/views/zyclothsample/ZyClothSampleList.vue  |  6 +++---
 .../controller/ZyModuleSampleController.java       | 14 +++++++-------
 5 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesForm.vue b/ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesForm.vue
index e4b1f500..f962e5b5 100644
--- a/ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesForm.vue
+++ b/ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesForm.vue
@@ -24,9 +24,13 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="材质" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="material">
-              <a-input v-model="model.material" placeholder="请输入材质"  ></a-input>
-            </a-form-model-item>
+<!--            <a-form-model-item label="材质" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="material">-->
+<!--              <a-input v-model="model.material" placeholder="请输入材质"  ></a-input>-->
+              <a-form-model-item label="材质" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="material">
+                <j-search-select-tag v-model="model.material" dict="material"  />
+              </a-form-model-item>
+<!--          </a-col>-->
+<!--            </a-form-model-item>-->
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="规格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="specs">
@@ -131,7 +135,7 @@
               that.confirmLoading = false;
             })
           }
-         
+
         })
       },
     }
diff --git a/ant-design-vue-jeecg/src/views/erp/fabric/ZyFabricList.vue b/ant-design-vue-jeecg/src/views/erp/fabric/ZyFabricList.vue
index 8ce14d87..fabb3be3 100644
--- a/ant-design-vue-jeecg/src/views/erp/fabric/ZyFabricList.vue
+++ b/ant-design-vue-jeecg/src/views/erp/fabric/ZyFabricList.vue
@@ -118,6 +118,7 @@
         </template>
 
         <span slot="action" slot-scope="text,record">
+
           <a @click="handleEdit(record)">编辑</a>
           <a-divider type="vertical" />
 
@@ -280,8 +281,7 @@ import  ZyFabricFormDetailModel from  './modules/ZyFabricFormDetailModel'
             title: '操作',
             dataIndex: 'action',
             align:"center",
-            fixed:"right",
-            width:147,
+            // fixed:"right",
             scopedSlots: { customRender: 'action' }
           }
         ],
diff --git a/ant-design-vue-jeecg/src/views/sample/ZyModuleSampleList.vue b/ant-design-vue-jeecg/src/views/sample/ZyModuleSampleList.vue
index 24fb9bfc..20ad2d76 100644
--- a/ant-design-vue-jeecg/src/views/sample/ZyModuleSampleList.vue
+++ b/ant-design-vue-jeecg/src/views/sample/ZyModuleSampleList.vue
@@ -189,14 +189,15 @@
           deleteBatch: "/sample/zyModuleSample/deleteBatch",
           exportXlsUrl: "/sample/zyModuleSample/exportXls",
           importExcelUrl: "sample/zyModuleSample/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],
       }
     },
     created() {
-
+   this.queryParam.clothId=this.$route.query.id;
+        this.loadData()
     this.getSuperFieldList();
     },
     computed: {
diff --git a/ant-design-vue-jeecg/src/views/zyclothsample/ZyClothSampleList.vue b/ant-design-vue-jeecg/src/views/zyclothsample/ZyClothSampleList.vue
index 63bd4f9d..9ea54f3f 100644
--- a/ant-design-vue-jeecg/src/views/zyclothsample/ZyClothSampleList.vue
+++ b/ant-design-vue-jeecg/src/views/zyclothsample/ZyClothSampleList.vue
@@ -278,9 +278,9 @@ export default {
     jumpPage(record) {
       this.$router.push({
         path: '/src/views/sample/ZyModuleSampleList',
-        // query: { //路由携带参数
-        //   'id': record.id,
-        // }
+        query: { //路由携带参数
+          'id': record.id,
+        }
       });
     },
 
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/sample/controller/ZyModuleSampleController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/sample/controller/ZyModuleSampleController.java
index 7b671a85..1813c197 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/sample/controller/ZyModuleSampleController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/sample/controller/ZyModuleSampleController.java
@@ -49,7 +49,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class ZyModuleSampleController extends JeecgController<ZyModuleSample, IZyModuleSampleService> {
 	@Autowired
 	private IZyModuleSampleService zyModuleSampleService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -66,12 +66,12 @@ public class ZyModuleSampleController extends JeecgController<ZyModuleSample, IZ
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		QueryWrapper<ZyModuleSample> queryWrapper = QueryGenerator.initQueryWrapper(zyModuleSample, req.getParameterMap());
+		QueryWrapper<ZyModuleSample> queryWrapper = QueryGenerator.initQueryWrapper(zyModuleSample, req.getParameterMap()).eq("cloth_id",zyModuleSample.getClothId());
 		Page<ZyModuleSample> page = new Page<ZyModuleSample>(pageNo, pageSize);
 		IPage<ZyModuleSample> pageList = zyModuleSampleService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -85,7 +85,7 @@ public class ZyModuleSampleController extends JeecgController<ZyModuleSample, IZ
 		zyModuleSampleService.save(zyModuleSample);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -107,7 +107,7 @@ public class ZyModuleSampleController extends JeecgController<ZyModuleSample, IZ
 		zyModuleSampleService.updateById(zyModuleSample);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -121,7 +121,7 @@ public class ZyModuleSampleController extends JeecgController<ZyModuleSample, IZ
 		zyModuleSampleService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -135,7 +135,7 @@ public class ZyModuleSampleController extends JeecgController<ZyModuleSample, IZ
 		this.zyModuleSampleService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *