Merge remote-tracking branch 'origin/master'

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

@@ -138,6 +138,8 @@
   import ZyProcessModal5 from './modules/ZyProcessModal5'
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
   import ZyProcessDetail from './modules/ZyProcessDetail'
+  import {getAction} from "@api/manage";
+  import {filterObj} from "@/utils/util";
   export default {
     name: 'ZyProcessList',
     mixins:[JeecgListMixin, mixinDevice],
@@ -285,12 +287,17 @@
           importExcelUrl: "base/zyProcess/importExcel",
 
         },
+        //参数
+        loadRouteType:false,
+        styleId:"",
         dictOptions:{},
         superFieldList:[],
       }
     },
     created() {
-      this.getSuperFieldList();
+      // queryParam.styleId=this.styleId
+    //  this.getSuperFieldList();
+      this.loadParameter() ;
     },
     computed: {
       importExcelUrl: function(){
@@ -300,6 +307,58 @@
     methods: {
       initDictConfig(){
       },
+      //加载传递参数
+      loadParameter() {
+        if (this.loadRouteType == false) {
+          this.styleId = this.$route.query.styleId;
+          console.log(this.styleId)
+          this.loadRouteType = true;
+        }
+      },
+      loadData(arg) {
+        if(!this.url.list){
+          this.$message.error("请设置url.list属性!")
+          return
+        }
+        //加载数据 若传入参数1则加载第一页的内容
+        if (arg === 1) {
+          this.ipagination.current = 1;
+        }
+        this.loadParameter();
+        var params = this.getQueryParams();//查询条件
+        this.loading = true;
+        getAction(this.url.list, params).then((res) => {
+          if (res.success) {
+            //update-begin---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
+            this.dataSource = res.result.records||res.result;
+            if(res.result.total)
+            {
+              this.ipagination.total = res.result.total;
+            }else{
+              this.ipagination.total = 0;
+            }
+            //update-end---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
+          }else{
+            this.$message.warning(res.message)
+          }
+        }).finally(() => {
+          this.loading = false
+        })
+      },
+      getQueryParams() {
+        //获取查询条件
+        let sqp = {}
+        if(this.superQueryParams){
+          sqp['superQueryParams']=encodeURI(this.superQueryParams)
+          sqp['superQueryMatchType'] = this.superQueryMatchType
+        }
+        var param = Object.assign(sqp, this.queryParam, this.isorter ,this.filters);
+        param.field = this.getQueryField();
+        param.pageNo = this.ipagination.current;
+        param.pageSize = this.ipagination.pageSize;
+        param.styleId=this.styleId;
+        return filterObj(param);
+      },
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'string',value:'processCode',text:'工序代码',dictCode:''})

ant-design-vue-jeecg/src/views/zyclothsstyle/ZyClothsStyleList.vue

@@ -247,12 +247,20 @@
       },
       jumpPage4(record) {
         this.$router.push({
-          path: '/zyclothsstyle/ZyClothsStyleList',
+          path: '/src/views/zystylemodel/ZyStyleModelList',
           query: {  // 路由携带参数
             'id': record.id,
           }
         });
       },
+      jumpPage5(record) {
+        this.$router.push({
+          path: '/process/ZyProcessList',
+          query: {  // 路由携带参数
+            'styleId': record.id,
+          }
+        });
+      },
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'popup',value:'typeId',text:'类型id', popup:{code:'zy_cloths_type',field:'type_name',orgFields:'type_name',destFields:'id'}})

ant-design-vue-jeecg/src/views/zystylemodel/ZyStyleModelList.vue

@@ -27,7 +27,6 @@
         :pagination="pagination"
         style="margin-top: 8px;"
         @pageChange="handlePageChange"
-        @selectRowChange="handleSelectRowChange"
       >
         <template v-slot:action="props">
           <a @click="submitForm(props)">保存</a>
@@ -52,7 +51,7 @@
   import ZyStyleModelModal from './modules/ZyStyleModelModal'
   import {deleteAction, getAction, postAction, putAction, postFormAction, httpAction} from "@api/manage";
   import store from "@/store";
-  import { validateDuplicateValue } from '@/utils/util'
+  import {filterObj, validateDuplicateValue} from '@/utils/util'
 
   export default {
     name: 'ZyStyleModelList',
@@ -86,11 +85,13 @@
           pageSizeOptions: ['10', '20', '30', '100', '200'],
           // 数据总数（目前并不知道真实的总数，所以先填写0，在后台查出来后再赋值）
           total: 0,
+          showQuickJumper: true,
+          showSizeChanger: true,
+           id:null
         },
-        // 选择的行
-        selectedRows: [],
+
         // 数据源，控制表格的数据
-        dataSource: [],
+
         columns: [
           {
             title: '款式',
@@ -144,15 +145,19 @@
           exportXlsUrl: "/zystylemodel/zyStyleModel/exportXls",
           importExcelUrl: "zystylemodel/zyStyleModel/importExcel",
         },
+        //参数
+        loadRouteType:false,
+        id:null,
         rowId:'',
         dictOptions:{},
         superFieldList:[],
       }
     },
     created() {
-    this.loadData();
+      //this.loadData();
+      this.loadParameter() ;
       //备份model原始值
-      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+      //this.modelDefault = JSON.parse(JSON.stringify(this.model));
     },
     computed: {
       importExcelUrl: function(){
@@ -179,8 +184,6 @@
       },
       submitForm (props) {
               this.model = Object.assign({}, props);
-             // console.log(props.rowId)
-             // console.log(this.model)
               var str = props.rowId;
               let httpurl = '';
               let method = '';
@@ -200,25 +203,38 @@
                 }
               })
       },
-
+//加载传递参数
+      loadParameter() {
+        if (this.loadRouteType == false) {
+          this.id = this.$route.query.id;
+          this.loadRouteType = true;
+        }
+      },
 // 加载数据
-      loadData() {
-        // 封装查询条件
-        let formData = {
-          pageNo: this.pagination.current,
-          pageSize: this.pagination.pageSize
+      loadData(arg) {
+        //加载数据 若传入参数1则加载第一页的内容
+        if (arg === 1) {
+          this.pagination.current = 1;
         }
         // 调用查询数据接口
-        this.loading = true
-        getAction(this.url.list, formData).then(res => {
+        this.loadParameter();
+        var params = this.getQueryParams();//查询条件
+        this.loading = true;
+        getAction(this.url.list, params).then(res => {
           if (res.success) {
-            // 后台查询回来的 total，数据总数量
-            this.pagination.total = res.result.total
+            /*// 后台查询回来的 total，数据总数量
+            this.pagination.total = res.result.total*/
             // 将查询的数据赋值给 dataSource
-            this.dataSource = res.result.records
-            console.log(this.dataSource,'aaa')
-            // 重置选择
-            this.selectedRows = []
+            this.dataSource = res.result.records||res.result;
+            console.log(this.dataSource,'abc')
+            if(res.result.total)
+            {
+              this.pagination.total = res.result.total;
+            }else{
+              this.pagination.total = 0;
+            }
+            //this.dataSource = res.result.records
+
           } else {
             this.$error({title: '主表查询失败', content: res.message})
           }
@@ -237,7 +253,20 @@
       },
       initDictConfig(){
       },
-
+      getQueryParams() {
+        //获取查询条件
+        let sqp = {}
+        if(this.superQueryParams){
+          sqp['superQueryParams']=encodeURI(this.superQueryParams)
+          sqp['superQueryMatchType'] = this.superQueryMatchType
+        }
+        var param = Object.assign(sqp, this.queryParam, this.isorter ,this.filters);
+        param.field = this.getQueryField();
+        param.pageNo = this.ipagination.current;
+        param.pageSize = this.ipagination.pageSize;
+        param.styleId=this.id
+        return filterObj(param);
+      },
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'string',value:'styleId',text:'款式id',dictCode:''})

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodel/controller/ZyStyleModelController.java

@@ -66,11 +66,13 @@ public class ZyStyleModelController extends JeecgController<ZyStyleModel, IZySty
 	//@AutoLog(value = "zy_style_model-分页列表查询")
 	@ApiOperation(value="zy_style_model-分页列表查询", notes="zy_style_model-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<IPage<ZyStyleModel>> queryPageList(ZyStyleModel zyStyleModel,
+	public Result<IPage<ZyStyleModel>> queryPageList(ZyStyleModel zyStyleModel,String id,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
 		QueryWrapper<ZyStyleModel> queryWrapper = QueryGenerator.initQueryWrapper(zyStyleModel, req.getParameterMap());
+		System.out.println(zyStyleModel.getStyleId());
+		//queryWrapper.eq("style_id", id);
 		Page<ZyStyleModel> page = new Page<ZyStyleModel>(pageNo, pageSize);
 		IPage<ZyStyleModel> pageList = zyStyleModelService.page(page, queryWrapper);
 		return Result.OK(pageList);

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/controller/ZyStyleModuleController.java

@@ -81,7 +81,6 @@ public class ZyStyleModuleController extends JeecgController<ZyStyleModule, IZyS
 													   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 													   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 													   HttpServletRequest req) {
-		 System.out.println(id);
 	 	List<NewStyleModule> listNewStyleModules = new ArrayList<>();
 	 	QueryWrapper<ZyStyleModule> queryWrapper = new QueryWrapper<>();
 		 if(id!=null){