Commit ff8ae767 authored by liudong1993's avatar liudong1993

车资增加备注录入;营收报表增加领队导游查询

parent 689a5758
...@@ -527,13 +527,31 @@ tr._item_list td:last-child { ...@@ -527,13 +527,31 @@ tr._item_list td:last-child {
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="是否联运"> <el-form-item label="是否联运">
<el-select v-model="msg.Is_Transport" filterable class="w150"> <el-select v-model="msg.Is_Transport" filterable class="w150">
<el-option value="-1" label="不限"></el-option> <el-option value="-1" label="不限"></el-option>
<el-option value="1" label="是"></el-option> <el-option value="1" label="是"></el-option>
<el-option value="0" label="否"></el-option> <el-option value="0" label="否"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="领队类型:">
<el-select v-model="msg.LeaderType" filterable class="w150" @change="GetLeaderList()">
<el-option :value="0" label="请选择"></el-option>
<el-option :value="1" label="领队"></el-option>
<el-option :value="2" label="领兼导"></el-option>
<el-option :value="3" label="导游"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="领队/导游:">
<el-select v-model="msg.LeaderId" filterable class="w150">
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option v-for="item in LeaderList" :label='item.Name' :value='item.ID' :key='item.ID'></el-option>
</el-select>
</el-form-item>
</el-col> </el-col>
<el-col :span="4" v-if="userId==1||userId==5"> <el-col :span="4" v-if="userId==1||userId==5">
<el-button @click="msg.Is_Open=0,SetTravelClose()" type="danger" size="small" round :loading="btnloading">开启团队收支</el-button> <el-button @click="msg.Is_Open=0,SetTravelClose()" type="danger" size="small" round :loading="btnloading">开启团队收支</el-button>
...@@ -815,7 +833,9 @@ export default { ...@@ -815,7 +833,9 @@ export default {
Type: 1, Type: 1,
QueryCondition: "-1", QueryCondition: "-1",
DataType: "1", DataType: "1",
Is_Transport:'-1' Is_Transport:'-1',
LeaderId:0,
LeaderType:0
}, },
getCompanyMsg: { getCompanyMsg: {
// 公司 // 公司
...@@ -838,6 +858,7 @@ export default { ...@@ -838,6 +858,7 @@ export default {
multipleSort: false, multipleSort: false,
kaiqiZzBox: false, kaiqiZzBox: false,
KaiqiZzTime: [], KaiqiZzTime: [],
LeaderList: [],
kaiqiZzTitle: "", kaiqiZzTitle: "",
kaiqiZzLoading: false, kaiqiZzLoading: false,
kaiqiZzMsg: { kaiqiZzMsg: {
...@@ -920,6 +941,28 @@ export default { ...@@ -920,6 +941,28 @@ export default {
isFrozen: true, isFrozen: true,
componentName: "TCNUMJump" componentName: "TCNUMJump"
}, },
{
field: "LeaderName",
title: "领队",
width: 60,
titleAlign: "left",
columnAlign: "left",
isResize: true,
result: [],
type: "select",
isFrozen: true
},
{
field: "GuideName",
title: "导游",
width: 60,
titleAlign: "left",
columnAlign: "left",
isResize: true,
result: [],
type: "select",
isFrozen: true
},
{ {
field: "Is_Transport", field: "Is_Transport",
title: "是否有联运支出", title: "是否有联运支出",
...@@ -1570,6 +1613,23 @@ export default { ...@@ -1570,6 +1613,23 @@ export default {
} }
}) })
}, },
//获取领队和导游
GetLeaderList() {
this.LeaderList=[];
this.msg.LeaderId=0;
let msg = {
Type: this.msg.LeaderType,
}
this.apipost(
'leader_post_GetList', msg,
res => {
if (res.data.resultCode == 1) {
this.LeaderList = res.data.data;
}
},
err => {}
)
},
getLineTeamList(lineId,PlaceId) { getLineTeamList(lineId,PlaceId) {
......
<style> <style>
.BusedHeight { .BusedHeight {
display: block !important; display: block !important;
height: 450px; height: 550px;
} }
.FinaceItem span{ .FinaceItem span{
display: inline-block; display: inline-block;
...@@ -318,6 +318,13 @@ ...@@ -318,6 +318,13 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row>
<el-col :span="8" :gutter="35">
<el-form-item label="制单备注">
<el-input v-model="addMsg.Remark" type="textarea" rows="2" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row> <el-row>
<el-col :span="4" :gutter="35"> <el-col :span="4" :gutter="35">
<el-form-item label="团队编号"> <el-form-item label="团队编号">
...@@ -464,6 +471,7 @@ export default { ...@@ -464,6 +471,7 @@ export default {
f_rate:'', f_rate:'',
ClientID:0, ClientID:0,
PayDate:'', PayDate:'',
Remark:'',
VorList:[] VorList:[]
}, },
dataList: [], dataList: [],
...@@ -715,6 +723,7 @@ export default { ...@@ -715,6 +723,7 @@ export default {
f_rate:'', f_rate:'',
ClientID:0, ClientID:0,
PayDate:'', PayDate:'',
Remark:'',
VorList:[] VorList:[]
}; };
this.Year = ''; this.Year = '';
......
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