fix bug

src/views/base/fee-item.vue

@@ -14,6 +14,7 @@
       @row-del="rowDel"
       @search-change="searchChange"
       @search-reset="searchReset"
+      @selection-change="selectionChange"
       @current-change="currentChange"
       @size-change="sizeChange"
       @refresh-change="refreshChange"
@@ -40,6 +41,7 @@
           v-model="form.feeCategory"
           class="fee-item-form-control"
           clearable
+          :disabled="dialogType !== 'add'"
           filterable
           placeholder="请选择费用类型"
           @change="handleFeeCategoryChange"
@@ -58,6 +60,7 @@
           :maxlength="feeItemCodeMaxlength"
           class="fee-item-form-control"
           clearable
+          :disabled="dialogType !== 'add'"
           placeholder="请输入费用项代码"
           @change="handleFeeItemCodeChange"
         >
@@ -114,12 +117,14 @@ export default {
       data: [],
       excelBox: false,
       excelForm: {},
+      dialogType: 'add',
       feeCategoryOptions: [],
       page: {
         pageSize: 10,
         currentPage: 1,
         total: 0,
       },
+      selectionList: [],
       option: {
         height: 'auto',
         calcHeight: 32,
@@ -139,7 +144,7 @@ export default {
         viewBtn: false,
         delBtn: false,
         editBtn: false,
-        selection: false,
+        selection: true,
         dialogClickModal: false,
         menuWidth: 180,
         column: [
@@ -294,6 +299,9 @@ export default {
     feeItemCodeMaxlength() {
       return Math.max(1, 100 - this.feeCategoryPrefix.length);
     },
+    ids() {
+      return this.selectionList.map(item => item.id).join(',');
+    },
     permissionList() {
       return {
         addBtn: this.validData(this.permission.fee_item_add, false),
@@ -418,6 +426,7 @@ export default {
         });
     },
     beforeOpen(done, type) {
+      this.dialogType = type || 'add';
       if (['edit', 'view'].includes(type)) {
         getDetail(this.form.id).then(res => {
           this.form = this.normalizeFormForEdit(res.data.data || {});
@@ -439,6 +448,13 @@ export default {
       this.onLoad(this.page, params);
       done();
     },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.$refs.crud.toggleSelection();
+    },
     currentChange(currentPage) {
       this.page.currentPage = currentPage;
     },
@@ -454,6 +470,7 @@ export default {
     buildExportParams() {
       return {
         ...this.query,
+        ids: this.ids,
         [this.website.tokenHeader]: getToken(),
       };
     },
@@ -490,6 +507,7 @@ export default {
         const data = res.data.data;
         this.page.total = data.total;
         this.data = data.records;
+        this.selectionClear();
         this.loading = false;
       });
     },

src/views/base/port-terminal.vue

@@ -250,81 +250,6 @@ import NProgress from 'nprogress';
 import 'nprogress/nprogress.css';
 
 const DEFAULT_COUNTRY_CODE = '+86';
-const EXCLUDED_EXCEL_HEADERS = ['数据来源', '启停状态'];
-const REQUIRED_EXPORT_HEADERS = [
-  '港口码头名称',
-  '港口/码头名称',
-  '类型',
-  '国家',
-  '城市',
-  '经度',
-  '纬度',
-];
-
-const getExcelCellText = value => {
-  if (value === undefined || value === null) return '';
-  if (typeof value === 'object') {
-    if (Array.isArray(value.richText)) {
-      return value.richText.map(item => item.text || '').join('');
-    }
-    if (value.text) return value.text;
-    if (value.result) return value.result;
-  }
-  return String(value);
-};
-
-const removeWorkbookColumnsByHeaders = workbook => {
-  workbook.eachSheet(worksheet => {
-    const maxHeaderRow = Math.min(worksheet.rowCount || 0, 10);
-    for (let rowIndex = 1; rowIndex <= maxHeaderRow; rowIndex += 1) {
-      const row = worksheet.getRow(rowIndex);
-      const indexes = [];
-      row.eachCell((cell, colNumber) => {
-        const text = getExcelCellText(cell.value).trim();
-        if (EXCLUDED_EXCEL_HEADERS.includes(text)) {
-          indexes.push(colNumber);
-        }
-      });
-      if (indexes.length) {
-        indexes.sort((a, b) => b - a).forEach(colNumber => worksheet.spliceColumns(colNumber, 1));
-        break;
-      }
-    }
-  });
-};
-
-const addWorkbookRequiredHeaderMarks = workbook => {
-  workbook.eachSheet(worksheet => {
-    const maxHeaderRow = Math.min(worksheet.rowCount || 0, 10);
-    for (let rowIndex = 1; rowIndex <= maxHeaderRow; rowIndex += 1) {
-      const row = worksheet.getRow(rowIndex);
-      let hasRequiredHeader = false;
-      row.eachCell(cell => {
-        const text = getExcelCellText(cell.value).trim();
-        const header = text.replace(/\*+$/g, '').trim();
-        if (REQUIRED_EXPORT_HEADERS.includes(header)) {
-          cell.value = `${header}*`;
-          hasRequiredHeader = true;
-        }
-      });
-      if (hasRequiredHeader) break;
-    }
-  });
-};
-
-const removeExcelColumnsByHeaders = async (blob, options = {}) => {
-  const { markRequiredHeaders = false } = options;
-  const ExcelJS = await import('exceljs');
-  const workbook = new ExcelJS.Workbook();
-  await workbook.xlsx.load(await blob.arrayBuffer());
-  removeWorkbookColumnsByHeaders(workbook);
-  if (markRequiredHeaders) {
-    addWorkbookRequiredHeaderMarks(workbook);
-  }
-  const buffer = await workbook.xlsx.writeBuffer();
-  return new Blob([buffer], { type: 'application/vnd.ms-excel' });
-};
-
 const newLocal = '请选择类型';
 export default {
   data() {
@@ -1323,9 +1248,6 @@ export default {
         '港口码头主数据',
         () => {
           this.loadPortOptions();
-        },
-        {
-          failDetailDecorator: removeWorkbookColumnsByHeaders,
         }
       );
     },
@@ -1339,11 +1261,8 @@ export default {
         exportBlob('/blade-system/port-terminal/export-port-terminal', this.buildExportParams(), {
           feedback: true,
         })
-          .then(async res => {
-            const blob = await removeExcelColumnsByHeaders(res.data, {
-              markRequiredHeaders: true,
-            });
-            downloadXls(blob, `港口码头主数据${this.$dayjs().format('YYYY-MM-DD HH:mm:ss')}.xlsx`);
+          .then(res => {
+            downloadXls(res.data, `港口码头主数据${this.$dayjs().format('YYYY-MM-DD HH:mm:ss')}.xlsx`);
           })
           .finally(() => {
             NProgress.done();
@@ -1362,9 +1281,8 @@ export default {
         `/blade-system/port-terminal/export-template?${this.website.tokenHeader}=${getToken()}`,
         undefined,
         { feedback: true }
-      ).then(async res => {
-        const blob = await removeExcelColumnsByHeaders(res.data);
-        downloadXls(blob, '港口码头主数据模板.xlsx');
+      ).then(res => {
+        downloadXls(res.data, '港口码头主数据模板.xlsx');
       });
     },
   },

src/views/base/region.vue

@@ -689,6 +689,7 @@ export default {
         feedback: true,
       }).then(res => {
         downloadXls(res.data, '行政区划模板.xlsx');
+        this.$message.success('模板下载成功');
       });
     },
   },