2023-1-4面料

ant-design-vue-jeecg/src/views/erp/fabric/ZyFabricList.vue

@@ -24,7 +24,7 @@
               <a-input placeholder="名称" v-model="queryParam.name"></a-input>
             </a-form-item>
           </a-col>
-          <template v-if="toggleSearchStatus">
+
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="颜色">
               <a-input placeholder="请输入颜色" v-model="queryParam.color"></a-input>
@@ -40,15 +40,10 @@
               <j-search-select-tag placeholder="请选择材质" v-model="queryParam.material" dict="material"/>
             </a-form-item>
           </a-col>
-          </template>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
             </span>
           </a-col>
         </a-row>

jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/fabric/controller/ZyFabricController.java

@@ -89,6 +89,15 @@ public class ZyFabricController extends JeecgController<ZyFabric, IZyFabricServi
 		if(zyFabric.getName()!=null&&!zyFabric.getName().equals("")){
 			queryWrapper.like("name",zyFabric.getName());
 		}
+		if(zyFabric.getColor()!=null&&!zyFabric.getColor().equals("")){
+			queryWrapper.like("color",zyFabric.getColor());
+		}
+		if(zyFabric.getPattern()!=null&&!zyFabric.getPattern().equals("")){
+			queryWrapper.like("pattern",zyFabric.getPattern());
+		}
+		if(zyFabric.getMaterial()!=null&&!zyFabric.getMaterial().equals("")){
+			queryWrapper.like("material",zyFabric.getMaterial());
+		}
         queryWrapper.orderByDesc("create_time");
 //		QueryWrapper queryWrapper = new QueryWrapper();
 		Page<ZyFabric> page = new Page<>(pageNo, pageSize);