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

src/view/mst/dictionary/index.vue

@@ -28,13 +28,13 @@
     <div>
 
       <!--  列表区  -->
-      <div :style="'height: ' + (tableHeight - 65)+ 'px'"  class="split-div-class">
+      <div :style="'height: ' + tableHeight+ 'px'"  class="split-div-class">
         <DkSplit v-model="split">
           <!-- 左边部分   -->
           <DkTable slot="left"
                    ref="leftTable"
                    :data="searchInfo"
-                   :height="this.tableHeight - 65"
+                   :height="this.tableHeight"
                    :page-flag="false"
                    :page-total-flag="false"
                    :show-setting-flag="false"
@@ -49,7 +49,7 @@
                    :page-total="pageInfo.total"
                    :current-page="pageInfo.currentPage"
                    :choose-flag="false"
-                   :height="tableHeight - 65" primaryKey="dataId"
+                   :height="tableHeight" primaryKey="dataId"
                    @pageChange="pageSizeChange">
             <DkTableColumn field="dataValue" type="link"
                            @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
@@ -101,6 +101,7 @@ export default {
   data() {
     let self = this
     return {
+      split: 0.2,// 分区的默认
       dataValue: 'dataValue',
       editAddModal: false,
       modalTitle: '',//新建编辑弹窗名称
@@ -138,7 +139,7 @@ export default {
         let params = this.params
         params.dictCode = row.dictCode
         //查询型号类别列表的数据-右侧列表
-        this.getData(params)
+        this.searchData(params)
       }
     },
     /**
@@ -167,15 +168,18 @@ export default {
      *   @date   : 2022/12/21
      *   @author : 洪旭东
      */
-    getData(params) {
-      // 查询数据
-    //  return this.excute(this.$service.dictionaryDataService, this.$service.dictionaryDataService.selectByCond, params);
-      // 查询数据
+    getData(params){
+         // return this.excute(this.$service.dictionaryDataService, this.$service.dictionaryDataService.selectByCond, params);
       this.excute(this.$service.dictionaryDataService, this.$service.dictionaryDataService.selectByCond, params).then(res => {
         if (res.code === this.$config.SUCCESS_CODE) {
           this.tableData = res.data.list
+          this.loading = false;
+          if (params.currentPage == 1) {
+            this.pageInfo.total = res.data.total
+            this.pageInfo.currentPage = 1;
+          }
         }
-      })
+      });
     },
     /**
      * @desc   : 获取数据字典数据-左侧列表
@@ -208,9 +212,7 @@ export default {
       this.primaryKey = 'dataId'     // 设置主键
       this.routeObjName = 'dictionaryData'  // 设置路由名称
       this.getDataKindData() //获取数据字典数据
-      this.dictCodeType = this.$config.dicCode.kilnDicCode
-      // 导出额外的条件
-      this.exportCondition = {dictCode: this.dictCodeType}
+
     },
     // endregion