Merge remote-tracking branch 'origin/master'

ant-design-vue-jeecg/src/views/process/ZyProcessList.vue

@@ -4,6 +4,17 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item  label="服装款式">
+              <j-dict-select-tag placeholder="请选择服装款式" dictCode="zy_cloths_style,style_names,id" v-model="queryParam.styleId" ></j-dict-select-tag>
+            </a-form-item>
+          </a-col>
+          <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>
+            </span>
+          </a-col>
         </a-row>
       </a-form>
     </div>
@@ -212,7 +223,7 @@
           {
             title:'款式名称',
             align:"center",
-            dataIndex: 'styleId'
+            dataIndex: 'styleId_dictText'
           },
           {
             title:'工段代码',

ant-design-vue-jeecg/src/views/process/modules/ZyProcessForm.vue

@@ -122,10 +122,15 @@
 <!--            <a-form-model-item label="工具名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolId">-->
 <!--              <j-dict-select-tag type="list" v-model="model.toolId" dictCode="zy_tool,name,id" placeholder="请选择工具名称" />-->
 <!--            </a-form-model-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="款式名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="styleId">-->
+<!--              <a-input v-model="model.styleId" placeholder="请输入款式名称"  ></a-input>-->
+<!--            </a-form-model-item>-->
 <!--          </a-col>-->
           <a-col :span="24">
             <a-form-model-item label="款式名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="styleId">
-              <a-input v-model="model.styleId" placeholder="请输入款式名称"  ></a-input>
+              <j-dict-select-tag  v-model="model.styleId"  placeholder="请输入款式名称" dictCode="zy_cloths_style,style_names,id" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">

jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/controller/ZyProcessController.java

@@ -5,6 +5,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.demo.accessories.entity.ZyAccessories;
 import org.jeecg.modules.demo.base.entity.ZyAllProcess;
 import org.jeecg.modules.demo.base.entity.ZyClothAction;
@@ -71,8 +72,8 @@ public class ZyProcessController extends JeecgController<ZyProcess, IZyProcessSe
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		//QueryWrapper<ZyProcess> queryWrapper = QueryGenerator.initQueryWrapper(zyProcess, req.getParameterMap());
-		QueryWrapper queryWrapper = new QueryWrapper();
+		QueryWrapper<ZyProcess> queryWrapper = QueryGenerator.initQueryWrapper(zyProcess, req.getParameterMap());
+		//QueryWrapper queryWrapper = new QueryWrapper();
 		Page<ZyProcess> page = new Page<ZyProcess>(pageNo, pageSize);
 		IPage<ZyProcess> pageList = zyProcessService.page(page, queryWrapper);
 		return Result.OK(pageList);

jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyProcess.java

@@ -141,6 +141,7 @@ public class ZyProcess implements Serializable {
 	/**款式名称*/
 	@Excel(name = "款式名称", width = 15)
     @ApiModelProperty(value = "款式名称")
+	@Dict(dictTable = "zy_cloths_style", dicText = "style_names", dicCode = "id")
     private java.lang.String styleId;
 	/**工段代码*/
 	@Excel(name = "工段代码", width = 15)