Przeglądaj źródła

1、修改导出excel设置

zhoux 2 lat temu
rodzic
commit
a72204ca6b

+ 1 - 1
.env.test

@@ -1,7 +1,7 @@
 NODE_ENV='production'
 VUE_APP_BUILD_TYPE='test'
 VUE_APP_SERVER_URL='https://s.dev01.dkiboss.com:6010/api'
-VUE_APP_EXPORT_URL='https://s.dev01.dkiboss.com:6010/file/'
+VUE_APP_EXPORT_URL='https://s.dev01.dkiboss.com:6010/excel/'
 VUE_APP_EXPORT_SQL_URL='https://s.dev01.dkiboss.com:6010/custom-report-sql.sql'
 VUE_APP_UPLOAD_URL='https://s.dev01.dkiboss.com:6010/api/mdm-server/file/upload'
 VUE_APP_LOGS_URL='https://ibossmp.dongkesoft.com:7050/logs'

+ 13 - 3
src/components/business/select-magnifier/select-magnifier.vue

@@ -81,6 +81,7 @@
                  :perspective-flag="false"
                  :export="false"
                  :show-setting-flag="false" :data="batchRowsPage" :operateFlag="true" :height="tableHeight"
+                 :pageSize="pageInfo.pageSize"
                  :refreshSelect="false"
                  :add-flag="false"
                  @delRow="delItem"
@@ -106,7 +107,9 @@
                :export="false"
                :seq-tip-content="vm.$t('doubleSeq')"
                :choose-data-flag="true"
-               :linkClickChecked="true" @pageChange="pageSizeChange"
+               :linkClickChecked="true"
+               :pageSize="pageInfo.pageSize"
+               @pageChange="pageSizeChange"
                @chooseData="chooseData"
       >
         <DkTableColumn v-for="(item,index) in columns" :key="index" :field="item.field"
@@ -294,6 +297,7 @@ export default {
         currentPage: 1
       },
       otherConditionInner: {},
+      initSearchFlag:false,  // 是否打开就查询
     }
   },
   watch: {
@@ -959,7 +963,10 @@ export default {
      */
     onVisibleChange(val) {
       if (val) {
-        // this.getDataTable()
+        if(this.initSearchFlag){
+          // 查询
+          this.getDataTable()
+        }
         // this.batchRowsPage = this.$refs['table-select'].batchRows
       } else {
         this.searchTable = {} // 关闭选择画面需要清空条件
@@ -1145,7 +1152,10 @@ export default {
       // 设置接口相关信息
       let set = setting.setSetting(this.$service, self.type);
       self = this.objectMerge(self, set)
-
+      if(self.pageSize){
+        self.pageInfo.pageSize = self.pageSize;
+        console.log('bbd34',self.pageSize)
+      }
       // // 员工
       // if (self.type === self.$config.MagnifierType.staff) {
       //   self.service = this.$service.commonService

+ 4 - 0
src/components/business/select-magnifier/setting.js

@@ -12,6 +12,10 @@ const $t = (name) => {
 const data = {
   // 员工
   staff: {
+    // 是否自动查询
+    // initSearchFlag:true,
+    // 默认页数
+    pageSize:200,
     // 接口文件
     service: 'commonService',
     // 下拉的查询方法