Merge remote-tracking branch 'origin/master'

ant-design-vue-jeecg/src/views/modulex/ModulexList.vue

@@ -123,6 +123,7 @@ import ModulexModal from './modules/ModulexModal'
 import {getAction} from "@api/manage";
 import BugxModal from "@views/modulex/modules/BugxModal";
 import store from "@/store";
+import {filterObj} from "@/utils/util";
 
 export default {
   name: 'ModulexList',
@@ -303,6 +304,8 @@ export default {
       dictOptions: {},
       superFieldList: [],
       userRole1: '', //管理员是1 其他是2
+      projectIdx: '',
+      loadRouteType:false,
     }
   },
   created() {
@@ -426,8 +429,67 @@ export default {
       fieldList.push({type: 'int', value: 'verisonStatus', text: '版本状态', dictCode: ''})
       fieldList.push({type: 'int', value: 'verison', text: '版本号', dictCode: ''})
       this.superFieldList = fieldList
-    }
-  }
+    },
+    loadParameter() {
+      if (this.loadRouteType === false) {
+        this.projectIdx = this.$route.query.moduleid;
+        // console.log('aaaaaaaaa',this.projectIdx)
+        // console.log("***********想看看")
+        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.id=this.id;
+      param.projectId = this.$route.query.moduleid;
+      // console.log('paaaaaaaaaaaaaaaaaaaaa')
+      return filterObj(param);
+    },
+    searchReset() {
+      this.queryParam=''
+      this.loadData();
+    },
+
+  },
+
 }
 </script>
 <style scoped>

ant-design-vue-jeecg/src/views/modulex/modules/ModulexForm.vue

@@ -179,9 +179,9 @@
            moduleEnName: [
               { required: true, message: '请输入英文名称!'},
            ],
-           moduleCode: [
-              { required: true, message: '请输入模块编码!'},
-           ],
+           // moduleCode: [
+           //    { required: true, message: '请输入模块编码!'},
+           // ],
            workLevel: [
               { required: true, message: '请输入任务等级!'},
            ],

ant-design-vue-jeecg/src/views/projectx/ProjectxList.vue

@@ -80,11 +80,11 @@
         class="j-table-force-nowrap"
         @change="handleTableChange">
 
-        <template slot="htmlSlot" slot-scope="text">
+        <template slot="htmlSlot" slot-scope="text, record">
           <!--          <div v-html="text"></div>-->
           <a @click="rolemanage()">角色</a>
           <a-divider type="vertical"/>
-          <a @click="modulemanage()">模块</a>
+          <a @click="modulemanage(record)">模块</a>
         </template>
 
 
@@ -146,7 +146,7 @@ export default {
         {
           title: '项目英文名称',
           align: "center",
-          dataIndex: 'projectEnName'
+          dataIndex: 'projectEnName',
         },
         {
           title: '项目编码',
@@ -258,10 +258,10 @@ export default {
         //query: {id: '123456'}
       })
     },
-    modulemanage() {
+    modulemanage(record) {
       this.$router.push({
         path: '/src/views/modulex/ModulexList',
-        //query: {id: '123456'}
+        query: {moduleid: record.id}
       })
     },
     initDictConfig() {