lex 2 gadi atpakaļ
vecāks
revīzija
e485969084

+ 1 - 1
src/constant/index.js

@@ -347,7 +347,7 @@ export const orderType = {
   REPAIR: "乐器维修",
   OUTORDER: "外部收入",
   GOODS_SELL: "商品销售",
-  MALL_SELL: "商品销售",
+  MALL_BUY: "商城销售",
   SUBJECT_CHANGE: "声部更换",
   DOUBLE_ELEVEN2020: "2020双十一活动",
   DOUBLE_ELEVEN2021: "2021双十一活动",

+ 355 - 312
src/utils/searchArray.js

@@ -27,15 +27,16 @@ import {
   catRole,
   catType,
   quiteReason
-} from '../constant'
+} from "../constant";
 // 课程类型
-let tenantConfig = sessionStorage.getItem('tenantConfig')
-tenantConfig = tenantConfig ? JSON.parse(tenantConfig) : {}
-let tenantId = tenantConfig.tenantId
-let courseType = null
-let musicCourseType = null
+let tenantConfig = sessionStorage.getItem("tenantConfig");
+tenantConfig = tenantConfig ? JSON.parse(tenantConfig) : {};
+let tenantId = tenantConfig.tenantId;
+let courseType = null;
+let musicCourseType = null;
 if (tenantId == 1) {
-  musicCourseType = [{
+  musicCourseType = [
+    {
       label: "声部课",
       value: "SINGLE"
     },
@@ -70,9 +71,10 @@ if (tenantId == 1) {
     {
       label: "综合课",
       value: "COMPREHENSIVE"
-    },
-  ]
-  courseType = [{
+    }
+  ];
+  courseType = [
+    {
       label: "声部课",
       value: "SINGLE"
     },
@@ -128,9 +130,10 @@ if (tenantId == 1) {
       label: "对外课",
       value: "COMM"
     }
-  ]
+  ];
 } else {
-  musicCourseType = [{
+  musicCourseType = [
+    {
       label: "声部课",
       value: "SINGLE"
     },
@@ -158,9 +161,10 @@ if (tenantId == 1) {
     {
       label: "综合课",
       value: "COMPREHENSIVE"
-    },
-  ]
-  courseType = [{
+    }
+  ];
+  courseType = [
+    {
       label: "声部课",
       value: "SINGLE"
     },
@@ -205,19 +209,13 @@ if (tenantId == 1) {
       label: "对外课",
       value: "COMM"
     }
-  ]
+  ];
 }
 
-export {
-  courseType,
-  musicCourseType
-};
-
-
-
+export { courseType, musicCourseType };
 
-
-export const courseListType = [{
+export const courseListType = [
+  {
     label: "乐团课",
     value: "MUSIC"
   },
@@ -228,51 +226,55 @@ export const courseListType = [{
   {
     label: "网管课",
     value: "PRACTICE"
-  },
-]
+  }
+];
 
 // 考勤状态
-export const attendance = [{
-    label: '正常签到',
+export const attendance = [
+  {
+    label: "正常签到",
     value: 1
   },
   {
-    label: '异常签到',
+    label: "异常签到",
     value: 0
-  },
-]
+  }
+];
 
 // 工作类型
-export const jobNature = [{
-    label: '兼职',
-    value: 'PART_TIME'
+export const jobNature = [
+  {
+    label: "兼职",
+    value: "PART_TIME"
   },
   {
-    label: '全职',
-    value: 'FULL_TIME'
+    label: "全职",
+    value: "FULL_TIME"
   },
   {
-    label: '劳务',
-    value: 'LABOUR'
+    label: "劳务",
+    value: "LABOUR"
   }
   // { label: '临时工', value: 'TEMPORARY' }
-]
+];
 
 // 老师状态
-export const teacherStatus = [{
-    label: '正常',
-    value: '0'
+export const teacherStatus = [
+  {
+    label: "正常",
+    value: "0"
   },
   {
-    label: '冻结',
-    value: '1'
+    label: "冻结",
+    value: "1"
   },
   {
-    label: '锁定',
-    value: '9'
+    label: "锁定",
+    value: "9"
   }
-]
-export const stuAttendance = [{
+];
+export const stuAttendance = [
+  {
     value: "NORMAL",
     label: "正常"
   },
@@ -284,7 +286,7 @@ export const stuAttendance = [{
     value: "LEAVE",
     label: "请假"
   }
-]
+];
 
 // 考勤状态
 export const attendanceStatus = [
@@ -302,11 +304,11 @@ export const attendanceStatus = [
     label: "迟到"
   }
   // { value: "DROP_OUT", label: "休学" }
-]
-
+];
 
 // 交易状态
-export const orderStatus = [{
+export const orderStatus = [
+  {
     value: "APPLY",
     label: "报名"
   },
@@ -351,44 +353,48 @@ export const orderStatus = [{
     label: "网管课"
   },
   {
-    value: 'PRACTICE_GROUP_RENEW',
-    label: '网管课续费'
+    value: "PRACTICE_GROUP_RENEW",
+    label: "网管课续费"
   },
   {
-    value: 'REPAIR',
-    label: '乐器维修'
+    value: "REPAIR",
+    label: "乐器维修"
   },
   {
-    value: 'OUTORDER',
-    label: '外部收入'
+    value: "OUTORDER",
+    label: "外部收入"
   },
   {
-    value: 'GOODS_SELL',
-    label: '商品销售'
+    value: "GOODS_SELL",
+    label: "商品销售"
   },
   {
-    value: 'SUBJECT_CHANGE',
-    label: '声部更换'
+    value: "MALL_BUY",
+    label: "商城销售"
   },
   {
-    value: 'MAINTENANCE',
-    label: '乐器保养'
+    value: "SUBJECT_CHANGE",
+    label: "声部更换"
   },
   {
-    value: 'ADD_STUDENT',
-    label: '乐团报名'
+    value: "MAINTENANCE",
+    label: "乐器保养"
   },
   {
-    value: 'REPLACEMENT',
-    label: '乐器置换'
+    value: "ADD_STUDENT",
+    label: "乐团报名"
   },
   {
-    value: 'SCHOOL',
-    label: '学校订单'
+    value: "REPLACEMENT",
+    label: "乐器置换"
   },
   {
-    value: 'PERSONAL',
-    label: '个人订单'
+    value: "SCHOOL",
+    label: "学校订单"
+  },
+  {
+    value: "PERSONAL",
+    label: "个人订单"
   },
   {
     value: "OTHER",
@@ -401,11 +407,12 @@ export const orderStatus = [{
   {
     value: "LIVE_BUY",
     label: "直播购物"
-  },
-]
+  }
+];
 
 // 交易状态
-export const dealStatus = [{
+export const dealStatus = [
+  {
     value: "ING",
     label: "交易中"
   },
@@ -421,42 +428,42 @@ export const dealStatus = [{
     value: "CLOSE",
     label: "交易关闭"
   }
-]
-
-
+];
 
-export const vipGroupStatus = [{
-    value: '0',
-    text: '未开始'
-  },
+export const vipGroupStatus = [
   {
-    value: '1',
-    text: '报名中'
+    value: "0",
+    text: "未开始"
   },
   {
-    value: '5',
-    text: '报名结束'
+    value: "1",
+    text: "报名中"
   },
   {
-    value: '2',
-    text: '进行中'
+    value: "5",
+    text: "报名结束"
   },
   {
-    value: '4',
-    text: '已结束'
+    value: "2",
+    text: "进行中"
   },
   {
-    value: '3',
-    text: '取消'
+    value: "4",
+    text: "已结束"
   },
   {
-    value: '6',
-    text: '暂停'
+    value: "3",
+    text: "取消"
   },
-]
+  {
+    value: "6",
+    text: "暂停"
+  }
+];
 
 // 课程状态
-export const courseStatus = [{
+export const courseStatus = [
+  {
     value: "NOT_START",
     label: "未开始"
   },
@@ -467,9 +474,10 @@ export const courseStatus = [{
   {
     value: "OVER",
     label: "已结束"
-  },
-]
-export const courseGroupStatus = [{
+  }
+];
+export const courseGroupStatus = [
+  {
     value: "NORMAL",
     label: "正常"
   },
@@ -484,9 +492,10 @@ export const courseGroupStatus = [{
   {
     value: "CANCEL",
     label: "取消"
-  },
-]
-export const commGroupStatus = [{
+  }
+];
+export const commGroupStatus = [
+  {
     value: "NORMAL",
     label: "进行中"
   },
@@ -501,11 +510,12 @@ export const commGroupStatus = [{
   {
     value: "LOCK",
     label: "锁定"
-  },
-]
+  }
+];
 
 // 老师时间充值状态
-export const teacherTimeStatus = [{
+export const teacherTimeStatus = [
+  {
     value: "RECHARGE",
     label: "充值"
   },
@@ -524,10 +534,11 @@ export const teacherTimeStatus = [{
   {
     value: "MANUAL_SUB",
     label: "系统扣除"
-  },
-]
+  }
+];
 
-export const practiceGroupType = [{
+export const practiceGroupType = [
+  {
     value: "FREE",
     label: "免费"
   },
@@ -547,219 +558,251 @@ export const practiceGroupType = [{
     value: "COME_ON_PACKAGE",
     label: "加油包"
   }
-]
-export const visitChiose = [{
-    value: '课程推荐',
-    label: '课程推荐',
-    children: [{
-      value: '新课推荐',
-      label: '新课推荐'
-    }, {
-      value: '续费提醒',
-      label: '续费提醒'
-    }]
-  },
-  {
-    value: '常规回访',
-    label: '常规回访',
-    children: [{
-      value: '课后及训练回访',
-      label: '课后及训练回访'
-    }, {
-      value: '练习及乐团表现',
-      label: '练习及乐团表现'
-    }]
-  },
-  {
-    value: '其它',
-    label: '其它',
-    children: [{
-      value: '其它',
-      label: '其它'
-    }]
+];
+export const visitChiose = [
+  {
+    value: "课程推荐",
+    label: "课程推荐",
+    children: [
+      {
+        value: "新课推荐",
+        label: "新课推荐"
+      },
+      {
+        value: "续费提醒",
+        label: "续费提醒"
+      }
+    ]
+  },
+  {
+    value: "常规回访",
+    label: "常规回访",
+    children: [
+      {
+        value: "课后及训练回访",
+        label: "课后及训练回访"
+      },
+      {
+        value: "练习及乐团表现",
+        label: "练习及乐团表现"
+      }
+    ]
+  },
+  {
+    value: "其它",
+    label: "其它",
+    children: [
+      {
+        value: "其它",
+        label: "其它"
+      }
+    ]
   }
-]
-export const visitChiose1 = [{
-    value: '课程推荐',
-    label: '课程推荐',
-    children: [{
-      value: '新课推荐',
-      label: '新课推荐'
-    }, {
-      value: '续费提醒',
-      label: '续费提醒'
-    }]
-  },
-  {
-    value: '常规回访',
-    label: '常规回访',
-    children: [{
-      value: '课后及训练回访',
-      label: '课后及训练回访'
-    }, {
-      value: '练习及乐团表现',
-      label: '练习及乐团表现'
-    }, {
-      label: '考勤申诉',
-      value: '考勤申诉'
-    }, {
-      value: "异常请假回访",
-      label: "异常请假回访"
-    }]
-  },
-  {
-    value: '小课回访',
-    label: '小课回访',
-    children: [{
-      value: 'VIP课回访',
-      label: 'VIP课回访'
-    }, {
-      value: '乐理课回访',
-      label: '乐理课回访'
-    }, {
-      value: '网管课回访',
-      label: '网管课回访'
-    }]
-  },
-  {
-    value: '云教练',
-    label: '云教练',
-    children: [{
-      value: '体验回访',
-      label: '体验回访'
-    }]
-  },
-  {
-    value: '其它',
-    label: '其它',
-    children: [{
-      value: '其它',
-      label: '其它'
-    }, {
-      value: '会员续费',
-      label: '会员续费'
-    }]
+];
+export const visitChiose1 = [
+  {
+    value: "课程推荐",
+    label: "课程推荐",
+    children: [
+      {
+        value: "新课推荐",
+        label: "新课推荐"
+      },
+      {
+        value: "续费提醒",
+        label: "续费提醒"
+      }
+    ]
+  },
+  {
+    value: "常规回访",
+    label: "常规回访",
+    children: [
+      {
+        value: "课后及训练回访",
+        label: "课后及训练回访"
+      },
+      {
+        value: "练习及乐团表现",
+        label: "练习及乐团表现"
+      },
+      {
+        label: "考勤申诉",
+        value: "考勤申诉"
+      },
+      {
+        value: "异常请假回访",
+        label: "异常请假回访"
+      }
+    ]
+  },
+  {
+    value: "小课回访",
+    label: "小课回访",
+    children: [
+      {
+        value: "VIP课回访",
+        label: "VIP课回访"
+      },
+      {
+        value: "乐理课回访",
+        label: "乐理课回访"
+      },
+      {
+        value: "网管课回访",
+        label: "网管课回访"
+      }
+    ]
+  },
+  {
+    value: "云教练",
+    label: "云教练",
+    children: [
+      {
+        value: "体验回访",
+        label: "体验回访"
+      }
+    ]
+  },
+  {
+    value: "其它",
+    label: "其它",
+    children: [
+      {
+        value: "其它",
+        label: "其它"
+      },
+      {
+        value: "会员续费",
+        label: "会员续费"
+      }
+    ]
   }
-]
+];
 
 // 交易状态
-export const paymentChannelStatus = [{
-    value: 'YQPAY',
-    label: '双乾'
+export const paymentChannelStatus = [
+  {
+    value: "YQPAY",
+    label: "双乾"
   },
   {
-    value: 'BALANCE',
-    label: '余额'
+    value: "BALANCE",
+    label: "余额"
   },
   {
-    value: 'ADAPAY',
-    label: '汇付'
+    value: "ADAPAY",
+    label: "汇付"
   }
-]
+];
 // 销售类型
-export const saleStatus = [{
-    value: 'INSTRUMENT',
-    label: '乐器销售'
+export const saleStatus = [
+  {
+    value: "INSTRUMENT",
+    label: "乐器销售"
   },
   {
-    value: 'ACCESSORIES',
-    label: '配件销售'
+    value: "ACCESSORIES",
+    label: "配件销售"
   },
   {
-    value: 'SCHOOL_BUY',
-    label: '学校采购'
+    value: "SCHOOL_BUY",
+    label: "学校采购"
   },
   {
-    value: 'OTHER',
-    label: '其它'
+    value: "OTHER",
+    label: "其它"
   }
-]
+];
 // 商品类型
-export const goodsType = [{
-    value: 'INSTRUMENT',
-    label: '乐器'
-  },
+export const goodsType = [
   {
-    value: 'ACCESSORIES',
-    label: '辅件'
+    value: "INSTRUMENT",
+    label: "乐器"
   },
   {
-    value: 'TEACHING',
-    label: '教材'
+    value: "ACCESSORIES",
+    label: "辅件"
   },
   {
-    value: 'STAFF',
-    label: '教谱'
+    value: "TEACHING",
+    label: "教材"
   },
   {
-    value: 'OTHER',
-    label: '其它'
+    value: "STAFF",
+    label: "教谱"
   },
-]
+  {
+    value: "OTHER",
+    label: "其它"
+  }
+];
 
-export const classStatus = [{
-    value: '1',
-    label: '一年级'
-  },
+export const classStatus = [
   {
-    value: '2',
-    label: '二年级'
+    value: "1",
+    label: "一年级"
   },
   {
-    value: '3',
-    label: '三年级'
+    value: "2",
+    label: "二年级"
   },
   {
-    value: '4',
-    label: '四年级'
+    value: "3",
+    label: "三年级"
   },
   {
-    value: '5',
-    label: '五年级'
+    value: "4",
+    label: "四年级"
   },
   {
-    value: '6',
-    label: '六年级'
+    value: "5",
+    label: "五年级"
   },
   {
-    value: '7',
-    label: '初一'
+    value: "6",
+    label: "六年级"
   },
   {
-    value: '8',
-    label: '初二'
+    value: "7",
+    label: "初一"
   },
   {
-    value: '9',
-    label: '初三'
+    value: "8",
+    label: "初二"
   },
   {
-    value: '10',
-    label: '高一'
+    value: "9",
+    label: "初三"
   },
   {
-    value: '11',
-    label: '高二'
+    value: "10",
+    label: "高一"
   },
   {
-    value: '12',
-    label: '高三'
+    value: "11",
+    label: "高二"
   },
-]
+  {
+    value: "12",
+    label: "高三"
+  }
+];
 // 库存类型
-export const stockType = [{
-    value: 'INTERNAL',
-    label: '内部'
+export const stockType = [
+  {
+    value: "INTERNAL",
+    label: "内部"
   },
   {
-    value: 'EXTERNAL',
-    label: '外部'
+    value: "EXTERNAL",
+    label: "外部"
   },
   {
-    value: 'ALL',
-    label: '全部'
+    value: "ALL",
+    label: "全部"
   }
-]
+];
 // export const musicGroupStatus = [
 //   { value: 'DRAFT', text: '编辑中' },
 //   { value: 'AUDIT', text: '审核中' },
@@ -775,71 +818,71 @@ export const stockType = [{
 //   { value: 'CANCELED', text: '取消' },
 //   { value: 'CLOSE', text: '已关闭' },
 // ]
-export const vipResetTypeList = [{
-    label: '不限制',
-    value: '1'
+export const vipResetTypeList = [
+  {
+    label: "不限制",
+    value: "1"
   },
   {
-    label: '线上不可调为线下',
-    value: '0'
+    label: "线上不可调为线下",
+    value: "0"
   },
   {
-    label: '线下不可调为线上',
-    value: '2'
+    label: "线下不可调为线上",
+    value: "2"
   },
   {
-    label: '线上线下不可互调',
-    value: '3'
+    label: "线上线下不可互调",
+    value: "3"
   }
-]
-export const musicGroupStatus = getValueForKey(musicGroupType)
-export const classTimeList = getValueForKey(classTime)
-export const courseViewTypeList = getValueForKey(courseViewType)
-export const payOrderTypeList = getValueForKey(payOrderType)
-export const auditTypeList = getValueForKey(auditType)
-export const auditPaymentTypeList = getValueForKey(auditPaymentType)
-export const orderServerList = getValueForKey(orderServerType)
-export const orderAuditTypeList = getValueForKey(orderAuditType)
-export const rewardModeTypeList = getValueForKey(rewardModeType)
-export const musicClassTypeList = getValueForKey(musicClassType)
-export const ProbationPeriodList = getValueForKey(ProbationPeriodStatus)
-export const downTypeList = getValueForKey(downListType)
-export const conclusionList = getValueForKey(conclusion)
-export const clientList = getValueForKey(clientType)
-export const couponTypeList = getValueForKey(couponType)
-export const backTypeList = getValueForKey(backType)
-export const memberEnumList = getValueForKey(memberEnum)
-export const coupontypeDetailList = getValueForKey(coupontypeDetail)
-export const issueList = getValueForKey(issue)
-export const feedbackTypeList = getValueForKey(feedbackType)
-export const feedbackTypeDescList = getValueForKey(feedbackTypeDesc)
-export const campStateList = getValueForKey(campState)
-export const catgGoupTypeList =  getValueForKey(catgGoupType)
-export const catRoleList = getValueForKey(catRole)
-export const catTypeList = getValueForKey(catType)
-export const quiteReasonList = getValueForKey(quiteReason)
+];
+export const musicGroupStatus = getValueForKey(musicGroupType);
+export const classTimeList = getValueForKey(classTime);
+export const courseViewTypeList = getValueForKey(courseViewType);
+export const payOrderTypeList = getValueForKey(payOrderType);
+export const auditTypeList = getValueForKey(auditType);
+export const auditPaymentTypeList = getValueForKey(auditPaymentType);
+export const orderServerList = getValueForKey(orderServerType);
+export const orderAuditTypeList = getValueForKey(orderAuditType);
+export const rewardModeTypeList = getValueForKey(rewardModeType);
+export const musicClassTypeList = getValueForKey(musicClassType);
+export const ProbationPeriodList = getValueForKey(ProbationPeriodStatus);
+export const downTypeList = getValueForKey(downListType);
+export const conclusionList = getValueForKey(conclusion);
+export const clientList = getValueForKey(clientType);
+export const couponTypeList = getValueForKey(couponType);
+export const backTypeList = getValueForKey(backType);
+export const memberEnumList = getValueForKey(memberEnum);
+export const coupontypeDetailList = getValueForKey(coupontypeDetail);
+export const issueList = getValueForKey(issue);
+export const feedbackTypeList = getValueForKey(feedbackType);
+export const feedbackTypeDescList = getValueForKey(feedbackTypeDesc);
+export const campStateList = getValueForKey(campState);
+export const catgGoupTypeList = getValueForKey(catgGoupType);
+export const catRoleList = getValueForKey(catRole);
+export const catTypeList = getValueForKey(catType);
+export const quiteReasonList = getValueForKey(quiteReason);
 //downListType
 function getValueForKey(obj) {
-  let arr = []
+  let arr = [];
   for (let k in obj) {
     arr.push({
       label: obj[k],
       value: k
-    })
+    });
   }
-  return arr
+  return arr;
 }
 
-export const array2object = (array, [lk, vk] = ['value', 'label']) => {
-  const object = {}
+export const array2object = (array, [lk, vk] = ["value", "label"]) => {
+  const object = {};
   if (array && array.length) {
     for (const item of array) {
-      object[item[lk]] = item[vk]
+      object[item[lk]] = item[vk];
     }
   }
-  return object
-}
-
+  return object;
+};
 
 // export {
 //   courseType,

+ 8 - 8
src/utils/vueFilter.js

@@ -209,14 +209,14 @@ Vue.filter("organPayState", val => constant.organPayState[val]);
 // 教学伴奏
 Vue.filter("clientType", val => constant.clientStatus[val]);
 // 会员周期
-Vue.filter('memberEnumType',val=> {
+Vue.filter("memberEnumType", val => {
   let template = {
-    "DAY": '天',
+    DAY: "天",
     ...constant.memberEnum
-  }
+  };
   // constant.memberEnum[val]
-  return template[val]
-})
+  return template[val];
+});
 // 优惠券类型
 Vue.filter("coupontypeDetailType", val => constant.coupontypeDetail[val]);
 
@@ -857,9 +857,9 @@ Vue.filter("catDotType", value => {
   return constant.catDotType[value];
 });
 
-Vue.filter('quiteReasonFilter',value=>{
-  return constant.quiteReason[value]
-})
+Vue.filter("quiteReasonFilter", value => {
+  return constant.quiteReason[value];
+});
 
 Vue.filter("usageStatus", value => {
   let obj = {

+ 34 - 34
src/views/businessManager/orderManager/income.vue

@@ -14,26 +14,26 @@
         报表导出
       </el-button> -->
       <div class="btnList">
-              <ExportChiose
-        v-permission="{ child: 'export/orderList', parent: '/income' }"
-        style="margin-bottom: 20px;margin-right:20px;"
-        name="订单汇总导出"
-        ExportEnum="ORDER_LIST_SUM"
-        :exportData="onOrderExport"
-        fileName="订单汇总"
-        errorMsg="请选择月份"
-        :isDownList="true"
-      />
-      <ExportChiose
-        v-permission="{ child: 'export/orderList', parent: '/income' }"
-        style="margin-bottom: 20px"
-        name="报表导出"
-        ExportEnum="ORDER_LIST1"
-        :exportData="onOrderExport"
-        fileName="订单报表导出"
-        errorMsg="请选择月份"
-        :isDownList="true"
-      />
+        <ExportChiose
+          v-permission="{ child: 'export/orderList', parent: '/income' }"
+          style="margin-bottom: 20px;margin-right:20px;"
+          name="订单汇总导出"
+          ExportEnum="ORDER_LIST_SUM"
+          :exportData="onOrderExport"
+          fileName="订单汇总"
+          errorMsg="请选择月份"
+          :isDownList="true"
+        />
+        <ExportChiose
+          v-permission="{ child: 'export/orderList', parent: '/income' }"
+          style="margin-bottom: 20px"
+          name="报表导出"
+          ExportEnum="ORDER_LIST1"
+          :exportData="onOrderExport"
+          fileName="订单报表导出"
+          errorMsg="请选择月份"
+          :isDownList="true"
+        />
       </div>
 
       <!-- 搜索类型 -->
@@ -139,7 +139,7 @@
             value-format="yyyy-MM-dd"
             range-separator="至"
             :picker-options="{
-              firstDayOfWeek: 1,
+              firstDayOfWeek: 1
             }"
             start-placeholder="订单开始日期"
             end-placeholder="订单结束日期"
@@ -397,7 +397,7 @@ export default {
         merNos: null,
         lessBalancePaymentAmount: null,
         lessActualAmount: null,
-        orderDate: [],
+        orderDate: []
       },
       tableList: [],
       organList: [],
@@ -406,12 +406,12 @@ export default {
         limit: 10, // 限制显示条数
         page: 1, // 当前页
         total: 0, // 总条数
-        page_size: [10, 20, 40, 50], // 选择限制显示条数
+        page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
       totalUserBalance: 0,
       totalActualAmount: 0,
       totalAdvanceAmount: 0,
-      totalRevenueAmount: 0,
+      totalRevenueAmount: 0
     };
   },
   created() {
@@ -540,7 +540,7 @@ export default {
         organId: organId.join(","),
         page: this.pageInfo.page,
         rows: this.pageInfo.limit,
-        ...getTimes(orderDate, ["orderStartDate", "orderEndDate"]),
+        ...getTimes(orderDate, ["orderStartDate", "orderEndDate"])
       };
       // let params = JSON.parse(JSON.stringify(this.searchForm));
       // params.rows = this.pageInfo.limit;
@@ -559,7 +559,7 @@ export default {
       //   params.orderStartDate = null;
       //   params.orderEndDate = null;
       // }
-      orderQueryPage(cleanDeep(params)).then((res) => {
+      orderQueryPage(cleanDeep(params)).then(res => {
         let result = res.data;
         if (res.code == 200) {
           this.tableList = result.rows;
@@ -583,14 +583,14 @@ export default {
       this.$confirm("您确定查询该订单状态", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning",
+        type: "warning"
       })
         .then(() => {
-          getOrderStatus({ id: row.id }).then((res) => {
+          getOrderStatus({ id: row.id }).then(res => {
             this.getList();
           });
         })
-        .catch((err) => {});
+        .catch(err => {});
     },
     onReSet() {
       // 重置搜索
@@ -608,12 +608,12 @@ export default {
         merNos: null,
         lessBalancePaymentAmount: null,
         lessActualAmount: null,
-        orderDate: [],
+        orderDate: []
       };
       // this.pageInfo.page = 1;
       this.getNow();
       this.getList();
-    },
+    }
   },
   computed: {
     onOrderExport() {
@@ -632,7 +632,7 @@ export default {
         paymentType: searchForm.paymentType,
         organId: searchForm.organId.join(","),
         lessBalancePaymentAmount: searchForm.lessBalancePaymentAmount,
-        lessActualAmount: searchForm.lessActualAmount,
+        lessActualAmount: searchForm.lessActualAmount
       };
       if (this.searchForm.orderDate && this.searchForm.orderDate.length > 0) {
         data.orderStartDate = this.searchForm.orderDate[0];
@@ -642,8 +642,8 @@ export default {
         data.orderEndDate = null;
       }
       return data;
-    },
-  },
+    }
+  }
 };
 </script>
 <style lang="scss" scoped>