Skip to content

C
confucius
Commit 953eec94 authored by 黄奎's avatar 黄奎
Browse files
Options

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

parents 46198617 2bae3427
Hide whitespace changes
Inline Side-by-side
Showing with 500 additions and 63 deletions
src/App.vue
View file @ 953eec94
...@@ -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_ag7cz0869bp.css'); @import url('//at.alicdn.com/t/font_2077629_pzn5murglf.css');
html, html,
body, body,
......
src/components/system/process-form.vue 0 → 100644
View file @ 953eec94
<style>
.classinfo_Dialog .drawerTop {
width: 100%;
height: 50px;
display: flex;
justify-content: space-between;
background-color: #F0F5FB;
padding: 5px 10px;
align-items: center;
}
.classinfo_Dialog .classFirst {
color: #000000;
font-weight: bold;
}
.classinfo_Dialog .className {
margin-left: 10px;
}
.classinfo_Dialog .classStatus {
padding: 3px 8px;
background-color: #c8d7fc;
color: #2961FE;
font-size: 12px;
border-radius: 2px;
margin-left: 20px;
}
.classinfo_Dialog .normalName {
color: #999999;
}
.classinfo_Dialog .normalInner {
color: #111111;
}
.drop_NameDown {
margin-top: 20px;
width: 300px;
}
.processShenPi {
position: relative;
width: 92%;
height: auto;
margin: 0 20px 0 20px;
background-color: #F7F7F7;
}
.processMain:first-child{
margin-top:20px;
}
.processPerson {
position: absolute;
width: 78px;
height: 30px;
left: 0;
top: 0;
background-color: #2961FE;
color: #fff;
text-align: center;
line-height: 30px;
font-weight: bold;
}
.processInner {
padding: 20px;
border-bottom: 1px solid #E2E2E2;
}
.process_Warm {
color: #F93C1C;
font-size: 12px;
}
.process_Warm i {
font-size: 12px;
}
.process_Btn_List {
display: flex;
justify-content: flex-end;
padding: 20px;
}
.processBtn_Cancel {
width: 90px;
height: 35px;
border: 1px solid #A1AAB2;
color: #000000;
background-color: #fff;
;
text-align: center;
line-height: 35px;
border-radius: 5px;
cursor: pointer;
margin-right: 20px;
}
.processBtn_Save {
width: 90px;
height: 35px;
background-color: #2961FE;
color: #FFF;
text-align: center;
line-height: 35px;
border-radius: 5px;
cursor: pointer;
}
.process_LineTwo {
background-color: #fff;
position: relative;
display: flex;
justify-content: center;
}
.process_InnerLine {
width: 5px;
height: 75px;
position: absolute;
background-color: #E9EFFF;
}
.processAddzhai{
height:50px;
border:1px dashed #2961FE!important;
text-align: center;
background-color: #fff;
color:#2961FE;
line-height: 50px;
cursor: pointer;
margin:0 20px;
border-radius: 5px!important;
}
</style>
<template>
<q-dialog v-model="persistent" maximized full-height seamless position="right" @hide="closeProcess">
<q-card style="margin-top:61px;width:500px" class="no-border-radius classinfo_Dialog">
<div class="processMain">
<div class="processShenPi">
<div class="processPerson">审批人1</div>
<div class="processInner">
<div class="q-gutter-sm" style="padding-top:20px;">
<q-radio left-label v-model="roleChoice" :val="1" label="指定人员" />
<q-radio left-label v-model="roleChoice" :val="2" label="内置角色" />
</div>
<div style="margin:10px 0;">
<q-select class="col-6 q-pb" v-if="roleChoice==1" clearable filled stack-label use-input option-value="Id"
option-label="EmployeeName" v-model="zhidingName" ref="ManagerId" :options="EmployeeList" label="指定人员名称"
:dense="false" emit-value map-options @filter="filterFn">
<template v-slot:no-option>
<q-item>
<q-item-section class="text-grey">
未找到相关数据
</q-item-section>
</q-item>
</template>
</q-select>
<q-select class="col-6 q-pb" v-if="roleChoice==2" clearable filled stack-label use-input option-value="Id"
option-label="Name" v-model="role" ref="ManagerId" :options="roleList" label="选择角色" :dense="false"
emit-value map-options>
</q-select>
</div>
<q-toggle v-model="shousun" label="设定收损" left-label />
<div class="process_Warm">
<i class="iconfont icon-jinggao"></i>
只能由一个人开启，一旦开启其他关闭
</div>
</div>
<div class="process_Btn_List">
<div class="processBtn_Cancel">关闭</div>
<div class="processBtn_Save">保存</div>
</div>
</div>
<div class="process_LineTwo">
<div class="process_InnerLine"></div>
<div style="width:100px;margin:10px 0">
<q-select class="col=3 q-pb" filled stack-label option-value="Id" option-label="Name" v-model="heormore"
:options="arrList" label="" :dense="false" emit-value map-options>
</q-select>
</div>
</div>
</div>
<div class="processMain">
<div class="processShenPi">
<div class="processPerson">审批人1</div>
<div class="processInner">
<div class="q-gutter-sm" style="padding-top:20px;">
<q-radio left-label v-model="roleChoice" :val="1" label="指定人员" />
<q-radio left-label v-model="roleChoice" :val="2" label="内置角色" />
</div>
<div style="margin:10px 0;">
<q-select class="col-6 q-pb" v-if="roleChoice==1" clearable filled stack-label use-input option-value="Id"
option-label="EmployeeName" v-model="zhidingName" ref="ManagerId" :options="EmployeeList" label="指定人员名称"
:dense="false" emit-value map-options @filter="filterFn">
<template v-slot:no-option>
<q-item>
<q-item-section class="text-grey">
未找到相关数据
</q-item-section>
</q-item>
</template>
</q-select>
<q-select class="col-6 q-pb" v-if="roleChoice==2" clearable filled stack-label use-input option-value="Id"
option-label="Name" v-model="role" ref="ManagerId" :options="roleList" label="选择角色" :dense="false"
emit-value map-options>
</q-select>
</div>
<q-toggle v-model="shousun" label="设定收损" left-label />
<div class="process_Warm">
<i class="iconfont icon-jinggao"></i>
只能由一个人开启，一旦开启其他关闭
</div>
</div>
<div class="process_Btn_List">
<div class="processBtn_Cancel">关闭</div>
<div class="processBtn_Save">保存</div>
</div>
</div>
<div class="process_LineTwo">
<div class="process_InnerLine"></div>
<div style="width:100px;margin:10px 0">
<q-select class="col=3 q-pb" filled stack-label option-value="Id" option-label="Name" v-model="heormore"
:options="arrList" label="" :dense="false" emit-value map-options>
</q-select>
</div>
</div>
</div>
<div class="processAddzhai">新增摘要</div>
</q-card>
<div class="dialog-out-close" @click="closeProcess"
style="height:40px !important;border-top-left-radius: 4px !important;border-bottom-left-radius: 4px !important;">
<q-icon name="iconfont icon-jujue1" size="26px" />
</div>
</q-dialog>
</template>
<script>
import {
queryEmployee
} from '../../api/users/user'
export default {
props: {
saveObj: {
type: Object,
default: null
}
},
components: {},
data() {
return {
persistent: true,
roleChoice: 1,
AllemployeeList: [], //所有员工列表
EmployeeList: [], //员工列表
zhidingName: '', //指定人员选择
role: '', //角色
shousun: true, //设定收损
heormore: 1, //和或者
roleList: [{
Name: '班级老师',
Id: 0
}, {
Name: '关联销售',
Id: 1
}, {
Name: '分校校长',
Id: 2
}],
arrList: [{
Name: '和',
Id: 1
}, {
Name: '或者',
Id: 2
}]
}
},
created() {
},
mounted() {
this.getEmployee();
},
methods: {
closeProcess() {
this.persistent = false;
this.$emit('close');
},
//获取员工列表
getEmployee() {
var qMsg = {
EmployeeName: ""
}
queryEmployee(qMsg).then(res => {
if (res.Code == 1) {
var jsonData = res.Data;
if (jsonData && jsonData.length > 0) {
this.AllemployeeList = JSON.parse(JSON.stringify(jsonData));
this.EmployeeList = JSON.parse(JSON.stringify(jsonData));;
}
}
})
},
//筛选员工
filterFn(val, update) {
update(() => {
if (val === '') {
this.EmployeeList = JSON.parse(JSON.stringify(this.AllemployeeList))
} else {
const needle = val.toLowerCase()
this.EmployeeList = this.AllemployeeList.filter(v => v.EmployeeName.toLowerCase().indexOf(needle) > -1)
}
})
},
}
}
</script>
src/pages/administration/AttendanceRules.vue
View file @ 953eec94
...@@ -282,8 +282,8 @@ ...@@ -282,8 +282,8 @@
</template> </template>
<script> <script>
import VueAMap from 'vue-amap' // import VueAMap from 'vue-amap'
let amapManager = new VueAMap.AMapManager(); // let amapManager = new VueAMap.AMapManager();
import { import {
getDepartmentGetList, getDepartmentGetList,
getAttendanceInfo, getAttendanceInfo,
...@@ -315,7 +315,7 @@ ...@@ -315,7 +315,7 @@
} }
}, },
zoom: 12, zoom: 12,
amapManager, // amapManager,
events: {}, events: {},
searchData: [], searchData: [],
lnglatXY: [], lnglatXY: [],
......
src/pages/course/rewardDetailed.vue
View file @ 953eec94
...@@ -59,6 +59,9 @@ ...@@ -59,6 +59,9 @@
import { import {
getTeacherDropDownList, getTeacherDropDownList,
} from '../../api/school/index'; } from '../../api/school/index';
import {
EduDownLoad,
} from '../../api/common/common';
export default { export default {
name: "rewardDetailed", name: "rewardDetailed",
data() { data() {
...@@ -183,7 +186,8 @@ ...@@ -183,7 +186,8 @@
}, },
methods: { methods: {
Export() { Export() {
this.GetEduDownLoad("/TeachingRewards/GetTeachingBonusDetailToExcel", this.msg, "课时奖励.xls"); var msg = JSON.parse(JSON.stringify(this.msg));
EduDownLoad("/TeachingRewards/GetTeachingBonusDetailToExcel", msg, "课时奖励.xls");
}, },
//获取教师下拉 //获取教师下拉
GetTeacherList() { GetTeacherList() {
......
src/pages/financial/components/GZBillModule.vue
View file @ 953eec94
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
<i v-if="name===2">{{$t('fnc.kuaijilian')}}</i> <i v-if="name===2">{{$t('fnc.kuaijilian')}}</i>
</p> </p>
<!--<p class="_yewudanju">订单号：<span class="_jump_page" @click="GetDetail.OrderID>0?jumpPage('RegistrationList',GetDetail.TCID,1):''">{{GetDetail.OrderID?GetDetail.OrderID:'无'}}</span></p>--> <!--<p class="_yewudanju">订单号：<span class="_jump_page" @click="GetDetail.OrderID>0?jumpPage('RegistrationList',GetDetail.TCID,1):''">{{GetDetail.OrderID?GetDetail.OrderID:'无'}}</span></p>-->
<p class="_yewudanju" v-if="GetDetail.OrderSource==8&&!isPrintPage">{{$t('hotel.order_Number')}}：<span class="_jump_page" @click="GetDetail.OrderID>0?jumpPage('RegistrationList',GetDetail.TCID,1):''">{{GetDetail.OrderID?GetDetail.OrderID:$t('fnc.no')}}</span></p> <p class="_yewudanju" v-if="GetDetail.OrderSource==17&&!isPrintPage">{{$t('hotel.order_Number')}}：<span class="_jump_page" @click="GetDetail.OrderID>0?jumpPage('RegistrationList',GetDetail.TCID,1):''">{{GetDetail.OrderID?GetDetail.OrderID:$t('fnc.no')}}</span></p>
<p class="_yewudanju" v-if="isPrintPage">{{$t('fnc.dayinshijian')}}：<span >{{printTime}}</span></p> <p class="_yewudanju" v-if="isPrintPage">{{$t('fnc.dayinshijian')}}：<span >{{printTime}}</span></p>
<div class="rb_top_row _r_mb5"> <div class="rb_top_row _r_mb5">
<p v-if="GetDetail.Type==1 || GetDetail.Type==5">{{$t('fnc.hnrdanwei')}}：<span class="_r_name">{{GetDetail.RemitterName}}</span></p> <p v-if="GetDetail.Type==1 || GetDetail.Type==5">{{$t('fnc.hnrdanwei')}}：<span class="_r_name">{{GetDetail.RemitterName}}</span></p>
...@@ -285,7 +285,7 @@ export default { ...@@ -285,7 +285,7 @@ export default {
props:["ID","width","color","isPrintPage","name","OrderSource"], //接收参数 ID width color props:["ID","width","color","isPrintPage","name","OrderSource"], //接收参数 ID width color
data(){ data(){
return{ return{
loading:true, loading:true,
EmployeeId:'', EmployeeId:'',
EndDate:'', EndDate:'',
StartDate:'', StartDate:'',
...@@ -345,7 +345,7 @@ export default { ...@@ -345,7 +345,7 @@ export default {
this.loading=false this.loading=false
} }
}, err => {}) }, err => {})
}, },
},mounted(){ },mounted(){
const myDate = new Date(); const myDate = new Date();
let yaer = myDate.getFullYear(); //获取完整的年份(4位,1970-????) let yaer = myDate.getFullYear(); //获取完整的年份(4位,1970-????)
...@@ -353,7 +353,7 @@ export default { ...@@ -353,7 +353,7 @@ export default {
let dateS = myDate.getDate(); //获取当前日(1-31) let dateS = myDate.getDate(); //获取当前日(1-31)
this.StartDate = yaer + '-' + month + '-' + '01'; this.StartDate = yaer + '-' + month + '-' + '01';
this.EndDate = yaer + '-' + month + '-' + dateS; this.EndDate = yaer + '-' + month + '-' + dateS;
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
this.EmployeeId = userInfo.EmployeeId; this.EmployeeId = userInfo.EmployeeId;
this.Financial_post_GetDetail(this.ID); this.Financial_post_GetDetail(this.ID);
},watch: { // 监听参数变化 },watch: { // 监听参数变化
......
src/pages/financial/components/ReceivablesModule.vue
View file @ 953eec94
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
._color_b{color: #333333 !important;font-size: 12px} ._color_b{color: #333333 !important;font-size: 12px}
.rb_top_row span._r_name._no_border{border: none} .rb_top_row span._r_name._no_border{border: none}
._font_size12{font-size: 12px} ._font_size12{font-size: 12px}
._yewudanju{ ._yewudanju{
position: absolute; position: absolute;
text-align: right; text-align: right;
...@@ -87,11 +87,12 @@ ...@@ -87,11 +87,12 @@
{{GetDetail.PlatFormName}}</span> {{GetDetail.PlatFormName}}</span>
</a> </a>
</p> </p>
<p class="_yewudanju" v-if="GetDetail.OrderSource==8&&!isPrintPage">{{$t('hotel.order_Number')}}：<span class="_jump_page" @click="GetDetail.OrderID>0?jumpPage('RegistrationList',GetDetail.TCID,1):''">{{GetDetail.OrderID?GetDetail.OrderID:'无'}}</span></p> <p class="_yewudanju" v-if="GetDetail.OrderSource==17&&!isPrintPage">{{$t('hotel.order_Number')}}：<span class="_jump_page" @click="GetDetail.OrderID>0?jumpPage('RegistrationList',GetDetail.TCID,1):''">{{GetDetail.OrderID?GetDetail.OrderID:'无'}}</span></p>
<p class="_yewudanju" v-if="GetDetail.OrderSource==15&&!isPrintPage">{{$t('hotel.order_Number')}}：<span class="_jump_page" @click="GetDetail.OrderID>0?jumpFreePage('freeTravelOrderStatiDetails',GetDetail.OrderID,1):''">{{GetDetail.OrderID?GetDetail.OrderID:'无'}}</span></p> <!-- <p class="_yewudanju" v-if="GetDetail.OrderSource==8&&!isPrintPage">{{$t('hotel.order_Number')}}：<span class="_jump_page" @click="GetDetail.OrderID>0?jumpPage('RegistrationList',GetDetail.TCID,1):''">{{GetDetail.OrderID?GetDetail.OrderID:'无'}}</span></p>-->
<p class="_yewudanju" v-if="GetDetail.OrderSource==1&&!isPrintPage">{{$t('hotel.order_Number')}}：<span class="_jump_page" @click="GetDetail.OrderID>0?jumpFreePage('OpHotelOrderDetail',GetDetail.OrderID,1):''">{{GetDetail.OrderID?GetDetail.OrderID:'无'}}</span></p> <!-- <p class="_yewudanju" v-if="GetDetail.OrderSource==15&&!isPrintPage">{{$t('hotel.order_Number')}}：<span class="_jump_page" @click="GetDetail.OrderID>0?jumpFreePage('freeTravelOrderStatiDetails',GetDetail.OrderID,1):''">{{GetDetail.OrderID?GetDetail.OrderID:'无'}}</span></p>-->
<p class="_yewudanju" v-if="GetDetail.OrderSource==3&&!isPrintPage">{{$t('hotel.order_Number')}}：<span class="_jump_page" @click="GetDetail.OrderID>0?jumpFreePage('scenOrderDetails',GetDetail.OrderID,1):''">{{GetDetail.OrderID?GetDetail.OrderID:'无'}}</span></p> <!-- <p class="_yewudanju" v-if="GetDetail.OrderSource==1&&!isPrintPage">{{$t('hotel.order_Number')}}：<span class="_jump_page" @click="GetDetail.OrderID>0?jumpFreePage('OpHotelOrderDetail',GetDetail.OrderID,1):''">{{GetDetail.OrderID?GetDetail.OrderID:'无'}}</span></p>-->
<!-- <p class="_yewudanju" v-if="GetDetail.OrderSource==3&&!isPrintPage">{{$t('hotel.order_Number')}}：<span class="_jump_page" @click="GetDetail.OrderID>0?jumpFreePage('scenOrderDetails',GetDetail.OrderID,1):''">{{GetDetail.OrderID?GetDetail.OrderID:'无'}}</span></p>-->
<p class="_yewudanju" v-if="isPrintPage">{{$t('fnc.dayinshijian')}}：<span >{{printTime}}</span></p> <p class="_yewudanju" v-if="isPrintPage">{{$t('fnc.dayinshijian')}}：<span >{{printTime}}</span></p>
<div class="rb_top_row _r_mb5"> <div class="rb_top_row _r_mb5">
<p v-if="GetDetail.CashierDetail&&GetDetail.CashierDetail[0]">{{$t('fnc.fkuanzhanghu')}}：<span class="_r_name _no_border">{{GetDetail.CashierDetail[0].Alias}}</span></p> <p v-if="GetDetail.CashierDetail&&GetDetail.CashierDetail[0]">{{$t('fnc.fkuanzhanghu')}}：<span class="_r_name _no_border">{{GetDetail.CashierDetail[0].Alias}}</span></p>
...@@ -322,7 +323,7 @@ export default { ...@@ -322,7 +323,7 @@ export default {
jumpPageNew(){ jumpPageNew(){
this.$router.push({ this.$router.push({
name: 'platOrderquery', name: 'platOrderquery',
query: { query: {
platName: this.GetDetail.PlatFormName, platName: this.GetDetail.PlatFormName,
TradeWay: this.GetDetail.OrderTradeWay, TradeWay: this.GetDetail.OrderTradeWay,
PlatformAccount: this.GetDetail.PlatformAccountId, PlatformAccount: this.GetDetail.PlatformAccountId,
...@@ -344,14 +345,14 @@ export default { ...@@ -344,14 +345,14 @@ export default {
// query: { id:id,orderID:this.GetDetail.OrderID,isShow:false} // query: { id:id,orderID:this.GetDetail.OrderID,isShow:false}
// }); // });
// window.open(routeData.href, "_blank"); // window.open(routeData.href, "_blank");
let idStr = ''; // let idStr = '';
if(this.GetDetail.TCIDList.length>0){ // if(this.GetDetail.TCIDList.length>0){
idStr = this.GetDetail.TCIDList[0]; // idStr = this.GetDetail.TCIDList[0];
} // }
this.$router.push({ // this.$router.push({
name: path, // name: path,
query: { id:idStr,orderID:this.GetDetail.OrderID,isShow:false,blank:'y',tab:'报名清单'} // query: { id:idStr,orderID:this.GetDetail.OrderID,isShow:false,blank:'y',tab:'报名清单'}
}) // })
}else if(type==2){ }else if(type==2){
// let routeData = this.$router.resolve({ // let routeData = this.$router.resolve({
// name: path, // name: path,
...@@ -393,7 +394,7 @@ export default { ...@@ -393,7 +394,7 @@ export default {
this.$set(this.$data,"GetDetail",data); this.$set(this.$data,"GetDetail",data);
} }
}, err => {}) }, err => {})
}, },
},mounted(){ },mounted(){
const myDate = new Date(); const myDate = new Date();
let yaer = myDate.getFullYear(); //获取完整的年份(4位,1970-????) let yaer = myDate.getFullYear(); //获取完整的年份(4位,1970-????)
...@@ -402,7 +403,7 @@ export default { ...@@ -402,7 +403,7 @@ export default {
this.StartDate = yaer + '-' + month + '-' + '01'; this.StartDate = yaer + '-' + month + '-' + '01';
this.EndDate = yaer + '-' + month + '-' + dateS; this.EndDate = yaer + '-' + month + '-' + dateS;
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
this.EmployeeId = userInfo.EmployeeId; this.EmployeeId = userInfo.EmployeeId;
this.Financial_post_GetDetail(this.ID); this.Financial_post_GetDetail(this.ID);
},watch: { // 监听参数变化 },watch: { // 监听参数变化
GetDetail: { GetDetail: {
......
src/pages/financial/financalDocument/RecPayQuery.vue
View file @ 953eec94
...@@ -751,7 +751,7 @@ ...@@ -751,7 +751,7 @@
<div class="_TCIDAndTCNUMList" style="display: flex;"> <div class="_TCIDAndTCNUMList" style="display: flex;">
<span>团号：</span> <span>团号：</span>
<div v-if="scope.row.TCIDAndTCNUMList&&scope.row.TCIDAndTCNUMList.length>0"> <div v-if="scope.row.TCIDAndTCNUMList&&scope.row.TCIDAndTCNUMList.length>0">
<p><span v-for="(i,ix) in scope.row.TCIDAndTCNUMList">{{i.TCNUM}}（{{i.TCID}}） <span v-if="ix!=scope.row.TCIDAndTCNUMList.length-1">,</br></span></span></p> <p><span v-for="(i,ix) in scope.row.TCIDAndTCNUMList">{{i.ClassName}}（{{i.ClassId}}） <span v-if="ix!=scope.row.TCIDAndTCNUMList.length-1">,</br></span></span></p>
</div> </div>
<div v-else> <div v-else>
<span>无</span> <span>无</span>
...@@ -912,6 +912,8 @@ ...@@ -912,6 +912,8 @@
import myBill from "../components/BillModule.vue"; import myBill from "../components/BillModule.vue";
import myrbvBill from "../components/ReceivablesModule.vue"; import myrbvBill from "../components/ReceivablesModule.vue";
import myhrBill from "../components/MergeBillModule.vue"; import myhrBill from "../components/MergeBillModule.vue";
import {getClassNameList} from '../../../api/finance/index'
import { import {
queryEmployee queryEmployee
} from '../../../api/users/user' } from '../../../api/users/user'
...@@ -1216,14 +1218,40 @@ ...@@ -1216,14 +1218,40 @@
} }
}) })
this.total = res.data.data.count; this.total = res.data.data.count;
let da = []
if (this.total == 0) { if (this.total == 0) {
this.DataList = []; this.DataList = [];
} else { } else {
data.forEach(x => { data.forEach(x => {
// this.columns[0].filters.push({label:x.FrID,value:x.FrID}) // this.columns[0].filters.push({label:x.FrID,value:x.FrID})
x.modelShow = false; x.modelShow = false;
if(x.TCIDList.length>0){
da =da.concat(x.TCIDList)
}
}) })
this.DataList = data; this.DataList = data;
if(da.length>0){
let str = da.join(',')
getClassNameList({ClassIds:str}).then(res => {
this.DataList.forEach(x=>{
if(x.TCIDList.length>0){
x.TCIDList.forEach(z=>{
res.Data.forEach(j=>{
if(z == j.ClassId){
x.TCIDAndTCNUMList.push(j)
}
})
})
}
})
}).catch(() => {
})
}
} }
this.loading = false; this.loading = false;
} else { } else {
......
src/pages/financial/financalDocument/addFinancialDocuments.vue
View file @ 953eec94
...@@ -1123,6 +1123,8 @@ ...@@ -1123,6 +1123,8 @@
} else { } else {
this.msg.ClientType = 0; this.msg.ClientType = 0;
} }
if (this.msg.RB_Branch_Id == '' || this.msg.RB_Branch_Id == 0) return this.$message.error('请选择校区');
// IsPublic 2 现金 IsLeader 0 临时领队 // IsPublic 2 现金 IsLeader 0 临时领队
if (this.msg.IsPublic < 2 && this.IsLeader === 1) { if (this.msg.IsPublic < 2 && this.IsLeader === 1) {
if (this.msg.ClientID === '') return this.$message.error(this.$t('rule.qxzkhmingcheng')); if (this.msg.ClientID === '') return this.$message.error(this.$t('rule.qxzkhmingcheng'));
......
src/pages/financial/financalDocument/addReceivablesDocuments.vue
View file @ 953eec94
...@@ -444,11 +444,11 @@ ...@@ -444,11 +444,11 @@
<input v-model="da.UnitPrice" type="number" @keydown="handleInput2" @change="Calculation(2,daIn+1)" @blur="addList(2,daIn+1)" class="w80 h34 _border_b_1"></input> <input v-model="da.UnitPrice" type="number" @keydown="handleInput2" @change="Calculation(2,daIn+1)" @blur="addList(2,daIn+1)" class="w80 h34 _border_b_1"></input>
</td> --> </td> -->
<td height="26px"> <td height="26px">
<el-input v-model="da.Number" @keyup.native="checkInteger(da,'Number')" type="text" <el-input v-model="da.Number" @keyup.native="checkInteger(da,'Number')" type="text" @input="chages($event)"
@blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 _border_b_1"></el-input> @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 _border_b_1"></el-input>
</td> </td>
<td height="26px"> <td height="26px">
<el-input v-model="da.UnitPrice" type="text" @keyup.native="checkPrice(da,'UnitPrice',true)" <el-input v-model="da.UnitPrice" type="text" @keyup.native="checkPrice(da,'UnitPrice',true)" @input="chages($event)"
@change="Calculation(2,daIn+1)" @blur="addList(2,daIn+1)" class="w80 h34 _border_b_1"></el-input> @change="Calculation(2,daIn+1)" @blur="addList(2,daIn+1)" class="w80 h34 _border_b_1"></el-input>
</td> </td>
<td height="26px"> <td height="26px">
...@@ -461,7 +461,7 @@ ...@@ -461,7 +461,7 @@
</td> </td>
<td height="26px">{{da.bTotalPrice}}</td> <td height="26px">{{da.bTotalPrice}}</td>
<td height="26px"> <td height="26px">
<el-input v-model="da.Remark" type="textarea" class="w80 _border_b_1"></el-input> <i <el-input v-model="da.Remark" type="textarea" class="w80 _border_b_1" @input="chages($event)"></el-input> <i
@click="deleteRow(daIn,da)" class="_delete_row iconfont icon-img_delete_small"></i> @click="deleteRow(daIn,da)" class="_delete_row iconfont icon-img_delete_small"></i>
</td> </td>
</tr> </tr>
...@@ -481,12 +481,12 @@ ...@@ -481,12 +481,12 @@
<input v-model="detailList.UnitPrice" type="number" @keydown="handleInput2" @change="Calculation(1)" @blur="addList(1)" class="w80 h34 _border_b_1"></input> <input v-model="detailList.UnitPrice" type="number" @keydown="handleInput2" @change="Calculation(1)" @blur="addList(1)" class="w80 h34 _border_b_1"></input>
</td> --> </td> -->
<td> <td>
<el-input v-model="detailList.Number" type="text" @keyup.native="checkInteger(detailList,'Number')" <el-input v-model="detailList.Number" type="text" @keyup.native="checkInteger(detailList,'Number')" @input="chages($event)"
@blur="addList(1)" @change="Calculation(1)" class="w80 _border_b_1"></el-input> @blur="addList(1)" @change="Calculation(1)" class="w80 _border_b_1"></el-input>
</td> </td>
<td> <td>
<el-input v-model="detailList.UnitPrice" type="text" <el-input v-model="detailList.UnitPrice" type="text"
@keyup.native="checkPrice(detailList,'UnitPrice',true)" @change="Calculation(1)" @blur="addList(1)" @keyup.native="checkPrice(detailList,'UnitPrice',true)" @change="Calculation(1)" @blur="addList(1)" @input="chages($event)"
class="w80 h34 _border_b_1"></el-input> class="w80 h34 _border_b_1"></el-input>
</td> </td>
<td> <td>
...@@ -499,7 +499,7 @@ ...@@ -499,7 +499,7 @@
</td> </td>
<td>{{detailList.bTotalPrice}}</td> <td>{{detailList.bTotalPrice}}</td>
<td> <td>
<el-input v-model="detailList.Remark" @blur="addList(1)" type="textarea" class="w80 _border_b_1"> <el-input v-model="detailList.Remark" @blur="addList(1)" type="textarea" class="w80 _border_b_1" @input="chages($event)">
</el-input> </el-input>
</td> </td>
</tr> </tr>
...@@ -1281,6 +1281,7 @@ ...@@ -1281,6 +1281,7 @@
return this.$message.error(this.$t('rule.qxzjylshuihao')); return this.$message.error(this.$t('rule.qxzjylshuihao'));
} }
} }
if (this.msg.RB_Branch_Id == '' || this.msg.RB_Branch_Id == 0) return this.$message.error('请选择校区');
if (this.msg.BankId == '') return this.$message.error(this.$t('rule.qxzskzhanghao')); if (this.msg.BankId == '') return this.$message.error(this.$t('rule.qxzskzhanghao'));
if (!this.msg.RB_Depart_Id) return this.$message.error(this.$t('rule.qxzzdbumen')); if (!this.msg.RB_Depart_Id) return this.$message.error(this.$t('rule.qxzzdbumen'));
if (!this.$route.query.edit) { if (!this.$route.query.edit) {
...@@ -1531,6 +1532,9 @@ ...@@ -1531,6 +1532,9 @@
this.msg.BankList[0].Fee = parseFloat(this.msg.BankList[0].ybFee); this.msg.BankList[0].Fee = parseFloat(this.msg.BankList[0].ybFee);
this.$forceUpdate(); this.$forceUpdate();
}, },
chages(){
this.$forceUpdate()
},
shouxufeiJiSuan: function () { shouxufeiJiSuan: function () {
let price = 0; let price = 0;
this.msg.detailList.forEach(y => { this.msg.detailList.forEach(y => {
...@@ -1789,6 +1793,7 @@ ...@@ -1789,6 +1793,7 @@
this.msg.RB_BranchName = x.SName; this.msg.RB_BranchName = x.SName;
} }
}) })
}).catch(() => { }).catch(() => {
}) })
......
src/pages/sale/myOrder.vue
View file @ 953eec94
...@@ -178,6 +178,7 @@ ...@@ -178,6 +178,7 @@
myorderObjOption:{}, myorderObjOption:{},
classObjOption: null, classObjOption: null,
isShowClassInfo: false, //是否显示课程信息 isShowClassInfo: false, //是否显示课程信息
showone:false,
} }
}, },
created() { created() {
...@@ -220,9 +221,11 @@ ...@@ -220,9 +221,11 @@
//翻页 //翻页
changePage(val) { changePage(val) {
if(val !=1 && this.msg.pageIndex!=1){//对第一次进来防止掉2次getList if(this.showone == true){
this.msg.pageIndex = val; this.msg.pageIndex = val;
this.getList() this.getList()
}else {
this.showone=true
} }
}, },
...@@ -259,6 +262,7 @@ ...@@ -259,6 +262,7 @@
this.data.List.forEach(x=>{ this.data.List.forEach(x=>{
OrderIds.push(x.OrderId) OrderIds.push(x.OrderId)
}) })
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){
......
src/pages/system/processSet.vue
View file @ 953eec94
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
text-align: center; text-align: center;
line-height: 54px; line-height: 54px;
border-radius: 2px; border-radius: 2px;
cursor: pointer;
} }
.processLine { .processLine {
...@@ -51,11 +52,61 @@ ...@@ -51,11 +52,61 @@
line-height: 36px; line-height: 36px;
color: #fff; color: #fff;
border-radius: 50%; border-radius: 50%;
margin:0 20px 0 10px }
.process_Left{
width:40%;
height:100%;
text-align: right;
}
.process_center{
width:20%;
height:100%;
display: flex;
align-items: center;
justify-content: center;
}
.process_Right{
width:40%;
height:100%;
text-align: left;
}
.process_OR{
background-color: #F28C1D;
}
.addProcessBtn{
width:100%;
height:45px;
text-align: center;
line-height: 45px;
color:#2961FE;
border:1px dashed #2961FE;
border-radius: 2px;
cursor: pointer;
}
.process_BtnList{
margin-top:30px;
width:100%;
display: flex;
justify-content: center;
}
.process_BtnOne{
width:90px;
height:38px;
text-align: center;
line-height: 38px;
border-radius: 2px;
border:1px solid #A1AAB2;
color:#000000;
cursor: pointer;
margin-right:50px;
} }
</style> </style>
<template> <template>
<div class="page-body"> <div class="page-body">
<q-tabs style="margin-bottom:20px;" v-model="tabCheck" narrow-indicator dense align="left" class="text-primary">
<q-tab :ripple="false" name="1" label="退课流程" />
<q-tab :ripple="false" name="2" label="某某流程" />
</q-tabs>
<div class="processSet"> <div class="processSet">
<div class="processList"> <div class="processList">
<div class="processTop">发起人</div> <div class="processTop">发起人</div>
...@@ -63,7 +114,7 @@ ...@@ -63,7 +114,7 @@
<i class="iconfont icon-down"></i> <i class="iconfont icon-down"></i>
</div> </div>
</div> </div>
<div class="processList"> <div class="processList" @click="getItem()">
<div class="processTop otherList">班级老师</div> <div class="processTop otherList">班级老师</div>
<div class="processLine"> <div class="processLine">
<i class="iconfont icon-down"></i> <i class="iconfont icon-down"></i>
...@@ -71,27 +122,56 @@ ...@@ -71,27 +122,56 @@
</div> </div>
<div class="processList"> <div class="processList">
<div class="processTop process_TwoList"> <div class="processTop process_TwoList">
<div>关联销售</div> <div class="process_Left">关联销售</div>
<div class="process_He">和</div> <div class="process_center">
<div>刘小勇</div> <div class="process_He">和</div>
</div>
<div class="process_Right">刘小勇</div>
</div> </div>
<div class="processLine"> <div class="processLine">
<i class="iconfont icon-down"></i> <i class="iconfont icon-down"></i>
</div> </div>
</div> </div>
<div class="processList">
<div class="processTop process_TwoList">
<div class="process_Left">分校校长</div>
<div class="process_center">
<div class="process_He process_OR">或者</div>
</div>
<div class="process_Right">教务长</div>
</div>
<div class="processLine">
<i class="iconfont icon-down"></i>
</div>
</div>
<div class="processList">
<div class="processTop otherList">吴大春</div>
<div class="processLine">
<i class="iconfont icon-down"></i>
</div>
</div>
<div class="addProcessBtn">新增节点</div>
<div class="process_BtnList">
<div class="process_BtnOne">日志信息</div>
<q-btn label="保存" color="accent q-px-md" style="font-weight:400 !important"/>
</div>
</div> </div>
<process-form v-if="isShowProcess" :save-obj="processObj" @close="closeProcessForm" @success="refreshPage"></process-form>
</div> </div>
</template> </template>
<script> <script>
import processForm from '../../components/system/process-form';
export default { export default {
components: { components: {
processForm
}, },
data() { data() {
return { return {
dateList: [], //开学时间 dateList: [], //开学时间
msg: {}, msg: {},
tabCheck:'1',
isShowProcess:false, //显示旁边弹窗
processObj:{}, //传递子组件
} }
}, },
created() {}, created() {},
...@@ -101,6 +181,19 @@ ...@@ -101,6 +181,19 @@
methods: { methods: {
getList() { getList() {
},
//点开旁边
getItem(){
this.isShowProcess=true;
},
//关闭
closeProcessForm(){
this.isShowProcess = false
},
//成功刷新
refreshPage(){
this.isShowProcess=false;
this.getList();
} }
} }
} }
......
src/utils/erpindex.js
View file @ 953eec94
...@@ -374,27 +374,5 @@ export default { ...@@ -374,27 +374,5 @@ export default {
Vue.prototype.previewPDF = function (url) { Vue.prototype.previewPDF = function (url) {
window.open(url); window.open(url);
} }
//教育文件下载
Vue.prototype.GetEduDownLoad = function (cmd, msg, fileName, successCall) {
var apiurl = process.env.API + cmd;
var postData = {
Msg: msg
};
this.$http.post(apiurl, postData, {
responseType: 'arraybuffer'
}).then((res) => {
let blob = new Blob([res.data], {
type: "application/vnd.ms-excel"
})
let url = URL.createObjectURL(blob);
let link = document.createElement('a');
link.href = url;
link.setAttribute("download", fileName);
document.body.appendChild(link);
link.click();
successCall(res);
}).catch(function (res) {});
}
} }
} }
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