Merge branch 'dev' into pre-production

2 weeks ago · b3a2f2d3ba
9 changed files with 113 additions and 58 deletions
--- a/src/option/reportforms/AuditTimelinessRatioReport.js
+++ b/src/option/reportforms/AuditTimelinessRatioReport.js
@ -52,7 +52,7 @@ export const columnList = [
    label: '品牌',
    type: 1,
    values: '',
-    width: '150',
+    width: '90',
    checkarr: [],
    fixed: false,
    sortable: true,
@ -63,7 +63,7 @@ export const columnList = [
    label: '总运单数',
    type: 1,
    values: '',
-    width: '150',
+    width: '90',
    checkarr: [],
    fixed: false,
    sortable: true,
@ -75,7 +75,19 @@ export const columnList = [
    label: '已审单数',
    type: 1,
    values: '',
-    width: '150',
+    width: '90',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true, //开启统计
+  },
+  {
+    prop: 'hasCheckNum',
+    label: '未审单数',
+    type: 1,
+    values: '',
+    width: '90',
    checkarr: [],
    fixed: false,
    sortable: true,
@ -87,7 +99,7 @@ export const columnList = [
    label: '审单率',
    type: 6,
    values: '',
-    width: '150',
+    width: '90',
    checkarr: [],
    fixed: false,
    sortable: true,
@ -99,7 +111,7 @@ export const columnList = [
    label: '准时审单数',
    type: 1,
    values: '',
-    width: '150',
+    width: '90',
    checkarr: [],
    fixed: false,
    sortable: true,
@ -111,7 +123,7 @@ export const columnList = [
    label: '审单准时率',
    type: 6,
    values: '',
-    width: '150',
+    width: '100',
    checkarr: [],
    fixed: false,
    sortable: true,
@ -123,7 +135,7 @@ export const columnList = [
    label: '平均审单时效(小时)',
    type: 1,
    values: '',
-    width: '160',
+    width: '130',
    checkarr: [],
    fixed: false,
    sortable: true,
--- a/src/option/reportforms/CreateOrderTimelinessRatioReport.js
+++ b/src/option/reportforms/CreateOrderTimelinessRatioReport.js
@ -59,6 +59,30 @@ export const columnList = [
    head: false,
    isshowSummary: false, //开启统计
  },
+  {
+    prop: 'noOpenHasFreezeNum',
+    label: '未开单已冻结数',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true, //开启统计
+  },
+  {
+    prop: 'needOpenNum',
+    label: '应开单数',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true, //开启统计
+  },
  {
    prop: 'hasOpenNum',
    label: '已开单数',
@ -84,8 +108,20 @@ export const columnList = [
    isshowSummary: false, //开启统计
  },
  {
-    prop: 'noOpenRate',
-    label: '未开单占比',
+    prop: 'onTimeNum',
+    label: '准时开单数',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: true, //开启统计
+  },
+  {
+    prop: 'onTimeRate',
+    label: '开单准时率',
    type: 6,
    values: '',
    width: '150',
@ -93,18 +129,31 @@ export const columnList = [
    fixed: false,
    sortable: true,
    head: false,
+    isshowSummary: true, //开启统计
  },
+
  {
-    prop: 'noOpenHasFreezeNum',
-    label: '未开单已冻结数',
+    prop: 'avgTime',
+    label: '平均开单时效(小时)',
    type: 1,
    values: '',
+    width: '160',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+    isshowSummary: false, //开启统计
+  },
+  {
+    prop: 'noOpenRate',
+    label: '未开单占比',
+    type: 6,
+    values: '',
    width: '150',
    checkarr: [],
    fixed: false,
    sortable: true,
    head: false,
-    isshowSummary: true, //开启统计
  },
  {
    prop: 'noOpenHasFreezeRate',
@ -166,18 +215,6 @@ export const columnList = [
    head: false,
    isshowSummary: false, //开启统计
  },
-  {
-    prop: 'onTimeNum',
-    label: '准时开单数',
-    type: 1,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-    head: false,
-    isshowSummary: true, //开启统计
-  },
  {
    prop: 'overTimeNum',
    label: '超期开单数',
@ -190,28 +227,4 @@ export const columnList = [
    head: false,
    isshowSummary: true, //开启统计
  },
-  {
-    prop: 'onTimeRate',
-    label: '开单准时率',
-    type: 6,
-    values: '',
-    width: '150',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-    head: false,
-    isshowSummary: true, //开启统计
-  },
-  {
-    prop: 'avgTime',
-    label: '平均开单时效(小时)',
-    type: 1,
-    values: '',
-    width: '160',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-    head: false,
-    isshowSummary: false, //开启统计
-  },
 ];
--- a/src/option/reportforms/PackageAllTrunklineTimePageReport.js
+++ b/src/option/reportforms/PackageAllTrunklineTimePageReport.js
@ -119,7 +119,7 @@ export const columnList = [
    label: '到仓平均干线时效(天)',
    type: 1,
    values: '',
-    width: '150',
+    width: '160',
    checkarr: [],
    fixed: false,
    sortable: true,
--- a/src/option/reportformsOption/AllTrunklineConfig.js
+++ b/src/option/reportformsOption/AllTrunklineConfig.js
@ -49,7 +49,7 @@ export const columnList = [
  },
  {
    prop: 'hoursTime',
-    label: '时效',
+    label: '时效(小时)',
    type: 1,
    values: '',
    width: '150',
--- a/src/option/reportformsOption/CheckWaybillConfig.js
+++ b/src/option/reportformsOption/CheckWaybillConfig.js
@ -49,7 +49,7 @@ export const columnList = [
  },
  {
    prop: 'hoursTime',
-    label: '时效',
+    label: '时效(小时)',
    type: 1,
    values: '',
    width: '150',
--- a/src/option/reportformsOption/DespatchConfig.js
+++ b/src/option/reportformsOption/DespatchConfig.js
@ -49,7 +49,7 @@ export const columnList = [
  },
  {
    prop: 'hoursTime',
-    label: '时效',
+    label: '时效(小时)',
    type: 1,
    values: '',
    width: '150',
--- a/src/option/reportformsOption/OpenTimeConfig.js
+++ b/src/option/reportformsOption/OpenTimeConfig.js
@ -38,7 +38,7 @@ export const columnList = [
  },
  {
    prop: 'hoursTime',
-    label: '时效',
+    label: '时效(小时)',
    type: 1,
    values: '',
    width: '150',
--- a/src/option/reportformsOption/TransferConfig.js
+++ b/src/option/reportformsOption/TransferConfig.js
@ -38,7 +38,7 @@ export const columnList = [
  },
  {
    prop: 'hoursTime',
-    label: '时效',
+    label: '时效(小时)',
    type: 1,
    values: '',
    width: '150',
--- a/src/views/reportforms/OrderAllTime.vue
+++ b/src/views/reportforms/OrderAllTime.vue
@ -4,7 +4,7 @@
      <!-- 搜索模块 -->
      <div v-h5uShow="search">
        <!-- 查询模块 -->
-        <el-form :inline="true" :model="query" class="header_search" label-width="100px">
+        <el-form :inline="true" :model="query" class="header_search" label-width="120px">
          <el-form-item label="品牌" prop="brandId">
            <el-select
              class="w100"
@ -24,7 +24,7 @@
            </el-select>
          </el-form-item>

-          <el-form-item label="运单创建时间">
+          <el-form-item label="工厂推送时间">
            <el-date-picker
              v-model="query.timeArr"
              type="daterange"
@ -35,6 +35,17 @@
            />
          </el-form-item>

+          <el-form-item label="开单时间">
+            <el-date-picker
+              v-model="query.openTime"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+              value-format="YYYY-MM-DD"
+            />
+          </el-form-item>
+
          <el-form-item label="事业线">
            <el-select
              class="w100"
@ -295,17 +306,36 @@ const onLoad = async (params = {}) => {
      const end = new Date(submitData.endTimeStr).getTime();

      if (end - start + 1000 * 60 * 60 * 24 > 1000 * 60 * 60 * 24 * 31)
-        return ElMessage.warning('时间不能大于31天');
+        return ElMessage.warning('工厂推送时间不能大于31天');
+    }
+
+    // 开单时间
+    // if ()openTime
+    if (getObjType(submitData.openTime) === 'array' && submitData.openTime.length > 0) {
+      submitData.openTimeStartStr = submitData.openTime[0];
+      submitData.openTimeEndStr = submitData.openTime[1];
+
+      const start = new Date(submitData.openTimeStartStr).getTime();
+      const end = new Date(submitData.openTimeEndStr).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) {
      details.data = [];
-      return ElMessage.warning('请选择时间');
+      return ElMessage.warning('请选择工厂推送时间');
    }

    delete submitData.timeArr;
+    delete submitData.openTime;
    delete submitData.total;

+    if (submitData.waybillNo) {
+      submitData.waybillCode = submitData.waybillNo;
+      delete submitData.waybillNo;
+    }
+
    const res = await postOrderAllTimePage(submitData);
    const { code, data } = res.data;
    if (code !== 200) return;