2022-11-05修改

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 label="材质" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="material">
-              <a-input v-model="model.material" placeholder="请输入材质"  ></a-input>
+                <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">

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",
+            // fixed:"right",
-            width:147,
             scopedSlots: { customRender: 'action' }
           }
         ],

ant-design-vue-jeecg/src/views/sample/ZyModuleSampleList.vue

@@ -196,7 +196,8 @@
       }
     },
     created() {
-
+   this.queryParam.clothId=this.$route.query.id;
+        this.loadData()
     this.getSuperFieldList();
     },
     computed: {

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: { //路由携带参数
+        query: { //路由携带参数
-        //   'id': record.id,
+          'id': record.id,
-        // }
+        }
       });
     },
 

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/sample/controller/ZyModuleSampleController.java

@@ -66,7 +66,7 @@ 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);