Skip to content

C
confucius
Commit 51e4fecb authored by 黄奎's avatar 黄奎
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

parents 01e2253e 478aa15a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 460 additions and 248 deletions
src/App.vue
View file @ 51e4fecb
...@@ -12,7 +12,7 @@ export default { ...@@ -12,7 +12,7 @@ export default {
<style> <style>
@import url('~assets/css/font.css'); @import url('~assets/css/font.css');
@import url('//at.alicdn.com/t/font_2077629_pzn5murglf.css'); @import url('//at.alicdn.com/t/font_2077629_ykxxzo63hxp.css');
html, html,
body, body,
......
src/api/administration/administration.js
View file @ 51e4fecb
...@@ -197,6 +197,27 @@ export function setAttendanceInfo(data) { ...@@ -197,6 +197,27 @@ export function setAttendanceInfo(data) {
data data
}); });
} }
/**
*
*/
export function getTimeSpanValue(data) {
return request({
url: '/usercenter/GetTimeSpanValue',
method: 'post',
data
});
}
/**
*审批的获取和发起 根据类型不用的接口名称 第二为接口名称
*/
export function getleaveCmd(data,cmd) {
return request({
url: cmd,
method: 'post',
data
});
}
......
src/components/sale/backinfo-form.vue
View file @ 51e4fecb
This diff is collapsed.
src/components/sale/orderlist.vue
View file @ 51e4fecb
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<div style="margin-top: 30px;margin-bottom: 10px">班级</div> <div style="margin-top: 30px;margin-bottom: 10px">班级</div>
<div style="font-weight: bold;color:#2961FE;cursor:pointer;" @click="getClassInfo(item)">{{item.ClassName}}</div> <div style="font-weight: bold;color:#2961FE;cursor:pointer;" @click="getClassInfo(item)">{{item.ClassName}}</div>
</template> </template>
<template v-if="!isShowClass&&item.IsCommissionGive==1"> <template v-if="item.IsCommissionGive==1">
<div style="margin-top:30px;">提成：{{item.CommissionMoney}}</div> <div style="margin-top:30px;">提成：{{item.CommissionMoney}}</div>
</template> </template>
<template> <template>
...@@ -118,9 +118,16 @@ ...@@ -118,9 +118,16 @@
</tr> </tr>
<tr> <tr>
<td :colspan="11" style="text-align: left"> <td :colspan="11" style="text-align: left">
<div class="row" v-if="item.GuestList.length>0">
学生名单： 学生名单：
<span v-for="(x,j) in item.GuestList" :index="j" v-if="item.GuestList.length>0" style="color:#2961FE;">{{x.GuestName}} </span> <span v-for="(x,j) in item.GuestList" :index="j" v-if="x.GuestState==1" style="color:#2961FE;margin-right: 5px">{{x.GuestName}} </span>
<span v-if="item.GuestList.length==0">暂无</span> </div>
<div class="row" v-if=" item.GuestList.length>0&&getTkshow(item.GuestList)">
退课名单：
<span v-for="(x,j) in item.GuestList" :index="j" v-if="x.GuestState==2" style="color:#f5576c;margin-right: 5px">{{x.GuestName}} </span>
</div>
<span v-if="item.GuestList.length==0">暂无</span>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -293,9 +300,15 @@ ...@@ -293,9 +300,15 @@
</tr> </tr>
<tr> <tr>
<td :colspan="11" style="text-align: left"> <td :colspan="11" style="text-align: left">
<div class="row" v-if="item.GuestList.length>0">
学生名单： 学生名单：
<span v-for="(x,j) in item.GuestList" :index="j" v-if="item.GuestList.length>0" style="color:#2961FE;">{{x.GuestName}} </span> <span v-for="(x,j) in item.GuestList" :index="j" v-if="x.GuestState==1" style="color:#2961FE;margin-right: 5px">{{x.GuestName}} </span>
<span v-if="item.GuestList.length==0">暂无</span> </div>
<div class="row" v-if=" item.GuestList.length>0&&getTkshow(item.GuestList)">
退课名单：
<span v-for="(x,j) in item.GuestList" :index="j" v-if="x.GuestState==2" style="color:#f5576c;margin-right: 5px">{{x.GuestName}} </span>
</div>
<span v-if="item.GuestList.length==0">暂无</span>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -396,7 +409,7 @@ ...@@ -396,7 +409,7 @@
<div class="col"> <div class="col">
<div class="row" style="justify-content: space-between"> <div class="row" style="justify-content: space-between">
<span>收款单据：</span> <span>收款单据：</span>
<q-btn flat size="xs" icon="edit" style="font-weight:400;color: #02C499" label="修改" @click="chanceType(item,1)" /> <q-btn flat size="xs" icon="edit" v-if="isShowClass" style="font-weight:400;color: #02C499" label="修改" @click="chanceType(item,1)" />
</div> </div>
<div class="row wrap"> <div class="row wrap">
...@@ -408,7 +421,7 @@ ...@@ -408,7 +421,7 @@
</div> </div>
<div class="row" style="justify-content: space-between"> <div class="row" style="justify-content: space-between">
<span>付款单据：</span> <span>付款单据：</span>
<q-btn flat size="xs" icon="edit" style="font-weight:400;color: #02C499" label="修改" @click="chanceType(item,2)" /> <q-btn flat size="xs" icon="edit" v-if="isShowClass" style="font-weight:400;color: #02C499" label="修改" @click="chanceType(item,2)" />
</div> </div>
<div class="row wrap"> <div class="row wrap">
<div class="finance row" v-for="(x,j) in item.RefundFinanceList" :index="j" :style="{ <div class="finance row" v-for="(x,j) in item.RefundFinanceList" :index="j" :style="{
...@@ -507,10 +520,23 @@ export default { ...@@ -507,10 +520,23 @@ export default {
} }
}, },
created() { created() {
this.Employee() this.Employee()
}, },
mounted() {}, mounted() {},
methods: { methods: {
getTkshow(data){
let Tkshow=false;
if(data.length>0){
data.forEach(x=>{
if(x.GuestState==2){
Tkshow=true
}
});
}
return Tkshow
},
//显示退课申请 //显示退课申请
showBackClassForm(item) { showBackClassForm(item) {
this.orderObj = item; this.orderObj = item;
......
src/pages/administration/AttendanceRules.vue
View file @ 51e4fecb
...@@ -287,6 +287,7 @@ ...@@ -287,6 +287,7 @@
import { import {
getDepartmentGetList, getDepartmentGetList,
getAttendanceInfo, getAttendanceInfo,
getTimeSpanValue,
setAttendanceInfo setAttendanceInfo
} from '../../api/administration/administration' } from '../../api/administration/administration'
import { import {
...@@ -448,12 +449,6 @@ ...@@ -448,12 +449,6 @@
}) })
}, },
getEmployee(id) { getEmployee(id) {
// this.employeeMsg.departmentId = id
// this.apipost('app_get_company_employee', this.employeeMsg, res => {
// if(res.data.resultCode == 1) {
// this.employeeList = res.data.data;
// }
// }, err => {})
let msg={ let msg={
Dept_Id: id, Dept_Id: id,
EmployeeName: "", EmployeeName: "",
...@@ -502,22 +497,32 @@ ...@@ -502,22 +497,32 @@
}, },
getDateArr() { getDateArr() {
if (this.fwStartTime != '' && this.fwEndTime != '') { if (this.fwStartTime != '' && this.fwEndTime != '') {
this.apipost('User_get_AttendanceGetTimeSpanValue', { getTimeSpanValue(
StartTime: this.fwStartTime, {
EndTime: this.fwEndTime StartTime: this.fwStartTime,
}, res => { EndTime: this.fwEndTime
this.fwdateArr = res.data.data }
}, err => {}) ).then(res => {
if(res.Code==1){
this.fwdateArr = res.Data
}
}).catch(() => {
})
} }
}, },
getDateArr1() { getDateArr1() {
if (this.fwStartTime1 != '' && this.fwEndTime1 != '') { if (this.fwStartTime1 != '' && this.fwEndTime1 != '') {
this.apipost('User_get_AttendanceGetTimeSpanValue', { getTimeSpanValue(
StartTime: this.fwStartTime1, {
EndTime: this.fwEndTime1 StartTime: this.fwStartTime1,
}, res => { EndTime: this.fwEndTime1
this.fwdateArr1 = res.data.data }
}, err => {}) ).then(res => {
if(res.Code==1){
this.fwdateArr1 = res.Data
}
}).catch(() => {
})
} }
}, },
onSearchResult(pois) { onSearchResult(pois) {
...@@ -876,40 +881,44 @@ ...@@ -876,40 +881,44 @@
this.addMsg.NottdList = this.signOutDates; //不用打卡的日期 this.addMsg.NottdList = this.signOutDates; //不用打卡的日期
this.addMsg.awList = this.awListData; //根据地点考勤 this.addMsg.awList = this.awListData; //根据地点考勤
this.addMsg.awWifiList = this.awWifiListDates; //根据Wifi考勤 this.addMsg.awWifiList = this.awWifiListDates; //根据Wifi考勤
this.apipost('User_post_AttendanceSet', this.addMsg, res => { setAttendanceInfo(this.addMsg).then(res => {
if (res.data.resultCode == 1) { if (res.Code == 1) {
this.$message.success(res.data.message) this.$message.success(res.Message)
this.goBack() this.goBack()
} else { } else {
this.$message.error(res.data.message) this.$message.error(res.Message)
} }
}).catch(() => {
}, err => {}) })
}, },
getUpdateList() { //获取修改数据 getUpdateList() { //获取修改数据
this.apipost('User_get_AttendanceGet', {
attendanceId: this.addMsg.attendanceId getAttendanceInfo({attendanceId: this.addMsg.attendanceId}).then(res => {
}, res => { if(res.Code==1){
this.listArr = res.data.data.WdList; this.listArr = res.Data.WdList;
this.listArr.forEach((item, index) => { this.listArr.forEach((item, index) => {
item.IsCheck = res.data.data.WdList[index].IsCheck == '1' ? true : false item.IsCheck = res.Data.WdList[index].IsCheck == '1' ? true : false
}) })
this.signInDates = res.data.data.TdList; this.signInDates = res.Data.TdList;
this.signInDates.forEach(item => { this.signInDates.forEach(item => {
item.Date = item.Date.substring(0, 10) item.Date = item.Date.substring(0, 10)
}) })
this.signOutDates = res.data.data.NottdList; this.signOutDates = res.Data.NottdList;
this.signOutDates.forEach(item => { this.signOutDates.forEach(item => {
item.Date = item.Date.substring(0, 10) item.Date = item.Date.substring(0, 10)
}) })
this.getSpecialDates(); this.getSpecialDates();
this.awListData = res.data.data.AwList; this.awListData = res.Data.AwList;
this.awWifiListDates = res.data.data.AwWifiList; this.awWifiListDates = res.Data.AwWifiList;
if (res.data.data.AwList.length > 0) { if (res.Data.AwList.length > 0) {
this.addressRange = res.data.data.AwList[0].Scope.toString(); this.addressRange = res.Data.AwList[0].Scope.toString();
}
} }
}).catch(() => {
})
}, err => {})
}, },
goBack() { goBack() {
history.back(-1) history.back(-1)
......
src/pages/administration/leaveApproval.vue
View file @ 51e4fecb
...@@ -63,7 +63,8 @@ ...@@ -63,7 +63,8 @@
} from '../../api/common/common' } from '../../api/common/common'
import { import {
getDictValueList, getDictValueList,
calculateDuration calculateDuration,
getleaveCmd
} from '../../api/administration/administration'; } from '../../api/administration/administration';
export default { export default {
data() { data() {
...@@ -100,53 +101,34 @@ ...@@ -100,53 +101,34 @@
}, },
methods: { methods: {
getLunchTime() { getLunchTime() {
this.apipost('dict_post_GetList', { getDictValueList({Key: 'SK_AskForLeaveSet_LunchBreak'}).then(res => {
Key: 'SK_AskForLeaveSet_LunchBreak' if(res.Code == 1) {
}, res => {
if(res.data.resultCode == 1) {
this.getList() this.getList()
if(res.data.data[0].Content!=''&&res.data.data[0].Content!=null) if(res.Data[0].Content!=''&&res.Data[0].Content!=null)
{ {
this.lunchTime = res.data.data[0].Content this.lunchTime = res.Data[0].Content
}else{ }else{
this.lunchTime='12:00-13:00' this.lunchTime='12:00-13:00'
} }
} }
}, err => {}) }).catch(() => {
})
// getDictValueList({Key: 'SK_AskForLeaveSet_LunchBreak'}).then(res => {
// if(res.Code == 1) {
//
// }
// }).catch(() => {
// this.getList()
// if(res.data.data[0].Content!=''&&res.data.data[0].Content!=null)
// {
// this.lunchTime = res.data.data[0].Content
// }else{
// this.lunchTime='12:00-13:00'
// }
// })
}, },
getKey() { getKey() {
this.apipost('dict_post_GetList', { getDictValueList({Key: 'SK_AskForLeaveSet_Month'}).then(res => {
Key: 'SK_AskForLeaveSet_Month' if(res.Code == 1) {
}, res => { this.keyContent = res.Data[0].Content
if(res.data.resultCode == 1) {
this.keyContent = res.data.data[0].Content
} }
}, err => {}) }).catch(() => {
})
}, },
getKeyBefore() { getKeyBefore() {
this.apipost('dict_post_GetList', { getDictValueList({Key: 'SK_AskForLeaveSet_Befor'}).then(res => {
Key: 'SK_AskForLeaveSet_Befor' if(res.Code == 1) {
}, res => { this.keyContentBefor = res.Data[0].Content
if(res.data.resultCode == 1) {
this.keyContentBefor = res.data.data[0].Content
} }
}, err => {}) }).catch(() => {
})
}, },
isYearLeave(val) { isYearLeave(val) {
if(val == 1) { if(val == 1) {
...@@ -236,50 +218,60 @@ ...@@ -236,50 +218,60 @@
}) })
}, },
getList() { getList() {
this.apipost(this.cmd, {
getleaveCmd({
workFlowId: this.workFlowId workFlowId: this.workFlowId
}, res => { },
if(res.data.resultCode == 1) { this.cmd
this.list = res.data.data ).then(res => {
this.list.forEach(item => { this.list = res.Data
if(item.formType == 'selectField' && item.value == 0) { this.list.forEach(item => {
item.value = ''; if(item.formType == 'selectField' && item.value == 0) {
} item.value = '';
if(item.formType == 'imageField' && item.value.length > 0) { }
item.value.forEach(item => { if(item.formType == 'imageField' && item.value.length > 0) {
this.fileList.push({ item.value.forEach(item => {
url: item this.fileList.push({
}) url: item
this.submitFileList.push(item)
}) })
} this.submitFileList.push(item)
}) })
if(this.list[0].value==1) }
{ })
if(this.list[0].value==1)
{
this.yearLeave = true this.yearLeave = true
let _start=this.list[1].value.split(' ')[1] let _start=this.list[1].value.split(' ')[1]
let _end=this.list[2].value.split(' ')[1] let _end=this.list[2].value.split(' ')[1]
let _startLunchTime=this.lunchTime.split('-')[0]+':00' let _startLunchTime=this.lunchTime.split('-')[0]+':00'
let _endLunchTime=this.lunchTime.split('-')[1]+':00' let _endLunchTime=this.lunchTime.split('-')[1]+':00'
this.list[1].value=this.list[1].value.split(' ')[0] this.list[1].value=this.list[1].value.split(' ')[0]
this.list[2].value=this.list[2].value.split(' ')[0] this.list[2].value=this.list[2].value.split(' ')[0]
if(_start<_startLunchTime){ if(_start<_startLunchTime){
this.startVal='1' this.startVal='1'
}else{ }else{
this.startVal='2' this.startVal='2'
} }
if(_end<_endLunchTime){ if(_end<_endLunchTime){
this.endVal='1' this.endVal='1'
}else{
this.endVal='2'
}
}else{ }else{
this.yearLeave = false this.endVal='2'
} }
}else{
this.yearLeave = false
} }
}, err => {}) }).catch(() => {
})
// this.apipost(this.cmd, {
// workFlowId: this.workFlowId
// }, res => {
// if(res.data.resultCode == 1) {
//
// }
// }, err => {})
}, },
getDuration(obj, index) { getDuration(obj, index) {
let starTime = '' let starTime = ''
...@@ -326,32 +318,17 @@ ...@@ -326,32 +318,17 @@
}) })
} }
if(starTime != '' && endTime != '') { if(starTime != '' && endTime != '') {
calculateDuration({
// calculateDuration({
// startTime: starTime,
// endTime: endTime,
// templateId: this.type,
// LunchTime: this.lunchTime
// }).then(res => {
// if(res.Code == 1) {
//
// }
// }).catch(() => {
//
// })
this.apipost('app_user_workflow_calculate_duration', {
startTime: starTime, startTime: starTime,
endTime: endTime, endTime: endTime,
templateId: this.type, templateId: this.type,
LunchTime: this.lunchTime LunchTime: this.lunchTime
}, res => { }).then(res => {
if(res.data.resultCode == 1) { if(res.Code == 1) {
this.totalList = []; this.totalList = [];
obj.forEach(item => { obj.forEach(item => {
if(item.formType == 'durationField') { if(item.formType == 'durationField') {
item.value = res.data.data.duration; item.value = res.Data.duration;
let totalDurationField = 0; let totalDurationField = 0;
this.list.forEach(item => { this.list.forEach(item => {
if(item.formType == 'childField') { if(item.formType == 'childField') {
...@@ -373,7 +350,11 @@ ...@@ -373,7 +350,11 @@
} }
}) })
} }
}, err => {}) }).catch(() => {
})
} }
}, },
...@@ -439,17 +420,16 @@ ...@@ -439,17 +420,16 @@
this.msg.endTime = this.msg.endTime + ' 23:59:59' this.msg.endTime = this.msg.endTime + ' 23:59:59'
} }
} }
getleaveCmd(this.msg,this.submitCmd).then(res => {
this.apipost(this.submitCmd, this.msg, res => { if(res.Code == 1) {
if(res.data.resultCode == 1) { this.$message.success(res.Message)
this.$message.success(res.data.message)
this.loading = false this.loading = false
//this.goback() }else {
} else { this.$message.warning(res.Message)
this.$message.warning(res.data.message)
this.loading = false this.loading = false
} }
}, err => {}) }).catch(() => {
})
}, },
}, },
mounted() { mounted() {
......
src/pages/course/achievements.vue
View file @ 51e4fecb
...@@ -182,7 +182,7 @@ ...@@ -182,7 +182,7 @@
</div> </div>
<div class="d7"> <div class="d7">
<div class="row" style="align-items: center;color: #3FC4FF;cursor: pointer" v-if="item.PerfState==2" @click="systemShan(item)"> <div class="row" style="align-items: center;color: #3FC4FF;cursor: pointer" v-if="item.PerfState==2 && item.FinanceId==0" @click="systemShan(item)">
<img src="../../assets/images/course/zhidan.png" alt="" style="width: 16px;height: 12px;margin-right: 5px;"> <img src="../../assets/images/course/zhidan.png" alt="" style="width: 16px;height: 12px;margin-right: 5px;">
自动生成单据 自动生成单据
</div> </div>
......
src/pages/sale/myOrder.vue
View file @ 51e4fecb
...@@ -265,6 +265,7 @@ ...@@ -265,6 +265,7 @@
this.loading = false this.loading = false
OrderIds = OrderIds.join(',') OrderIds = OrderIds.join(',')
// this.getOrderFinanceList(OrderIds) // this.getOrderFinanceList(OrderIds)
if( this.data.List.length>0){ if( this.data.List.length>0){
this.$refs.orderL.getOrderFinanceList(OrderIds,1) this.$refs.orderL.getOrderFinanceList(OrderIds,1)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment