Browse Source

Merge branch '02/23reviewBUG' into 11/24SAAS

lex-xin 3 years ago
parent
commit
df529f1b1f

+ 2 - 0
src/constant/index.js

@@ -353,6 +353,8 @@ export const orderType = {
   MAINTENANCE: '乐器保养',
   REPLACEMENT: '乐器置换',
   ADD_STUDENT: '乐团报名',
+  SCHOOL: "学校订单",
+  PERSONAL: "个人订单",
   OTHER: "其他",
 }
 

+ 845 - 837
src/utils/searchArray.js

@@ -1,837 +1,845 @@
-// 搜索用的下拉数据列表
-import {
-  payOrderType,
-  auditType,
-  auditPaymentType,
-  orderServerType,
-  orderAuditType,
-  rewardModeType,
-  classTime,
-  musicClassType,
-  ProbationPeriodStatus,
-  downListType,
-  musicGroupType,
-  conclusion,
-  vipResetType,
-  courseViewType,
-  clientType,
-  couponType,
-  backType,
-  memberEnum,
-  coupontypeDetail,
-  issue,
-  feedbackType
-} from '../constant'
-// 课程类型
-let tenantConfig = sessionStorage.getItem('tenantConfig')
-tenantConfig = tenantConfig ? JSON.parse(tenantConfig) : {}
-let tenantId = tenantConfig.tenantId
-let  courseType = null
-let musicCourseType = null
-if (tenantId == 1) {
-  musicCourseType = [{
-    label: "声部课",
-    value: "SINGLE"
-  },
-  {
-    label: "合奏课",
-    value: "MIX"
-  },
-  {
-    label: "基础技能课",
-    value: "HIGH"
-  },
-  {
-    label: "线上基础技能课",
-    value: "HIGH_ONLINE"
-  },
-  {
-    label: "乐团网管课",
-    value: "MUSIC_NETWORK"
-  },
-  {
-    label: "集训声部课",
-    value: "TRAINING_SINGLE"
-  },
-  {
-    label: "集训合奏课",
-    value: "TRAINING_MIX"
-  },
-  {
-    label: "课堂课",
-    value: "CLASSROOM"
-  },
-  {
-    label: "综合课",
-    value: "COMPREHENSIVE"
-  },
-]
-   courseType= [{
-      label: "声部课",
-      value: "SINGLE"
-    },
-    {
-      label: "合奏课",
-      value: "MIX"
-    },
-    {
-      label: "基础技能课",
-      value: "HIGH"
-    },
-    {
-      label: "线上基础技能课",
-      value: "HIGH_ONLINE"
-    },
-    {
-      label: "vip课",
-      value: "VIP"
-    },
-    {
-      label: "试听课",
-      value: "DEMO"
-    },
-    {
-      label: "综合课",
-      value: "COMPREHENSIVE"
-    },
-    {
-      label: "网管课",
-      value: "PRACTICE"
-    },
-    {
-      label: "乐团网管课",
-      value: "MUSIC_NETWORK"
-    },
-    {
-      label: "启蒙课",
-      value: "ENLIGHTENMENT"
-    },
-    {
-      label: "集训声部课",
-      value: "TRAINING_SINGLE"
-    },
-    {
-      label: "集训合奏课",
-      value: "TRAINING_MIX"
-    },
-    {
-      label: "课堂课",
-      value: "CLASSROOM"
-    },
-    {
-      label: "对外课",
-      value: "COMM"
-    }
-  ]
-} else {
-  musicCourseType = [{
-    label: "声部课",
-    value: "SINGLE"
-  },
-  {
-    label: "合奏课",
-    value: "MIX"
-  },
-  {
-    label: "基础技能课",
-    value: "HIGH"
-  },
-
-  {
-    label: "集训声部课",
-    value: "TRAINING_SINGLE"
-  },
-  {
-    label: "集训合奏课",
-    value: "TRAINING_MIX"
-  },
-  {
-    label: "课堂课",
-    value: "CLASSROOM"
-  },
-  {
-    label: "综合课",
-    value: "COMPREHENSIVE"
-  },
-]
-   courseType = [{
-      label: "声部课",
-      value: "SINGLE"
-    },
-    {
-      label: "合奏课",
-      value: "MIX"
-    },
-    {
-      label: "vip课",
-      value: "VIP"
-    },
-    {
-      label: "试听课",
-      value: "DEMO"
-    },
-    {
-      label: "综合课",
-      value: "COMPREHENSIVE"
-    },
-    {
-      label: "网管课",
-      value: "PRACTICE"
-    },
-
-    {
-      label: "启蒙课",
-      value: "ENLIGHTENMENT"
-    },
-    {
-      label: "集训声部课",
-      value: "TRAINING_SINGLE"
-    },
-    {
-      label: "集训合奏课",
-      value: "TRAINING_MIX"
-    },
-    {
-      label: "课堂课",
-      value: "CLASSROOM"
-    },
-    {
-      label: "对外课",
-      value: "COMM"
-    }
-  ]
-}
-
-export {courseType,musicCourseType};
-
-
-
-
-
-export const courseListType = [{
-    label: "乐团课",
-    value: "MUSIC"
-  },
-  {
-    label: "VIP课",
-    value: "VIP"
-  },
-  {
-    label: "网管课",
-    value: "PRACTICE"
-  },
-]
-
-// 考勤状态
-export const attendance = [{
-    label: '正常签到',
-    value: 1
-  },
-  {
-    label: '异常签到',
-    value: 0
-  },
-]
-
-// 工作类型
-export const jobNature = [{
-    label: '兼职',
-    value: 'PART_TIME'
-  },
-  {
-    label: '全职',
-    value: 'FULL_TIME'
-  },
-  {
-    label: '劳务',
-    value: 'LABOUR'
-  }
-  // { label: '临时工', value: 'TEMPORARY' }
-]
-
-// 老师状态
-export const teacherStatus = [{
-    label: '正常',
-    value: '0'
-  },
-  {
-    label: '冻结',
-    value: '1'
-  },
-  {
-    label: '锁定',
-    value: '9'
-  }
-]
-export const stuAttendance = [{
-    value: "NORMAL",
-    label: "正常"
-  },
-  {
-    value: "TRUANT",
-    label: "旷课"
-  },
-  {
-    value: "LEAVE",
-    label: "请假"
-  }
-]
-
-// 考勤状态
-export const attendanceStatus = [
-  ...stuAttendance,
-  {
-    value: "QUIT_SCHOOL",
-    label: "休学"
-  },
-  {
-    value: "DROP_OUT",
-    label: "退学"
-  },
-  {
-    value: "LATE",
-    label: "迟到"
-  }
-  // { value: "DROP_OUT", label: "休学" }
-]
-
-
-// 交易状态
-export const orderStatus = [{
-    value: "APPLY",
-    label: "报名"
-  },
-  {
-    value: "RENEW",
-    label: "续费"
-  },
-  {
-    value: "MEMBER",
-    label: "会员购买"
-  },
-  {
-    value: "SMALL_CLASS_TO_BUY",
-    label: "VIP购买"
-  },
-  {
-    value: "SPORADIC",
-    label: "零星收费"
-  },
-  {
-    value: "LUCK",
-    label: "福袋活动"
-  },
-  {
-    value: "DEGREE_REGISTRATION",
-    label: "考级报名"
-  },
-  {
-    value: "DOUBLE_ELEVEN2020",
-    label: "2020双十一活动"
-  },
-  {
-    value: "DOUBLE_ELEVEN2021",
-    label: "2021双十一活动"
-  },
-  {
-    value: "DEGREE",
-    label: "儿童节活动"
-  },
-  {
-    value: "PRACTICE_GROUP_BUY",
-    label: "网管课"
-  },
-  {
-    value: 'PRACTICE_GROUP_RENEW',
-    label: '网管课续费'
-  },
-  {
-    value: 'REPAIR',
-    label: '乐器维修'
-  },
-  {
-    value: 'OUTORDER',
-    label: '外部收入'
-  },
-  {
-    value: 'GOODS_SELL',
-    label: '商品销售'
-  },
-  {
-    value: 'SUBJECT_CHANGE',
-    label: '声部更换'
-  },
-  {
-    value: 'MAINTENANCE',
-    label: '乐器保养'
-  },
-  {
-    value: 'ADD_STUDENT',
-    label: '乐团报名'
-  },
-  {
-    value: 'REPLACEMENT',
-    label: '乐器置换'
-  },
-  {
-    value: "OTHER",
-    label: "其他"
-  },
-]
-
-// 交易状态
-export const dealStatus = [{
-    value: "ING",
-    label: "交易中"
-  },
-  {
-    value: "SUCCESS",
-    label: "成功交易"
-  },
-  {
-    value: "FAILED",
-    label: "交易失败"
-  },
-  {
-    value: "CLOSE",
-    label: "交易关闭"
-  }
-]
-
-
-
-export const vipGroupStatus = [{
-    value: '0',
-    text: '未开始'
-  },
-  {
-    value: '1',
-    text: '报名中'
-  },
-  {
-    value: '5',
-    text: '报名结束'
-  },
-  {
-    value: '2',
-    text: '进行中'
-  },
-  {
-    value: '4',
-    text: '已结束'
-  },
-  {
-    value: '3',
-    text: '取消'
-  },
-  {
-    value: '6',
-    text: '暂停'
-  },
-]
-
-// 课程状态
-export const courseStatus = [{
-    value: "NOT_START",
-    label: "未开始"
-  },
-  {
-    value: "UNDERWAY",
-    label: "进行中"
-  },
-  {
-    value: "OVER",
-    label: "已结束"
-  },
-]
-export const courseGroupStatus = [{
-    value: "NORMAL",
-    label: "正常"
-  },
-  {
-    value: "LOCK",
-    label: "锁定"
-  },
-  {
-    value: "FINISH",
-    label: "结束"
-  },
-  {
-    value: "CANCEL",
-    label: "取消"
-  },
-]
-export const commGroupStatus = [{
-    value: "NORMAL",
-    label: "进行中"
-  },
-  {
-    value: "FINISH",
-    label: "结束"
-  },
-  {
-    value: "CANCEL",
-    label: "关闭"
-  },
-  {
-    value: "LOCK",
-    label: "锁定"
-  },
-]
-
-// 老师时间充值状态
-export const teacherTimeStatus = [{
-    value: "RECHARGE",
-    label: "充值"
-  },
-  {
-    value: "CONSUME",
-    label: "建课"
-  },
-  {
-    value: "RETURN",
-    label: "退课"
-  },
-  {
-    value: "MANUAL_ADD",
-    label: "系统充值"
-  },
-  {
-    value: "MANUAL_SUB",
-    label: "系统扣除"
-  },
-]
-
-export const practiceGroupType = [{
-    value: "FREE",
-    label: "免费"
-  },
-  {
-    value: "CHARGE",
-    label: "收费"
-  },
-  {
-    value: "TRIAL",
-    label: "试听课"
-  },
-  {
-    value: "CARE_PACKAGE",
-    label: "关心包"
-  },
-  {
-    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 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: '双乾'
-  },
-  {
-    value: 'BALANCE',
-    label: '余额'
-  },
-  {
-    value: 'ADAPAY',
-    label: '汇付'
-  }
-]
-// 销售类型
-export const saleStatus = [{
-    value: 'INSTRUMENT',
-    label: '乐器销售'
-  },
-  {
-    value: 'ACCESSORIES',
-    label: '配件销售'
-  },
-  {
-    value: 'SCHOOL_BUY',
-    label: '学校采购'
-  },
-  {
-    value: 'OTHER',
-    label: '其它'
-  }
-]
-// 商品类型
-export const goodsType = [{
-    value: 'INSTRUMENT',
-    label: '乐器'
-  },
-  {
-    value: 'ACCESSORIES',
-    label: '辅件'
-  },
-  {
-    value: 'TEACHING',
-    label: '教材'
-  },
-  {
-    value: 'STAFF',
-    label: '教谱'
-  },
-  {
-    value: 'OTHER',
-    label: '其它'
-  },
-]
-
-export const classStatus = [{
-    value: '1',
-    label: '一年级'
-  },
-  {
-    value: '2',
-    label: '二年级'
-  },
-  {
-    value: '3',
-    label: '三年级'
-  },
-  {
-    value: '4',
-    label: '四年级'
-  },
-  {
-    value: '5',
-    label: '五年级'
-  },
-  {
-    value: '6',
-    label: '六年级'
-  },
-  {
-    value: '7',
-    label: '初一'
-  },
-  {
-    value: '8',
-    label: '初二'
-  },
-  {
-    value: '9',
-    label: '初三'
-  },
-  {
-    value: '10',
-    label: '高一'
-  },
-  {
-    value: '11',
-    label: '高二'
-  },
-  {
-    value: '12',
-    label: '高三'
-  },
-]
-// 库存类型
-export const stockType = [{
-    value: 'INTERNAL',
-    label: '内部'
-  },
-  {
-    value: 'EXTERNAL',
-    label: '外部'
-  },
-  {
-    value: 'ALL',
-    label: '全部'
-  }
-]
-// export const musicGroupStatus = [
-//   { value: 'DRAFT', text: '编辑中' },
-//   { value: 'AUDIT', text: '审核中' },
-//   { value: 'PRE_APPLY', text: '预报名中' },
-//   { value: 'PRE_BUILD_FEE', text: '创建缴费中' },
-//   { value: 'APPLY', text: '报名中' },
-//   { value: 'PAY', text: '缴费中' },
-//   { value: 'PREPARE', text: '筹备中' },
-//   { value: 'PROGRESS', text: '进行中' },
-//   { value: 'FEE_AUDIT', text: '费用审核中' },
-//   { value: 'AUDIT_FAILED', text: '审核失败' },
-//   { value: 'PAUSE', text: '暂停' },
-//   { value: 'CANCELED', text: '取消' },
-//   { value: 'CLOSE', text: '已关闭' },
-// ]
-export const vipResetTypeList = [{
-    label: '不限制',
-    value: '1'
-  },
-  {
-    label: '线上不可调为线下',
-    value: '0'
-  },
-  {
-    label: '线下不可调为线上',
-    value: '2'
-  },
-  {
-    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)
-
-//downListType
-function getValueForKey(obj) {
-  let arr = []
-  for (let k in obj) {
-    arr.push({
-      label: obj[k],
-      value: k
-    })
-  }
-  return arr
-}
-
-export const array2object = (array, [lk, vk] = ['value', 'label']) => {
-  const object = {}
-  if (array && array.length) {
-    for (const item of array) {
-      object[item[lk]] = item[vk]
-    }
-  }
-  return object
-}
-
-
-// export {
-//   courseType,
-//   attendance,
-//   jobNature,
-//   teacherStatus,
-//   attendanceStatus,
-//   orderStatus,
-//   dealStatus,
-//   musicGroupStatus,
-//   vipGroupStatus,
-//   courseStatus,
-//   teacherTimeStatus,
-//   courseGroupStatus,
-//   commGroupStatus,
-//   courseListType,
-//   practiceGroupType,
-//   visitChiose,
-//   paymentChannelStatus,
-//   saleStatus,
-//   goodsType,
-//   classStatus,
-//   stockType,
-//   classTimeList
-// }
+// 搜索用的下拉数据列表
+import {
+  payOrderType,
+  auditType,
+  auditPaymentType,
+  orderServerType,
+  orderAuditType,
+  rewardModeType,
+  classTime,
+  musicClassType,
+  ProbationPeriodStatus,
+  downListType,
+  musicGroupType,
+  conclusion,
+  vipResetType,
+  courseViewType,
+  clientType,
+  couponType,
+  backType,
+  memberEnum,
+  coupontypeDetail,
+  issue,
+  feedbackType
+} from '../constant'
+// 课程类型
+let tenantConfig = sessionStorage.getItem('tenantConfig')
+tenantConfig = tenantConfig ? JSON.parse(tenantConfig) : {}
+let tenantId = tenantConfig.tenantId
+let  courseType = null
+let musicCourseType = null
+if (tenantId == 1) {
+  musicCourseType = [{
+    label: "声部课",
+    value: "SINGLE"
+  },
+  {
+    label: "合奏课",
+    value: "MIX"
+  },
+  {
+    label: "基础技能课",
+    value: "HIGH"
+  },
+  {
+    label: "线上基础技能课",
+    value: "HIGH_ONLINE"
+  },
+  {
+    label: "乐团网管课",
+    value: "MUSIC_NETWORK"
+  },
+  {
+    label: "集训声部课",
+    value: "TRAINING_SINGLE"
+  },
+  {
+    label: "集训合奏课",
+    value: "TRAINING_MIX"
+  },
+  {
+    label: "课堂课",
+    value: "CLASSROOM"
+  },
+  {
+    label: "综合课",
+    value: "COMPREHENSIVE"
+  },
+]
+   courseType= [{
+      label: "声部课",
+      value: "SINGLE"
+    },
+    {
+      label: "合奏课",
+      value: "MIX"
+    },
+    {
+      label: "基础技能课",
+      value: "HIGH"
+    },
+    {
+      label: "线上基础技能课",
+      value: "HIGH_ONLINE"
+    },
+    {
+      label: "vip课",
+      value: "VIP"
+    },
+    {
+      label: "试听课",
+      value: "DEMO"
+    },
+    {
+      label: "综合课",
+      value: "COMPREHENSIVE"
+    },
+    {
+      label: "网管课",
+      value: "PRACTICE"
+    },
+    {
+      label: "乐团网管课",
+      value: "MUSIC_NETWORK"
+    },
+    {
+      label: "启蒙课",
+      value: "ENLIGHTENMENT"
+    },
+    {
+      label: "集训声部课",
+      value: "TRAINING_SINGLE"
+    },
+    {
+      label: "集训合奏课",
+      value: "TRAINING_MIX"
+    },
+    {
+      label: "课堂课",
+      value: "CLASSROOM"
+    },
+    {
+      label: "对外课",
+      value: "COMM"
+    }
+  ]
+} else {
+  musicCourseType = [{
+    label: "声部课",
+    value: "SINGLE"
+  },
+  {
+    label: "合奏课",
+    value: "MIX"
+  },
+  {
+    label: "基础技能课",
+    value: "HIGH"
+  },
+
+  {
+    label: "集训声部课",
+    value: "TRAINING_SINGLE"
+  },
+  {
+    label: "集训合奏课",
+    value: "TRAINING_MIX"
+  },
+  {
+    label: "课堂课",
+    value: "CLASSROOM"
+  },
+  {
+    label: "综合课",
+    value: "COMPREHENSIVE"
+  },
+]
+   courseType = [{
+      label: "声部课",
+      value: "SINGLE"
+    },
+    {
+      label: "合奏课",
+      value: "MIX"
+    },
+    {
+      label: "vip课",
+      value: "VIP"
+    },
+    {
+      label: "试听课",
+      value: "DEMO"
+    },
+    {
+      label: "综合课",
+      value: "COMPREHENSIVE"
+    },
+    {
+      label: "网管课",
+      value: "PRACTICE"
+    },
+
+    {
+      label: "启蒙课",
+      value: "ENLIGHTENMENT"
+    },
+    {
+      label: "集训声部课",
+      value: "TRAINING_SINGLE"
+    },
+    {
+      label: "集训合奏课",
+      value: "TRAINING_MIX"
+    },
+    {
+      label: "课堂课",
+      value: "CLASSROOM"
+    },
+    {
+      label: "对外课",
+      value: "COMM"
+    }
+  ]
+}
+
+export {courseType,musicCourseType};
+
+
+
+
+
+export const courseListType = [{
+    label: "乐团课",
+    value: "MUSIC"
+  },
+  {
+    label: "VIP课",
+    value: "VIP"
+  },
+  {
+    label: "网管课",
+    value: "PRACTICE"
+  },
+]
+
+// 考勤状态
+export const attendance = [{
+    label: '正常签到',
+    value: 1
+  },
+  {
+    label: '异常签到',
+    value: 0
+  },
+]
+
+// 工作类型
+export const jobNature = [{
+    label: '兼职',
+    value: 'PART_TIME'
+  },
+  {
+    label: '全职',
+    value: 'FULL_TIME'
+  },
+  {
+    label: '劳务',
+    value: 'LABOUR'
+  }
+  // { label: '临时工', value: 'TEMPORARY' }
+]
+
+// 老师状态
+export const teacherStatus = [{
+    label: '正常',
+    value: '0'
+  },
+  {
+    label: '冻结',
+    value: '1'
+  },
+  {
+    label: '锁定',
+    value: '9'
+  }
+]
+export const stuAttendance = [{
+    value: "NORMAL",
+    label: "正常"
+  },
+  {
+    value: "TRUANT",
+    label: "旷课"
+  },
+  {
+    value: "LEAVE",
+    label: "请假"
+  }
+]
+
+// 考勤状态
+export const attendanceStatus = [
+  ...stuAttendance,
+  {
+    value: "QUIT_SCHOOL",
+    label: "休学"
+  },
+  {
+    value: "DROP_OUT",
+    label: "退学"
+  },
+  {
+    value: "LATE",
+    label: "迟到"
+  }
+  // { value: "DROP_OUT", label: "休学" }
+]
+
+
+// 交易状态
+export const orderStatus = [{
+    value: "APPLY",
+    label: "报名"
+  },
+  {
+    value: "RENEW",
+    label: "续费"
+  },
+  {
+    value: "MEMBER",
+    label: "会员购买"
+  },
+  {
+    value: "SMALL_CLASS_TO_BUY",
+    label: "VIP购买"
+  },
+  {
+    value: "SPORADIC",
+    label: "零星收费"
+  },
+  {
+    value: "LUCK",
+    label: "福袋活动"
+  },
+  {
+    value: "DEGREE_REGISTRATION",
+    label: "考级报名"
+  },
+  {
+    value: "DOUBLE_ELEVEN2020",
+    label: "2020双十一活动"
+  },
+  {
+    value: "DOUBLE_ELEVEN2021",
+    label: "2021双十一活动"
+  },
+  {
+    value: "DEGREE",
+    label: "儿童节活动"
+  },
+  {
+    value: "PRACTICE_GROUP_BUY",
+    label: "网管课"
+  },
+  {
+    value: 'PRACTICE_GROUP_RENEW',
+    label: '网管课续费'
+  },
+  {
+    value: 'REPAIR',
+    label: '乐器维修'
+  },
+  {
+    value: 'OUTORDER',
+    label: '外部收入'
+  },
+  {
+    value: 'GOODS_SELL',
+    label: '商品销售'
+  },
+  {
+    value: 'SUBJECT_CHANGE',
+    label: '声部更换'
+  },
+  {
+    value: 'MAINTENANCE',
+    label: '乐器保养'
+  },
+  {
+    value: 'ADD_STUDENT',
+    label: '乐团报名'
+  },
+  {
+    value: 'REPLACEMENT',
+    label: '乐器置换'
+  },
+  {
+    value: 'SCHOOL',
+    label: '学校订单'
+  },
+  {
+    value: 'PERSONAL',
+    label: '个人订单'
+  },
+  {
+    value: "OTHER",
+    label: "其他"
+  },
+]
+
+// 交易状态
+export const dealStatus = [{
+    value: "ING",
+    label: "交易中"
+  },
+  {
+    value: "SUCCESS",
+    label: "成功交易"
+  },
+  {
+    value: "FAILED",
+    label: "交易失败"
+  },
+  {
+    value: "CLOSE",
+    label: "交易关闭"
+  }
+]
+
+
+
+export const vipGroupStatus = [{
+    value: '0',
+    text: '未开始'
+  },
+  {
+    value: '1',
+    text: '报名中'
+  },
+  {
+    value: '5',
+    text: '报名结束'
+  },
+  {
+    value: '2',
+    text: '进行中'
+  },
+  {
+    value: '4',
+    text: '已结束'
+  },
+  {
+    value: '3',
+    text: '取消'
+  },
+  {
+    value: '6',
+    text: '暂停'
+  },
+]
+
+// 课程状态
+export const courseStatus = [{
+    value: "NOT_START",
+    label: "未开始"
+  },
+  {
+    value: "UNDERWAY",
+    label: "进行中"
+  },
+  {
+    value: "OVER",
+    label: "已结束"
+  },
+]
+export const courseGroupStatus = [{
+    value: "NORMAL",
+    label: "正常"
+  },
+  {
+    value: "LOCK",
+    label: "锁定"
+  },
+  {
+    value: "FINISH",
+    label: "结束"
+  },
+  {
+    value: "CANCEL",
+    label: "取消"
+  },
+]
+export const commGroupStatus = [{
+    value: "NORMAL",
+    label: "进行中"
+  },
+  {
+    value: "FINISH",
+    label: "结束"
+  },
+  {
+    value: "CANCEL",
+    label: "关闭"
+  },
+  {
+    value: "LOCK",
+    label: "锁定"
+  },
+]
+
+// 老师时间充值状态
+export const teacherTimeStatus = [{
+    value: "RECHARGE",
+    label: "充值"
+  },
+  {
+    value: "CONSUME",
+    label: "建课"
+  },
+  {
+    value: "RETURN",
+    label: "退课"
+  },
+  {
+    value: "MANUAL_ADD",
+    label: "系统充值"
+  },
+  {
+    value: "MANUAL_SUB",
+    label: "系统扣除"
+  },
+]
+
+export const practiceGroupType = [{
+    value: "FREE",
+    label: "免费"
+  },
+  {
+    value: "CHARGE",
+    label: "收费"
+  },
+  {
+    value: "TRIAL",
+    label: "试听课"
+  },
+  {
+    value: "CARE_PACKAGE",
+    label: "关心包"
+  },
+  {
+    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 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: '双乾'
+  },
+  {
+    value: 'BALANCE',
+    label: '余额'
+  },
+  {
+    value: 'ADAPAY',
+    label: '汇付'
+  }
+]
+// 销售类型
+export const saleStatus = [{
+    value: 'INSTRUMENT',
+    label: '乐器销售'
+  },
+  {
+    value: 'ACCESSORIES',
+    label: '配件销售'
+  },
+  {
+    value: 'SCHOOL_BUY',
+    label: '学校采购'
+  },
+  {
+    value: 'OTHER',
+    label: '其它'
+  }
+]
+// 商品类型
+export const goodsType = [{
+    value: 'INSTRUMENT',
+    label: '乐器'
+  },
+  {
+    value: 'ACCESSORIES',
+    label: '辅件'
+  },
+  {
+    value: 'TEACHING',
+    label: '教材'
+  },
+  {
+    value: 'STAFF',
+    label: '教谱'
+  },
+  {
+    value: 'OTHER',
+    label: '其它'
+  },
+]
+
+export const classStatus = [{
+    value: '1',
+    label: '一年级'
+  },
+  {
+    value: '2',
+    label: '二年级'
+  },
+  {
+    value: '3',
+    label: '三年级'
+  },
+  {
+    value: '4',
+    label: '四年级'
+  },
+  {
+    value: '5',
+    label: '五年级'
+  },
+  {
+    value: '6',
+    label: '六年级'
+  },
+  {
+    value: '7',
+    label: '初一'
+  },
+  {
+    value: '8',
+    label: '初二'
+  },
+  {
+    value: '9',
+    label: '初三'
+  },
+  {
+    value: '10',
+    label: '高一'
+  },
+  {
+    value: '11',
+    label: '高二'
+  },
+  {
+    value: '12',
+    label: '高三'
+  },
+]
+// 库存类型
+export const stockType = [{
+    value: 'INTERNAL',
+    label: '内部'
+  },
+  {
+    value: 'EXTERNAL',
+    label: '外部'
+  },
+  {
+    value: 'ALL',
+    label: '全部'
+  }
+]
+// export const musicGroupStatus = [
+//   { value: 'DRAFT', text: '编辑中' },
+//   { value: 'AUDIT', text: '审核中' },
+//   { value: 'PRE_APPLY', text: '预报名中' },
+//   { value: 'PRE_BUILD_FEE', text: '创建缴费中' },
+//   { value: 'APPLY', text: '报名中' },
+//   { value: 'PAY', text: '缴费中' },
+//   { value: 'PREPARE', text: '筹备中' },
+//   { value: 'PROGRESS', text: '进行中' },
+//   { value: 'FEE_AUDIT', text: '费用审核中' },
+//   { value: 'AUDIT_FAILED', text: '审核失败' },
+//   { value: 'PAUSE', text: '暂停' },
+//   { value: 'CANCELED', text: '取消' },
+//   { value: 'CLOSE', text: '已关闭' },
+// ]
+export const vipResetTypeList = [{
+    label: '不限制',
+    value: '1'
+  },
+  {
+    label: '线上不可调为线下',
+    value: '0'
+  },
+  {
+    label: '线下不可调为线上',
+    value: '2'
+  },
+  {
+    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)
+
+//downListType
+function getValueForKey(obj) {
+  let arr = []
+  for (let k in obj) {
+    arr.push({
+      label: obj[k],
+      value: k
+    })
+  }
+  return arr
+}
+
+export const array2object = (array, [lk, vk] = ['value', 'label']) => {
+  const object = {}
+  if (array && array.length) {
+    for (const item of array) {
+      object[item[lk]] = item[vk]
+    }
+  }
+  return object
+}
+
+
+// export {
+//   courseType,
+//   attendance,
+//   jobNature,
+//   teacherStatus,
+//   attendanceStatus,
+//   orderStatus,
+//   dealStatus,
+//   musicGroupStatus,
+//   vipGroupStatus,
+//   courseStatus,
+//   teacherTimeStatus,
+//   courseGroupStatus,
+//   commGroupStatus,
+//   courseListType,
+//   practiceGroupType,
+//   visitChiose,
+//   paymentChannelStatus,
+//   saleStatus,
+//   goodsType,
+//   classStatus,
+//   stockType,
+//   classTimeList
+// }

+ 14 - 0
src/views/businessManager/orderManager/financeManager-taoqi.vue

@@ -1253,6 +1253,20 @@ export default {
             } else {
               this.insertOrderType = 3;
             }
+
+            // 添加类型判断
+            // SCHOOL("SCHOOL", "学校订单"),
+            // PERSONAL("PERSONAL", "个人订单"),
+            // OTHER("OTHER", "其他")
+            if(row.type !== 'OUTORDER'){
+              if(row.type === 'OTHER') {
+                this.insertOrderType = 3
+              } else if(row.type === 'SCHOOL') {
+                this.insertOrderType = 2
+              } else if(row.type === 'PERSONAL') {
+                this.insertOrderType = 1
+              }
+            }
             this.routeOrderStatus = true;
           });
         }

+ 15 - 0
src/views/businessManager/orderManager/financeManager.vue

@@ -1257,6 +1257,21 @@ export default {
             } else {
               this.insertOrderType = 3;
             }
+
+            // 添加类型判断
+            // SCHOOL("SCHOOL", "学校订单"),
+            // PERSONAL("PERSONAL", "个人订单"),
+            // OTHER("OTHER", "其他")
+            if(row.type !== 'OUTORDER'){
+              if(row.type === 'OTHER') {
+                this.insertOrderType = 3
+              } else if(row.type === 'SCHOOL') {
+                this.insertOrderType = 2
+              } else if(row.type === 'PERSONAL') {
+                this.insertOrderType = 1
+              }
+            }
+
             this.routeOrderStatus = true;
           });
         }

+ 531 - 517
src/views/businessManager/orderManager/orderAudit-taoqi/orderAuditDetail.vue

@@ -1,517 +1,531 @@
-<template>
-  <div>
-    <el-form :inline="true" ref="ruleForm">
-      <div class="lookTitle">申请信息</div>
-      <el-form-item label="申请人" label-width="80px">
-        <div style="width: 180px">
-          <p v-if="form.operator && form.operator.username">
-            {{ form.operator.username }}
-          </p>
-        </div>
-      </el-form-item>
-      <el-form-item label="申请时间" label-width="80px">
-        <div style="width: 180px">{{ form.createTime }}</div>
-      </el-form-item>
-    </el-form>
-    <el-form :model="form" ref="ruleForm">
-      <div class="lookTitle">基本信息</div>
-      <el-form-item
-        label="所属分部"
-        :rules="[{ required: true, message: '请选择分部', trigger: 'change' }]"
-        prop="routeOrganId"
-        :label-width="formLabelWidth"
-      >
-        <!--    -->
-        <el-select
-          v-model.trim="form.routeOrganId"
-          :disabled="!isAdd"
-          @change="changeOrgin"
-          style="width: 100% !important"
-        >
-          <el-option
-            v-for="(item, index) in selects.branchs"
-            :key="index"
-            :label="item.name"
-            :value="item.id"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item
-        label="所属学校"
-        prop="schoolId"
-        :label-width="formLabelWidth"
-      >
-        <!--    @change="checkSchool" -->
-        <el-select
-          v-model="form.schoolId"
-          :disabled="!isAdd"
-          style="width: 100% !important"
-        >
-          <el-option
-            v-for="(item, index) in cooperationList"
-            :key="index"
-            :label="item.name"
-            :value="item.id"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <!-- 订单类型 -->
-      <el-form-item
-        label="订单类型"
-        prop="insertOrderType"
-        :label-width="formLabelWidth"
-      >
-        <el-radio-group v-model="insertOrderType" :disabled="!isAdd">
-          <el-radio :label="1">个人订单</el-radio>
-          <el-radio :label="2">学校订单</el-radio>
-          <el-radio :label="3">其它订单</el-radio>
-        </el-radio-group>
-      </el-form-item>
-          <el-form-item
-            label="缴费单号"
-            prop="calenderId"
-            v-if="insertOrderType == 2 || insertOrderType == 3"
-            :label-width="formLabelWidth"
-             :rules="[{pattern:/^[0-9]*$/,message:'请输入正确的缴费单号',trigger: 'blur'}]"
-          >
-            <el-input
-              v-model.trim="form.calenderId"
-              :disabled="!isAdd"
-              placeholder="请输入缴费单号"
-            ></el-input>
-          </el-form-item>
-      <el-form-item
-        label="学员编号"
-        prop="userId"
-        v-if="insertOrderType == 1 || insertOrderType == 3"
-        :label-width="formLabelWidth"
-      >
-        <el-input
-          v-model.trim="form.userId"
-          :disabled="!isAdd"
-          placeholder="请输入学员编号"
-        ></el-input>
-      </el-form-item>
-      <div class="lookTitle">交易信息</div>
-      <el-form-item
-        label="交易流水号"
-        :rules="[
-          { required: true, message: '请输入流水号', trigger: 'change' },
-        ]"
-        prop="transNo"
-        :label-width="formLabelWidth"
-      >
-        <el-input
-          placeholder="请输入交易流水号"
-          type="text"
-          :disabled="!isAdd"
-          v-model.trim="form.transNo"
-        ></el-input>
-      </el-form-item>
-      <el-form-item
-        label="收款账户"
-        prop="merNo"
-        :rules="[
-          { required: true, message: '请输入收款账户', trigger: 'change' },
-        ]"
-        :label-width="formLabelWidth"
-      >
-        <el-input
-          placeholder="请输入收款账户"
-          type="text"
-          :disabled="!isAdd"
-          v-model.trim="form.merNo"
-        ></el-input>
-      </el-form-item>
-      <el-form-item
-        label="交易日期"
-        :rules="[
-          { required: true, message: '请选择交易日期', trigger: 'change' },
-        ]"
-        prop="payTime"
-        :label-width="formLabelWidth"
-      >
-        <el-date-picker
-          style="width: 100%"
-          :disabled="!isAdd"
-          v-model="form.payTime"
-          type="datetime"
-          format="yyyy-MM-dd HH:mm:ss"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择交易日期"
-        >
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item
-        label="收入类型"
-        :label-width="formLabelWidth"
-        :rules="[
-          { required: true, message: '请选收入类型', trigger: 'change' },
-        ]"
-        prop="applyType"
-      >
-        <el-select
-          class="multiple"
-          style="width: 100% !important"
-          v-model.trim="form.applyType"
-          filterable
-          clearable
-          :disabled="!isAdd"
-          placeholder="请选择收入类型"
-        >
-          <el-option
-            v-for="(item, index) in orderServerList"
-            :key="index"
-            :label="item.label"
-            :value="item.value"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item
-        label="销售金额"
-        prop="saleAmount"
-        :rules="[
-          { required: true, message: '请输入销售金额', trigger: 'change' },
-        ]"
-        v-if="form.applyType == 'SELL'"
-        :label-width="formLabelWidth"
-      >
-        <el-input
-          v-model="form.saleAmount"
-          @mousewheel.native.prevent
-          type="number"
-          :disabled="!isAdd"
-          placeholder="请输入销售金额"
-        />
-      </el-form-item>
-      <el-form-item
-        label="服务金额"
-        v-if="form.applyType == 'SERVICE'"
-        :rules="[
-          { required: true, message: '请输入服务金额', trigger: 'change' },
-        ]"
-        prop="serviceAmount"
-        :label-width="formLabelWidth"
-      >
-        <el-input
-          type="number"
-          @mousewheel.native.prevent
-          :disabled="!isAdd"
-          v-model="form.serviceAmount"
-          placeholder="请输入收入金额"
-        />
-      </el-form-item>
-
-      <div v-if="form.applyType == 'SELL'">
-        <div v-for="(goodsList, index) in form.goodsList" :key="index">
-          <el-form-item
-            :label="'商品名称' + (index + 1)"
-            :label-width="formLabelWidth"
-            class="setWidth"
-            :prop="'goodsList.' + index + '.id'"
-            :rules="[
-              { required: true, message: '请选择商品', trigger: 'change' },
-            ]"
-          >
-            <el-select
-              v-model.trim="goodsList.id"
-              filterable
-              :disabled="!isAdd"
-              placeholder="请选择商品"
-            >
-              <el-option
-                v-for="(item, index) in shopList"
-                :key="index"
-                :label="item.name"
-                :value="item.id"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item
-            class="setWidth"
-            style="margin-right: 10px"
-            :prop="'goodsList.' + index + '.number'"
-          >
-            <!--  :rules="validAmount" <el-input-number style="width: 160px;" v-model="goodsList.number" placeholder="商品数量"></el-input-number> -->
-            <el-input
-              type="age"
-              style="width: 160px"
-              :disabled="!isAdd"
-              clearable
-              placeholder="请输入商品数量"
-              @mousewheel.native.prevent
-              v-model.number="goodsList.number"
-            ></el-input>
-          </el-form-item>
-          <el-button
-            icon="el-icon-minus"
-            :disabled="!isAdd"
-            v-if="form.goodsList.length > 1 && auditStatus == 'REJECT'"
-            circle
-            @click.prevent="removeGoodsList(goodsList)"
-          ></el-button>
-          <el-button
-            icon="el-icon-plus"
-            :disabled="!isAdd"
-            v-if="auditStatus == 'REJECT'"
-            @click.prevent="addGoodsList"
-            circle
-            style="margin-left: 5px"
-          ></el-button>
-        </div>
-      </div>
-      <div class="lookTitle">其它</div>
-      <el-form-item
-        label="提交备注"
-        :label-width="formLabelWidth"
-        :rules="[
-          { required: true, message: '请输入提交备注', trigger: 'change' },
-        ]"
-      >
-        <el-input
-          placeholder="请输入备注"
-          :disabled="!isAdd"
-          v-model.trim="form.memo"
-          type="textarea"
-          :rows="3"
-        ></el-input>
-      </el-form-item>
-      <!-- &&auditStatus != 'REJECT' -->
-      <el-form-item
-        label="审核备注"
-        v-if="auditStatus != 'ING'"
-        :label-width="formLabelWidth"
-      >
-        <el-input
-          placeholder="请输入备注"
-          :disabled="true"
-          v-model.trim="form.auditComment"
-          type="textarea"
-          :rows="3"
-        ></el-input>
-      </el-form-item>
-    </el-form>
-    <div class="lookTitle" v-if="auditStatus == 'ING'" v-permission="'routeOrder/auditOutOrder'">审核意见</div>
-    <el-form :model="submitForm" v-if="auditStatus == 'ING'" ref="submitForm" v-permission="'routeOrder/auditOutOrder'">
-      <el-form-item
-        prop="memo"
-        :rules="[
-          { required: true, message: '请输入审核意见', trigger: 'blur' },
-        ]"
-      >
-        <el-input
-          type="textarea"
-          :rows="4"
-          v-model="submitForm.memo"
-        ></el-input>
-      </el-form-item>
-    </el-form>
-  </div>
-</template>
-<script>
-import {
-  getRouteOrderInfo,
-  auditOutOrder,
-  updateRouteOrder,
-} from "@/api/orderManager";
-import { orderServerList } from "@/utils/searchArray";
-import { getCooperation } from "@/api/buildTeam";
-export default {
-  props: ["orderId", "shopList", "isLook"],
-  data() {
-    return {
-      formLabelWidth: "100px",
-      form: {
-        routeOrganId: null,
-        transNo: null,
-        type: "OTHER",
-        merNo: null,
-        actualAmount: null,
-        memo: null,
-        payTime: null,
-        serviceAmount: null,
-        goodsAmount: null,
-        schoolId: null,
-        goodsList: [
-          {
-            id: null,
-            number: null,
-          },
-        ],
-        applyType: null,
-        userId: "",
-        auditComment: "",
-        calenderId:''
-      },
-      isAdd: !this.isLook,
-      insertOrderType: 1, // 订单类型  1 个人订单 2 学校订单 2 其它订单
-      cooperationList: [],
-      submitForm: {
-        memo: "",
-      },
-      auditStatus: "",
-      orderServerList: orderServerList,
-      clearSchool: false,
-    };
-  },
-  mounted() {
-    if (this.orderId) {
-      getRouteOrderInfo({ id: this.orderId }).then((res) => {
-        if (res.code == 200) {
-          let orderInfo = res.data;
-          this.form = {
-            createTime: orderInfo.createTime,
-            operator: orderInfo.operator,
-            routeOrganId: orderInfo.routeOrganId,
-            transNo: orderInfo.transNo,
-            type: "OTHER",
-            merNo: orderInfo.merNo,
-            actualAmount: orderInfo.actualAmount,
-            memo: orderInfo.memo,
-            payTime: orderInfo.payTime,
-            serviceAmount: orderInfo.serviceAmount,
-            saleAmount: orderInfo.saleAmount,
-            schoolId: orderInfo.schoolId,
-            userId: orderInfo.userId ? orderInfo.userId : "",
-            auditComment: orderInfo.auditComment,
-            applyType: orderInfo.saleAmount ? "SELL" : "SERVICE",
-            calenderId:orderInfo.calenderId?orderInfo.calenderId:''
-          };
-          this.auditStatus = orderInfo.auditStatus;
-          this.$set(
-            this.form,
-            "goodsList",
-            this.getShopList(orderInfo.goodsJson)
-          );
-          this.changeOrgin(orderInfo.routeOrganId);
-          if(orderInfo.userId && !res.data.calenderId) {
-            this.insertOrderType = 1
-          } else if(res.data.calenderId && !orderInfo.userId) {
-            this.insertOrderType = 2
-          } else {
-            this.insertOrderType = 3
-          }
-          this.clearSchool = true;
-        }
-      });
-    }
-    // 获取分部
-     this.$store.dispatch("setBranchs");
-  },
-  methods: {
-    changeOrgin(val) {
-      if (val) {
-        if (this.clearSchool) {
-          this.$set(this.form, "schoolId", null);
-        }
-        getCooperation({ rows: 9999, organId: val }).then((res) => {
-          if (res.code === 200) {
-            this.cooperationList = res.data.rows;
-          }
-        });
-      }
-    },
-    getShopList(str) {
-      let arr = [];
-      try {
-        const obj = JSON.parse(str);
-
-        // id: item.goodsId, number: item.num
-        for (let i in obj) {
-          arr.push({ id: parseInt(i), number: obj[i] });
-        }
-      } catch {}
-      return arr.length > 0
-        ? arr
-        : [
-            {
-              id: null,
-              number: null,
-            },
-          ];
-    },
-    auditOutOrder(status) {
-      const that = this;
-      this.$refs.submitForm.validate((res) => {
-        if (res) {
-          auditOutOrder({
-            auditStatus: status,
-            memo: this.submitForm.memo,
-            studentPaymentRouteOrderId: this.orderId,
-          }).then((res) => {
-            if (res.code == 200) {
-              this.$message.success("审核成功");
-              that.$emit("getList");
-              return;
-            }
-          });
-        }
-      });
-    },
-    removeGoodsList(item) {
-      const index = this.form.goodsList.indexOf(item);
-      if (index !== -1) {
-        this.form.goodsList.splice(index, 1);
-      }
-    },
-    addGoodsList() {
-      this.form.goodsList.push({
-        id: null,
-        number: null,
-      });
-    },
-    submitReaet() {
-      this.$refs.ruleForm.validate((valid) => {
-        if (valid) {
-          let form = JSON.parse(JSON.stringify(this.form));
-          if (!form.saleAmount && !form.serviceAmount) {
-            this.$message.error("请输入销售收入或服务收入");
-            return;
-          }
-          form.applyType == "SELL"
-            ? (form.serviceAmount = 0)
-            : (form.saleAmount = 0);
-          if (!form.saleAmount) {
-            form.goodsList = null;
-          }
-          let goodsJson = {};
-          for (let i in form.goodsList) {
-            goodsJson[form.goodsList[i]["id"]] = form.goodsList[i]["number"];
-          }
-          form.goodsJson =
-            form.applyType == "SERVICE" ? null : JSON.stringify(goodsJson);
-          form.id = this.orderId;
-          form.auditStatus = "ING";
-          if(this.insertOrderType == 1) {
-            form.calenderId = null
-          } else if(this.insertOrderType == 2) {
-            form.userId = null
-          }
-          updateRouteOrder(form).then((res) => {
-            if (res.code == 200) {
-              this.$message.success("修改成功");
-              this.$emit("getList");
-              return;
-            } else {
-              this.$message.error(res.msg);
-            }
-          });
-        }
-      });
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-.lookTitle {
-  height: 40px;
-  line-height: 40px;
-  font-weight: bold;
-  background-color: rgb(237, 238, 240);
-  padding: 0 20px;
-  margin-bottom: 20px;
-}
-.setWidth {
-  display: inline-block;
-}
-</style>
+<template>
+  <div>
+    <el-form :inline="true" ref="ruleForm">
+      <div class="lookTitle">申请信息</div>
+      <el-form-item label="申请人" label-width="80px">
+        <div style="width: 180px">
+          <p v-if="form.operator && form.operator.username">
+            {{ form.operator.username }}
+          </p>
+        </div>
+      </el-form-item>
+      <el-form-item label="申请时间" label-width="80px">
+        <div style="width: 180px">{{ form.createTime }}</div>
+      </el-form-item>
+    </el-form>
+    <el-form :model="form" ref="ruleForm">
+      <div class="lookTitle">基本信息</div>
+      <el-form-item
+        label="所属分部"
+        :rules="[{ required: true, message: '请选择分部', trigger: 'change' }]"
+        prop="routeOrganId"
+        :label-width="formLabelWidth"
+      >
+        <!--    -->
+        <el-select
+          v-model.trim="form.routeOrganId"
+          :disabled="!isAdd"
+          @change="changeOrgin"
+          style="width: 100% !important"
+        >
+          <el-option
+            v-for="(item, index) in selects.branchs"
+            :key="index"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        label="所属学校"
+        prop="schoolId"
+        :label-width="formLabelWidth"
+      >
+        <!--    @change="checkSchool" -->
+        <el-select
+          v-model="form.schoolId"
+          :disabled="!isAdd"
+          style="width: 100% !important"
+        >
+          <el-option
+            v-for="(item, index) in cooperationList"
+            :key="index"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <!-- 订单类型 -->
+      <el-form-item
+        label="订单类型"
+        prop="insertOrderType"
+        :label-width="formLabelWidth"
+      >
+        <el-radio-group v-model="insertOrderType" :disabled="!isAdd">
+          <el-radio :label="1">个人订单</el-radio>
+          <el-radio :label="2">学校订单</el-radio>
+          <el-radio :label="3">其它订单</el-radio>
+        </el-radio-group>
+      </el-form-item>
+          <el-form-item
+            label="缴费单号"
+            prop="calenderId"
+            v-if="insertOrderType == 2 || insertOrderType == 3"
+            :label-width="formLabelWidth"
+             :rules="[{pattern:/^[0-9]*$/,message:'请输入正确的缴费单号',trigger: 'blur'}]"
+          >
+            <el-input
+              v-model.trim="form.calenderId"
+              :disabled="!isAdd"
+              placeholder="请输入缴费单号"
+            ></el-input>
+          </el-form-item>
+      <el-form-item
+        label="学员编号"
+        prop="userId"
+        v-if="insertOrderType == 1 || insertOrderType == 3"
+        :label-width="formLabelWidth"
+      >
+        <el-input
+          v-model.trim="form.userId"
+          :disabled="!isAdd"
+          placeholder="请输入学员编号"
+        ></el-input>
+      </el-form-item>
+      <div class="lookTitle">交易信息</div>
+      <el-form-item
+        label="交易流水号"
+        :rules="[
+          { required: true, message: '请输入流水号', trigger: 'change' },
+        ]"
+        prop="transNo"
+        :label-width="formLabelWidth"
+      >
+        <el-input
+          placeholder="请输入交易流水号"
+          type="text"
+          :disabled="!isAdd"
+          v-model.trim="form.transNo"
+        ></el-input>
+      </el-form-item>
+      <el-form-item
+        label="收款账户"
+        prop="merNo"
+        :rules="[
+          { required: true, message: '请输入收款账户', trigger: 'change' },
+        ]"
+        :label-width="formLabelWidth"
+      >
+        <el-input
+          placeholder="请输入收款账户"
+          type="text"
+          :disabled="!isAdd"
+          v-model.trim="form.merNo"
+        ></el-input>
+      </el-form-item>
+      <el-form-item
+        label="交易日期"
+        :rules="[
+          { required: true, message: '请选择交易日期', trigger: 'change' },
+        ]"
+        prop="payTime"
+        :label-width="formLabelWidth"
+      >
+        <el-date-picker
+          style="width: 100%"
+          :disabled="!isAdd"
+          v-model="form.payTime"
+          type="datetime"
+          format="yyyy-MM-dd HH:mm:ss"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          placeholder="选择交易日期"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item
+        label="收入类型"
+        :label-width="formLabelWidth"
+        :rules="[
+          { required: true, message: '请选收入类型', trigger: 'change' },
+        ]"
+        prop="applyType"
+      >
+        <el-select
+          class="multiple"
+          style="width: 100% !important"
+          v-model.trim="form.applyType"
+          filterable
+          clearable
+          :disabled="!isAdd"
+          placeholder="请选择收入类型"
+        >
+          <el-option
+            v-for="(item, index) in orderServerList"
+            :key="index"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        label="销售金额"
+        prop="saleAmount"
+        :rules="[
+          { required: true, message: '请输入销售金额', trigger: 'change' },
+        ]"
+        v-if="form.applyType == 'SELL'"
+        :label-width="formLabelWidth"
+      >
+        <el-input
+          v-model="form.saleAmount"
+          @mousewheel.native.prevent
+          type="number"
+          :disabled="!isAdd"
+          placeholder="请输入销售金额"
+        />
+      </el-form-item>
+      <el-form-item
+        label="服务金额"
+        v-if="form.applyType == 'SERVICE'"
+        :rules="[
+          { required: true, message: '请输入服务金额', trigger: 'change' },
+        ]"
+        prop="serviceAmount"
+        :label-width="formLabelWidth"
+      >
+        <el-input
+          type="number"
+          @mousewheel.native.prevent
+          :disabled="!isAdd"
+          v-model="form.serviceAmount"
+          placeholder="请输入收入金额"
+        />
+      </el-form-item>
+
+      <div v-if="form.applyType == 'SELL'">
+        <div v-for="(goodsList, index) in form.goodsList" :key="index">
+          <el-form-item
+            :label="'商品名称' + (index + 1)"
+            :label-width="formLabelWidth"
+            class="setWidth"
+            :prop="'goodsList.' + index + '.id'"
+            :rules="[
+              { required: true, message: '请选择商品', trigger: 'change' },
+            ]"
+          >
+            <el-select
+              v-model.trim="goodsList.id"
+              filterable
+              :disabled="!isAdd"
+              placeholder="请选择商品"
+            >
+              <el-option
+                v-for="(item, index) in shopList"
+                :key="index"
+                :label="item.name"
+                :value="item.id"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            class="setWidth"
+            style="margin-right: 10px"
+            :prop="'goodsList.' + index + '.number'"
+          >
+            <!--  :rules="validAmount" <el-input-number style="width: 160px;" v-model="goodsList.number" placeholder="商品数量"></el-input-number> -->
+            <el-input
+              type="age"
+              style="width: 160px"
+              :disabled="!isAdd"
+              clearable
+              placeholder="请输入商品数量"
+              @mousewheel.native.prevent
+              v-model.number="goodsList.number"
+            ></el-input>
+          </el-form-item>
+          <el-button
+            icon="el-icon-minus"
+            :disabled="!isAdd"
+            v-if="form.goodsList.length > 1 && auditStatus == 'REJECT'"
+            circle
+            @click.prevent="removeGoodsList(goodsList)"
+          ></el-button>
+          <el-button
+            icon="el-icon-plus"
+            :disabled="!isAdd"
+            v-if="auditStatus == 'REJECT'"
+            @click.prevent="addGoodsList"
+            circle
+            style="margin-left: 5px"
+          ></el-button>
+        </div>
+      </div>
+      <div class="lookTitle">其它</div>
+      <el-form-item
+        label="提交备注"
+        :label-width="formLabelWidth"
+        :rules="[
+          { required: true, message: '请输入提交备注', trigger: 'change' },
+        ]"
+      >
+        <el-input
+          placeholder="请输入备注"
+          :disabled="!isAdd"
+          v-model.trim="form.memo"
+          type="textarea"
+          :rows="3"
+        ></el-input>
+      </el-form-item>
+      <!-- &&auditStatus != 'REJECT' -->
+      <el-form-item
+        label="审核备注"
+        v-if="auditStatus != 'ING'"
+        :label-width="formLabelWidth"
+      >
+        <el-input
+          placeholder="请输入备注"
+          :disabled="true"
+          v-model.trim="form.auditComment"
+          type="textarea"
+          :rows="3"
+        ></el-input>
+      </el-form-item>
+    </el-form>
+    <div class="lookTitle" v-if="auditStatus == 'ING'" v-permission="'routeOrder/auditOutOrder'">审核意见</div>
+    <el-form :model="submitForm" v-if="auditStatus == 'ING'" ref="submitForm" v-permission="'routeOrder/auditOutOrder'">
+      <el-form-item
+        prop="memo"
+        :rules="[
+          { required: true, message: '请输入审核意见', trigger: 'blur' },
+        ]"
+      >
+        <el-input
+          type="textarea"
+          :rows="4"
+          v-model="submitForm.memo"
+        ></el-input>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+<script>
+import {
+  getRouteOrderInfo,
+  auditOutOrder,
+  updateRouteOrder,
+} from "@/api/orderManager";
+import { orderServerList } from "@/utils/searchArray";
+import { getCooperation } from "@/api/buildTeam";
+export default {
+  props: ["orderId", "shopList", "isLook"],
+  data() {
+    return {
+      formLabelWidth: "100px",
+      form: {
+        routeOrganId: null,
+        transNo: null,
+        type: "OTHER",
+        merNo: null,
+        actualAmount: null,
+        memo: null,
+        payTime: null,
+        serviceAmount: null,
+        goodsAmount: null,
+        schoolId: null,
+        goodsList: [
+          {
+            id: null,
+            number: null,
+          },
+        ],
+        applyType: null,
+        userId: "",
+        auditComment: "",
+        calenderId:''
+      },
+      isAdd: !this.isLook,
+      insertOrderType: 1, // 订单类型  1 个人订单 2 学校订单 2 其它订单
+      cooperationList: [],
+      submitForm: {
+        memo: "",
+      },
+      auditStatus: "",
+      orderServerList: orderServerList,
+      clearSchool: false,
+    };
+  },
+  mounted() {
+    if (this.orderId) {
+      getRouteOrderInfo({ id: this.orderId }).then((res) => {
+        if (res.code == 200) {
+          let orderInfo = res.data;
+          this.form = {
+            createTime: orderInfo.createTime,
+            operator: orderInfo.operator,
+            routeOrganId: orderInfo.routeOrganId,
+            transNo: orderInfo.transNo,
+            type: "OTHER",
+            merNo: orderInfo.merNo,
+            actualAmount: orderInfo.actualAmount,
+            memo: orderInfo.memo,
+            payTime: orderInfo.payTime,
+            serviceAmount: orderInfo.serviceAmount,
+            saleAmount: orderInfo.saleAmount,
+            schoolId: orderInfo.schoolId,
+            userId: orderInfo.userId ? orderInfo.userId : "",
+            auditComment: orderInfo.auditComment,
+            applyType: orderInfo.saleAmount ? "SELL" : "SERVICE",
+            calenderId:orderInfo.calenderId?orderInfo.calenderId:''
+          };
+          this.auditStatus = orderInfo.auditStatus;
+          this.$set(
+            this.form,
+            "goodsList",
+            this.getShopList(orderInfo.goodsJson)
+          );
+          this.changeOrgin(orderInfo.routeOrganId);
+          if(orderInfo.userId && !res.data.calenderId) {
+            this.insertOrderType = 1
+          } else if(res.data.calenderId && !orderInfo.userId) {
+            this.insertOrderType = 2
+          } else {
+            this.insertOrderType = 3
+          }
+
+          // 添加类型判断
+          // SCHOOL("SCHOOL", "学校订单"),
+          // PERSONAL("PERSONAL", "个人订单"),
+          // OTHER("OTHER", "其他")
+          if(orderInfo.type !== 'OUTORDER'){
+            if(orderInfo.type === 'OTHER') {
+              this.insertOrderType = 3
+            } else if(orderInfo.type === 'SCHOOL') {
+              this.insertOrderType = 2
+            } else if(orderInfo.type === 'PERSONAL') {
+              this.insertOrderType = 1
+            }
+          }
+          this.clearSchool = true;
+        }
+      });
+    }
+    // 获取分部
+     this.$store.dispatch("setBranchs");
+  },
+  methods: {
+    changeOrgin(val) {
+      if (val) {
+        if (this.clearSchool) {
+          this.$set(this.form, "schoolId", null);
+        }
+        getCooperation({ rows: 9999, organId: val }).then((res) => {
+          if (res.code === 200) {
+            this.cooperationList = res.data.rows;
+          }
+        });
+      }
+    },
+    getShopList(str) {
+      let arr = [];
+      try {
+        const obj = JSON.parse(str);
+
+        // id: item.goodsId, number: item.num
+        for (let i in obj) {
+          arr.push({ id: parseInt(i), number: obj[i] });
+        }
+      } catch {}
+      return arr.length > 0
+        ? arr
+        : [
+            {
+              id: null,
+              number: null,
+            },
+          ];
+    },
+    auditOutOrder(status) {
+      const that = this;
+      this.$refs.submitForm.validate((res) => {
+        if (res) {
+          auditOutOrder({
+            auditStatus: status,
+            memo: this.submitForm.memo,
+            studentPaymentRouteOrderId: this.orderId,
+          }).then((res) => {
+            if (res.code == 200) {
+              this.$message.success("审核成功");
+              that.$emit("getList");
+              return;
+            }
+          });
+        }
+      });
+    },
+    removeGoodsList(item) {
+      const index = this.form.goodsList.indexOf(item);
+      if (index !== -1) {
+        this.form.goodsList.splice(index, 1);
+      }
+    },
+    addGoodsList() {
+      this.form.goodsList.push({
+        id: null,
+        number: null,
+      });
+    },
+    submitReaet() {
+      this.$refs.ruleForm.validate((valid) => {
+        if (valid) {
+          let form = JSON.parse(JSON.stringify(this.form));
+          if (!form.saleAmount && !form.serviceAmount) {
+            this.$message.error("请输入销售收入或服务收入");
+            return;
+          }
+          form.applyType == "SELL"
+            ? (form.serviceAmount = 0)
+            : (form.saleAmount = 0);
+          if (!form.saleAmount) {
+            form.goodsList = null;
+          }
+          let goodsJson = {};
+          for (let i in form.goodsList) {
+            goodsJson[form.goodsList[i]["id"]] = form.goodsList[i]["number"];
+          }
+          form.goodsJson =
+            form.applyType == "SERVICE" ? null : JSON.stringify(goodsJson);
+          form.id = this.orderId;
+          form.auditStatus = "ING";
+          if(this.insertOrderType == 1) {
+            form.calenderId = null
+          } else if(this.insertOrderType == 2) {
+            form.userId = null
+          }
+          updateRouteOrder(form).then((res) => {
+            if (res.code == 200) {
+              this.$message.success("修改成功");
+              this.$emit("getList");
+              return;
+            } else {
+              this.$message.error(res.msg);
+            }
+          });
+        }
+      });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.lookTitle {
+  height: 40px;
+  line-height: 40px;
+  font-weight: bold;
+  background-color: rgb(237, 238, 240);
+  padding: 0 20px;
+  margin-bottom: 20px;
+}
+.setWidth {
+  display: inline-block;
+}
+</style>

+ 585 - 571
src/views/businessManager/orderManager/orderAudit/orderAuditDetail.vue

@@ -1,571 +1,585 @@
-<template>
-  <div>
-    <el-form :inline="true" ref="ruleForm">
-      <div class="lookTitle">申请信息</div>
-      <el-form-item label="申请人" label-width="80px">
-        <div style="width: 180px">
-          <p v-if="form.operator && form.operator.username">
-            {{ form.operator.username }}
-          </p>
-        </div>
-      </el-form-item>
-      <el-form-item label="申请时间" label-width="80px">
-        <div style="width: 180px">{{ form.createTime }}</div>
-      </el-form-item>
-    </el-form>
-    <el-form :model="form" ref="ruleForm">
-      <div class="lookTitle">基本信息</div>
-      <el-form-item
-        label="所属分部"
-        :rules="[{ required: true, message: '请选择分部', trigger: 'change' }]"
-        prop="routeOrganId"
-        :label-width="formLabelWidth"
-      >
-        <!--    -->
-        <el-select
-          v-model.trim="form.routeOrganId"
-          :disabled="!isAdd"
-          @change="changeOrgin"
-          style="width: 100% !important"
-        >
-          <el-option
-            v-for="(item, index) in selects.branchs"
-            :key="index"
-            :label="item.name"
-            :value="item.id"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item
-        label="所属学校"
-        prop="schoolId"
-        :label-width="formLabelWidth"
-      >
-        <!--    @change="checkSchool" -->
-        <el-select
-          v-model="form.schoolId"
-          :disabled="!isAdd"
-          style="width: 100% !important"
-        >
-          <el-option
-            v-for="(item, index) in cooperationList"
-            :key="index"
-            :label="item.name"
-            :value="item.id"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <!-- 订单类型 -->
-      <el-form-item
-        label="订单类型"
-        prop="insertOrderType"
-        :label-width="formLabelWidth"
-      >
-        <el-radio-group v-model="insertOrderType" :disabled="!isAdd">
-          <el-radio :label="1">个人订单</el-radio>
-          <el-radio :label="2">学校订单</el-radio>
-          <el-radio :label="3">其它订单</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item
-        label="缴费单号"
-        prop="calenderId"
-        v-if="insertOrderType == 2 || insertOrderType == 3"
-        :label-width="formLabelWidth"
-         :rules="[{pattern:/^[0-9]*$/,message:'请输入正确的缴费单号',trigger: 'blur'}]"
-      >
-        <el-input
-          v-model.trim="form.calenderId"
-          :disabled="!isAdd"
-          placeholder="请输入缴费单号"
-        ></el-input>
-      </el-form-item>
-      <el-form-item
-        label="学员编号"
-        prop="userId"
-        v-if="insertOrderType == 1 || insertOrderType == 3"
-        :label-width="formLabelWidth"
-      >
-        <el-input
-          v-model.trim="form.userId"
-          :disabled="!isAdd"
-          placeholder="请输入学员编号"
-        ></el-input>
-      </el-form-item>
-      <div class="lookTitle">交易信息</div>
-      <el-form-item
-        label="交易流水号"
-        :rules="[
-          { required: true, message: '请输入流水号', trigger: 'change' },
-        ]"
-        prop="transNo"
-        :label-width="formLabelWidth"
-      >
-        <el-input
-          placeholder="请输入交易流水号"
-          type="text"
-          :disabled="!isAdd"
-          v-model.trim="form.transNo"
-        ></el-input>
-      </el-form-item>
-      <el-form-item
-        label="收款账户"
-        prop="merNo"
-        :rules="[
-          { required: true, message: '请输入收款账户', trigger: 'change' },
-        ]"
-        :label-width="formLabelWidth"
-      >
-        <el-input
-          placeholder="请输入收款账户"
-          type="text"
-          :disabled="!isAdd"
-          v-model.trim="form.merNo"
-        ></el-input>
-      </el-form-item>
-      <el-form-item
-        label="交易日期"
-        :rules="[
-          { required: true, message: '请选择交易日期', trigger: 'change' },
-        ]"
-        prop="payTime"
-        :label-width="formLabelWidth"
-      >
-        <el-date-picker
-          style="width: 100%"
-          :disabled="!isAdd"
-          v-model="form.payTime"
-          type="datetime"
-          format="yyyy-MM-dd HH:mm:ss"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择交易日期"
-        >
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item
-        label="收入类型"
-        :label-width="formLabelWidth"
-        :rules="[
-          { required: true, message: '请选收入类型', trigger: 'change' },
-        ]"
-        prop="applyType"
-      >
-        <el-select
-          class="multiple"
-          style="width: 100% !important"
-          v-model.trim="form.applyType"
-          filterable
-          clearable
-          :disabled="!isAdd"
-          placeholder="请选择收入类型"
-        >
-          <el-option
-            v-for="(item, index) in orderServerList"
-            :key="index"
-            :label="item.label"
-            :value="item.value"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item
-        label="销售金额"
-        prop="saleAmount"
-        :rules="[
-          { required: true, message: '请输入销售金额', trigger: 'change' },
-        ]"
-        v-if="form.applyType == 'SELL'"
-        :label-width="formLabelWidth"
-      >
-        <el-input
-          v-model="form.saleAmount"
-          @mousewheel.native.prevent
-          type="number"
-          :disabled="!isAdd"
-          placeholder="请输入销售金额"
-        />
-      </el-form-item>
-      <el-form-item
-        label="服务金额"
-        v-if="form.applyType == 'SERVICE'"
-        :rules="[
-          { required: true, message: '请输入服务金额', trigger: 'change' },
-        ]"
-        prop="serviceAmount"
-        :label-width="formLabelWidth"
-      >
-        <el-input
-          type="number"
-          @mousewheel.native.prevent
-          :disabled="!isAdd"
-          v-model="form.serviceAmount"
-          placeholder="请输入收入金额"
-        />
-      </el-form-item>
-
-      <div v-if="form.applyType == 'SELL'">
-        <div
-          v-for="(goodsList, index) in form.goodsList"
-          :key="index"
-          class="shopListWrap"
-        >
-          <el-form-item
-            :label="'商品名称' + (index + 1)"
-            :label-width="formLabelWidth"
-            class="setWidth"
-            :prop="'goodsList.' + index + '.id'"
-            :rules="[
-              { required: true, message: '请选择商品', trigger: 'change' },
-            ]"
-          >
-            <el-select
-              v-if="isAdd"
-              v-model.trim="goodsList.id"
-              filterable
-              :disabled="!isAdd"
-              placeholder="请选择商品"
-              :popper-append-to-body="false"
-            >
-              <el-option
-                :title="item.name"
-                v-for="(item, index) in shopList"
-                :key="index"
-                :label="item.name"
-                :value="item.id"
-              ></el-option>
-            </el-select>
-            <p class="showShop" v-else>
-              <Tooltip :content="goodsList.id | filterShopId" />
-            </p>
-          </el-form-item>
-          <el-form-item
-            class="setWidth"
-            style="margin-right: 10px;margin-left: 10px;"
-            :prop="'goodsList.' + index + '.number'"
-          >
-            <!--  :rules="validAmount" <el-input-number style="width: 160px;" v-model="goodsList.number" placeholder="商品数量"></el-input-number> -->
-            <el-input
-              type="age"
-              style="width: 160px"
-              :disabled="!isAdd"
-              clearable
-              placeholder="请输入商品数量"
-              @mousewheel.native.prevent
-              v-model.number="goodsList.number"
-            ></el-input>
-          </el-form-item>
-          <el-button
-            icon="el-icon-minus"
-            :disabled="!isAdd"
-            v-if="form.goodsList.length > 1 && auditStatus == 'REJECT'"
-            style="margin-bottom: 22px;"
-            circle
-            @click.prevent="removeGoodsList(goodsList)"
-          ></el-button>
-          <el-button
-            icon="el-icon-plus"
-            :disabled="!isAdd"
-            v-if="auditStatus == 'REJECT'"
-            @click.prevent="addGoodsList"
-            circle
-            style="margin-left: 5px; margin-bottom: 22px;"
-          ></el-button>
-        </div>
-      </div>
-      <div class="lookTitle">其它</div>
-      <el-form-item
-        label="提交备注"
-        :label-width="formLabelWidth"
-        :rules="[
-          { required: true, message: '请输入提交备注', trigger: 'change' },
-        ]"
-      >
-        <el-input
-          placeholder="请输入备注"
-          :disabled="!isAdd"
-          v-model.trim="form.memo"
-          type="textarea"
-          :rows="3"
-        ></el-input>
-      </el-form-item>
-      <!-- &&auditStatus != 'REJECT' -->
-      <el-form-item
-        label="审核备注"
-        v-if="auditStatus != 'ING'"
-        :label-width="formLabelWidth"
-      >
-        <el-input
-          placeholder="请输入备注"
-          :disabled="true"
-          v-model.trim="form.auditComment"
-          type="textarea"
-          :rows="3"
-        ></el-input>
-      </el-form-item>
-    </el-form>
-    <div
-      class="lookTitle"
-      v-if="auditStatus == 'ING'"
-    >
-      审核意见
-    </div>
-    <el-form
-      :model="submitForm"
-      v-if="auditStatus == 'ING'"
-      ref="submitForm"
-    >
-      <el-form-item
-        prop="memo"
-        :rules="[
-          { required: true, message: '请输入审核意见', trigger: 'blur' },
-        ]"
-      >
-        <el-input
-          type="textarea"
-          :rows="4"
-          v-model="submitForm.memo"
-        ></el-input>
-      </el-form-item>
-    </el-form>
-  </div>
-</template>
-<script>
-import {
-  getRouteOrderInfo,
-  auditOutOrder,
-  updateRouteOrder,
-} from "@/api/orderManager";
-import { orderServerList } from "@/utils/searchArray";
-import { getCooperation } from "@/api/buildTeam";
-import Tooltip from "@/components/Tooltip/index";
-let that;
-export default {
-  components: { Tooltip },
-  props: ["orderId", "shopList", "isLook"],
-  data() {
-    return {
-      formLabelWidth: "100px",
-      form: {
-        routeOrganId: null,
-        transNo: null,
-        type: "OTHER",
-        merNo: null,
-        actualAmount: null,
-        memo: null,
-        payTime: null,
-        serviceAmount: null,
-        goodsAmount: null,
-        schoolId: null,
-        goodsList: [
-          {
-            id: null,
-            number: null,
-          },
-        ],
-        applyType: null,
-        userId: "",
-        auditComment: "",
-        calenderId: "",
-      },
-      isAdd: !this.isLook,
-      insertOrderType: 1, // 订单类型  1 个人订单 2 学校订单 2 其它订单
-      cooperationList: [],
-      submitForm: {
-        memo: "",
-      },
-      auditStatus: "",
-      orderServerList: orderServerList,
-      clearSchool: false,
-    };
-  },
-  created() {
-    that = this;
-  },
-  mounted() {
-    if (this.orderId) {
-      getRouteOrderInfo({ id: this.orderId }).then((res) => {
-        if (res.code == 200) {
-          let orderInfo = res.data;
-          this.form = {
-            createTime: orderInfo.createTime,
-            operator: orderInfo.operator,
-            routeOrganId: orderInfo.routeOrganId,
-            transNo: orderInfo.transNo,
-            type: "OTHER",
-            merNo: orderInfo.merNo,
-            actualAmount: orderInfo.actualAmount,
-            memo: orderInfo.memo,
-            payTime: orderInfo.payTime,
-            serviceAmount: orderInfo.serviceAmount,
-            saleAmount: orderInfo.saleAmount,
-            schoolId: orderInfo.schoolId,
-            userId: orderInfo.userId ? orderInfo.userId : "",
-            auditComment: orderInfo.auditComment,
-            applyType: orderInfo.saleAmount ? "SELL" : "SERVICE",
-            calenderId: orderInfo.calenderId ? orderInfo.calenderId : "",
-          };
-          this.auditStatus = orderInfo.auditStatus;
-          this.$set(
-            this.form,
-            "goodsList",
-            this.getShopList(orderInfo.goodsJson)
-          );
-          this.changeOrgin(orderInfo.routeOrganId);
-
-          if(orderInfo.userId && !res.data.calenderId) {
-            this.insertOrderType = 1
-          } else if(res.data.calenderId && !orderInfo.userId) {
-            this.insertOrderType = 2
-          } else {
-            this.insertOrderType = 3
-          }
-          this.clearSchool = true;
-        }
-      });
-    }
-    // 获取分部
-     this.$store.dispatch("setBranchs");
-  },
-  methods: {
-    changeOrgin(val) {
-      if (val) {
-        if (this.clearSchool) {
-          this.$set(this.form, "schoolId", null);
-        }
-        getCooperation({ rows: 9999, organId: val }).then((res) => {
-          if (res.code === 200) {
-            this.cooperationList = res.data.rows;
-          }
-        });
-      }
-    },
-    getShopList(str) {
-      let arr = [];
-      try {
-        const obj = JSON.parse(str);
-
-        // id: item.goodsId, number: item.num
-        for (let i in obj) {
-          arr.push({ id: parseInt(i), number: obj[i] });
-        }
-      } catch {}
-      return arr.length > 0
-        ? arr
-        : [
-            {
-              id: null,
-              number: null,
-            },
-          ];
-    },
-    auditOutOrder(status) {
-      const that = this;
-      this.$refs.submitForm.validate((res) => {
-        if (res) {
-          auditOutOrder({
-            auditStatus: status,
-            memo: this.submitForm.memo,
-            studentPaymentRouteOrderId: this.orderId,
-          }).then((res) => {
-            if (res.code == 200) {
-              this.$message.success("审核成功");
-              that.$emit("getList");
-              return;
-            }
-          });
-        }
-      });
-    },
-    removeGoodsList(item) {
-      const index = this.form.goodsList.indexOf(item);
-      if (index !== -1) {
-        this.form.goodsList.splice(index, 1);
-      }
-    },
-    addGoodsList() {
-      this.form.goodsList.push({
-        id: null,
-        number: null,
-      });
-    },
-    submitReaet() {
-      this.$refs.ruleForm.validate((valid) => {
-        if (valid) {
-          let form = JSON.parse(JSON.stringify(this.form));
-          if (!form.saleAmount && !form.serviceAmount) {
-            this.$message.error("请输入销售收入或服务收入");
-            return;
-          }
-          form.applyType == "SELL"
-            ? (form.serviceAmount = 0)
-            : (form.saleAmount = 0);
-          if (!form.saleAmount) {
-            form.goodsList = null;
-          }
-          let goodsJson = {};
-          for (let i in form.goodsList) {
-            goodsJson[form.goodsList[i]["id"]] = form.goodsList[i]["number"];
-          }
-          form.goodsJson =
-            form.applyType == "SERVICE" ? null : JSON.stringify(goodsJson);
-          form.id = this.orderId;
-          form.auditStatus = "ING";
-          if(this.insertOrderType == 1) {
-            form.calenderId = null
-          } else if(this.insertOrderType == 2) {
-            form.userId = null
-          }
-          updateRouteOrder(form).then((res) => {
-            if (res.code == 200) {
-              this.$message.success("修改成功");
-              this.$emit("getList");
-              return;
-            } else {
-              this.$message.error(res.msg);
-            }
-          });
-        }
-      });
-    },
-  },
-  filters: {
-    filterShopId(val) {
-      let str = "";
-      that.shopList.forEach((shop) => {
-        if (shop.id == val) {
-          str = shop.name;
-        }
-      });
-      return str;
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-.lookTitle {
-  height: 40px;
-  line-height: 40px;
-  font-weight: bold;
-  background-color: rgb(237, 238, 240);
-  padding: 0 20px;
-  margin-bottom: 20px;
-}
-.setWidth {
-  display: inline-block;
-}
-.showShop {
-  height: 40px;
-  line-height: 40px;
-  width: 150px;
-  background-color: #f5f7fa;
-  border-color: #e4e7ed;
-  color: #c0c4cc;
-  cursor: not-allowed;
-  color: #333;
-  opacity: 1;
-  border-radius: 4px;
-  border: 1px solid #dcdfe6;
-  padding: 0 15px;
-  margin-right: 10px;
-}
-.shopListWrap { display: flex; flex-direction: row; justify-content: flex-start;}
-</style>
+<template>
+  <div>
+    <el-form :inline="true" ref="ruleForm">
+      <div class="lookTitle">申请信息</div>
+      <el-form-item label="申请人" label-width="80px">
+        <div style="width: 180px">
+          <p v-if="form.operator && form.operator.username">
+            {{ form.operator.username }}
+          </p>
+        </div>
+      </el-form-item>
+      <el-form-item label="申请时间" label-width="80px">
+        <div style="width: 180px">{{ form.createTime }}</div>
+      </el-form-item>
+    </el-form>
+    <el-form :model="form" ref="ruleForm">
+      <div class="lookTitle">基本信息</div>
+      <el-form-item
+        label="所属分部"
+        :rules="[{ required: true, message: '请选择分部', trigger: 'change' }]"
+        prop="routeOrganId"
+        :label-width="formLabelWidth"
+      >
+        <!--    -->
+        <el-select
+          v-model.trim="form.routeOrganId"
+          :disabled="!isAdd"
+          @change="changeOrgin"
+          style="width: 100% !important"
+        >
+          <el-option
+            v-for="(item, index) in selects.branchs"
+            :key="index"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        label="所属学校"
+        prop="schoolId"
+        :label-width="formLabelWidth"
+      >
+        <!--    @change="checkSchool" -->
+        <el-select
+          v-model="form.schoolId"
+          :disabled="!isAdd"
+          style="width: 100% !important"
+        >
+          <el-option
+            v-for="(item, index) in cooperationList"
+            :key="index"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <!-- 订单类型 -->
+      <el-form-item
+        label="订单类型"
+        prop="insertOrderType"
+        :label-width="formLabelWidth"
+      >
+        <el-radio-group v-model="insertOrderType" :disabled="!isAdd">
+          <el-radio :label="1">个人订单</el-radio>
+          <el-radio :label="2">学校订单</el-radio>
+          <el-radio :label="3">其它订单</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        label="缴费单号"
+        prop="calenderId"
+        v-if="insertOrderType == 2 || insertOrderType == 3"
+        :label-width="formLabelWidth"
+         :rules="[{pattern:/^[0-9]*$/,message:'请输入正确的缴费单号',trigger: 'blur'}]"
+      >
+        <el-input
+          v-model.trim="form.calenderId"
+          :disabled="!isAdd"
+          placeholder="请输入缴费单号"
+        ></el-input>
+      </el-form-item>
+      <el-form-item
+        label="学员编号"
+        prop="userId"
+        v-if="insertOrderType == 1 || insertOrderType == 3"
+        :label-width="formLabelWidth"
+      >
+        <el-input
+          v-model.trim="form.userId"
+          :disabled="!isAdd"
+          placeholder="请输入学员编号"
+        ></el-input>
+      </el-form-item>
+      <div class="lookTitle">交易信息</div>
+      <el-form-item
+        label="交易流水号"
+        :rules="[
+          { required: true, message: '请输入流水号', trigger: 'change' },
+        ]"
+        prop="transNo"
+        :label-width="formLabelWidth"
+      >
+        <el-input
+          placeholder="请输入交易流水号"
+          type="text"
+          :disabled="!isAdd"
+          v-model.trim="form.transNo"
+        ></el-input>
+      </el-form-item>
+      <el-form-item
+        label="收款账户"
+        prop="merNo"
+        :rules="[
+          { required: true, message: '请输入收款账户', trigger: 'change' },
+        ]"
+        :label-width="formLabelWidth"
+      >
+        <el-input
+          placeholder="请输入收款账户"
+          type="text"
+          :disabled="!isAdd"
+          v-model.trim="form.merNo"
+        ></el-input>
+      </el-form-item>
+      <el-form-item
+        label="交易日期"
+        :rules="[
+          { required: true, message: '请选择交易日期', trigger: 'change' },
+        ]"
+        prop="payTime"
+        :label-width="formLabelWidth"
+      >
+        <el-date-picker
+          style="width: 100%"
+          :disabled="!isAdd"
+          v-model="form.payTime"
+          type="datetime"
+          format="yyyy-MM-dd HH:mm:ss"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          placeholder="选择交易日期"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item
+        label="收入类型"
+        :label-width="formLabelWidth"
+        :rules="[
+          { required: true, message: '请选收入类型', trigger: 'change' },
+        ]"
+        prop="applyType"
+      >
+        <el-select
+          class="multiple"
+          style="width: 100% !important"
+          v-model.trim="form.applyType"
+          filterable
+          clearable
+          :disabled="!isAdd"
+          placeholder="请选择收入类型"
+        >
+          <el-option
+            v-for="(item, index) in orderServerList"
+            :key="index"
+            :label="item.label"
+            :value="item.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        label="销售金额"
+        prop="saleAmount"
+        :rules="[
+          { required: true, message: '请输入销售金额', trigger: 'change' },
+        ]"
+        v-if="form.applyType == 'SELL'"
+        :label-width="formLabelWidth"
+      >
+        <el-input
+          v-model="form.saleAmount"
+          @mousewheel.native.prevent
+          type="number"
+          :disabled="!isAdd"
+          placeholder="请输入销售金额"
+        />
+      </el-form-item>
+      <el-form-item
+        label="服务金额"
+        v-if="form.applyType == 'SERVICE'"
+        :rules="[
+          { required: true, message: '请输入服务金额', trigger: 'change' },
+        ]"
+        prop="serviceAmount"
+        :label-width="formLabelWidth"
+      >
+        <el-input
+          type="number"
+          @mousewheel.native.prevent
+          :disabled="!isAdd"
+          v-model="form.serviceAmount"
+          placeholder="请输入收入金额"
+        />
+      </el-form-item>
+
+      <div v-if="form.applyType == 'SELL'">
+        <div
+          v-for="(goodsList, index) in form.goodsList"
+          :key="index"
+          class="shopListWrap"
+        >
+          <el-form-item
+            :label="'商品名称' + (index + 1)"
+            :label-width="formLabelWidth"
+            class="setWidth"
+            :prop="'goodsList.' + index + '.id'"
+            :rules="[
+              { required: true, message: '请选择商品', trigger: 'change' },
+            ]"
+          >
+            <el-select
+              v-if="isAdd"
+              v-model.trim="goodsList.id"
+              filterable
+              :disabled="!isAdd"
+              placeholder="请选择商品"
+              :popper-append-to-body="false"
+            >
+              <el-option
+                :title="item.name"
+                v-for="(item, index) in shopList"
+                :key="index"
+                :label="item.name"
+                :value="item.id"
+              ></el-option>
+            </el-select>
+            <p class="showShop" v-else>
+              <Tooltip :content="goodsList.id | filterShopId" />
+            </p>
+          </el-form-item>
+          <el-form-item
+            class="setWidth"
+            style="margin-right: 10px;margin-left: 10px;"
+            :prop="'goodsList.' + index + '.number'"
+          >
+            <!--  :rules="validAmount" <el-input-number style="width: 160px;" v-model="goodsList.number" placeholder="商品数量"></el-input-number> -->
+            <el-input
+              type="age"
+              style="width: 160px"
+              :disabled="!isAdd"
+              clearable
+              placeholder="请输入商品数量"
+              @mousewheel.native.prevent
+              v-model.number="goodsList.number"
+            ></el-input>
+          </el-form-item>
+          <el-button
+            icon="el-icon-minus"
+            :disabled="!isAdd"
+            v-if="form.goodsList.length > 1 && auditStatus == 'REJECT'"
+            style="margin-bottom: 22px;"
+            circle
+            @click.prevent="removeGoodsList(goodsList)"
+          ></el-button>
+          <el-button
+            icon="el-icon-plus"
+            :disabled="!isAdd"
+            v-if="auditStatus == 'REJECT'"
+            @click.prevent="addGoodsList"
+            circle
+            style="margin-left: 5px; margin-bottom: 22px;"
+          ></el-button>
+        </div>
+      </div>
+      <div class="lookTitle">其它</div>
+      <el-form-item
+        label="提交备注"
+        :label-width="formLabelWidth"
+        :rules="[
+          { required: true, message: '请输入提交备注', trigger: 'change' },
+        ]"
+      >
+        <el-input
+          placeholder="请输入备注"
+          :disabled="!isAdd"
+          v-model.trim="form.memo"
+          type="textarea"
+          :rows="3"
+        ></el-input>
+      </el-form-item>
+      <!-- &&auditStatus != 'REJECT' -->
+      <el-form-item
+        label="审核备注"
+        v-if="auditStatus != 'ING'"
+        :label-width="formLabelWidth"
+      >
+        <el-input
+          placeholder="请输入备注"
+          :disabled="true"
+          v-model.trim="form.auditComment"
+          type="textarea"
+          :rows="3"
+        ></el-input>
+      </el-form-item>
+    </el-form>
+    <div
+      class="lookTitle"
+      v-if="auditStatus == 'ING'"
+    >
+      审核意见
+    </div>
+    <el-form
+      :model="submitForm"
+      v-if="auditStatus == 'ING'"
+      ref="submitForm"
+    >
+      <el-form-item
+        prop="memo"
+        :rules="[
+          { required: true, message: '请输入审核意见', trigger: 'blur' },
+        ]"
+      >
+        <el-input
+          type="textarea"
+          :rows="4"
+          v-model="submitForm.memo"
+        ></el-input>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+<script>
+import {
+  getRouteOrderInfo,
+  auditOutOrder,
+  updateRouteOrder,
+} from "@/api/orderManager";
+import { orderServerList } from "@/utils/searchArray";
+import { getCooperation } from "@/api/buildTeam";
+import Tooltip from "@/components/Tooltip/index";
+let that;
+export default {
+  components: { Tooltip },
+  props: ["orderId", "shopList", "isLook"],
+  data() {
+    return {
+      formLabelWidth: "100px",
+      form: {
+        routeOrganId: null,
+        transNo: null,
+        type: "OTHER",
+        merNo: null,
+        actualAmount: null,
+        memo: null,
+        payTime: null,
+        serviceAmount: null,
+        goodsAmount: null,
+        schoolId: null,
+        goodsList: [
+          {
+            id: null,
+            number: null,
+          },
+        ],
+        applyType: null,
+        userId: "",
+        auditComment: "",
+        calenderId: "",
+      },
+      isAdd: !this.isLook,
+      insertOrderType: 1, // 订单类型  1 个人订单 2 学校订单 2 其它订单
+      cooperationList: [],
+      submitForm: {
+        memo: "",
+      },
+      auditStatus: "",
+      orderServerList: orderServerList,
+      clearSchool: false,
+    };
+  },
+  created() {
+    that = this;
+  },
+  mounted() {
+    if (this.orderId) {
+      getRouteOrderInfo({ id: this.orderId }).then((res) => {
+        if (res.code == 200) {
+          let orderInfo = res.data;
+          this.form = {
+            createTime: orderInfo.createTime,
+            operator: orderInfo.operator,
+            routeOrganId: orderInfo.routeOrganId,
+            transNo: orderInfo.transNo,
+            type: "OTHER",
+            merNo: orderInfo.merNo,
+            actualAmount: orderInfo.actualAmount,
+            memo: orderInfo.memo,
+            payTime: orderInfo.payTime,
+            serviceAmount: orderInfo.serviceAmount,
+            saleAmount: orderInfo.saleAmount,
+            schoolId: orderInfo.schoolId,
+            userId: orderInfo.userId ? orderInfo.userId : "",
+            auditComment: orderInfo.auditComment,
+            applyType: orderInfo.saleAmount ? "SELL" : "SERVICE",
+            calenderId: orderInfo.calenderId ? orderInfo.calenderId : "",
+          };
+          this.auditStatus = orderInfo.auditStatus;
+          this.$set(
+            this.form,
+            "goodsList",
+            this.getShopList(orderInfo.goodsJson)
+          );
+          this.changeOrgin(orderInfo.routeOrganId);
+
+          if(orderInfo.userId && !res.data.calenderId) {
+            this.insertOrderType = 1
+          } else if(res.data.calenderId && !orderInfo.userId) {
+            this.insertOrderType = 2
+          } else {
+            this.insertOrderType = 3
+          }
+
+          // 添加类型判断
+          // SCHOOL("SCHOOL", "学校订单"),
+          // PERSONAL("PERSONAL", "个人订单"),
+          // OTHER("OTHER", "其他")
+          if(orderInfo.type !== 'OUTORDER'){
+            if(orderInfo.type === 'OTHER') {
+              this.insertOrderType = 3
+            } else if(orderInfo.type === 'SCHOOL') {
+              this.insertOrderType = 2
+            } else if(orderInfo.type === 'PERSONAL') {
+              this.insertOrderType = 1
+            }
+          }
+          this.clearSchool = true;
+        }
+      });
+    }
+    // 获取分部
+     this.$store.dispatch("setBranchs");
+  },
+  methods: {
+    changeOrgin(val) {
+      if (val) {
+        if (this.clearSchool) {
+          this.$set(this.form, "schoolId", null);
+        }
+        getCooperation({ rows: 9999, organId: val }).then((res) => {
+          if (res.code === 200) {
+            this.cooperationList = res.data.rows;
+          }
+        });
+      }
+    },
+    getShopList(str) {
+      let arr = [];
+      try {
+        const obj = JSON.parse(str);
+
+        // id: item.goodsId, number: item.num
+        for (let i in obj) {
+          arr.push({ id: parseInt(i), number: obj[i] });
+        }
+      } catch {}
+      return arr.length > 0
+        ? arr
+        : [
+            {
+              id: null,
+              number: null,
+            },
+          ];
+    },
+    auditOutOrder(status) {
+      const that = this;
+      this.$refs.submitForm.validate((res) => {
+        if (res) {
+          auditOutOrder({
+            auditStatus: status,
+            memo: this.submitForm.memo,
+            studentPaymentRouteOrderId: this.orderId,
+          }).then((res) => {
+            if (res.code == 200) {
+              this.$message.success("审核成功");
+              that.$emit("getList");
+              return;
+            }
+          });
+        }
+      });
+    },
+    removeGoodsList(item) {
+      const index = this.form.goodsList.indexOf(item);
+      if (index !== -1) {
+        this.form.goodsList.splice(index, 1);
+      }
+    },
+    addGoodsList() {
+      this.form.goodsList.push({
+        id: null,
+        number: null,
+      });
+    },
+    submitReaet() {
+      this.$refs.ruleForm.validate((valid) => {
+        if (valid) {
+          let form = JSON.parse(JSON.stringify(this.form));
+          if (!form.saleAmount && !form.serviceAmount) {
+            this.$message.error("请输入销售收入或服务收入");
+            return;
+          }
+          form.applyType == "SELL"
+            ? (form.serviceAmount = 0)
+            : (form.saleAmount = 0);
+          if (!form.saleAmount) {
+            form.goodsList = null;
+          }
+          let goodsJson = {};
+          for (let i in form.goodsList) {
+            goodsJson[form.goodsList[i]["id"]] = form.goodsList[i]["number"];
+          }
+          form.goodsJson =
+            form.applyType == "SERVICE" ? null : JSON.stringify(goodsJson);
+          form.id = this.orderId;
+          form.auditStatus = "ING";
+          if(this.insertOrderType == 1) {
+            form.calenderId = null
+          } else if(this.insertOrderType == 2) {
+            form.userId = null
+          }
+          updateRouteOrder(form).then((res) => {
+            if (res.code == 200) {
+              this.$message.success("修改成功");
+              this.$emit("getList");
+              return;
+            } else {
+              this.$message.error(res.msg);
+            }
+          });
+        }
+      });
+    },
+  },
+  filters: {
+    filterShopId(val) {
+      let str = "";
+      that.shopList.forEach((shop) => {
+        if (shop.id == val) {
+          str = shop.name;
+        }
+      });
+      return str;
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.lookTitle {
+  height: 40px;
+  line-height: 40px;
+  font-weight: bold;
+  background-color: rgb(237, 238, 240);
+  padding: 0 20px;
+  margin-bottom: 20px;
+}
+.setWidth {
+  display: inline-block;
+}
+.showShop {
+  height: 40px;
+  line-height: 40px;
+  width: 150px;
+  background-color: #f5f7fa;
+  border-color: #e4e7ed;
+  color: #c0c4cc;
+  cursor: not-allowed;
+  color: #333;
+  opacity: 1;
+  border-radius: 4px;
+  border: 1px solid #dcdfe6;
+  padding: 0 15px;
+  margin-right: 10px;
+}
+.shopListWrap { display: flex; flex-direction: row; justify-content: flex-start;}
+</style>