Merge branch 'master' of http://git.huihenduo.com.cn:3000/wzh/JiangYunPhotosCargoOwner_WebApp into wuchan

src/views/accountManage/subAccountList.vue

@@ -8,6 +8,7 @@
           v-model="term"
           clearable
           style="height: 32px; width: 330px; line-height: 32px"
+          @keyup.enter.native="getSubAccountList"
         ></el-input>
         <div class="seach-btn" @click="getSubAccountList">查询</div>
       </div>

src/views/agencyManage/agencyCompanyList.vue

@@ -8,6 +8,7 @@
           v-model="term"
           clearable
           style="height: 32px; width: 330px; line-height: 32px"
+          @keyup.enter.native="getAgencyList"
         ></el-input>
         <div class="seach-btn" @click="getAgencyList">查询</div>
       </div>

src/views/authManage/departmentList.vue

@@ -8,6 +8,7 @@
           v-model="term"
           clearable
           style="height: 32px; width: 330px; line-height: 32px"
+          @keyup.enter.native="getDepartmentList"
         ></el-input>
         <div class="seach-btn" @click="getDepartmentList">查询</div>
       </div>

src/views/authManage/roleList.vue

@@ -8,6 +8,7 @@
           v-model="term"
           clearable
           style="height: 32px; width: 330px; line-height: 32px"
+          @keyup.enter.native="getRoleList"
         ></el-input>
         <div class="seach-btn" @click="getRoleList">查询</div>
       </div>

src/views/cargoManage/cargoList.vue

@@ -8,6 +8,7 @@
           v-model="term"
           clearable
           style="height: 32px; width: 330px; line-height: 32px"
+          @keyup.enter.native="getCargoList"
         ></el-input>
         <div class="seach-btn" @click="getCargoList">查询</div>
       </div>

src/views/voyage/voyageDetail.vue

@@ -361,9 +361,9 @@
   <div class="line-container-p24">
     <div v-auth="'SHIPDISCHARGE'">
       <div class="container-second-title df aic jcsb">
-        <div>{{ voyage.dischargeProt }} - 天气信息</div>
+        <div>卸货港 - {{ voyage.dischargeProt }} - 天气信息</div>
       </div>
-      <el-table style="width: 800px" :data="weatherTableData" stripe>
+      <el-table style="width: 1200px" :data="weatherTableData" stripe>
         <el-table-column
           type="index"
           label="序号"
@@ -401,7 +401,7 @@
           align="center"
         ></el-table-column>
       </el-table>
-      <div style="width: 800px; text-align: right; margin-top: 43px">
+      <div style="width: 1200px; text-align: right; margin-top: 43px">
         <el-pagination
           background
           layout="prev, pager, next"
@@ -415,7 +415,7 @@
       <div class="container-second-title df aic jcsb">
         <div>提单信息</div>
       </div>
-      <el-table :data="labTableData" stripe style="width: 800px">
+      <el-table :data="labTableData" stripe style="width: 1200px">
         <el-table-column
           type="index"
           label="序号"
@@ -447,7 +447,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div style="text-align: right; margin-top: 43px">
+      <div style="text-align: right; margin-top: 43px; width: 1200px">
         <el-pagination
           background
           layout="prev, pager, next"
@@ -515,7 +515,7 @@
           >下载卸货信息</el-button
         >
       </div>
-      <el-table :data="dischargeList" stripe style="width: 800px">
+      <el-table :data="dischargeList" stripe style="width: 1200px">
         <el-table-column
           type="index"
           label="序号"
@@ -553,7 +553,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div style="width: 100%; text-align: right; margin-top: 43px">
+      <div style="width: 1200px; text-align: right; margin-top: 43px">
         <el-pagination
           background
           layout="prev, pager, next"
@@ -1454,9 +1454,6 @@ async function getPortWeatherList() {
     currentPage: weatherCurrentPage.value,
   });
   weatherTableData.value = res.data.result;
-  for (let i of weatherTableData.value) {
-    i.reporttime = i.reporttime.substring(0, 10);
-  }
   weatherTotal.value = res.data.total;
 }
 

src/views/voyage/voyageList.vue

@@ -59,6 +59,7 @@
           v-model="term"
           clearable
           style="width: 240px"
+          @keyup.enter.native="getVoyageList()"
         ></el-input>
         <div class="search-btn" @click="getVoyageList()">查询</div>
       </div>
@@ -715,16 +716,32 @@ async function exportZip() {
   if (!currentMonth.value) return;
 
   isLoadingZip.value = true;
+  let path = "";
+  let type = "";
+  switch (exportModalTitle.value) {
+    case "航次列表": {
+      path = "/voyage/exportListExcel";
+      type =
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8";
+      break;
+    }
+    case "航次跟踪": {
+      path = "/voyage/exportMultExcel";
+      type = "application/zip";
+      break;
+    }
+    case "卸货记录": {
+      path = "/voyage/exportMultDischargeExcel";
+      type = "application/zip";
+      break;
+    }
+  }
   let res = await downloadBlobFile(
-    `${url.baseurl}${
-      exportModalTitle.value == "卸货记录"
-        ? "/voyage/exportMultDischargeExcel"
-        : "/voyage/exportMultExcel"
-    }`,
+    `${url.baseurl}${path}`,
     { loginAccountId: localStorage.loginAccountId, date: currentMonth.value },
     `${exportModalTitle.value}${currentMonth.value}`,
     "post",
-    "application/zip"
+    type
   );
   ElNotification({
     title: "导出成功!",