Merge branch 'pre-production'

src/option/reportforms/AuditTimelinessRatioReport.js

@@ -225,27 +225,18 @@ export const columnListDetails = [
     sortable: true,
     head: false,
   },
-  {
-    prop: 'waybillTypeName',
-    label: '运单类型',
-    type: 1,
-    values: '',
-    width: '150',
-    checkarr: [
-      { label: '定制品', value: 1 },
-      { label: '零担', value: 2 },
-    ],
-    fixed: false,
-    sortable: true,
-    head: false,
-  },
   {
     prop: 'serviceTypeName',
     label: '服务类型',
     type: 3,
     values: '',
     width: '150',
-    checkarr: [],
+    checkarr: [
+      { label: '商配', value: '1' },
+      { label: '市配', value: '2' },
+      { label: '自提', value: '3' },
+      { label: '三方中转', value: '4' },
+    ],
     fixed: false,
     sortable: true,
     head: false,
@@ -824,7 +815,15 @@ export const columnListDetails = [
     type: 3,
     values: '',
     width: '150',
-    checkarr: [],
+    checkarr: [
+      { label: '自提', value: '1' },
+      { label: '送货', value: '2' },
+      { label: '送货上门', value: '3' },
+      { label: '送货上门(有电梯)', value: '4' },
+      { label: '送货上门(无电梯)', value: '5' },
+      { label: '送货卸货', value: '6' },
+      { label: '送货安装', value: '7' },
+    ],
     fixed: false,
     sortable: true,
     head: false,
@@ -886,7 +885,14 @@ export const columnListDetails = [
     type: 3,
     values: '',
     width: '150',
-    checkarr: [],
+    checkarr: [
+      { label: '现金', value: '1' },
+      { label: '银行卡', value: '2' },
+      { label: '微信', value: '3' },
+      { label: '支付宝', value: '4' },
+      { label: '支票', value: '5' },
+      { label: '账本', value: '6' },
+    ],
     fixed: false,
     sortable: true,
     head: false,
@@ -897,13 +903,20 @@ export const columnListDetails = [
     type: 3,
     values: '',
     width: '150',
-    checkarr: [],
+    checkarr: [
+      { label: '现付', value: '1' },
+      { label: '到付', value: '1' },
+      { label: '月结', value: '1' },
+      { label: '回付', value: '1' },
+      { label: '内部结算', value: '1' },
+      { label: '多笔付', value: '1' },
+    ],
     fixed: false,
     sortable: true,
     head: false,
   },
   {
-    prop: 'xpay',
+    prop: 'nowPay',
     label: '现付',
     type: 1,
     values: '',
@@ -915,7 +928,7 @@ export const columnListDetails = [
     isshowSummary: true,
   },
   {
-    prop: 'dpay',
+    prop: 'arrivePay',
     label: '到付',
     type: 1,
     values: '',
@@ -927,7 +940,7 @@ export const columnListDetails = [
     isshowSummary: true,
   },
   {
-    prop: 'hpay',
+    prop: 'backPay',
     label: '回付',
     type: 1,
     values: '',
@@ -939,7 +952,7 @@ export const columnListDetails = [
     isshowSummary: true,
   },
   {
-    prop: 'ypay',
+    prop: 'monthPay',
     label: '月结',
     type: 1,
     values: '',
@@ -952,7 +965,7 @@ export const columnListDetails = [
   },
 
   {
-    prop: 'signCount',
+    prop: 'signNum',
     label: '签收件数',
     type: 1,
     values: '',
@@ -1169,7 +1182,7 @@ export const columnListDetails = [
   },
   {
     prop: 'checkHours',
-    label: '实际审单时效',
+    label: '实际审单时效(小时)',
     type: 1,
     values: '',
     width: '150',
@@ -1180,7 +1193,7 @@ export const columnListDetails = [
   },
   {
     prop: 'hoursTime',
-    label: '标准审核时效',
+    label: '标准审核时效(小时)',
     type: 1,
     values: '',
     width: '150',

src/option/reportforms/CreateOrderTimelinessRatioReport.js

@@ -656,7 +656,7 @@ export const columnListDetails = [
   },
   {
     prop: 'openHours',
-    label: '开单时效',
+    label: '开单时效(小时)',
     type: 1,
     values: '',
     width: '150',
@@ -669,7 +669,7 @@ export const columnListDetails = [
 
   {
     prop: 'hoursTime',
-    label: '标准开单时效',
+    label: '标准开单时效(小时)',
     type: 1,
     values: '',
     width: '150',

src/option/reportforms/UpdateWaybillQualityPageReport.js

@@ -302,26 +302,26 @@ export const columnListDetails = [
     fixed: false,
     sortable: true,
   },
-  // {
-  //   prop: 'agent',
-  //   label: '制单员',
-  //   type: 1,
-  //   values: '',
-  //   width: '130',
-  //   checkarr: [],
-  //   fixed: false,
-  //   sortable: true,
-  // },
-  // {
-  //   prop: 'openTime',
-  //   label: '开单时间',
-  //   type: 1,
-  //   values: '',
-  //   width: '150',
-  //   checkarr: [],
-  //   fixed: false,
-  //   sortable: true,
-  // },
+  {
+    prop: 'agent',
+    label: '制单员',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'createTime',
+    label: '制单时间',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
   {
     prop: 'applyTime',
     label: '申请时间',
@@ -332,6 +332,16 @@ export const columnListDetails = [
     fixed: false,
     sortable: true,
   },
+  {
+    prop: 'applyWarehouseName',
+    label: '申请人',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
   {
     prop: 'warehouseName',
     label: '申请网点',

src/views/reportforms/AuditTimelinessRatioReportDetails.vue

@@ -267,7 +267,6 @@ const details = reactive<any>({
       checkarr: [],
     },
     { type: 'time', label: '运单创建时间', prop: 'timeArr' },
-    { type: 'time', label: '开单时间', prop: 'createTimeArr' },
     { type: 'time', label: '审核时间', prop: 'checkTimeArr' },
   ],
   /** 流转节点数据 */

src/views/reportforms/SalesDepartmentIncomeReport.vue

@@ -612,14 +612,23 @@ const handleJumpDetail = (row, column) => {
     departureWarehouseId: row.departureWarehouseId,
     destinationWarehouseId: row.destinationWarehouseId,
     businessLine: row.businessLine,
-    startTimeStr: details.query.timeArr[0],
-    endTimeStr: details.query.timeArr[1],
+    // startTimeStr: details.query.timeArr[0],
+    startTimeStr: '',
+    // endTimeStr: details.query.timeArr[1],
+    endTimeStr: '',
   };
-  $store.commit('DEL_ONCE_TAG', '/reportforms/SalesDepartmentIncomeReportDetails');
-  $router.push({
-    path: '/reportforms/SalesDepartmentIncomeReportDetails',
-    query,
-  });
+
+  // 年
+  console.log('details.query.year :>> ', details.query.year);
+  if (getObjType(details.query.year) === 'array' && details.query.year.length > 0) {
+    // query.startTimeStr =
+  }
+
+  // $store.commit('DEL_ONCE_TAG', '/reportforms/SalesDepartmentIncomeReportDetails');
+  // $router.push({
+  //   path: '/reportforms/SalesDepartmentIncomeReportDetails',
+  //   query,
+  // });
 };
 </script>