Merge branch 'dev_v1.0.1' into release_v1.0.1

src/views/report/dispatch-analysis/custom-type-drill-dialog.vue

@@ -37,6 +37,12 @@
       }"
       v-loading="loading"
     >
+      <template #custom-type="{ col, row }">
+        {{ customerTypeFilter(row[col.colKey]) }}
+      </template>
+      <template #begin-time="{ col, row }">
+        {{ timestampFilter(row[col.colKey]) }}
+      </template>
     </t-table>
   </my-dialog>
 </template>
@@ -46,12 +52,13 @@ import { CUSTOMER_TYPE } from '@/config/constants';
 import { dateFormat } from '@/utils/tool';
 import useFetchTable from '@/hooks/useFetchTable';
 import { customTypeDrill } from '@/api/report';
+import {customerTypeFilter, timestampFilter} from "@/utils/filter";
 const tableColumns = [
   { colKey: 'service', title: '服务单元' },
   { colKey: 'crmNo', title: '项目单号' },
-  { colKey: 'beginTime', title: '派单时间' },
+  { colKey: 'beginTime', title: '派单时间' , cell: 'begin-time'},
   { colKey: 'crmUserName', title: '客户经理' },
-  { colKey: 'customType', title: '客户类型' },
+  { colKey: 'customType', title: '客户类型' , cell: 'custom-type'},
   { colKey: 'custom', title: '客户名称' },
   { colKey: 'name', title: '项目名称' },
   { colKey: 'product', title: '实施产品' },

src/views/report/dispatch-analysis/dispatch-statistics-drill-dialog.vue

@@ -37,6 +37,12 @@
       }"
       v-loading="loading"
     >
+      <template #custom-type="{ col, row }">
+        {{ customerTypeFilter(row[col.colKey]) }}
+      </template>
+      <template #begin-time="{ col, row }">
+        {{ timestampFilter(row[col.colKey]) }}
+      </template>
     </t-table>
   </my-dialog>
 </template>
@@ -46,12 +52,13 @@ import { CUSTOMER_TYPE } from '@/config/constants';
 import { dateFormat } from '@/utils/tool';
 import useFetchTable from '@/hooks/useFetchTable';
 import { dispatchStatisticsDrill } from '@/api/report';
+import {customerTypeFilter, timestampFilter} from "@/utils/filter";
 const tableColumns = [
   { colKey: 'service', title: '服务单元' },
   { colKey: 'crmNo', title: '项目单号' },
-  { colKey: 'beginTime', title: '派单时间' },
+  { colKey: 'beginTime', title: '派单时间' , cell: 'begin-time'},
   { colKey: 'crmUserName', title: '客户经理' },
-  { colKey: 'customType', title: '客户类型' },
+  { colKey: 'customType', title: '客户类型' , cell: 'custom-type'},
   { colKey: 'custom', title: '客户名称' },
   { colKey: 'name', title: '项目名称' },
   { colKey: 'product', title: '实施产品' },

src/views/report/dispatch-analysis/month-dispatch-drill-dialog.vue

@@ -34,6 +34,12 @@
       }"
       v-loading="loading"
     >
+      <template #custom-type="{ col, row }">
+        {{ customerTypeFilter(row[col.colKey]) }}
+      </template>
+      <template #begin-time="{ col, row }">
+        {{ timestampFilter(row[col.colKey]) }}
+      </template>
     </t-table>
   </my-dialog>
 </template>
@@ -43,12 +49,13 @@ import { CUSTOMER_TYPE } from '@/config/constants';
 import useFetchTable from '@/hooks/useFetchTable';
 import { monthDispatchDrill } from '@/api/report';
 import { dateFormat } from '@/utils/tool';
+import {customerTypeFilter, timestampFilter} from "@/utils/filter";
 const tableColumns = [
   { colKey: 'service', title: '服务单元' },
   { colKey: 'crmNo', title: '项目单号' },
-  { colKey: 'beginTime', title: '派单时间' },
+  { colKey: 'beginTime', title: '派单时间' , cell: 'begin-time'},
   { colKey: 'crmUserName', title: '客户经理' },
-  { colKey: 'customType', title: '客户类型' },
+  { colKey: 'customType', title: '客户类型' , cell: 'custom-type'},
   { colKey: 'custom', title: '客户名称' },
   { colKey: 'name', title: '项目名称' },
   { colKey: 'product', title: '实施产品' },

src/views/report/dispatch-analysis/region-dispatch-drill-dialog.vue

@@ -42,6 +42,12 @@
       }"
       v-loading="loading"
     >
+      <template #custom-type="{ col, row }">
+        {{ customerTypeFilter(row[col.colKey]) }}
+      </template>
+      <template #begin-time="{ col, row }">
+        {{ timestampFilter(row[col.colKey]) }}
+      </template>
     </t-table>
   </my-dialog>
 </template>
@@ -51,12 +57,13 @@ import { CUSTOMER_TYPE } from '@/config/constants';
 import { dateFormat } from '@/utils/tool';
 import useFetchTable from '@/hooks/useFetchTable';
 import { regionDispatchDrill } from '@/api/report';
+import {customerTypeFilter, timestampFilter} from "@/utils/filter";
 const tableColumns = [
   { colKey: 'service', title: '服务单元' },
   { colKey: 'crmNo', title: '项目单号' },
-  { colKey: 'beginTime', title: '派单时间' },
+  { colKey: 'beginTime', title: '派单时间' , cell: 'begin-time'},
   { colKey: 'crmUserName', title: '客户经理' },
-  { colKey: 'customType', title: '客户类型' },
+  { colKey: 'customType', title: '客户类型' , cell: 'custom-type'},
   { colKey: 'custom', title: '客户名称' },
   { colKey: 'name', title: '项目名称' },
   { colKey: 'product', title: '实施产品' },

src/views/report/dispatch-analysis/supplier-dispatch-drill-dialog.vue

@@ -37,6 +37,12 @@
       }"
       v-loading="loading"
     >
+      <template #custom-type="{ col, row }">
+        {{ customerTypeFilter(row[col.colKey]) }}
+      </template>
+      <template #begin-time="{ col, row }">
+        {{ timestampFilter(row[col.colKey]) }}
+      </template>
     </t-table>
   </my-dialog>
 </template>
@@ -46,12 +52,13 @@ import { CUSTOMER_TYPE } from '@/config/constants';
 import { dateFormat } from '@/utils/tool';
 import useFetchTable from '@/hooks/useFetchTable';
 import { supplierDispatchDrill } from '@/api/report';
+import {customerTypeFilter, timestampFilter} from "@/utils/filter";
 const tableColumns = [
   { colKey: 'service', title: '服务单元' },
   { colKey: 'crmNo', title: '项目单号' },
-  { colKey: 'beginTime', title: '派单时间' },
+  { colKey: 'beginTime', title: '派单时间' , cell: 'begin-time'},
   { colKey: 'crmUserName', title: '客户经理' },
-  { colKey: 'customType', title: '客户类型' },
+  { colKey: 'customType', title: '客户类型' , cell: 'custom-type'},
   { colKey: 'custom', title: '客户名称' },
   { colKey: 'name', title: '项目名称' },
   { colKey: 'product', title: '实施产品' },

src/views/report/project-analysis/sop-detail-drill-dialog.vue

@@ -38,6 +38,12 @@
       }"
       v-loading="loading"
     >
+      <template #custom-type="{ col, row }">
+        {{ customerTypeFilter(row[col.colKey]) }}
+      </template>
+      <template #begin-time="{ col, row }">
+        {{ timestampFilter(row[col.colKey]) }}
+      </template>
     </t-table>
   </my-dialog>
 </template>
@@ -47,12 +53,13 @@ import { CUSTOMER_TYPE } from '@/config/constants';
 import { dateFormat } from '@/utils/tool';
 import useFetchTable from '@/hooks/useFetchTable';
 import { sopDetailDrill } from '@/api/report';
+import {customerTypeFilter, issuesReasonTypeFilter, issuesTypeFilter, timestampFilter} from "@/utils/filter";
 const tableColumns = [
   { colKey: 'serviceName', title: '服务单元' },
   { colKey: 'crmNo', title: '项目单号' },
-  { colKey: 'beginTime', title: '派单时间' },
+  { colKey: 'beginTime', title: '派单时间', cell: 'begin-time'},
   { colKey: 'customManagerName', title: '客户经理' },
-  { colKey: 'customManagerTypeStr', title: '客户类型' },
+  { colKey: 'customManagerTypeStr', title: '客户类型' ,cell: 'custom-type'},
   { colKey: 'customName', title: '客户名称' },
   { colKey: 'crmName', title: '项目名称' },
   { colKey: 'productName', title: '实施产品' },

src/views/report/service-analysis/supplier-detail-drill-dialog.vue

@@ -34,6 +34,12 @@
       }"
       v-loading="loading"
     >
+      <template #custom-type="{ col, row }">
+        {{ customerTypeFilter(row[col.colKey]) }}
+      </template>
+      <template #begin-time="{ col, row }">
+        {{ timestampFilter(row[col.colKey]) }}
+      </template>
     </t-table>
   </my-dialog>
 </template>
@@ -43,12 +49,13 @@ import { CUSTOMER_TYPE } from '@/config/constants';
 import { dateFormat } from '@/utils/tool';
 import useFetchTable from '@/hooks/useFetchTable';
 import { supplierOverviewDrill } from '@/api/report';
+import {customerTypeFilter, timestampFilter} from "@/utils/filter";
 const tableColumns = [
   { colKey: 'service', title: '服务单元' },
   { colKey: 'crmNo', title: '项目单号' },
-  { colKey: 'beginTime', title: '派单时间' },
+  { colKey: 'beginTime', title: '派单时间' , cell: 'begin-time'},
   { colKey: 'crmUserName', title: '客户经理' },
-  { colKey: 'customType', title: '客户类型' },
+  { colKey: 'customType', title: '客户类型' , cell: 'custom-type'},
   { colKey: 'custom', title: '客户名称' },
   { colKey: 'name', title: '项目名称' },
   { colKey: 'product', title: '实施产品' },