Skip to content

S
SuperMan
Commit 59d07781 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent a58e2ccd
Hide whitespace changes
Inline Side-by-side
Showing with 144 additions and 95 deletions
src/components/TravelManager/TravelTeam/chooseCustomer.vue 0 → 100644
View file @ 59d07781
<style>
</style>
<template>
<el-card class="box-card">
<div slot="header" class="clearfix">
<span>选择同行</span>
<el-button style="float: right; padding: 3px 0" type="text" @click="sureData">确认选择</el-button>
</div>
<div class="chooseCustomerInfo">
<el-table :data="dataList" style="width:100%" border v-loading='loading'
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="55">
</el-table-column>
<el-table-column fixed label="同行名称" min-width="180">
<template slot-scope="scope">
{{scope.row.CustomerName}}
</template>
</el-table-column>
<el-table-column fixed label="联系电话" min-width="180">
<template slot-scope="scope">
{{scope.row.ContactNumber}}
</template>
</el-table-column>
<el-table-column fixed label="关联销售" min-width="180">
<template slot-scope="scope">
{{scope.row.EmName}}
</template>
</el-table-column>
<el-table-column fixed label="地址" min-width="180">
<template slot-scope="scope">
{{scope.row.Address}}
</template>
</el-table-column>
</el-table>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="qMsg.currentPage"
layout="total,prev, pager, next, jumper" :page-size="qMsg.pageSize" :total="qMsg.total">
</el-pagination>
</div>
</el-card>
</template>
<script>
export default {
data() {
return {
loading: false,
dataList: [], //数据列表
qMsg: {
pageIndex: 1,
currentPage: 1,
pageSize: 8,
total: 0,
},
saveLoading: false, //保存loading
selectData: [],
};
},
created() {
},
mounted() {
this.getCustomerList();
},
methods: {
//确认选择
sureData() {
this.$emit("success", this.selectData);
},
handleSelectionChange(val) {
var selectRow = JSON.parse(JSON.stringify(val));
this.selectData = selectRow;
},
//翻页
handleCurrentChange(val) {
this.qMsg.pageIndex = val;
this.getCustomerList();
},
// 获取合作伙伴列表
getCustomerList() {
this.loading = true;
this.apipost(
"app_customer_GetCustomerListForCareOf",
this.qMsg,
(res) => {
this.loading = false;
if (res.data.resultCode == 1) {
this.dataList = res.data.data.pages.pageData;
this.qMsg.total = res.data.data.pages.count;
} else {
this.$message.error(res.data.message);
}
},
(err) => {
this.loading = false;
}
);
},
},
};
</script>
src/components/TravelManager/TravelTeam/editTeamInfo.vue
View file @ 59d07781
...@@ -443,17 +443,11 @@ ...@@ -443,17 +443,11 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="合作伙伴"> <el-form-item label="合作伙伴">
<!-- <el-select @change="onChange" remote :remote-method="getCustomerList" :loading="loading" multiple <template v-for="(subItem,subIndex) in friendList">
v-model="friendValue" filterable :placeholder="$t('system.ph_choice')" style="100%"> <el-tag :key="subIndex+10000" style="margin-right:10px;" closable @close="deleteCustomer(subIndex)">
<el-option v-for="item in friendList" :key="item.ID" :label="item.CustomerName" :value="item.ID"> {{subItem.CustomerName}}</el-tag>
</el-option> </template>
</el-select> --> <el-button @click="showCustomer">选择</el-button>
<el-select @change="onChange" multiple v-model="friendValue" filterable
:placeholder="$t('system.ph_choice')" style="100%">
<el-option v-for="item in friendList" :key="item.ID" :label="item.CustomerName" :value="item.ID">
</el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -492,12 +486,20 @@ ...@@ -492,12 +486,20 @@
</el-row> </el-row>
</div> </div>
</el-form> </el-form>
<el-dialog class="app-attachment-dialog" width="400" title="选择客户" :visible.sync="isShowCustomerDialog"
:close-on-click-modal="false" append-to-body>
<chooseCustomer v-if="isShowCustomerDialog" @success="refreshPage"></chooseCustomer>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import chooseCustomer from "../TravelTeam/chooseCustomer"; //新增修改包机团
export default { export default {
name: 'addInfo', name: 'addInfo',
props: ["Q_GTeamId"], props: ["Q_GTeamId"],
components: {
chooseCustomer
},
data() { data() {
return { return {
loading: false, loading: false,
...@@ -533,43 +535,14 @@ ...@@ -533,43 +535,14 @@
message: "请输入中心价格", message: "请输入中心价格",
trigger: "blur", trigger: "blur",
}, ], }, ],
Remark: [{
required: true,
message: "请输入备注",
trigger: "blur",
}, ],
C_StartAddress: [{
required: true,
message: "请输入出发地点",
trigger: "change",
}, ],
C_ReturnAddress: [{
required: true,
message: "请输入返回地点",
trigger: "change",
}, ],
C_AdultNum: [{
required: true,
message: "请输入成人数",
trigger: "change",
}, ],
C_PayDate: [{
required: true,
message: "请选择支付日期",
trigger: "change",
}, ],
}, },
//合作伙伴
friendValue: [], friendList: [],
friendList: [ //新增修改航班信息
],
addMsg: { addMsg: {
TicketType: 2, TicketType: 2,
flightList: [], flightList: [],
}, },
addGoFlight: {},
AirportNameList: [], AirportNameList: [],
BackAirportNameList: [], BackAirportNameList: [],
airlineList: [], airlineList: [],
...@@ -621,12 +594,12 @@ ...@@ -621,12 +594,12 @@
AirLineID: "", AirLineID: "",
}, },
saveLoading: false, //保存loading saveLoading: false, //保存loading
isShowCustomerDialog: false, //是否显示选择客户弹窗
}; };
}, },
created() { created() {
this.customers = [] this.customers = []
this.initAirlines(); this.initAirlines();
this.getCustomerList();
}, },
mounted() { mounted() {
if (this.Q_GTeamId) { if (this.Q_GTeamId) {
...@@ -634,12 +607,25 @@ ...@@ -634,12 +607,25 @@
} }
}, },
methods: { methods: {
onChange(value) { //删除客户
this.friendList.forEach(item => { deleteCustomer(index) {
if (value.includes(item.ID) && this.customers.findIndex((el) => item.ID === el.ID) === -1) { this.friendList.splice(index, 1);
this.customers.push(item) },
} //显示客户
}) showCustomer() {
this.isShowCustomerDialog = true;
},
//刷新页面
refreshPage(selectArray) {
if (selectArray && selectArray.length > 0) {
selectArray.forEach(item => {
this.friendList.push({
CustomerId: item.CustomerId,
CustomerName: item.CustomerName
})
});
}
this.isShowCustomerDialog = false;
}, },
// 获取包机详情 // 获取包机详情
getDetail(id) { getDetail(id) {
...@@ -660,47 +646,13 @@ ...@@ -660,47 +646,13 @@
item.TicketType = Math.random() > 0.5 ? 1 : 2; item.TicketType = Math.random() > 0.5 ? 1 : 2;
}); });
this.addMsg.flightList = TravelTeamFlightList; this.addMsg.flightList = TravelTeamFlightList;
this.friendValue = TravelTeamPartnerList; this.friendList = TravelTeamPartnerList;
} else { } else {
this.$message.error(res.data.message); this.$message.error(res.data.message);
} }
} }
); );
}, },
// 获取合作伙伴列表
getCustomerList() {
var qMsg = {
pageIndex: 1,
pageSize: 1000,
};
this.loading = true
this.apipost(
"app_customer_GetCustomerListForCareOf",
qMsg,
(res) => {
this.loading = false
if (res.data.resultCode == 1) {
this.customerListAll = [];
res.data.data.pages.pageData.forEach((item) => {
this.customerListAll.push(item.CustomerId);
item.CustomerIdS = item.CustomerId;
item.CustomerId =
item.CustomerId +
"|" +
item.EmployeeId +
"|" +
item.RB_Department_Id;
item["disabled"] = false;
item.Address = item.Address.split(",").join("");
});
this.friendList = res.data.data.pages.pageData;
} else {
this.$message.error(res.data.message);
}
},
(err) => {}
);
},
//初始化航空公司下拉 //初始化航空公司下拉
initAirlines() { initAirlines() {
this.apipost( this.apipost(
...@@ -795,17 +747,12 @@ ...@@ -795,17 +747,12 @@
}, },
addAward() { addAward() {
this.editForm.TravelTeamFlightList = this.addMsg.flightList; this.editForm.TravelTeamFlightList = this.addMsg.flightList;
this.editForm.TravelTeamPartnerList = this.customers.map((item) => { this.editForm.TravelTeamPartnerList = this.friendList;
return {
...item,
CustomerId: item.ID
};
});
this.saveLoading = true; this.saveLoading = true;
// if (!this.editForm.TravelTeamPartnerList.length) { if (!this.editForm.TravelTeamPartnerList.length) {
// this.Warning("请选择合作伙伴"); this.Warning("请选择合作伙伴");
// return; return;
// } }
// if ( // if (
// this.editForm.TravelTeamFlightList.findIndex( // this.editForm.TravelTeamFlightList.findIndex(
// (item) => item.TicketType === 1 // (item) => item.TicketType === 1
......
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