Skip to content

S
SuperMan
Commit d8be3eb0 authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents 6c067155 6cd031ea
Hide whitespace changes
Inline Side-by-side
Showing with 461 additions and 17 deletions
src/components/FinancialModule/CashierWork.vue
View file @ d8be3eb0
...@@ -95,6 +95,9 @@ ...@@ -95,6 +95,9 @@
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start"> <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start">
<el-button type="primary" class="iconfont icon-bianji-smal" circle @click="editCurency(item.ID),text=$t('pub.updateMsg')"></el-button> <el-button type="primary" class="iconfont icon-bianji-smal" circle @click="editCurency(item.ID),text=$t('pub.updateMsg')"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')+'(新页面打开)'" placement="top-start">
<el-button type="primary" class="iconfont icon-bianji-smal" circle @click="goUrlCashierWorkAccount('CashierWorkAccount',item.ID),text=$t('pub.updateMsg')"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('fnc.w_djxinxi')" placement="top-start"> <el-tooltip class="item" effect="dark" :content="$t('fnc.w_djxinxi')" placement="top-start">
<el-button type="danger" class="iconfont icon-img-rili" circle @click="goUrlDetail('CashierWorkDetail',1,item.Name,item.ID)"></el-button> <el-button type="danger" class="iconfont icon-img-rili" circle @click="goUrlDetail('CashierWorkDetail',1,item.Name,item.ID)"></el-button>
</el-tooltip> </el-tooltip>
...@@ -276,8 +279,8 @@ ...@@ -276,8 +279,8 @@
<thead> <thead>
<tr> <tr>
<th>{{$t('fnc.acc')}}</th> <th>{{$t('fnc.acc')}}</th>
<th width="150px">{{$t('fnc.shoukuan')}} <input type="checkbox" v-model="shouChe" @change="isCheckAll(1)"><span class="_check_all">{{$t('table.table_chekAll')}}</span></th> <th width="150px">{{$t('fnc.shoukuan')}} <input type="checkbox" v-model="shouChe" @change="isCheckAll(1)"><span class="_check_all">{{$t('system.table_chekAll')}}</span></th>
<th width="150px">{{$t('fnc.zhikuan')}} <input type="checkbox" v-model="zhiChe" @change="isCheckAll(2)"><span class="_check_all">{{$t('table.table_chekAll')}}</span></th> <th width="150px">{{$t('fnc.zhikuan')}} <input type="checkbox" v-model="zhiChe" @change="isCheckAll(2)"><span class="_check_all">{{$t('system.table_chekAll')}}</span></th>
<th width="90px">{{$t('system.table_operation')}}</th> <th width="90px">{{$t('system.table_operation')}}</th>
</tr> </tr>
</thead> </thead>
...@@ -664,6 +667,9 @@ export default { ...@@ -664,6 +667,9 @@ export default {
this.loading = false; this.loading = false;
}, err => {this.loading = false;}) }, err => {this.loading = false;})
}, },
goUrlCashierWorkAccount(path,id){
this.$router.push({name:path,query:{ID:id,blank:'y'}})
},
editCurency(id){ // 修改 根据id 获取信息 editCurency(id){ // 修改 根据id 获取信息
this.apipost('Window_post_Get',{ID:id}, res => { this.apipost('Window_post_Get',{ID:id}, res => {
if(res.data.resultCode == 1) { if(res.data.resultCode == 1) {
......
src/components/FinancialModule/CashierWorkAccount.vue 0 → 100644
View file @ d8be3eb0
<style>
@import url('../../assets/css/financia/CashierWork.css');
</style>
<template>
<div class="page_CashierWork">
<div class="query-box" style="background:none;">
<el-form class="_info_box clearfix" label-width="110px">
<el-row>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.accBming')">
<el-input v-model="msg.Alias"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.accType')">
<el-select filterable v-model='msg.BankType' >
<el-option :label='$t("pub.unlimitedSel")' value='0'></el-option>
<el-option :label='$t("fnc.w_sypingtai")' value='2'></el-option>
<el-option :label='$t("fnc.w_syzjinchi")' value='4'></el-option>
<el-option :label='$t("fnc.w_syyhzhu")' value='1'></el-option>
<el-option :label='$t("fnc.w_syxjzhanghu")' value='3'></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.accType')"><el-select filterable v-model='msg.TypeId' >
<el-option :label='$t("pub.unlimitedSel")' value='-1'></el-option>
<el-option v-for='item in AccountTypeList'
:label='item.Name'
:value='item.ID'
:key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<ul>
<li>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
<input type="button" class="normalBtn" :value="$t('pub.saveBtn')" @click="submitForm('addMsg')"/>
</li>
</ul>
</div>
<div>
<div class="cm_content _scrollbar" :class="addShow==true?'_edHeight':''">
<div>
<el-form class=" clearfix" :model="addMsg" ref="addMsg" :rules="rules" label-width="100px">
<el-row>
<el-col :span="4">
<el-form-item :label="$t('system.query_airName')+'：'" prop="Name">
<el-input v-model="addMsg.Name"></el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item :label="$t('fnc.w_ywrenyuan')+'：'" prop="listArr">
<el-select
v-model="addMsg.listArr"
filterable
remote
multiple
reserve-keyword
placeholder="请输入"
:placeholder="$t('pub.pleaseImport')"
:remote-method="remoteMethod"
@change="$forceUpdate()"
@remove-tag="removeTag"
:loading="loading2">
<el-option
v-for="item in searchList"
:key="item.empId"
:label="item.name"
:value="item.empId">
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.postName }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loading" v-if="transitionShow2">
<tr>
<th>{{$t('fnc.acc')}}</th>
<th width="150px">{{$t('fnc.shoukuan')}} <input type="checkbox" v-model="shouChe" @change="isCheckAll(1)"><span class="_check_all">{{$t('system.table_chekAll')}}</span></th>
<th width="150px">{{$t('fnc.zhikuan')}} <input type="checkbox" v-model="zhiChe" @change="isCheckAll(2)"><span class="_check_all">{{$t('system.table_chekAll')}}</span></th>
</tr>
<tr v-for="(item,index) in dataList">
<td>
<span class="_fangkuang" v-if="item.IsPublic===1">{{$t('fnc.w_gsdgong')}}</span>
<span class="_fangkuang _fangkuang_si" v-if="item.IsPublic===0">{{$t('fnc.w_gsdsi')}}</span>
<span class="_accname">{{item.Alias}} {{item.BackNo}}</span>
</td>
<td width="150px">
<input v-model="item.isInCheckbox" :disabled="item.Is_Income==2" type="checkbox">
</td>
<td width="150px">
<input v-model="item.isOutCheckbox" :disabled="item.Is_Outcome==2" type="checkbox">
</td>
</tr>
</table>
<div class="noData" v-show="noData">
{{$t('system.content_noData')}}
</div>
</div>
</div>
</div>
</template>
<script>
export default {
data(){
return{
msg:{
ID:0,
Alias:'',
TypeId:'',
BankType:'0',
IsPublic:'-1',
},
addMsg:{
ID:0,
Name:'',
list:[],
emList:[],
listArr:[],
BranchId:-1,
},
getAccListMsg:{
IsPublic:-1,
BankType:0,
},
type:-1,
addShow:false,
loading:false,
loading2:false,
noData:false,
AccountTypeList:[],
zhiChe:false,
shouChe:false,
total:0,
currentPage: 1,
text:'',
dataList:[],
searchList:[],
AccList:[],
rules: {//表单必填验证
Name: [
{ required: true, message: this.$t('objFill.qingtxckmc'), trigger: 'blur' }
],
listArr: [
{type: 'array', required: true, message: this.$t('rule.qxzywuyuan'), trigger: 'blur' }
]
},
AccListProps: {
value:'Num',
label:'Name',
children: 'children'
},
selectVal:[],
transitionShow:false,
transitionShow2:true,
contenWidth:0,
contenHeight:0,
tableSize:0,
blockSize:0,
shouList:[],
shouListLoading:false,
}
},created(){
let allH,allW,cH,cW;
allH = document.documentElement.clientHeight;
allW = document.documentElement.clientWidth;
cW = allW-90;
cH = allH-187; //255 = 50 40 21 36 40
this.contenWidth = cW;
this.contenHeight = cH;
this.msg.ID=this.$route.query.ID
this.addMsg.ID=this.$route.query.ID
},methods:{
removeTag(id){
this.addMsg.emList.forEach((x,index)=>{
if(x.EmId === id){
this.addMsg.emList.splice(index,1)
}
})
},
remoteMethod(query) {
if (query !== ''||this.addShow) {
this.loading2 = true;
this.apipost("admin_Get_Chat_All_SelectEmpName",{ EmName:query },res => {
if (res.data.resultCode == 1) {
this.searchList = res.data.data;
this.loading2 = false;
}
},err => {});
} else {
this.searchList = [];
this.loading2 = false;
}
},
accType(t){
this.selectVal = [];
if(this.type===t){
this.type = -1;
this.msg.IsPublic=-1;
this.msg.BankType=0;
this.getList();
}else{
this.type = t;
this.msg.IsPublic=-1;
this.msg.BankType=0;
if(t===1){ // 1公 2私
this.msg.IsPublic = 1;
this.getList();
}else if(t===2){
this.msg.IsPublic = 0;
this.getList();
}else if(t===3){
this.msg.BankType = 2;
this.getList();
}else if(t===4){
this.msg.BankType = 4;
this.getList();
}else if(t===5){
this. msg.BankType = 1;
this.getList();
}else if(t===6){
this.msg.BankType = 3;
this.getList();
}
}
},
getAccountTypeList() { //获取账户类型
this.apipost('AccountType_post_GetList',{}, res => {
if(res.data.resultCode == 1) {
this.AccountTypeList = res.data.data;
}
}, err => {})
},
mergeArray(list3, list1){
for (var i = 0 ; i < list3.length ; i ++ ){
for(var j = 0 ; j < list1.length ; j ++ ){
if (list3[i].EmId === list1[j].EmId){
list3.splice(i,1);
}
}
}
for(var i = 0; i <list1.length; i++){
list3.push(list1[i]);
}
return list3;
},
addCashierWork(){ // 提交保存
if(this.addMsg.list.length==0) return this.$message.error(this.$t('objFill.qxzzsygzhanghu'))
let sub = true;
if(!sub) return this.$message.error(this.$t('objFill.qxzchunanailx'))
let emList = this.addMsg.listArr;
let arr = [];
emList.forEach(x=>{
let obj = {
'EmId':x,
'ID':0,
'WindowId':0
}
arr.push(obj);
});
let list4 = this.mergeArray(arr,this.addMsg.emList);
console.log("this.addMsg.emList",this.addMsg.emList);
console.log("arr",arr);
console.log("list4",list4);
this.addMsg.emList = list4;
this.apipost('Window_post_SetCashierRelationNew',this.addMsg,r=>{
if(r.data.resultCode==1){
this.$message.success(r.data.message);
this.getList();
this.addShow = false;
this.cancelEdit();
}else{
this.$message.error(r.data.message);
}
},null)
},
submitForm(addMsg) {//提交创建、修改表单
this.$refs[addMsg].validate((valid) => {
if (valid) {
this.addMsg.list=[];
//循环选中的数据添加到当前参数列表里面去
this.dataList.forEach(item => {
if((item.isInCheckbox&&item.Is_Income==1)||item.isOutCheckbox&&item.Is_Outcome==1){
this.addMsg.list.push(item);
}
});
this.addCashierWork();
} else {
return false;
}
});
},
isCheckAll(t){ //1 shou 2 zhi 全选
if(t===1){
if(this.shouChe){
this.dataList.forEach(x=>{
if(x.Is_Income!=2){
x.isInCheckbox = true;
x.Is_Income=1;
}
})
}else{
this.dataList.forEach(x=>{
if(x.Is_Income!=2){
x.isInCheckbox = false;
x.Is_Income=0;
}
})
}
}else{
if(this.zhiChe){
this.dataList.forEach(x=>{
if(x.Is_Outcome!=2){
x.isOutCheckbox = true;
x.Is_Outcome=1;
}
})
}else{
this.dataList.forEach(x=>{
if(x.Is_Outcome!=2){
x.isOutCheckbox = false;
x.Is_Outcome=0;
}
})
}
}
},
getList(){
this.loading = true;
this.apipost('Window_post_GetBackAccountNew',this.msg, res => {
if(res.data.resultCode == 1) {
let arr = [];
this.dataList = res.data.data.result;
this.addMsg.Name=res.data.data.Name;
this.addMsg.listArr = [];
this.addMsg.emList=[];
this.addMsg.emList=res.data.data.EmList;
console.log("我进来了哈哈哈res.data.data.emList",res.data.data.EmList);
if(res.data.data.EmList&&res.data.data.EmList.length>0){
console.log("我进来了哈哈哈");
res.data.data.EmList.forEach(x=>{
this.remoteMethod(x.emName);
this.addMsg.listArr.push(x.EmId)
})
console.log(" this.addMsg.listArr", this.addMsg.listArr);
}
} else {
this.$message.error(res.data.message);
}
this.loading = false;
}, err => {this.loading = false;})
},
editCurency(id){ // 修改 根据id 获取信息
this.apipost('Window_post_Get',{ID:id}, res => {
if(res.data.resultCode == 1) {
let data = res.data.data;
let arr = [];
arr.push(data.AccountType);
arr.push(data.Type);
arr.push(data.AccountId);
data.list.forEach(x=>{
if(x.Direct==3){
x.isInCheckbox = true;
x.isOutCheckbox = true;
}else if(x.Direct==1){
x.isInCheckbox = true;
x.isOutCheckbox = false;
}else if(x.Direct==2){
x.isInCheckbox = false;
x.isOutCheckbox = true;
}
x.Name = x.Alias;
x.IsPublic = x.Is_Public;
});
this.addMsg = data;
this.addMsg.listArr = [];
if(data.emList&&data.emList.length>0){
data.emList.forEach(x=>{
this.remoteMethod(x.emName);
this.addMsg.listArr.push(x.EmId)
})
}
this.selectVal = arr;
this.addShow = true;
} else {
this.tips(res.data.message,'error');
}
}, err => {})
},
cancelEdit(){ // 取消修改、新增
this.addMsg = {
ID:0,
Name:'',
list:[],
emList:[],
listArr:[],
BranchId:-1,
}
},
resetForm(formName) {//弹出框取消 初始化谈框内表单
this.$refs[formName].resetFields();
},
},mounted(){
this.getAccountTypeList();
this.getList();
}
}
</script>
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ d8be3eb0
...@@ -1880,7 +1880,7 @@ ...@@ -1880,7 +1880,7 @@
{{ $t("ground.lduikongwei") }} {{ $t("ground.lduikongwei") }}
</template> </template>
<template v-else> <template v-else>
导游 导游
</template> </template>
<input type="button" class="normalBtn" @click="UpdateLeaderSeat(item)" style="display: none" <input type="button" class="normalBtn" @click="UpdateLeaderSeat(item)" style="display: none"
:value="ConfigData.Config.IsLeaderUseSeat == 0?'占机位' :'取消机位'" /> :value="ConfigData.Config.IsLeaderUseSeat == 0?'占机位' :'取消机位'" />
...@@ -2684,7 +2684,13 @@ ...@@ -2684,7 +2684,13 @@
@click="goToPassenger2(msg.TCID, fourthItem.OrderId, 2)">{{ fourthItem.userName }} @click="goToPassenger2(msg.TCID, fourthItem.OrderId, 2)">{{ fourthItem.userName }}
<span style="color:#f56c6c">{{fourthItem.VisaType==1?'(个签)':''}} <span style="color:#f56c6c">{{fourthItem.VisaType==1?'(个签)':''}}
</span> </span>
<span style="color:#f56c6c">{{fourthItem.TicketOutTypeStr}} <span v-if="fourthItem.TicketOutType==1"
style="color:rgb(26, 168, 107);">{{fourthItem.TicketOutTypeStr}}
</span>
<span v-if="fourthItem.TicketOutType==2"
style="color:blue;">{{fourthItem.TicketOutTypeStr}}
</span>
<span v-else style="color:#f56c6c">{{fourthItem.TicketOutTypeStr}}
</span> </span>
</span> </span>
</template> </template>
...@@ -2855,19 +2861,20 @@ ...@@ -2855,19 +2861,20 @@
</el-popover> </el-popover>
</div> </div>
<div v-if="childItem.ChangePriceId>0" style=" overflow:hidden;"> <div v-if="childItem.ChangePriceId>0" style=" overflow:hidden;">
<span>改价申请: 申请金额【<span style="color:red;">{{childItem.ChangePriceMoney}}</span>元】{{childItem.ChangePriceReason}}</span> <span>改价申请: 申请金额【<span
<div style="text-align:right;" v-if="childItem.ChangePriceState==1"> style="color:red;">{{childItem.ChangePriceMoney}}</span>元】{{childItem.ChangePriceReason}}</span>
待{{childItem.ChangePriceType=="2"?"OP":"主管"}}{{childItem.ManagerExamineName}}审核 <div style="text-align:right;" v-if="childItem.ChangePriceState==1">
</div> 待{{childItem.ChangePriceType=="2"?"OP":"主管"}}{{childItem.ManagerExamineName}}审核
<div style="text-align:right;" v-if="childItem.ChangePriceState==2"> </div>
待{{childItem.ChangePriceType=="2"?"会计":"总经理"}}{{childItem.ExamineByName}}审核 <div style="text-align:right;" v-if="childItem.ChangePriceState==2">
</div> 待{{childItem.ChangePriceType=="2"?"会计":"总经理"}}{{childItem.ExamineByName}}审核
<div v-if="childItem.ChangePriceState==4" style="text-align:right;"> </div>
已驳回 <div v-if="childItem.ChangePriceState==4" style="text-align:right;">
</div> 已驳回
<div v-if="childItem.ChangePriceState==3" style="text-align:right;"> </div>
已通过 <div v-if="childItem.ChangePriceState==3" style="text-align:right;">
</div> 已通过
</div>
</div> </div>
</div> </div>
</td> </td>
......
src/router/config.js
View file @ d8be3eb0
...@@ -4202,6 +4202,14 @@ export default { ...@@ -4202,6 +4202,14 @@ export default {
meta: { meta: {
title: '出纳工作台' title: '出纳工作台'
}, },
},
{ //财务 财务单据 出纳工作台账户信息
path: '/CashierWorkAccount',
name: 'CashierWorkAccount',
component: resolve => require(['@/components/FinancialModule/CashierWorkAccount'], resolve),
meta: {
title: '出纳工作台'
},
}, { //财务 财务单据 会计工作台 }, { //财务 财务单据 会计工作台
path: '/accountingWork', path: '/accountingWork',
name: 'accountingWork', name: 'accountingWork',
......
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