Skip to content

C
confucius
Commit 0fc1e86a authored by Mac's avatar Mac
Browse files
Options

修改

parent 5c24b0f8
Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 32 deletions
src/pages/administration/AttendanceRules.vue
View file @ 0fc1e86a
......@@ -282,8 +282,8 @@
</template>
<script>
import VueAMap from 'vue-amap'
let amapManager = new VueAMap.AMapManager();
// import VueAMap from 'vue-amap'
// let amapManager = new VueAMap.AMapManager();
import {
getDepartmentGetList,
getAttendanceInfo,
......@@ -315,7 +315,7 @@
}
},
zoom: 12,
amapManager,
// amapManager,
events: {},
searchData: [],
lnglatXY: [],
......
src/pages/financial/components/GZBillModule.vue
View file @ 0fc1e86a
......@@ -92,7 +92,7 @@
<i v-if="name===2">{{$t('fnc.kuaijilian')}}</i>
</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>
<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>
......@@ -285,7 +285,7 @@ export default {
props:["ID","width","color","isPrintPage","name","OrderSource"], //接收参数 ID width color
data(){
return{
loading:true,
loading:true,
EmployeeId:'',
EndDate:'',
StartDate:'',
......@@ -345,7 +345,7 @@ export default {
this.loading=false
}
}, err => {})
},
},
},mounted(){
const myDate = new Date();
let yaer = myDate.getFullYear(); //获取完整的年份(4位,1970-????)
......@@ -353,7 +353,7 @@ export default {
let dateS = myDate.getDate(); //获取当前日(1-31)
this.StartDate = yaer + '-' + month + '-' + '01';
this.EndDate = yaer + '-' + month + '-' + dateS;
let userInfo = this.getLocalStorage();
let userInfo = this.getLocalStorage();
this.EmployeeId = userInfo.EmployeeId;
this.Financial_post_GetDetail(this.ID);
},watch: { // 监听参数变化
......
src/pages/financial/components/ReceivablesModule.vue
View file @ 0fc1e86a
......@@ -25,7 +25,7 @@
._color_b{color: #333333 !important;font-size: 12px}
.rb_top_row span._r_name._no_border{border: none}
._font_size12{font-size: 12px}
._yewudanju{
position: absolute;
text-align: right;
......@@ -87,11 +87,12 @@
{{GetDetail.PlatFormName}}</span>
</a>
</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==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==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="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==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==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==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>
<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>
......@@ -322,7 +323,7 @@ export default {
jumpPageNew(){
this.$router.push({
name: 'platOrderquery',
query: {
query: {
platName: this.GetDetail.PlatFormName,
TradeWay: this.GetDetail.OrderTradeWay,
PlatformAccount: this.GetDetail.PlatformAccountId,
......@@ -344,14 +345,14 @@ export default {
// query: { id:id,orderID:this.GetDetail.OrderID,isShow:false}
// });
// window.open(routeData.href, "_blank");
let idStr = '';
if(this.GetDetail.TCIDList.length>0){
idStr = this.GetDetail.TCIDList[0];
}
this.$router.push({
name: path,
query: { id:idStr,orderID:this.GetDetail.OrderID,isShow:false,blank:'y',tab:'报名清单'}
})
// let idStr = '';
// if(this.GetDetail.TCIDList.length>0){
// idStr = this.GetDetail.TCIDList[0];
// }
// this.$router.push({
// name: path,
// query: { id:idStr,orderID:this.GetDetail.OrderID,isShow:false,blank:'y',tab:'报名清单'}
// })
}else if(type==2){
// let routeData = this.$router.resolve({
// name: path,
......@@ -393,7 +394,7 @@ export default {
this.$set(this.$data,"GetDetail",data);
}
}, err => {})
},
},
},mounted(){
const myDate = new Date();
let yaer = myDate.getFullYear(); //获取完整的年份(4位,1970-????)
......@@ -402,7 +403,7 @@ export default {
this.StartDate = yaer + '-' + month + '-' + '01';
this.EndDate = yaer + '-' + month + '-' + dateS;
let userInfo = this.getLocalStorage();
this.EmployeeId = userInfo.EmployeeId;
this.EmployeeId = userInfo.EmployeeId;
this.Financial_post_GetDetail(this.ID);
},watch: { // 监听参数变化
GetDetail: {
......
src/pages/financial/financalDocument/RecPayQuery.vue
View file @ 0fc1e86a
......@@ -751,7 +751,7 @@
<div class="_TCIDAndTCNUMList" style="display: flex;">
<span>团号：</span>
<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 v-else>
<span>无</span>
......@@ -912,6 +912,8 @@
import myBill from "../components/BillModule.vue";
import myrbvBill from "../components/ReceivablesModule.vue";
import myhrBill from "../components/MergeBillModule.vue";
import {getClassNameList} from '../../../api/finance/index'
import {
queryEmployee
} from '../../../api/users/user'
......@@ -1216,14 +1218,40 @@
}
})
this.total = res.data.data.count;
let da = []
if (this.total == 0) {
this.DataList = [];
} else {
data.forEach(x => {
// this.columns[0].filters.push({label:x.FrID,value:x.FrID})
x.modelShow = false;
if(x.TCIDList.length>0){
da =da.concat(x.TCIDList)
}
})
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;
} else {
......
src/pages/financial/financalDocument/addFinancialDocuments.vue
View file @ 0fc1e86a
......@@ -1123,6 +1123,8 @@
} else {
this.msg.ClientType = 0;
}
if (this.msg.RB_Branch_Id == '' || this.msg.RB_Branch_Id == 0) return this.$message.error('请选择校区');
// IsPublic 2 现金 IsLeader 0 临时领队
if (this.msg.IsPublic < 2 && this.IsLeader === 1) {
if (this.msg.ClientID === '') return this.$message.error(this.$t('rule.qxzkhmingcheng'));
......
src/pages/financial/financalDocument/addReceivablesDocuments.vue
View file @ 0fc1e86a
......@@ -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>
</td> -->
<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>
</td>
<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>
</td>
<td height="26px">
......@@ -461,7 +461,7 @@
</td>
<td height="26px">{{da.bTotalPrice}}</td>
<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>
</td>
</tr>
......@@ -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>
</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>
</td>
<td>
<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>
</td>
<td>
......@@ -499,7 +499,7 @@
</td>
<td>{{detailList.bTotalPrice}}</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>
</td>
</tr>
......@@ -1281,6 +1281,7 @@
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.RB_Depart_Id) return this.$message.error(this.$t('rule.qxzzdbumen'));
if (!this.$route.query.edit) {
......@@ -1531,6 +1532,9 @@
this.msg.BankList[0].Fee = parseFloat(this.msg.BankList[0].ybFee);
this.$forceUpdate();
},
chages(){
this.$forceUpdate()
},
shouxufeiJiSuan: function () {
let price = 0;
this.msg.detailList.forEach(y => {
......@@ -1789,6 +1793,7 @@
this.msg.RB_BranchName = x.SName;
}
})
}).catch(() => {
})
......
src/pages/sale/myOrder.vue
View file @ 0fc1e86a
......@@ -178,6 +178,7 @@
myorderObjOption:{},
classObjOption: null,
isShowClassInfo: false, //是否显示课程信息
showone:false,
}
},
created() {
......@@ -220,9 +221,11 @@
//翻页
changePage(val) {
if(val !=1 && this.msg.pageIndex!=1){//对第一次进来防止掉2次getList
if(this.showone == true){
this.msg.pageIndex = val;
this.getList()
}else {
this.showone=true
}
},
......@@ -259,6 +262,7 @@
this.data.List.forEach(x=>{
OrderIds.push(x.OrderId)
})
this.loading = false
OrderIds = OrderIds.join(',')
// this.getOrderFinanceList(OrderIds)
if( this.data.List.length>0){
......
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