wzh 3 лет назад
Родитель
Сommit
8ba2fcfbb3
2 измененных файлов с 16 добавлено и 6 удалено
  1. 1 1
      src/App.vue
  2. 15 5
      src/views/voyage/voyageList.vue

+ 1 - 1
src/App.vue

@@ -74,7 +74,7 @@ export default {
 .main-section {
   margin: 24px 0 0 24px;
   height: calc(100% - 76px);
-  overflow: scroll;
+  overflow-y: auto;
 }
 
 .line-container-p18 {

+ 15 - 5
src/views/voyage/voyageList.vue

@@ -70,15 +70,24 @@
           type="primary"
           size="medium"
           class="mr20"
-          @click="showExportModal('卸货信息')"
-          >导出卸货信息</el-button
+          @click="showExportModal('航次列表')"
+          >导出航次列表</el-button
         >
         <el-button
           type="primary"
           size="medium"
           class="mr20"
-          @click="showExportModal('航次信息')"
-          >导出航次信息</el-button
+          v-auth="'MULTDOWNLOADSHIPTRACK'"
+          @click="showExportModal('航次跟踪')"
+          >导出航次跟踪</el-button
+        >
+        <el-button
+          type="primary"
+          size="medium"
+          class="mr20"
+          @click="showExportModal('卸货记录')"
+          v-auth="'MULTDOWNLOADDISCHARGE'"
+          >导出卸货记录</el-button
         >
         <el-button
           v-auth="'DOWNLOADFYDI'"
@@ -314,6 +323,7 @@
         label="操作"
         min-width="80"
         align="center"
+        fixed="right"
       >
         <template v-slot="scope">
           <el-button
@@ -688,7 +698,7 @@ async function exportZip() {
   isLoadingZip.value = true;
   let res = await downloadBlobFile(
     `${url.baseurl}${
-      exportModalTitle.value == "卸货信息"
+      exportModalTitle.value == "卸货记录"
         ? "/voyage/exportMultDischargeExcel"
         : "/voyage/exportMultExcel"
     }`,