diff --git a/src/api/xm/core/xmTaskOrder.js b/src/api/xm/core/xmTaskOrder.js index 5cb8abe5..6e1e8dbe 100644 --- a/src/api/xm/core/xmTaskOrder.js +++ b/src/api/xm/core/xmTaskOrder.js @@ -9,7 +9,7 @@ let base = config.getCoreBasePath(); /** * 任务相关费用订单表 *1 默认只开放普通查询，所有查询，只要上传 分页参数 {pageNum:当前页码从1开始,pageSize:每页记录数,total:总记录【数如果是0后台会自动计算总记录数非0不会自动计算】}，后台都会自动按分页查询 其它 api用到再打开，没用到的api请注释掉， - *2 查询、新增、修改的参数格式 params={id:'订单编号 主键',userid:'用户编号',branchId:'公司ID-下单客户对应的企业',ostatus:'订单状态0-初始，1-待确认，2-待付款，3-已付款，4-已完成，5-已取消-未付款前可取消，取消后可删除，6-退单-退单后变为已取消，8已关闭-售后完成后可以关闭订单',ctime:'创建时间',ltime:'更新时间',payType:'支付方式',payStatus:'支付状态0待付款，1已付款',payTime:'支付时间',prepayId:'第三方支付订单编号',finalFee:'最终总费用=origin_fee',othFee:'其它费用',originFee:'原始价格=top_fee+urgent_fee+crm_sup_fee+hot_fee+efunds+share_fee',payAt:'最终付款金额-客户付款后回填',payAuthId:'支付授权码',payOpenid:'支付账户对应的第三方openid,注意，下单根付款不一定是同一个人',payUserid:'付款用户编号',payUsername:'付款用户名称',discount:'折扣率0-199',topFee:'置顶费用',topStime:'置顶开始时间',topEtime:'置顶结束时间',hotFee:'热搜费用',hotStime:'热搜开始时间',hotEtime:'热搜结束时间',top:'是否置顶',hot:'是否热搜',crmSupFee:'客服包办费用',urgentFee:'加急费用',urgent:'是否加急',crmSup:'是否客服包办',efunds:'托管金额',estate:'资金托管状况0-无须托管，1-已托管，2-已付款给服务商，3-已退款',etoPlatTime:'托管资金付款给平台的时间',etoDevTime:'托管资金支付给服务商的时间',ebackTime:'托管资金退回甲方时间',taskId:'任务编号',topDays:'置顶天数',hotDays:'热搜天数',urgentDays:'加急天数',urgentStime:'加急开始时间',urgentEtime:'加急结束时间',calcStatus:'定时检查日期是否已过期，已过期则取消任务中的置顶、加急、热搜状态计算状态0-无须计算，1-本周期已计算待下周期计算，2-结束',calcTime:'计算时间',oshare:'是否开启分享赚',shareFee:'分享赚佣金'} + *2 查询、新增、修改的参数格式 params={id:'订单编号 主键',userid:'用户编号',branchId:'公司ID-下单客户对应的企业',ostatus:'订单状态0-初始，1-待确认，2-待付款，3-已付款，4-已完成，5-已取消-未付款前可取消，取消后可删除，6-退单-退单后变为已取消，8已关闭-售后完成后可以关闭订单',ctime:'创建时间',ltime:'更新时间',payType:'支付方式',payStatus:'支付状态0待付款，1已付款',payTime:'支付时间',prepayId:'第三方支付订单编号',finalFee:'最终总费用=origin_fee',othFee:'其它费用',originFee:'原始价格=top_fee+urgent_fee+crm_sup_fee+hot_fee+efunds+share_fee',payAt:'最终付款金额-客户付款后回填',payAuthId:'支付授权码',payOpenid:'支付账户对应的第三方openid,注意，下单根付款不一定是同一个人',payUserid:'付款用户编号',payUsername:'付款用户名称',discount:'折扣率0-199',topFee:'置顶费用',topStime:'置顶开始时间',topEtime:'置顶结束时间',hotFee:'热搜费用',hotStime:'热搜开始时间',hotEtime:'热搜结束时间',top:'是否置顶0否1待付款2已开通3已过期',hot:'是否热搜0否1待付款2已开通3已过期',crmSupFee:'客服包办费用',urgentFee:'加急费用',urgent:'是否加急0否1待付款2已开通3已过期',crmSup:'是否客服包办0否1待付款2已开通3已过期',efunds:'托管金额',estate:'资金托管状况0-无须托管，1-待付款，2-已托管资金，3-已付款给服务商，4-已退款',etoPlatTime:'托管资金付款给平台的时间',etoDevTime:'托管资金支付给服务商的时间',ebackTime:'托管资金退回甲方时间',taskId:'任务编号',topDays:'置顶天数',hotDays:'热搜天数',urgentDays:'加急天数',urgentStime:'加急开始时间',urgentEtime:'加急结束时间',calcStatus:'定时检查日期是否已过期，已过期则取消任务中的置顶、加急、热搜状态计算状态0-无须计算，1-本周期已计算待下周期计算，2-结束',calcTime:'计算时间',oshare:'是否开启分享赚0否1待付款2已开通3已过期',shareFee:'分享赚佣金'} **/ //普通查询 条件之间and关系 diff --git a/src/views/xm/core/xmTask/XmTaskAdd.vue b/src/views/xm/core/xmTask/XmTaskAdd.vue index bde84ea0..0149cac0 100644 --- a/src/views/xm/core/xmTask/XmTaskAdd.vue +++ b/src/views/xm/core/xmTask/XmTaskAdd.vue @@ -321,12 +321,10 @@ // validator: validateExec, trigger: 'blur' // }], }, - //新增界面数据 xm_task + //新增界面数据 xm_task + addForm: { - id:'',name:'',parentTaskid:'',parentTaskname:'',projectId:'',projectName:'',level:'3',sortLevel:'0',executorUserid:'',executorUsername:'', - preTaskid:'',preTaskname:'',startTime:'',endTime:'',milestone:'',description:'',remarks:'',createUserid:'',createUsername:'',createTime:'',taskOut:'0', - rate:0,budgetAt:'',budgetWorkload:'',actAt:'',actWorkload:'',taskState:'0',taskClass:'0',toTaskCenter:'0',actStartTime:'',actEndTime:'',taskType:'4',planType:'w2',settleSchemel:'1',ntype:'0',childrenCnt:0, - uniInnerPrice:80,uniOutPrice:100,crowd:'0',oshare:'0',shareFee:0 + id:'',name:'',parentTaskid:'',parentTaskname:'',projectId:'',projectName:'',level:'',sortLevel:'',executorUserid:'',executorUsername:'',preTaskid:'',preTaskname:'',startTime:'',endTime:'',milestone:'',description:'',remarks:'',createUserid:'',createUsername:'',createTime:'',rate:0,budgetAt:0,budgetWorkload:0,actAt:0,actWorkload:0,taskState:'0',taskType:'4',taskClass:'',toTaskCenter:'0',actStartTime:'',actEndTime:'',bizProcInstId:'',bizFlowState:'',phaseId:'',phaseName:'',taskSkillNames:'',exeUsernames:'',taskSkillIds:'',exeUserids:'',taskOut:'0',planType:'w2',settleSchemel:'1',menuId:'',menuName:'',productId:'',cbranchId:'',cdeptid:'',tagIds:'',tagNames:'',ntype:'',childrenCnt:'',ltime:'',pidPaths:'',lvl:'',isTpl:'',keyPath:'',uniInnerPrice:80,uniOutPrice:100,calcType:'',ptype:'',wtype:'',bctrl:'',initWorkload:'',shareFee:'',oshare:'',crowd:'',browseUsers:'',execUsers:'',cityId:'',cityName:'',regionType:'',browseTimes:'',capaLvls:'',tranMode:'',supRequires:'',hot:'0',top:'0',urgent:'0',crmSup:'0',bidStep:'0',interestLvls:'',filePaths:'',estate:'0',efunds:0,etoPlatTime:'',etoDevTime:'',ebackTime:'',topStime:'',topEtime:'',hotStime:'',hotEtime:'',urgentStime:'',urgentEtime:'' }, /**begin 在下面加自定义属性,记得补上面的一个逗号**/ menuVisible:false, diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue index 3981c963..36798bee 100644 --- a/src/views/xm/core/xmTask/XmTaskEdit.vue +++ b/src/views/xm/core/xmTask/XmTaskEdit.vue @@ -413,11 +413,9 @@ // }], }, //新增界面数据 xm_task + editForm: { - id:'',name:'',parentTaskid:'',parentTaskname:'',projectId:'',projectName:'',level:'3',sortLevel:'0',executorUserid:'',executorUsername:'', - preTaskid:'',preTaskname:'',startTime:'',endTime:'',milestone:'',description:'',remarks:'',createUserid:'',createUsername:'',createTime:'',taskOut:'0', - rate:0,budgetAt:'',budgetWorkload:'',actAt:'',actWorkload:'',taskState:'0',taskClass:'0',toTaskCenter:'0',actStartTime:'',actEndTime:'',taskType:'4',planType:'w2',settleSchemel:'1',ntype:'0',childrenCnt:0,wtype:'',rworkload:0, - uniInnerPrice:80,uniOutPrice:100,crowd:'0',oshare:'0',shareFee:0,menuName:'',hot:'0',top:'0',urgent:'0',crmSup:'0',bidStep:'0',capaLvls:'',interestLvls:'0',supRequires:'0',tranMode:'0',cityId:'',cityName:'',regionType:'0' + id:'',name:'',parentTaskid:'',parentTaskname:'',projectId:'',projectName:'',level:'',sortLevel:'',executorUserid:'',executorUsername:'',preTaskid:'',preTaskname:'',startTime:'',endTime:'',milestone:'',description:'',remarks:'',createUserid:'',createUsername:'',createTime:'',rate:0,budgetAt:0,budgetWorkload:0,actAt:0,actWorkload:0,taskState:'0',taskType:'4',taskClass:'',toTaskCenter:'0',actStartTime:'',actEndTime:'',bizProcInstId:'',bizFlowState:'',phaseId:'',phaseName:'',taskSkillNames:'',exeUsernames:'',taskSkillIds:'',exeUserids:'',taskOut:'0',planType:'w2',settleSchemel:'1',menuId:'',menuName:'',productId:'',cbranchId:'',cdeptid:'',tagIds:'',tagNames:'',ntype:'0',childrenCnt:0,ltime:'',pidPaths:'',lvl:'',isTpl:'',keyPath:'',uniInnerPrice:80,uniOutPrice:100,calcType:'',ptype:'',wtype:'',bctrl:'',initWorkload:'',shareFee:'',oshare:'',crowd:'',browseUsers:'',execUsers:'',cityId:'',cityName:'',regionType:'',browseTimes:'',capaLvls:'',tranMode:'',supRequires:'',hot:'0',top:'0',urgent:'0',crmSup:'0',bidStep:'0',interestLvls:'',filePaths:'',estate:'0',efunds:0,etoPlatTime:'',etoDevTime:'',ebackTime:'',topStime:'',topEtime:'',hotStime:'',hotEtime:'',urgentStime:'',urgentEtime:'' }, /**begin 在下面加自定义属性,记得补上面的一个逗号**/ menuVisible:false, diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue index 5bf00039..7ed2ed8b 100644 --- a/src/views/xm/core/xmTask/XmTaskMng.vue +++ b/src/views/xm/core/xmTask/XmTaskMng.vue @@ -1022,80 +1022,17 @@ export default { }, //下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} addFormVisible: false, //新增xmTask界面是否显示 - //新增xmTask界面初始化数据 - addForm: { - id: "", - name: "", - parentTaskid: "", - parentTaskname: "", - projectId: "", - projectName: "", - level: "", - sortLevel: "", - executorUserid: "", - executorUsername: "", - preTaskid: "", - preTaskname: "", - startTime: "", - endTime: "", - milestone: "", - description: "", - remarks: "", - createUserid: "", - createUsername: "", - createTime: "", - rate: "", - budgetAt: "", - budgetWorkload: "", - actAt: "", - actWorkload: "", - taskState: "", - taskType: "", - taskClass: "", - toTaskCenter: "", - actStartTime: "", - actEndTime: "", - uniInnerPrice:80,uniOutPrice:100, - cityId:'',cityName:'',regionType:'0' - }, + //新增xmTask界面初始化数据 + addForm: { + id:'',name:'',parentTaskid:'',parentTaskname:'',projectId:'',projectName:'',level:'',sortLevel:'',executorUserid:'',executorUsername:'',preTaskid:'',preTaskname:'',startTime:'',endTime:'',milestone:'',description:'',remarks:'',createUserid:'',createUsername:'',createTime:'',rate:0,budgetAt:0,budgetWorkload:0,actAt:0,actWorkload:0,taskState:'0',taskType:'4',taskClass:'',toTaskCenter:'0',actStartTime:'',actEndTime:'',bizProcInstId:'',bizFlowState:'',phaseId:'',phaseName:'',taskSkillNames:'',exeUsernames:'',taskSkillIds:'',exeUserids:'',taskOut:'0',planType:'w2',settleSchemel:'1',menuId:'',menuName:'',productId:'',cbranchId:'',cdeptid:'',tagIds:'',tagNames:'',ntype:'',childrenCnt:'',ltime:'',pidPaths:'',lvl:'',isTpl:'',keyPath:'',uniInnerPrice:80,uniOutPrice:100,calcType:'',ptype:'',wtype:'',bctrl:'',initWorkload:'',shareFee:'',oshare:'',crowd:'',browseUsers:'',execUsers:'',cityId:'',cityName:'',regionType:'',browseTimes:'',capaLvls:'',tranMode:'',supRequires:'',hot:'0',top:'0',urgent:'0',crmSup:'0',bidStep:'0',interestLvls:'',filePaths:'',estate:'0',efunds:0,etoPlatTime:'',etoDevTime:'',ebackTime:'',topStime:'',topEtime:'',hotStime:'',hotEtime:'',urgentStime:'',urgentEtime:'' + }, editFormVisible: false, //编辑界面是否显示 //编辑xmTask界面初始化数据 - editForm: { - id: "", - name: "", - parentTaskid: "", - parentTaskname: "", - projectId: "", - projectName: "", - level: "", - sortLevel: "", - executorUserid: "", - executorUsername: "", - preTaskid: "", - preTaskname: "", - startTime: "", - endTime: "", - milestone: "", - description: "", - remarks: "", - createUserid: "", - createUsername: "", - createTime: "", - rate: "", - budgetAt: "", - budgetWorkload: "", - actAt: "", - actWorkload: "", - taskState: "", - taskType: "", - taskClass: "", - toTaskCenter: "", - actStartTime: "", - actEndTime: "", - uniInnerPrice:80,uniOutPrice:100, - cityId:'',cityName:'',regionType:'0' - }, + + editForm: { + id:'',name:'',parentTaskid:'',parentTaskname:'',projectId:'',projectName:'',level:'',sortLevel:'',executorUserid:'',executorUsername:'',preTaskid:'',preTaskname:'',startTime:'',endTime:'',milestone:'',description:'',remarks:'',createUserid:'',createUsername:'',createTime:'',rate:0,budgetAt:0,budgetWorkload:0,actAt:0,actWorkload:0,taskState:'0',taskType:'4',taskClass:'',toTaskCenter:'0',actStartTime:'',actEndTime:'',bizProcInstId:'',bizFlowState:'',phaseId:'',phaseName:'',taskSkillNames:'',exeUsernames:'',taskSkillIds:'',exeUserids:'',taskOut:'0',planType:'w2',settleSchemel:'1',menuId:'',menuName:'',productId:'',cbranchId:'',cdeptid:'',tagIds:'',tagNames:'',ntype:'',childrenCnt:'',ltime:'',pidPaths:'',lvl:'',isTpl:'',keyPath:'',uniInnerPrice:80,uniOutPrice:100,calcType:'',ptype:'',wtype:'',bctrl:'',initWorkload:'',shareFee:'',oshare:'',crowd:'',browseUsers:'',execUsers:'',cityId:'',cityName:'',regionType:'',browseTimes:'',capaLvls:'',tranMode:'',supRequires:'',hot:'0',top:'0',urgent:'0',crmSup:'0',bidStep:'0',interestLvls:'',filePaths:'',estate:'0',efunds:0,etoPlatTime:'',etoDevTime:'',ebackTime:'',topStime:'',topEtime:'',hotStime:'',hotEtime:'',urgentStime:'',urgentEtime:'' + }, /**begin 自定义属性请在下面加 请加备注**/ taskStateList: ["待领取", "已领取执行中", "已完工", "已结算"], diff --git a/src/views/xm/core/xmTaskOrder/XmTaskOrderEdit.vue b/src/views/xm/core/xmTaskOrder/XmTaskOrderEdit.vue index 97ab9da6..18a0e1f5 100644 --- a/src/views/xm/core/xmTaskOrder/XmTaskOrderEdit.vue +++ b/src/views/xm/core/xmTaskOrder/XmTaskOrderEdit.vue @@ -80,11 +80,11 @@ - - + + - - + + @@ -92,17 +92,17 @@ - - + + - - + + - - + + @@ -137,8 +137,8 @@ - - + + diff --git a/src/views/xm/core/xmTaskOrder/XmTaskOrderMng.vue b/src/views/xm/core/xmTaskOrder/XmTaskOrderMng.vue index ea06d2c8..7a7e3b15 100644 --- a/src/views/xm/core/xmTaskOrder/XmTaskOrderMng.vue +++ b/src/views/xm/core/xmTaskOrder/XmTaskOrderMng.vue @@ -140,12 +140,12 @@ {{scope.row.hotEtime}} - + - + @@ -160,12 +160,12 @@ {{scope.row.urgentFee}} - + - + @@ -175,7 +175,7 @@ {{scope.row.efunds}} - + @@ -235,7 +235,7 @@ {{scope.row.calcTime}} - +