Skip to content

S
SuperMan
Commit 09e7f285 authored by youjie's avatar youjie
Browse files
Options

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

parents b2b19e8e a31ca5d9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 517 additions and 121 deletions
src/components/SalesModule/Common/productOrderList.vue
View file @ 09e7f285
......@@ -475,6 +475,10 @@
display: flex;
justify-content: center;
}
.line-down:hover {
text-decoration: underline;
color: #333;
}
</style>
<template>
......@@ -497,9 +501,10 @@
<div v-if="item.IsWarning === 1" class="product_warning"></div>
<div class="d12" style="float: none; margin: auto"
:style="{ width: pagesTitle == '跟团游产品' ? '200px' : 'auto' }">
<div>
<p><i class="iconfont icon-biaoti1"></i> {{ item.LineName }}</p>
<p class="d12TC">{{ item.TCNUM }}（{{ item.TCID }}）</p>
<p>{{ item.LtName }}</p>
<p class="d12TC line-down" style="cursor: pointer" @click="goUrlT('productQuery',item.TCNUM,'产品查询')">{{ item.TCNUM }}（{{ item.TCID }}）</p>
<p>{{ item.LtName }}</p></div>
<el-tooltip class="item" effect="dark" :content="item.Title" placement="top-start"
popper-class="max-w250">
<p class="d12p" @click="getTitledetail(item)" :title="item.Title">
......@@ -519,7 +524,7 @@
</div>
</div>
<div class="d5">
<p>
<p class="line-down" style="cursor: pointer" @click="goUrlT('RegistrationList',item.TCID,'报名清单')">
<span>{{ $t("visa.v_yibaoru") }}</span><i>{{ item.Seat == "" ? "0" : item.Seat
}}{{ $t("salesModule.PeoPle") }}</i>({{ $t("Operation.Op_takeSeat") }}：{{ item.Occupied
}}{{ $t("salesModule.PeoPle") }})
......@@ -601,132 +606,126 @@
</el-dialog>
</div>
</template>
<script>
export default {
props: ["loading", "list", "pagesTitle", "isVisa"],
data() {
return {
editNum: false,
showDialog: false,
queryData: {},
EmployeeList: [],
allCheck: false,
//当前登录用户信息
CurrentUserInfo: {},
travelControlTripLayerShow: false,
wxLoading: false,
userId: "",
outerVisible: false,
tripTitle: "",
tripDetails: [],
TCIDList: null,
tripObj: {
tcid: 0,
configId: 0,
cityId: 0,
orderId: 0,
},
showHotelObj: {
showPrice: false,
showPay: false,
showZhan: false,
},
qjGroupId: -1,
S_Travel_Share: false, //分享权限
userInfo: {},
crmOrderObj: null,
isShowTeamOrder: false, //是否显示订单弹窗
teamInfo: {}, //团队信息
};
},
components: {},
filters: {
priceFormat(value) {
if (value == null) {
return 0.0;
}
let nStr = value.toFixed(2);
nStr += "";
let x = nStr.split(".");
let x1 = x[0];
let x2 = x.length > 1 ? "." + x[1] : "";
var rgx = /(\d+)(\d{3})/;
while (rgx.test(x1)) {
x1 = x1.replace(rgx, "$1" + "," + "$2");
}
return x1 + x2;
export default {
props: ["loading", "list", "pagesTitle", "isVisa"],
data() {
return {
editNum: false,
showDialog: false,
queryData: {},
EmployeeList: [],
allCheck: false,
//当前登录用户信息
CurrentUserInfo: {},
travelControlTripLayerShow: false,
wxLoading: false,
userId: "",
outerVisible: false,
tripTitle: "",
tripDetails: [],
TCIDList: null,
tripObj: {
tcid: 0,
configId: 0,
cityId: 0,
orderId: 0,
},
priceFormat2(value) {
if (value == null) {
return "已包含";
}
let nStr = value.toFixed(2);
nStr += "";
let x = nStr.split(".");
let x1 = x[0];
let x2 = x.length > 1 ? "." + x[1] : "";
var rgx = /(\d+)(\d{3})/;
while (rgx.test(x1)) {
x1 = x1.replace(rgx, "$1" + "," + "$2");
}
let result = x1 + x2;
if (result === "0.00") {
result = "已包含";
}
return result;
showHotelObj: {
showPrice: false,
showPay: false,
showZhan: false,
},
qjGroupId: -1,
S_Travel_Share: false, //分享权限
userInfo: {},
crmOrderObj: null,
isShowTeamOrder: false, //是否显示订单弹窗
teamInfo: {}, //团队信息
};
},
components: {},
filters: {
priceFormat(value) {
if (value == null) {
return 0.0;
}
let nStr = value.toFixed(2);
nStr += "";
let x = nStr.split(".");
let x1 = x[0];
let x2 = x.length > 1 ? "." + x[1] : "";
var rgx = /(\d+)(\d{3})/;
while (rgx.test(x1)) {
x1 = x1.replace(rgx, "$1" + "," + "$2");
}
return x1 + x2;
},
methods: {
changeSelect() {
this.list.forEach((element) => {
element.check = this.allCheck;
});
},
changeSelectItem() {
const listTmp = JSON.parse(JSON.stringify(this.list));
this.list = [];
this.$nextTick(() => {
this.list = listTmp;
});
},
submitOP() {
let params = {
TCIDs: this.TCIDs,
Type: this.isVisa ? 1 : 0
};
if (!this.isVisa) {
priceFormat2(value) {
if (value == null) {
return "已包含";
}
let nStr = value.toFixed(2);
nStr += "";
let x = nStr.split(".");
let x1 = x[0];
let x2 = x.length > 1 ? "." + x[1] : "";
var rgx = /(\d+)(\d{3})/;
while (rgx.test(x1)) {
x1 = x1.replace(rgx, "$1" + "," + "$2");
}
let result = x1 + x2;
if (result === "0.00") {
result = "已包含";
}
return result;
},
},
methods: {
changeSelect() {
console.log("changeSelect");
this.list.forEach((element) => {
element.check = this.allCheck;
});
},
changeSelectItem() {
const listTmp = JSON.parse(JSON.stringify(this.list));
this.list = [];
this.$nextTick(() => {
this.list = listTmp;
});
},
submitOP() {
let params = { TCIDs: this.TCIDs, Type: this.isVisa ? 1 : 0 };
if (!this.isVisa) {
params.OPId = this.queryData.OPId;
if (!this.queryData.AssistantId || !this.queryData.AssistantId.length) {
params.AssistantId = '';
} else {
params.AssistantId = this.queryData.AssistantId.join(",");
}
if (!this.queryData.AssistantId || !this.queryData.AssistantId.length) {
params.AssistantId = '';
} else {
params.AssistantId = this.queryData.AssistantId.join(",");
}
}
params.VisaOPId = this.queryData.VisaOPId;
if (
!this.queryData.VisaAssistantId ||
!this.queryData.VisaAssistantId.length
) {
params.VisaAssistantId = ''
if (
!this.queryData.VisaAssistantId ||
!this.queryData.VisaAssistantId.length
) {
params.VisaAssistantId = ''
} else {
params.VisaAssistantId = this.queryData.VisaAssistantId.join(",");
}
if (this.editNum) {
if (this.queryData.VisaNum > this.editObj.NeedVisaNum) {
this.$message.error("签证人数最多" + this.editObj.NeedVisaNum + "人");
return;
} else {
params.VisaAssistantId = this.queryData.VisaAssistantId.join(",");
params.VisaNum = this.queryData.VisaNum;
}
if (this.editNum) {
if (!this.queryData.VisaNum) {
this.$message.error("请填写签证人数");
return;
} else if (this.queryData.VisaNum > this.editObj.NeedVisaNum) {
this.$message.error("签证人数最多" + this.editObj.NeedVisaNum + "人");
return;
} else {
params.VisaNum = this.queryData.VisaNum;
}
}
this.apipost(
"travel_post_BatchSetOpInfo",
params,
(res) => {
}
this.apipost(
"travel_post_BatchSetOpInfo",
params,
(res) => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message || "操作成功");
this.showDialog = false;
......@@ -774,7 +773,7 @@
//根据当前员工所在部门获取该部门及子部门员工信息
getEmployeeList() {
this.apipost(
"admin_get_EmployeeGetList", {},
"admin_get_GetEmpByDepPostNameList", {},
(res) => {
if (res.data.resultCode == 1) {
this.EmployeeList = res.data.data;
......@@ -922,6 +921,18 @@
var B2BDomain = this.CurrentUserInfo.B2BDomain;
this.$tripUtils.GotoB2CPage(B2BDomain, item.ConfigID, item.TCID);
},
goUrlT(path, obj, outItem, title) {
console.log('goUrlTO',path, obj, outItem, title)
this.$router.push({
name: path,
query: {
"id": obj,
NewCombinationNum: outItem.NewCombinationNum,
blank: 'y',
tab: title
}
})
},
},
mounted() {
this.getEmployeeList();
......
src/components/SalesModule/customerApprovalFor.vue 0 → 100644
View file @ 09e7f285
This diff is collapsed.
src/router/config.js
View file @ 09e7f285
......@@ -3188,6 +3188,14 @@ export default {
title: '客户审批'
},
},
{ // 销售 月结客户审批
path: '/customerApprovalFor',
name: 'customerApprovalFor',
component: resolve => require(['@/components/SalesModule/customerApprovalFor'], resolve),
meta: {
title: '月结客户审批'
},
},
{ // 销售 销售任务详情
path: '/saleTaskDetail',
name: 'saleTaskDetail',
......
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