Merge branch 'master' of http://git.dongkesoft.com:9001/DK-MES-3.0/mes-web

src/view/mst/dictionary/index.vue

@@ -45,14 +45,14 @@
           <DkTableColumn :title="$t('dictCode')" field="dictName" :center-flag="true"
                          width="auto" :filter=false :sortable="false"></DkTableColumn>
         </DkTable>
-        <DkTable slot="right" :id="'table-'+$options.name" ref="table-select" :pageSize="pageInfo.pageSize" :pageSizeOpts="pageSizeOpts" :data="tableData"
+        <DkTable slot="right" :id="'table-'+$options.name" ref="table-select" :pageSize="detailPageInfo.pageSize" :pageSizeOpts="pageSizeOpts" :data="tableData"
                  :pageFlag="true"
-                 :page-total="pageInfo.total"
-                 :current-page="pageInfo.currentPage"
+                 :page-total="detailPageInfo.total"
+                 :current-page="detailPageInfo.currentPage"
                  :choose-flag="false"
                  :height="tableHeight" primaryKey="dataId"
-                 @current-change="currentChangeDataEvent($event)">
-                 @pageChange="pageSizeChange">
+                 @current-change="currentChangeDataEvent($event)"
+                 @pageChange="detailPageSizeChange">
           <DkTableColumn field="dataValue" type="link"
                          @on-link="isEditFlag ? null:handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
           <DkTableColumn field="displayNo"></DkTableColumn>
@@ -120,6 +120,11 @@ export default {
         displayNo: 0,
         remarks: ''
       },
+      detailPageInfo:{
+        total: 0,
+        pageSize: 10,
+        currentPage: 1
+      },
       dictCodesList: [],
       isEditFlag: true,
       searchContent: [
@@ -155,10 +160,8 @@ export default {
         this.dictCodeType = row.dictCode
         // 导出额外的条件
         this.exportCondition = {dictCode: this.dictCodeType}
-        let params = this.params
-        params.dictCode = row.dictCode
         //查询型号类别列表的数据-右侧列表
-        this.searchData(params)
+        this.getDetail()
       }
     },
     /**
@@ -196,12 +199,25 @@ export default {
       params.dictCode = this.dictCodeType;
       return params
     },
+
+    detailPageSizeChange(pageInfo) {
+      this.detailPageInfo = pageInfo
+      this.$nextTick(()=>{
+        this.getDetail()
+      })
+    },
     /**
      *   @desc   : 获取数据
      *   @date   : 2022/12/21
      *   @author : 洪旭东
      */
-    getData(params) {
+    getDetail() {
+      let params = {
+        dictCode: this.dictCodeType,
+        ftyId: this.$store.state.user.ftyId,
+        currentPage: this.detailPageInfo.currentPage,
+        pageSize: this.detailPageInfo.pageSize,
+      }
       this.excute(this.$service.dictionaryDataService, this.$service.dictionaryDataService.selectByCond, params).then(res => {
         if (res.code === this.$config.SUCCESS_CODE) {
           for (let it of res.data.list) {
@@ -213,10 +229,7 @@ export default {
           }
           this.tableData = res.data.list
           this.loading = false;
-          if (params.currentPage == 1) {
-            this.pageInfo.total = res.data.total
-            this.pageInfo.currentPage = 1;
-          }
+          this.detailPageInfo.total = res.data.total
         }
       });
     },
@@ -225,7 +238,7 @@ export default {
      * @author : 王英杰
      * @date   : 2023/2/3 10:38
      */
-    getDataKindData() {
+    getData() {
       // 查询数据
       let params = {
         ftyId: this.$store.state.user.ftyId,
@@ -337,7 +350,6 @@ export default {
   created() {
     this.primaryKey = 'dataId'     // 设置主键
     this.routeObjName = 'dictionary'  // 设置路由名称
-    this.getDataKindData() //获取数据字典数据
     this.initSearchFlag = false;  // 初始不进行默认查询
   },
 }