Merge branch 'dev' into pre-production

src/api/basicdata/basicdataTray.js

@@ -179,3 +179,15 @@ export const getWarehouseListqx = () => {
     method: 'get',
   });
 };
+
+/**
+ * 托盘详情导出
+ */
+export const getExportTrayData = params => {
+  return request({
+    url: '/api/logpm-basicdata/tray/exportTrayData',
+    method: 'get',
+    params,
+    responseType: 'blob',
+  });
+};

src/api/reportforms/AuditTimelinessRatioReport.js

@@ -5,7 +5,6 @@ export const postCheckWaybillTimePage = data => {
     url: '/api/logpm-report/reportTime/checkWaybillTimePage',
     method: 'post',
     data,
-    timeout: 30000,
   });
 };
 

src/api/reportforms/ConsigneeReport.js

@@ -5,7 +5,6 @@ export const postDeptIncomingPage = params => {
     url: '/api/logpm-report/reportIncoming/consigineeIncomingPage',
     method: 'get',
     params,
-    timeout: 30000,
   });
 };
 

src/api/reportforms/CreateOrderTimelinessRatioReport.js

@@ -5,7 +5,6 @@ export const postOpenTimePage = data => {
     url: '/api/logpm-report/reportTime/openTimePage',
     method: 'post',
     data,
-    timeout: 30000,
   });
 };
 

src/api/reportforms/PackageAllTrunklineTimePageReport.js

@@ -5,7 +5,6 @@ export const postCheckWaybillTimePage = data => {
     url: '/api/logpm-report/reportTime/packageAllTrunklineTimePage',
     method: 'post',
     data,
-    timeout: 30000,
   });
 };
 

src/api/reportforms/PackageStartTimePageReport.js

@@ -5,7 +5,6 @@ export const postCheckWaybillTimePage = data => {
     url: '/api/logpm-report/reportTime/packageStartTimePage',
     method: 'post',
     data,
-    timeout: 30000,
   });
 };
 

src/api/reportforms/PackageTransferTimePageReport.js

@@ -5,7 +5,6 @@ export const postCheckWaybillTimePage = data => {
     url: '/api/logpm-report/reportTime/packageTransferTimePage',
     method: 'post',
     data,
-    timeout: 30000,
   });
 };
 

src/api/reportforms/UpdateWaybillQualityPageReport.js

@@ -5,7 +5,6 @@ export const postCheckWaybillTimePage = data => {
     url: '/api/logpm-report/reportQuality/updateWaybillQualityPage',
     method: 'post',
     data,
-    timeout: 30000,
   });
 };
 

src/api/reportforms/ZeroAllTrunklineTimePageReport.js

@@ -5,7 +5,6 @@ export const postCheckWaybillTimePage = data => {
     url: '/api/logpm-report/reportTime/zeroAllTrunklineTimePage',
     method: 'post',
     data,
-    timeout: 30000,
   });
 };
 

src/api/reportforms/ZeroStartTimePageReport.js

@@ -5,7 +5,6 @@ export const postCheckWaybillTimePage = data => {
     url: '/api/logpm-report/reportTime/zeroStartTimePage',
     method: 'post',
     data,
-    timeout: 30000,
   });
 };
 

src/api/reportforms/ZeroTransferTimePageReport.js

@@ -5,7 +5,6 @@ export const postCheckWaybillTimePage = data => {
     url: '/api/logpm-report/reportTime/zeroTransferTimePage',
     method: 'post',
     data,
-    timeout: 30000,
   });
 };
 

src/option/distribution/distributionStockArticleDetails.js

@@ -186,7 +186,7 @@ export const columnList = [
   {
     prop: 'materialCodeMaintainStatus',
     label: '物料维护状态',
-    type: 6,
+    type: 1,
     values: '',
     width: '150',
     checkarr: [],

src/option/reportforms/CreateOrderTimelinessRatioReport.js

@@ -119,8 +119,8 @@ export const columnList = [
     isshowSummary: false, //开启统计
   },
   {
-    prop: 'noOpenNoFreezeNum',
-    label: '未开单未处理数',
+    prop: 'noOpenNoChaoNum',
+    label: '未开单未超时数',
     type: 1,
     values: '',
     width: '150',
@@ -131,8 +131,32 @@ export const columnList = [
     isshowSummary: true, //开启统计
   },
   {
-    prop: 'noOpenNoFreezeRate',
-    label: '未处理占比',
+    prop: 'noOpenNoChaoRate',
+    label: '未开单未超时占比',
+    type: 6,
+    values: '',
+    width: '200',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: false, //开启统计
+  },
+  {
+    prop: 'noOpenChaoNum',
+    label: '未开单超时数',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true, //开启统计
+  },
+  {
+    prop: 'noOpenChaoRate',
+    label: '未开单超时占比',
     type: 6,
     values: '',
     width: '200',

src/option/reportforms/PackageStartTimePageReport.js

@@ -109,7 +109,7 @@ export const columnList = [
   {
     prop: 'onTimeRate',
     label: '准时发运率',
-    type: 1,
+    type: 6,
     values: '',
     width: '150',
     checkarr: [],

src/option/reportforms/PackageTransferTimePageReport.js

@@ -97,7 +97,7 @@ export const columnList = [
   {
     prop: 'outOnTimeRate',
     label: '中转准时出库率',
-    type: 1,
+    type: 6,
     values: '',
     width: '150',
     checkarr: [],
@@ -108,7 +108,7 @@ export const columnList = [
   {
     prop: 'avgTime',
     label: '平均中转时效',
-    type: 6,
+    type: 1,
     values: '',
     width: '150',
     checkarr: [],

src/option/reportforms/UpdateWaybillQualityPageReport.js

@@ -132,7 +132,7 @@ export const columnList = [
   {
     prop: 'personProbleRate',
     label: '人为操作错误率',
-    type: 1,
+    type: 6,
     values: '',
     width: '150',
     checkarr: [],
@@ -143,7 +143,7 @@ export const columnList = [
   {
     prop: 'financeUpdateNum',
     label: '财务修改数',
-    type: 6,
+    type: 1,
     values: '',
     width: '150',
     checkarr: [],
@@ -155,7 +155,7 @@ export const columnList = [
   {
     prop: 'financeUpdateRate',
     label: '财务修改率',
-    type: 1,
+    type: 6,
     values: '',
     width: '150',
     checkarr: [],
@@ -167,7 +167,7 @@ export const columnList = [
   {
     prop: 'merchantUpdateNum',
     label: '商家要求数',
-    type: 6,
+    type: 1,
     values: '',
     width: '150',
     checkarr: [],
@@ -179,7 +179,7 @@ export const columnList = [
   {
     prop: 'merchantUpdateRate',
     label: '商家要求率',
-    type: 1,
+    type: 6,
     values: '',
     width: '150',
     checkarr: [],
@@ -190,7 +190,7 @@ export const columnList = [
   {
     prop: 'businessUpdateNum',
     label: '业务调整数',
-    type: 6,
+    type: 1,
     values: '',
     width: '150',
     checkarr: [],
@@ -202,7 +202,7 @@ export const columnList = [
   {
     prop: 'businessUpdateRate',
     label: '业务调整率',
-    type: 1,
+    type: 6,
     values: '',
     width: '150',
     checkarr: [],

src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue

@@ -911,12 +911,13 @@ async function checkshelves() {
    * goodsAreaId 货区ID
    * goodsShelfId 货架ID
    */
-  let goodsAreaarr =
-    details.arrlist[details.checkselect]['warehouseGoodsAreaVOList'][details.checkregionselect];
+  console.log(details,'details');
+  
+  let goodsAreaarr =  details.arrlist[details.checkselect]['warehouseGoodsAreaVOList'][details.checkregionselect];
   let goodsShelfarr = goodsAreaarr['warehouseGoodsShelfEntitieList'][details.checksele];
   let data = {
-    goodsAreaId: goodsAreaarr.id,
-    goodsShelfId: goodsShelfarr.id,
+    goodsAreaId: goodsAreaarr?.id,
+    goodsShelfId: goodsShelfarr?.id,
   };
   const res = await getVisualization(data); // 调用异步函数获取可视化数据
   console.log(res.data, 'res.data.datares.data.datares.data.datares.data.datares.data.data');

src/views/basicdata/warehouse/tray/basicdataTrayedt.vue

@@ -31,7 +31,11 @@
         </el-col>
       </el-row>
 
-      <el-divider>在 托 货 物</el-divider>
+      <div class="flex export_row">
+        <el-divider class="flex1">在 托 货 物</el-divider>
+
+        <el-button icon="Download" type="primary" @click="handleExport">导出</el-button>
+      </div>
       <el-tabs type="border-card" v-model="activeTab" @tab-click="handleTabClick">
         <el-tab-pane label="包 件 列 表" name="tab1">
           <!-- 列表模块 -->
@@ -163,13 +167,14 @@ import {
   getpackList,
   getinventoryList,
   getlclList,
+  getExportTrayData,
 } from '@/api/basicdata/basicdataTray';
 
 import option from '@/option/basic/basicPdarecords';
 import { mapGetters } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';
 import dayjs from 'dayjs';
-import { handleTranslationDataSeclect } from '@/utils/util';
+import { handleTranslationDataSeclect, downloadXls } from '@/utils/util';
 
 export default {
   data() {
@@ -827,7 +832,7 @@ export default {
         //   head: false,
         // },
         {
-          prop: 'positionCode',
+          prop: 'goodsAllocation',
           label: '所在库位',
           type: 30,
           values: '',
@@ -1482,6 +1487,37 @@ export default {
       this.handleInventory(this.inventorypage);
       this.loading = false;
     },
+    /** 导出 */
+    async handleExport() {
+      console.log('this.traydata :>> ', this.traydata);
+
+      try {
+        this.loading = true;
+        const res = await getExportTrayData({ id: this.traydata.id });
+        const { status, data } = res;
+
+        if (status !== 200) return;
+
+        downloadXls(data, `${this.traydata.palletName} - 在托详情 - ${new Date().getTime()}.xlsx`);
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+        this.loading = false;
+      }
+    },
   },
 };
 </script>
+
+<style lang="scss" scoped>
+.export_row {
+  position: relative;
+
+  :deep(.el-button) {
+    position: absolute;
+    right: 0;
+    top: 50%;
+    transform: translateY(-50%);
+  }
+}
+</style>

src/views/reportforms/AuditTimelinessRatioReport.vue

@@ -32,12 +32,6 @@
               start-placeholder="开始时间"
               end-placeholder="结束时间"
               value-format="YYYY-MM-DD"
-              @change="
-                () => {
-                  delete details.query.year;
-                  delete details.query.month;
-                }
-              "
             />
           </el-form-item>
 
@@ -299,6 +293,12 @@ const onLoad = async (params = {}) => {
     if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) {
       submitData.startTimeStr = submitData.timeArr[0];
       submitData.endTimeStr = submitData.timeArr[1];
+
+      const start = new Date(submitData.startTimeStr).getTime();
+      const end = new Date(submitData.endTimeStr).getTime();
+
+      if (end - start + 1000 * 60 * 60 * 24 > 1000 * 60 * 60 * 24 * 31)
+        return ElMessage.warning('时间不能大于31天');
     }
 
     if (getObjType(submitData.timeArr) !== 'array' || submitData.timeArr.length === 0) {
@@ -470,25 +470,19 @@ const ExportData = async () => {
       if (!element && element !== 0) delete submitData[key];
     }
 
-    // 月
-    if (submitData.month) {
-      const _arr = submitData.month.split('-');
-      submitData.year = _arr[0];
-      submitData.month = _arr[1];
-    }
-
     // 时间周期
-    else if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) {
+    if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) {
       submitData.startTimeStr = submitData.timeArr[0];
       submitData.endTimeStr = submitData.timeArr[1];
-    }
 
-    if (
-      (getObjType(submitData.timeArr) !== 'array' || submitData.timeArr.length === 0) &&
-      !submitData.year &&
-      !submitData.month
-    ) {
-      return ElMessage.warning('请选择时间');
+      const start = new Date(submitData.startTimeStr).getTime();
+      const end = new Date(submitData.endTimeStr).getTime();
+      console.log('start :>> ', start);
+      console.log('end :>> ', end);
+      console.log('end - start :>> ', end - start);
+
+      if (end - start + 1000 * 60 * 60 * 24 > 1000 * 60 * 60 * 24 * 31)
+        return ElMessage.warning('时间不能大于31天');
     }
 
     delete submitData.timeArr;

src/views/reportforms/CreateOrderTimelinessRatioReport.vue

@@ -32,12 +32,6 @@
               start-placeholder="开始时间"
               end-placeholder="结束时间"
               value-format="YYYY-MM-DD"
-              @change="
-                () => {
-                  delete details.query.year;
-                  delete details.query.month;
-                }
-              "
             />
           </el-form-item>
 
@@ -280,6 +274,12 @@ const onLoad = async (params = {}) => {
     if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) {
       submitData.startTimeStr = submitData.timeArr[0];
       submitData.endTimeStr = submitData.timeArr[1];
+
+      const start = new Date(submitData.startTimeStr).getTime();
+      const end = new Date(submitData.endTimeStr).getTime();
+
+      if (end - start + 1000 * 60 * 60 * 24 > 1000 * 60 * 60 * 24 * 31)
+        return ElMessage.warning('时间不能大于31天');
     }
 
     if (getObjType(submitData.timeArr) !== 'array' || submitData.timeArr.length === 0) {
@@ -451,25 +451,19 @@ const ExportData = async () => {
       if (!element && element !== 0) delete submitData[key];
     }
 
-    // 月
-    if (submitData.month) {
-      const _arr = submitData.month.split('-');
-      submitData.year = _arr[0];
-      submitData.month = _arr[1];
-    }
-
     // 时间周期
-    else if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) {
+    if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) {
       submitData.startTimeStr = submitData.timeArr[0];
       submitData.endTimeStr = submitData.timeArr[1];
-    }
 
-    if (
-      (getObjType(submitData.timeArr) !== 'array' || submitData.timeArr.length === 0) &&
-      !submitData.year &&
-      !submitData.month
-    ) {
-      return ElMessage.warning('请选择时间');
+      const start = new Date(submitData.startTimeStr).getTime();
+      const end = new Date(submitData.endTimeStr).getTime();
+      console.log('start :>> ', start);
+      console.log('end :>> ', end);
+      console.log('end - start :>> ', end - start);
+
+      if (end - start + 1000 * 60 * 60 * 24 > 1000 * 60 * 60 * 24 * 31)
+        return ElMessage.warning('时间不能大于31天');
     }
 
     delete submitData.timeArr;

src/views/reportforms/PackageAllTrunklineTimePageReport.vue

@@ -32,12 +32,6 @@
               start-placeholder="开始时间"
               end-placeholder="结束时间"
               value-format="YYYY-MM-DD"
-              @change="
-                () => {
-                  delete details.query.year;
-                  delete details.query.month;
-                }
-              "
             />
           </el-form-item>
 
@@ -299,6 +293,12 @@ const onLoad = async (params = {}) => {
     if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) {
       submitData.startTimeStr = submitData.timeArr[0];
       submitData.endTimeStr = submitData.timeArr[1];
+
+      const start = new Date(submitData.startTimeStr).getTime();
+      const end = new Date(submitData.endTimeStr).getTime();
+
+      if (end - start + 1000 * 60 * 60 * 24 > 1000 * 60 * 60 * 24 * 31)
+        return ElMessage.warning('时间不能大于31天');
     }
 
     if (getObjType(submitData.timeArr) !== 'array' || submitData.timeArr.length === 0) {
@@ -470,25 +470,16 @@ const ExportData = async () => {
       if (!element && element !== 0) delete submitData[key];
     }
 
-    // 月
-    if (submitData.month) {
-      const _arr = submitData.month.split('-');
-      submitData.year = _arr[0];
-      submitData.month = _arr[1];
-    }
-
     // 时间周期
-    else if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) {
+    if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) {
       submitData.startTimeStr = submitData.timeArr[0];
       submitData.endTimeStr = submitData.timeArr[1];
-    }
 
-    if (
-      (getObjType(submitData.timeArr) !== 'array' || submitData.timeArr.length === 0) &&
-      !submitData.year &&
-      !submitData.month
-    ) {
-      return ElMessage.warning('请选择时间');
+      const start = new Date(submitData.startTimeStr).getTime();
+      const end = new Date(submitData.endTimeStr).getTime();
+
+      if (end - start + 1000 * 60 * 60 * 24 > 1000 * 60 * 60 * 24 * 31)
+        return ElMessage.warning('时间不能大于31天');
     }
 
     delete submitData.timeArr;

src/views/reportforms/PackageStartTimePageReport.vue

@@ -32,12 +32,6 @@
               start-placeholder="开始时间"
               end-placeholder="结束时间"
               value-format="YYYY-MM-DD"
-              @change="
-                () => {
-                  delete details.query.year;
-                  delete details.query.month;
-                }
-              "
             />
           </el-form-item>
 
@@ -299,6 +293,12 @@ const onLoad = async (params = {}) => {
     if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) {
       submitData.startTimeStr = submitData.timeArr[0];
       submitData.endTimeStr = submitData.timeArr[1];
+
+      const start = new Date(submitData.startTimeStr).getTime();
+      const end = new Date(submitData.endTimeStr).getTime();
+
+      if (end - start + 1000 * 60 * 60 * 24 > 1000 * 60 * 60 * 24 * 31)
+        return ElMessage.warning('时间不能大于31天');
     }
 
     if (getObjType(submitData.timeArr) !== 'array' || submitData.timeArr.length === 0) {
@@ -470,25 +470,19 @@ const ExportData = async () => {
       if (!element && element !== 0) delete submitData[key];
     }
 
-    // 月
-    if (submitData.month) {
-      const _arr = submitData.month.split('-');
-      submitData.year = _arr[0];
-      submitData.month = _arr[1];
-    }
-
     // 时间周期
-    else if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) {
+    if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) {
       submitData.startTimeStr = submitData.timeArr[0];
       submitData.endTimeStr = submitData.timeArr[1];
-    }
 
-    if (
-      (getObjType(submitData.timeArr) !== 'array' || submitData.timeArr.length === 0) &&
-      !submitData.year &&
-      !submitData.month
-    ) {
-      return ElMessage.warning('请选择时间');
+      const start = new Date(submitData.startTimeStr).getTime();
+      const end = new Date(submitData.endTimeStr).getTime();
+      console.log('start :>> ', start);
+      console.log('end :>> ', end);
+      console.log('end - start :>> ', end - start);
+
+      if (end - start + 1000 * 60 * 60 * 24 > 1000 * 60 * 60 * 24 * 31)
+        return ElMessage.warning('时间不能大于31天');
     }
 
     delete submitData.timeArr;

src/views/reportforms/PackageTransferTimePageReport.vue

@@ -32,12 +32,6 @@
               start-placeholder="开始时间"
               end-placeholder="结束时间"
               value-format="YYYY-MM-DD"
-              @change="
-                () => {
-                  delete details.query.year;
-                  delete details.query.month;
-                }
-              "
             />
           </el-form-item>
 
@@ -299,6 +293,12 @@ const onLoad = async (params = {}) => {
     if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) {
       submitData.startTimeStr = submitData.timeArr[0];
       submitData.endTimeStr = submitData.timeArr[1];
+
+      const start = new Date(submitData.startTimeStr).getTime();
+      const end = new Date(submitData.endTimeStr).getTime();
+
+      if (end - start + 1000 * 60 * 60 * 24 > 1000 * 60 * 60 * 24 * 31)
+        return ElMessage.warning('时间不能大于31天');
     }
 
     if (getObjType(submitData.timeArr) !== 'array' || submitData.timeArr.length === 0) {
@@ -470,27 +470,20 @@ const ExportData = async () => {
       if (!element && element !== 0) delete submitData[key];
     }
 
-    // 月
-    if (submitData.month) {
-      const _arr = submitData.month.split('-');
-      submitData.year = _arr[0];
-      submitData.month = _arr[1];
-    }
-
     // 时间周期
-    else if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) {
+    if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) {
       submitData.startTimeStr = submitData.timeArr[0];
       submitData.endTimeStr = submitData.timeArr[1];
-    }
 
-    if (
-      (getObjType(submitData.timeArr) !== 'array' || submitData.timeArr.length === 0) &&
-      !submitData.year &&
-      !submitData.month
-    ) {
-      return ElMessage.warning('请选择时间');
-    }
+      const start = new Date(submitData.startTimeStr).getTime();
+      const end = new Date(submitData.endTimeStr).getTime();
+      console.log('start :>> ', start);
+      console.log('end :>> ', end);
+      console.log('end - start :>> ', end - start);
 
+      if (end - start + 1000 * 60 * 60 * 24 > 1000 * 60 * 60 * 24 * 31)
+        return ElMessage.warning('时间不能大于31天');
+    }
     delete submitData.timeArr;
     delete submitData.total;
 

src/views/reportforms/UpdateWaybillQualityPageReport.vue

@@ -32,12 +32,6 @@
               start-placeholder="开始时间"
               end-placeholder="结束时间"
               value-format="YYYY-MM-DD"
-              @change="
-                () => {
-                  delete details.query.year;
-                  delete details.query.month;
-                }
-              "
             />
           </el-form-item>
 
@@ -299,6 +293,12 @@ const onLoad = async (params = {}) => {
     if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) {
       submitData.startTimeStr = submitData.timeArr[0];
       submitData.endTimeStr = submitData.timeArr[1];
+
+      const start = new Date(submitData.startTimeStr).getTime();
+      const end = new Date(submitData.endTimeStr).getTime();
+
+      if (end - start + 1000 * 60 * 60 * 24 > 1000 * 60 * 60 * 24 * 31)
+        return ElMessage.warning('时间不能大于31天');
     }
 
     if (getObjType(submitData.timeArr) !== 'array' || submitData.timeArr.length === 0) {
@@ -470,25 +470,19 @@ const ExportData = async () => {
       if (!element && element !== 0) delete submitData[key];
     }
 
-    // 月
-    if (submitData.month) {
-      const _arr = submitData.month.split('-');
-      submitData.year = _arr[0];
-      submitData.month = _arr[1];
-    }
-
     // 时间周期
-    else if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) {
+    if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) {
       submitData.startTimeStr = submitData.timeArr[0];
       submitData.endTimeStr = submitData.timeArr[1];
-    }
 
-    if (
-      (getObjType(submitData.timeArr) !== 'array' || submitData.timeArr.length === 0) &&
-      !submitData.year &&
-      !submitData.month
-    ) {
-      return ElMessage.warning('请选择时间');
+      const start = new Date(submitData.startTimeStr).getTime();
+      const end = new Date(submitData.endTimeStr).getTime();
+      console.log('start :>> ', start);
+      console.log('end :>> ', end);
+      console.log('end - start :>> ', end - start);
+
+      if (end - start + 1000 * 60 * 60 * 24 > 1000 * 60 * 60 * 24 * 31)
+        return ElMessage.warning('时间不能大于31天');
     }
 
     delete submitData.timeArr;

src/views/reportforms/ZeroAllTrunklineTimePageReport.vue

@@ -32,12 +32,6 @@
               start-placeholder="开始时间"
               end-placeholder="结束时间"
               value-format="YYYY-MM-DD"
-              @change="
-                () => {
-                  delete details.query.year;
-                  delete details.query.month;
-                }
-              "
             />
           </el-form-item>
 
@@ -299,6 +293,12 @@ const onLoad = async (params = {}) => {
     if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) {
       submitData.startTimeStr = submitData.timeArr[0];
       submitData.endTimeStr = submitData.timeArr[1];
+
+      const start = new Date(submitData.startTimeStr).getTime();
+      const end = new Date(submitData.endTimeStr).getTime();
+
+      if (end - start + 1000 * 60 * 60 * 24 > 1000 * 60 * 60 * 24 * 31)
+        return ElMessage.warning('时间不能大于31天');
     }
 
     if (getObjType(submitData.timeArr) !== 'array' || submitData.timeArr.length === 0) {
@@ -470,25 +470,19 @@ const ExportData = async () => {
       if (!element && element !== 0) delete submitData[key];
     }
 
-    // 月
-    if (submitData.month) {
-      const _arr = submitData.month.split('-');
-      submitData.year = _arr[0];
-      submitData.month = _arr[1];
-    }
-
     // 时间周期
-    else if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) {
+    if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) {
       submitData.startTimeStr = submitData.timeArr[0];
       submitData.endTimeStr = submitData.timeArr[1];
-    }
 
-    if (
-      (getObjType(submitData.timeArr) !== 'array' || submitData.timeArr.length === 0) &&
-      !submitData.year &&
-      !submitData.month
-    ) {
-      return ElMessage.warning('请选择时间');
+      const start = new Date(submitData.startTimeStr).getTime();
+      const end = new Date(submitData.endTimeStr).getTime();
+      console.log('start :>> ', start);
+      console.log('end :>> ', end);
+      console.log('end - start :>> ', end - start);
+
+      if (end - start + 1000 * 60 * 60 * 24 > 1000 * 60 * 60 * 24 * 31)
+        return ElMessage.warning('时间不能大于31天');
     }
 
     delete submitData.timeArr;

src/views/reportforms/ZeroStartTimePageReport.vue

@@ -32,12 +32,6 @@
               start-placeholder="开始时间"
               end-placeholder="结束时间"
               value-format="YYYY-MM-DD"
-              @change="
-                () => {
-                  delete details.query.year;
-                  delete details.query.month;
-                }
-              "
             />
           </el-form-item>
 
@@ -299,6 +293,12 @@ const onLoad = async (params = {}) => {
     if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) {
       submitData.startTimeStr = submitData.timeArr[0];
       submitData.endTimeStr = submitData.timeArr[1];
+
+      const start = new Date(submitData.startTimeStr).getTime();
+      const end = new Date(submitData.endTimeStr).getTime();
+
+      if (end - start + 1000 * 60 * 60 * 24 > 1000 * 60 * 60 * 24 * 31)
+        return ElMessage.warning('时间不能大于31天');
     }
 
     if (getObjType(submitData.timeArr) !== 'array' || submitData.timeArr.length === 0) {
@@ -470,25 +470,19 @@ const ExportData = async () => {
       if (!element && element !== 0) delete submitData[key];
     }
 
-    // 月
-    if (submitData.month) {
-      const _arr = submitData.month.split('-');
-      submitData.year = _arr[0];
-      submitData.month = _arr[1];
-    }
-
     // 时间周期
-    else if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) {
+    if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) {
       submitData.startTimeStr = submitData.timeArr[0];
       submitData.endTimeStr = submitData.timeArr[1];
-    }
 
-    if (
-      (getObjType(submitData.timeArr) !== 'array' || submitData.timeArr.length === 0) &&
-      !submitData.year &&
-      !submitData.month
-    ) {
-      return ElMessage.warning('请选择时间');
+      const start = new Date(submitData.startTimeStr).getTime();
+      const end = new Date(submitData.endTimeStr).getTime();
+      console.log('start :>> ', start);
+      console.log('end :>> ', end);
+      console.log('end - start :>> ', end - start);
+
+      if (end - start + 1000 * 60 * 60 * 24 > 1000 * 60 * 60 * 24 * 31)
+        return ElMessage.warning('时间不能大于31天');
     }
 
     delete submitData.timeArr;

src/views/reportforms/ZeroTransferTimePageReport.vue

@@ -32,12 +32,6 @@
               start-placeholder="开始时间"
               end-placeholder="结束时间"
               value-format="YYYY-MM-DD"
-              @change="
-                () => {
-                  delete details.query.year;
-                  delete details.query.month;
-                }
-              "
             />
           </el-form-item>
 
@@ -195,7 +189,7 @@ import {
 } from '@/utils/util';
 import { useRouter } from 'vue-router';
 import { ElMessage, ElMessageBox } from 'element-plus';
-import { columnList } from '@/option/reportforms/PackageAllTrunklineTimePageReport';
+import { columnList } from '@/option/reportforms/PackageTransferTimePageReport';
 
 // 获取路由实例
 const $router = useRouter();
@@ -299,6 +293,12 @@ const onLoad = async (params = {}) => {
     if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) {
       submitData.startTimeStr = submitData.timeArr[0];
       submitData.endTimeStr = submitData.timeArr[1];
+
+      const start = new Date(submitData.startTimeStr).getTime();
+      const end = new Date(submitData.endTimeStr).getTime();
+
+      if (end - start + 1000 * 60 * 60 * 24 > 1000 * 60 * 60 * 24 * 31)
+        return ElMessage.warning('时间不能大于31天');
     }
 
     if (getObjType(submitData.timeArr) !== 'array' || submitData.timeArr.length === 0) {
@@ -470,25 +470,19 @@ const ExportData = async () => {
       if (!element && element !== 0) delete submitData[key];
     }
 
-    // 月
-    if (submitData.month) {
-      const _arr = submitData.month.split('-');
-      submitData.year = _arr[0];
-      submitData.month = _arr[1];
-    }
-
     // 时间周期
-    else if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) {
+    if (getObjType(submitData.timeArr) === 'array' && submitData.timeArr.length > 0) {
       submitData.startTimeStr = submitData.timeArr[0];
       submitData.endTimeStr = submitData.timeArr[1];
-    }
 
-    if (
-      (getObjType(submitData.timeArr) !== 'array' || submitData.timeArr.length === 0) &&
-      !submitData.year &&
-      !submitData.month
-    ) {
-      return ElMessage.warning('请选择时间');
+      const start = new Date(submitData.startTimeStr).getTime();
+      const end = new Date(submitData.endTimeStr).getTime();
+      console.log('start :>> ', start);
+      console.log('end :>> ', end);
+      console.log('end - start :>> ', end - start);
+
+      if (end - start + 1000 * 60 * 60 * 24 > 1000 * 60 * 60 * 24 * 31)
+        return ElMessage.warning('时间不能大于31天');
     }
 
     delete submitData.timeArr;