Skip to content

S
SuperMan
Commit 84efbbf3 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

修改一些bug、

parent fc4397ba
Show whitespace changes
Inline Side-by-side
Showing with 200 additions and 13 deletions
src/components/FinancialModule/PlatformAccount.vue
View file @ 84efbbf3
...@@ -1106,7 +1106,14 @@ export default { ...@@ -1106,7 +1106,14 @@ export default {
err => {} err => {}
); );
}, },
getCompanyList() { getCompanyList(t, info) {
if(t){
this.CompanyList.push({
BName: info.BranchName,
Id: info.RB_Branch_id
})
return
}
//获取公司列表 //获取公司列表
this.apipost( this.apipost(
"admin_get_BranchGetList", "admin_get_BranchGetList",
...@@ -1187,6 +1194,9 @@ export default { ...@@ -1187,6 +1194,9 @@ export default {
this.addCuren = true; this.addCuren = true;
} }
this.Charge = 3; this.Charge = 3;
let userInfo = this.getLocalStorage();
var branchId = userInfo.RB_Branch_id;
this.addMsg.BranchIdS = branchId;
}, },
getAccountTypeList() { getAccountTypeList() {
//获取账户类型(平台账户只能获取对公账户类型) //获取账户类型(平台账户只能获取对公账户类型)
...@@ -1348,6 +1358,9 @@ export default { ...@@ -1348,6 +1358,9 @@ export default {
RiskLowerLimitMoney: "" RiskLowerLimitMoney: ""
}; };
this.addMsg = newMsg; this.addMsg = newMsg;
let userInfo = this.getLocalStorage();
var branchId = userInfo.RB_Branch_id;
this.addMsg.BranchIdS = branchId;
}, },
SetProfitLoss() { SetProfitLoss() {
//币种调汇 //币种调汇
...@@ -1429,11 +1442,14 @@ export default { ...@@ -1429,11 +1442,14 @@ export default {
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID
var branchId = userInfo.RB_Branch_id; var branchId = userInfo.RB_Branch_id;
this.addMsg.BranchIdS = branchId;
if(branchId==0||branchId==49){ if(branchId==0||branchId==49){
this.getCompanyList(); this.getCompanyList();
}else{ }else{
this.getCompanyList(2,userInfo);
this.msg.RB_Branch_Id = branchId; this.msg.RB_Branch_Id = branchId;
} }
this.getList(); this.getList();
this.initColums(); this.initColums();
this.getAccountTypeList(); this.getAccountTypeList();
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 84efbbf3
...@@ -591,7 +591,7 @@ ...@@ -591,7 +591,7 @@
<input type="button" v-if="item.TeamType == 1 && index2==0" value="日当费" class="normalBtn" <input type="button" v-if="item.TeamType == 1 && index2==0" value="日当费" class="normalBtn"
@click="goZhiDan(item, 2)" /> @click="goZhiDan(item, 2)" />
<el-tooltip class="item" effect="dark" :content="currencyTypeObj[leadr.CurrencyId]" placement="top"> <el-tooltip class="item" effect="dark" :content="currencyTypeObj[leadr.CurrencyId]" placement="top">
<input type="button" v-if="!item.hideZDBtn" value="制单" class="normalBtn" <input type="button" v-if="item.hideZDBtn" value="制单" class="normalBtn"
@click="goZhiDan(item,0,leadr,cur)" /> @click="goZhiDan(item,0,leadr,cur)" />
</el-tooltip> </el-tooltip>
</template> </template>
......
src/components/SalesModule/salesHotelOrder.vue
View file @ 84efbbf3
...@@ -71,6 +71,7 @@ ...@@ -71,6 +71,7 @@
<table class="SalesHotelOrderTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading"> <table class="SalesHotelOrderTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr> <tr>
<th>订单号</th> <th>订单号</th>
<th>团号</th>
<th>客户信息</th> <th>客户信息</th>
<th>房间数</th> <th>房间数</th>
<th>总价格</th> <th>总价格</th>
...@@ -83,11 +84,12 @@ ...@@ -83,11 +84,12 @@
<th>入住时间</th> <th>入住时间</th>
<th>离店时间</th> <th>离店时间</th>
<th>取消费用</th> <th>取消费用</th>
<!-- <th>操作</th> --> <th>操作</th>
</tr> </tr>
<tbody v-for="(item,index) in dataList"> <tbody v-for="(item,index) in dataList">
<tr> <tr>
<td style="border-bottom:2px solid #333" rowspan="2">{{item.ThirdOrderNo}}</td> <td style="border-bottom:2px solid #333" rowspan="2">{{item.ThirdOrderNo}}</td>
<td><span class="cursorpointer text-decoration" @click="GotoUrl(item.TCNUM)" v-if="item.TCID">{{item.TCNUM}}({{item.TCID}})</span></td>
<td> <td>
<div>{{item.CustomerName}}</div> <div>{{item.CustomerName}}</div>
<div>{{item.CustomerPhone}}</div> <div>{{item.CustomerPhone}}</div>
...@@ -103,10 +105,33 @@ ...@@ -103,10 +105,33 @@
<td>{{item.CheckInStr}}</td> <td>{{item.CheckInStr}}</td>
<td>{{item.CheckOutStr}}</td> <td>{{item.CheckOutStr}}</td>
<td>{{item.CancelFee}}</td> <td>{{item.CancelFee}}</td>
<!-- <td>详情</td> --> <td>
<el-row>
<el-button-group>
<el-tooltip class="item" effect="dark" content="付款" placement="top-start">
<el-button type="primary" icon="iconfont icon-fukuan2" @click="getShouKuan(item)" ></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="取消订单" placement="top-start">
<el-button type="info" v-if="item.ShowBtn" icon="iconfont icon-quxiao1" @click="cancelHTorder(item.ThirdOrderNo)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="确定" placement="top-start">
<el-button type="success" icon="iconfont icon-duigou" v-if="item.IsCanClear == 0" @click="queren(1, item.OrderID)" ></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="取消确认" placement="top-start">
<el-button type="info" icon=" iconfont icon-quxiao1" v-if="item.IsCanClear == 1" @click="queren(0, item.OrderID)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="关联团" placement="top-start">
<el-button type="warning" icon="iconfont icon-guanlian" @click="TCID = '',GLOrderID = item.OrderID,dialogFormVisible = true"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="详情" placement="top-start">
<el-button type="success" icon="iconfont icon-sousuo" @click="goOrderDetails(item.OrderID)"></el-button>
</el-tooltip>
</el-button-group>
</el-row>
</td>
</tr> </tr>
<tr> <tr>
<td colspan="6" style="text-align:left;width:600px"> <td colspan="7" style="text-align:left;width:600px">
<div class="clearfix"> <div class="clearfix">
<div class="SH_beizhu" style=""> <div class="SH_beizhu" style="">
备注： 备注：
...@@ -116,30 +141,57 @@ ...@@ -116,30 +141,57 @@
</div> </div>
</div> </div>
</td> </td>
<td colspan="6" style="text-align:left;width:600px"> <td colspan="7" style="text-align:left;width:600px">
<div class="SH_OrderDan"> <div class="SH_OrderDan">
<div>收款单据：</div> <div>收款单据：</div>
<div> <div>
<span v-for="subItem in item.FinanceList"> <span v-for="subItem in item.FinanceList">
{{item.frID}} {{subItem.FrID}}
</span> </span>
<span v-if="item.FinanceList==0">暂无数据</span> <span v-if="item.FinanceList.length < 1">暂无数据</span>
</div> </div>
</div> </div>
<div class="SH_OrderDan"> <div class="SH_OrderDan">
<div>付款单据：</div> <div>付款单据：</div>
<div> <div>
<span v-for="subItem in item.RefundFinanceList"> <span v-for="subItem in item.RefundFinanceList">
{{item.frID}} {{subItem.FrID}}
</span> </span>
<span v-if="item.RefundFinanceList==0">暂无数据</span> <span v-if="item.RefundFinanceList.length < 1">暂无数据</span>
</div> </div>
</div> </div>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<el-dialog title="请选择团号" width="400px" :visible.sync="dialogFormVisible" center :before-close="closeChangeMachie">
<el-form label-width="110px">
<el-form-item label="团号">
<el-select
v-model="TCID"
filterable
remote
reserve-keyword
:placeholder="$t('pub.pleaseImport')"
:remote-method="remoteMethodTCNum"
:loading="loading2">
<el-option
v-for="item in searchList"
:key="item.TCID"
:label="item.TCNUM"
:value="item.TCID">
<span style="float: left">{{ item.TCNUM }}</span>
</el-option>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="dialogFormVisible=false,GLOrderID = ''">{{$t('pub.cancelBtn')}}</button>
<button class="normalBtn" type="primary" @click="querenGL">{{$t('pub.sureBtn')}}</button>
</div>
</el-dialog>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper"
:page-size=msg.pageSize :total=total> :page-size=msg.pageSize :total=total>
</el-pagination> </el-pagination>
...@@ -158,6 +210,8 @@ export default { ...@@ -158,6 +210,8 @@ export default {
EndTime:'', EndTime:'',
GetOrderType:0 GetOrderType:0
}, },
searchList: [],
loading2: false,
total:0, total:0,
currentPage: 1, currentPage: 1,
loading:false, loading:false,
...@@ -178,9 +232,125 @@ export default { ...@@ -178,9 +232,125 @@ export default {
} }
}, },
dataList: [], dataList: [],
dialogFormVisible: false,
TCID: '',
GLOrderID: '',
}; };
}, },
methods: { methods: {
GotoUrl(TCNUM) {
this.$router.push({
path: "TravelControlList",
query: {
tcmun: TCNUM,
blank: 'y',
tab: "团控查询",
}
});
},
closeChangeMachie(done) { // 弹=窗口关闭
done();
},
goOrderDetails(ID){
this.$router.push({
name: 'OpHotelOrderDetail',
query: {
ID: ID,
blank:'y',
}
})
},
remoteMethodTCNum(query) {
if (query !== ''||this.addShow) {
this.loading2 = true;
this.apipost("InvoiceApply_get_GetPriceList",{ TCNUM:query },res => {
if (res.data.resultCode == 1) {
this.searchList = res.data.data;
this.loading2 = false;
}
},err => {});
} else {
this.searchList = [];
this.loading2 = false;
}
},
queren(type, OrderID){
let text = type == 1 ? '确认后，订单不会自动取消' : '取消后，订单会自动取消'
this.$confirm(text, this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.apipost('dmc_post_get_UpdateOrderCanClear',{OrderID: OrderID, IsCanClear: type},res=>{
if(res.data.resultCode==1){
this.Success(res.data.message);
this.getList();
}else{
this.Error(res.data.message);
}
},err=>{})
}).catch(() => {
this.$message({
type: 'info',
message: this.$t('ios.yi') + this.$t('pub.cancelBtn')
});
});
},
querenGL(){
this.apipost("dmc_post_get_RelevanceTCID",{ TCID: this.TCID, OrderID: this.GLOrderID },res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.getList();
this.dialogFormVisible = false
}
},err => {});
},
//点击取消操作
cancelHTorder(ThirdOrderNo){
let userInfo = this.getLocalStorage();
let customerId = userInfo.customerId;
let msg ={
bookingNumber:ThirdOrderNo,
CancelBy:customerId,
CancelType:1
}
this.apipost(
"dmc_post_Get_GetJAPAN_GetJAPAN_ReservationCancallation",
msg,
res => {
if (res.data.resultCode == 1) {
this.Success('取消成功');
this.getList();
} else {
this.Error(res.data.message);
}
},
null
);
},
//点击收款
getShouKuan(obj){
let TCIDARR = obj.TCID ? [obj.TCID] : [];
let orderObj = {
OrderID:obj.OrderID,
OrderSource:1,
Obj: {},
SourceID:null,
TCIDList: TCIDARR
}
this.$router.push({
name: 'ChoiceAddFinancialDocuments',
query:{
"Type":1,
"companyID":obj.RB_Branch_id,
"path": "",
'blank':'y',
'orderObj':JSON.stringify(orderObj),
'tradeWay':1,
'platformAccount':0
}
});
},
getList() { getList() {
//获取现有线路列表 //获取现有线路列表
this.loading = true; this.loading = true;
......
src/components/TravelManager/TravelList/HotelOrderTotal.vue
View file @ 84efbbf3
...@@ -339,8 +339,8 @@ ...@@ -339,8 +339,8 @@
<el-tooltip class="item" effect="dark" content="付款" placement="top-start"> <el-tooltip class="item" effect="dark" content="付款" placement="top-start">
<el-button type="primary" icon="iconfont icon-fukuan2" @click="getShouKuan(item)" ></el-button> <el-button type="primary" icon="iconfont icon-fukuan2" @click="getShouKuan(item)" ></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" v-if="item.ShowBtn" effect="dark" content="取消订单" placement="top-start"> <el-tooltip class="item" effect="dark" content="取消订单" placement="top-start">
<el-button type="info" icon="iconfont icon-quxiao1" @click="cancelHTorder(item.ThirdOrderNo)"></el-button> <el-button type="info" v-if="item.ShowBtn" icon="iconfont icon-quxiao1" @click="cancelHTorder(item.ThirdOrderNo)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="确定" placement="top-start"> <el-tooltip class="item" effect="dark" content="确定" placement="top-start">
<el-button type="success" icon="iconfont icon-duigou" v-if="item.IsCanClear == 0" @click="queren(1, item.OrderID)" ></el-button> <el-button type="success" icon="iconfont icon-duigou" v-if="item.IsCanClear == 0" @click="queren(1, item.OrderID)" ></el-button>
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 84efbbf3
...@@ -2829,7 +2829,7 @@ ...@@ -2829,7 +2829,7 @@
<el-dialog custom-class='w450' title="追加团款" :visible.sync="zhuijiaShow" center> <el-dialog custom-class='w450' title="追加团款" :visible.sync="zhuijiaShow" center>
<el-form label-width="110px"> <el-form label-width="110px">
<el-form-item label="追加团款金额：" class=""> <el-form-item label="追加团款金额：" class="">
<el-input placeholder="请输入" type="text" @keyup.native="checkPrice(zhuijiaMsg,'ChangePrice')" <el-input placeholder="请输入" type="text" @keyup.native="checkPrice(zhuijiaMsg,'ChangePrice', true)"
v-model="zhuijiaMsg.ChangePrice"> v-model="zhuijiaMsg.ChangePrice">
</el-input> </el-input>
</el-form-item> </el-form-item>
...@@ -3299,6 +3299,7 @@ ...@@ -3299,6 +3299,7 @@
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.$message.success(res.data.message) this.$message.success(res.data.message)
this.zhuijiaShow = false this.zhuijiaShow = false
this.getList();
} else { } else {
this.$message.error(res.data.message) this.$message.error(res.data.message)
} }
......
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