Skip to content

C
CRM
Commit e4323fce authored by 罗超's avatar 罗超
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/huaguohao/crm 

# Conflicts:
#	src/components/customerManage/orderDetailsDrawer.vue
#	src/components/customerManage/orderList.vue
parents 59d305cf 2385084b
Show whitespace changes
Inline Side-by-side
Showing with 1066 additions and 1130 deletions
src/components/contractManagement/contractManagement.vue
View file @ e4323fce
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
</div> </div>
<div> <div>
<el-pagination class="Mypagination" background @current-change="handleCurrentChange" <el-pagination class="Mypagination" background @current-change="handleCurrentChange"
:page-sizes="[30, 60, 90, 100]" :page-size="msg.pageSize" layout="total, sizes, prev, pager, next" :page-sizes="[15, 30, 60, 90, 100]" :page-size="msg.pageSize" layout="total, sizes, prev, pager, next"
@size-change="handleSizeChange" :total="total"> @size-change="handleSizeChange" :total="total">
</el-pagination> </el-pagination>
</div> </div>
......
src/components/customerManage/customerOrder.vue
View file @ e4323fce
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
<orderList :dataList="dataList" :loading="loading" @emptyMore="emptyMore" :superManage="superManage"></orderList> <orderList :dataList="dataList" :loading="loading" @emptyMore="emptyMore" :superManage="superManage"></orderList>
<div> <div>
<el-pagination class="Mypagination" background @current-change="handleCurrentChange" <el-pagination class="Mypagination" background @current-change="handleCurrentChange"
:page-sizes="[30, 60, 90, 100]" :page-size="msg.pageSize" layout="total, sizes, prev, pager, next" :page-sizes="[15, 30, 60, 90, 100]" :page-size="msg.pageSize" layout="total, sizes, prev, pager, next"
@size-change="handleSizeChange" :total="total"> @size-change="handleSizeChange" :total="total">
</el-pagination> </el-pagination>
</div> </div>
...@@ -214,6 +214,24 @@ ...@@ -214,6 +214,24 @@
}, },
data() { data() {
return { return {
MultipleChoiceList: [ //多选项目
{
Name: '机票',
Id: '1'
}, {
Name: '签证',
Id: '2'
}, {
Name: '地接',
Id: '3'
}, {
Name: '套餐',
Id: '4'
}, {
Name: '其他',
Id: '5'
}
],
superManage:"订单统计", superManage:"订单统计",
StatModel:{},// 合计 StatModel:{},// 合计
loading:false, loading:false,
...@@ -351,6 +369,18 @@ ...@@ -351,6 +369,18 @@
}); });
}; };
addList(data); addList(data);
data.forEach(item=>{
if(item.OrderType){
let list = item.OrderType&&item.OrderType.split(',')
for(let j=0;j<list.length;j++){
for(let i=0;i<this.MultipleChoiceList.length;i++){
if(list[j]==this.MultipleChoiceList[i].Id){
item.MultipleChoiceList.push(this.MultipleChoiceList[i])
}
}
}
}
})
this.dataList = res.data.data.Data.pageData; this.dataList = res.data.data.Data.pageData;
this.total = res.data.data.Data.count; this.total = res.data.data.Data.count;
this.StatModel = res.data.data.StatModel this.StatModel = res.data.data.StatModel
......
src/components/customerManage/myCustomerOrder.vue
View file @ e4323fce
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
<orderList :dataList="dataList" :loading="loading" @emptyMore="emptyMore"></orderList> <orderList :dataList="dataList" :loading="loading" @emptyMore="emptyMore"></orderList>
<div> <div>
<el-pagination class="Mypagination" background @current-change="handleCurrentChange" <el-pagination class="Mypagination" background @current-change="handleCurrentChange"
:page-sizes="[30, 60, 90, 100]" :page-size="msg.pageSize" layout="total, sizes, prev, pager, next" :page-sizes="[15, 30, 60, 90, 100]" :page-size="msg.pageSize" layout="total, sizes, prev, pager, next"
@size-change="handleSizeChange" :total="total"> @size-change="handleSizeChange" :total="total">
</el-pagination> </el-pagination>
</div> </div>
...@@ -197,6 +197,24 @@ ...@@ -197,6 +197,24 @@
}, },
data() { data() {
return { return {
MultipleChoiceList: [ //多选项目
{
Name: '机票',
Id: '1'
}, {
Name: '签证',
Id: '2'
}, {
Name: '地接',
Id: '3'
}, {
Name: '套餐',
Id: '4'
}, {
Name: '其他',
Id: '5'
}
],
StatModel:{},// 合计 StatModel:{},// 合计
loading:false, loading:false,
total:0, total:0,
...@@ -332,6 +350,18 @@ ...@@ -332,6 +350,18 @@
}); });
}; };
addList(data); addList(data);
data.forEach(item=>{
if(item.OrderType){
let list = item.OrderType&&item.OrderType.split(',')
for(let j=0;j<list.length;j++){
for(let i=0;i<this.MultipleChoiceList.length;i++){
if(list[j]==this.MultipleChoiceList[i].Id){
item.MultipleChoiceList.push(this.MultipleChoiceList[i])
}
}
}
}
})
this.dataList = res.data.data.Data.pageData; this.dataList = res.data.data.Data.pageData;
this.total = res.data.data.Data.count; this.total = res.data.data.Data.count;
this.StatModel = res.data.data.StatModel this.StatModel = res.data.data.StatModel
......
src/components/customerManage/orderDetailsDrawer.vue
View file @ e4323fce
...@@ -19,13 +19,14 @@ ...@@ -19,13 +19,14 @@
flex-direction: column; flex-direction: column;
} }
.orderDetails-body .order-info { .orderDetails-body .order-info {
height: 115px;
padding: 30px; padding: 30px;
box-sizing: border-box; box-sizing: border-box;
font-size: 12px; font-size: 12px;
background-color: #f6f4fc; background-color: #f6f4fc;
} }
.orderDetails-body .order-info .order-lable-box { .order-lable-box {
display: flex;
justify-content: space-between;
color: #999999; color: #999999;
} }
.orderDetails-content { .orderDetails-content {
...@@ -35,6 +36,19 @@ ...@@ -35,6 +36,19 @@
.no-relative .el-tabs__content { .no-relative .el-tabs__content {
position: unset !important; position: unset !important;
} }
.order-lable-box:last-child {
margin-top: 20px;
}
.order-lable {
display: flex;
flex-direction: column;
}
.order-lable span:last-child {
font-size: 18px;
font-weight: bold;
color: #333;
margin-top: 5px;
}
</style> </style>
<template> <template>
<div class="orderDetails-box"> <div class="orderDetails-box">
...@@ -49,14 +63,14 @@ ...@@ -49,14 +63,14 @@
<div class="orderDetails-body"> <div class="orderDetails-body">
<div class="order-info"> <div class="order-info">
<div class="order-lable-box"> <div class="order-lable-box">
<div><span class="order-lable">关联销售：</span><span>5555</span></div> <div class="order-lable"><span>关联销售：</span><span>5555</span></div>
<div><span class="order-lable">订单号：</span><span >111</span></div> <div class="order-lable"><span>订单号：</span><span >111</span></div>
<div><span class="order-lable">客户姓名：</span><span>1</span></div> <div class="order-lable"><span>客户姓名：</span><span>1</span></div>
</div> </div>
<div> <div class="order-lable-box">
<div><span class="order-lable">性质：</span><span>1</span></div> <div class="order-lable"><span>性质：</span><span>1</span></div>
<div><span class="order-lable">形成概述：</span><span>111</span></div> <div class="order-lable"><span>形成概述：</span><span>111</span></div>
<div><span class="order-lable">状态：</span><span>1</span></div> <div class="order-lable"><span>状态：</span><span>1</span></div>
</div> </div>
</div> </div>
<div class="orderDetails-content"> <div class="orderDetails-content">
......
src/components/customerManage/orderList.vue
View file @ e4323fce
...@@ -58,7 +58,9 @@ ...@@ -58,7 +58,9 @@
<tbody v-for="(item, index) in dataList" :key="index"> <tbody v-for="(item, index) in dataList" :key="index">
<tr> <tr>
<td :rowspan="3"> <td :rowspan="3">
<p class="OrderId-text" @click="clickSingleNumber(item)">{{item.OrderId}}</p> <p class="OrderId-text" @click="clickSingleNumber(item)">{{item.OrderId}}
<!-- <span class="OrderType-text" v-for="(items,index) in item.MultipleChoiceList">{{items.Name}}</span> -->
</p>
<p class="CreateByName-text">{{item.CreateByName}}</p> <p class="CreateByName-text">{{item.CreateByName}}</p>
<p class="CreateByName-text">业务员：<span class="colorblue">{{item.EnterName}}</span></p> <p class="CreateByName-text">业务员：<span class="colorblue">{{item.EnterName}}</span></p>
<p>{{item.CreateTime}}</p> <p>{{item.CreateTime}}</p>
...@@ -89,11 +91,11 @@ ...@@ -89,11 +91,11 @@
{{item.TaxMoney}} {{item.TaxMoney}}
</td> </td>
<td style="border:none"> <td style="border:none">
{{item.DueinMoney}} <span :style="{color: item.DueinMoney!=0?'red':''}">{{item.DueinMoney}}</span>
</td> </td>
<td style="border:none"> <td style="border:none">
<p class="TicketVoucher-box"> <p class="TicketVoucher-box">
<span @click="modifyStatus(item)" <span @click="item.TicketStatusName!='无需机票'?modifyStatus(item):''"
class="cp tatusText" class="cp tatusText"
:class="item.TicketStatus==1?'grey': :class="item.TicketStatus==1?'grey':
(item.TicketStatus==2?'success': (item.TicketStatus==2?'success':
...@@ -101,7 +103,8 @@ ...@@ -101,7 +103,8 @@
(item.TicketStatus==4?'Black':'')))"> (item.TicketStatus==4?'Black':'')))">
{{item.TicketStatusName}} {{item.TicketStatusName}}
</span> </span>
<i v-if="item.TicketStatus!=1&&item.TicketVoucherList!=[]&&item.CancelVoucherList!=[]" class="iconfont iconpingzhengchaxun Credentials" @click="viewCredentials(item)"></i> <i v-if="item.TicketStatus!=1&&item.TicketVoucherList!=[]&&item.CancelVoucherList!=[]&&item.TicketStatusName!='无需机票'" class="iconfont iconpingzhengchaxun Credentials"
@click="viewCredentials(item)"></i>
</p> </p>
</td> </td>
...@@ -210,8 +213,8 @@ ...@@ -210,8 +213,8 @@
:label="item.Id">{{item.Name}}</el-radio> :label="item.Id">{{item.Name}}</el-radio>
</el-radio-group> </el-radio-group>
<div class="agreement-Cancel"> <div class="agreement-Cancel">
<span @click="popCancelClick(item,index,1)">取消</span> <span @click="popCancelClick(item,index,3)">取消</span>
<span @click="popClick(item,index,1)">确定</span> <span @click="popClick(item,index,3)">确定</span>
</div> </div>
</div> </div>
...@@ -228,7 +231,7 @@ ...@@ -228,7 +231,7 @@
<customerInfoBox :CustomerId="CustomerId" /> <customerInfoBox :CustomerId="CustomerId" />
</el-drawer> </el-drawer>
<!-- 单号抽屉 --> <!-- 单号抽屉 -->
<el-drawer :with-header="false" @closed="closeOrderDrawerHandler" size='70%' :visible.sync="orderDrawer" direction="rtl" :before-close="handleClose"> <el-drawer :with-header="false" size='70%' :visible.sync="orderDrawer" direction="rtl" :before-close="handleClose">
<orderDetailsDrawer v-if="currentOrder" :orderId="currentOrder.OrderId" /> <orderDetailsDrawer v-if="currentOrder" :orderId="currentOrder.OrderId" />
</el-drawer> </el-drawer>
...@@ -236,18 +239,18 @@ ...@@ -236,18 +239,18 @@
</template> </template>
<script> <script>
import customerInfoBox from "../guestManagement/customerInfoBox"; import customerInfoBox from "../guestManagement/customerInfoBox";
import orderDetailsDrawer from "./orderDetailsDrawer"; import orderDetailsDrawer from "./orderDetailsDrawer";
export default { export default {
components: { components: {
customerInfoBox, customerInfoBox,
orderDetailsDrawer, orderDetailsDrawer
}, },
props: { props: {
//订单 //订单
dataList: { dataList: {
type: Array, type: Array,
default: null, default: null
}, },
loading: { loading: {
type: Boolean, type: Boolean,
...@@ -255,155 +258,125 @@ export default { ...@@ -255,155 +258,125 @@ export default {
}, },
superManage: { superManage: {
type: String, type: String,
default: "", default: ""
}, }
}, },
data() { data() {
return { return {
MultipleChoiceList: [ MultipleChoiceList: [ //多选项目
//多选项目
{
Name: "机票",
Id: "1",
},
{
Name: "签证",
Id: "2",
},
{
Name: "地接",
Id: "3",
},
{ {
Name: "套餐", Name: '机票',
Id: "4", Id: '1'
}, }, {
Name: '签证',
Id: '2'
}, {
Name: '地接',
Id: '3'
}, {
Name: '套餐',
Id: '4'
}
], ],
userInfo: {}, userInfo: {},
MoreList: [ MoreList: [{
{ Name: '取消订单',
Name: "取消订单", Id: '1'
Id: "1", }, {
}, Name: '订单转交',
{ Id: '2'
Name: "订单转交", }, {
Id: "2", Name: '修改出票状态',
}, Id: '4'
{ }, {
Name: "修改出票状态", Name: '操作日志',
Id: "4", Id: '3'
}, }, ],
{ clickMore: '',
Name: "操作日志",
Id: "3",
},
],
clickMore: "",
drawer: false, drawer: false,
orderDrawer: false, orderDrawer: false,
CustomerId: "", CustomerId: '',
CustomerName: "", CustomerName: '',
currentOrder: null, currentOrder:null
}; };
}, },
created() {}, created() {
},
watch: { watch: {
loading: { loading: {
handler(val, oldVal) { handler(val, oldVal) {
this.loading = val; this.loading = val
},
deep: true,
}, },
deep: true
}
}, },
mounted() { mounted() {
this.userInfo = this.getLocalStorage(); this.userInfo = this.getLocalStorage();
let $this = this; let $this = this
$this.MsgBus.$on("closeBillMaking", function() { $this.MsgBus.$on("closeBillMaking", function() {
for (let i = 0; i < $this.dataList.length; i++) { for(let i=0;i<$this.dataList.length;i++){
$this.dataList[i].checkList = []; $this.dataList[i].checkList = []
$this.dataList[i].MultipleChoiceList = []; $this.dataList[i].selectedType = ""
$this.dataList[i].selectedType = ""; $this.dataList[i].actuallyReceived = false
$this.dataList[i].actuallyReceived = false; $this.dataList[i].cost = false
$this.dataList[i].cost = false;
} }
}); });
}, },
methods: { methods: {
// 多选发生变化 // 多选发生变化
clickMultipleChoice(row, index, num) { clickMultipleChoice(row, index, num) {
if (num == 1) { if(num == 1){
if (row.checkList.slice(-1)[0] == 4) { if(row.checkList.slice(-1)[0] == 4){
this.delType(row, 1); this.delType(row,1)
this.delType(row, 2); this.delType(row,2)
this.delType(row, 3); this.delType(row,3)
this.delType(row, 5); this.delType(row,5)
row.selectedType = row.checkList.join(","); row.selectedType = row.checkList.join(',')
} else if (row.checkList.slice(-1)[0] == 5) { }else if(row.checkList.slice(-1)[0] == 5){
this.delType(row, 1); this.delType(row,1)
this.delType(row, 2); this.delType(row,2)
this.delType(row, 3); this.delType(row,3)
this.delType(row, 4); this.delType(row,4)
row.selectedType = row.checkList.join(","); row.selectedType = row.checkList.join(',')
} else { }else{
this.delType(row, 4); this.delType(row,4)
this.delType(row, 5); this.delType(row,5)
row.selectedType = row.checkList.join(","); row.selectedType = row.checkList.join(',')
} }
} }
}, },
// 删除套餐值 // 删除套餐值
delType(row, item) { delType(row,item) {
for (let i = 0; i < row.checkList.length; i++) { for (let i = 0; i < row.checkList.length; i++) {
if (row.checkList[i] == item) { if (row.checkList[i] == item) {
row.checkList.splice(i, 1); row.checkList.splice(i, 1)
} }
} }
}, },
// 取消 // 取消
popCancelClick(row, index, num) { popCancelClick(row, index, num){
if (num == 1) { this.dataList.forEach(item=>{
} item.checkList = []
this.dataList.forEach((item) => { item.selectedType = ''
return (item.actuallyReceived = false); item.actuallyReceived =false
}); item.cost =false
})
if (num == 3) {
}
this.dataList.forEach((item) => {
return (item.cost = false);
});
this.dataList.forEach((item) => {
item.checkList = [];
item.MultipleChoiceList = [];
item.selectedType = "";
});
}, },
// 确定弹窗 // 确定弹窗
popClick(row, index, num) { popClick(row, index, num){
if (!row.selectedType) { if(!row.selectedType){
this.$message.warning("请选择类型!"); this.$message.warning('请选择类型!');
return; return
}
this.makeAdocumentFun(row, index, num);
if (num == 1) {
if (this.dataList[index].checkList.length == 1) {
} else {
this.dataList[index].actuallyReceived = false;
}
}
if (num == 3) {
this.dataList[index].cost = false;
} }
this.makeAdocumentFun(row, index, num)
this.dataList[index].actuallyReceived =false
this.dataList[index].cost =false
}, },
// 点击单号 // 点击单号
clickSingleNumber(item) { clickSingleNumber(item){
this.currentOrder = item; this.currentOrder=item
this.orderDrawer = true; this.orderDrawer = true
},
closeOrderDrawerHandler() {
this.currentOrder = null;
this.orderDrawer = false;
}, },
handleClose(done) { handleClose(done) {
done(); done();
...@@ -416,219 +389,160 @@ export default { ...@@ -416,219 +389,160 @@ export default {
// 查看出票凭据 // 查看出票凭据
viewCredentials(row) { viewCredentials(row) {
let $this = this; let $this = this;
this.MsgBus.$emit( this.MsgBus.$emit("CredentialsOrderTicketOrderBoxOpen", $this.ID, row, true);
"CredentialsOrderTicketOrderBoxOpen",
$this.ID,
row,
true
);
}, },
chooseMore(row) { chooseMore(row) {
// 取消订单 // 取消订单
if (row.More == "1") { if (row.More == '1') {
this.cancelOrder(row); this.cancelOrder(row)
} }
// 订单转换 // 订单转换
if (row.More == "2") { if (row.More == '2') {
this.convertOrder(row); this.convertOrder(row)
} }
// 操作日志 // 操作日志
if (row.More == "3") { if (row.More == '3') {
this.operationLog(row); this.operationLog(row)
} }
// 修改出票状态 // 修改出票状态
if (row.More == "4") { if (row.More == '4') {
this.modifyStatus(row); this.modifyStatus(row)
} }
// 编辑订单金额 // 编辑订单金额
if (row.More == "5") { if (row.More == '5') {
this.editOrderAmount(row); this.editOrderAmount(row)
} }
}, },
// 转换订单 // 转换订单
convertOrder(row) { convertOrder(row) {
this.MsgBus.$emit( this.MsgBus.$emit("convertOrderTicketOrderBoxOpen", row.GuestId, row, true);
"convertOrderTicketOrderBoxOpen",
row.GuestId,
row,
true
);
}, },
// 验证操作员 // 验证操作员
ValidateOperator() { ValidateOperator() {
this.$message({ this.$message({
type: "warning", type: 'warning',
message: "抱歉,该订单您没有操作权限!", message: '抱歉,该订单您没有操作权限!'
}); });
this.$emit("emptyMore"); this.$emit('emptyMore')
}, },
// 制作单据 // 制作单据
makeAdocument(row, index, num) { makeAdocument(row, index, num) {
this.dataList[index].MultipleChoiceList = []; let list = row.OrderType&&row.OrderType.split(',')
let list = row.OrderType && row.OrderType.split(",");
if(list!=null&&list.length>1&&num==1){
this.dataList.forEach(item=>{
return item.cost = false
})
this.dataList.forEach(item=>{
return item.actuallyReceived = false
})
this.dataList[index].actuallyReceived = true
if (list != null && list.length > 1 && num == 1) {
this.dataList.forEach((item) => {
return (item.cost = false);
});
this.dataList.forEach((item) => {
return (item.actuallyReceived = false);
});
this.dataList[index].actuallyReceived = true;
for (let j = 0; j < list.length; j++) {
for (let i = 0; i < this.MultipleChoiceList.length; i++) {
if (list[j] == this.MultipleChoiceList[i].Id) {
this.dataList[index].MultipleChoiceList.push(
this.MultipleChoiceList[i]
);
}
}
}
} else if (list != null && list.length > 1 && num == 3) {
this.dataList.forEach((item) => {
return (item.actuallyReceived = false);
});
this.dataList.forEach((item) => {
return (item.cost = false);
});
this.dataList[index].cost = true;
for (let j = 0; j < list.length; j++) {
for (let i = 0; i < this.MultipleChoiceList.length; i++) {
if (list[j] == this.MultipleChoiceList[i].Id) {
this.dataList[index].MultipleChoiceList.push(
this.MultipleChoiceList[i]
);
}
}
} }
} else { else if(list!=null&&list.length>1&&num==3){
this.makeAdocumentFun(row, index, num); this.dataList.forEach(item=>{
return item.actuallyReceived = false
})
this.dataList.forEach(item=>{
return item.cost = false
})
this.dataList[index].cost = true
}else{
this.makeAdocumentFun(row, index, num)
} }
}, },
makeAdocumentFun(row, index, num) { makeAdocumentFun(row, index, num){
let list = row.OrderType && row.OrderType.split(","); let type
type = num == 1 ? 1 : 2 // 1收款 2退款 3成本
let href
let url = this.domainManager().erpRoutingUrl
let data
let list = row.OrderType&&row.OrderType.split(',')
if (this.userInfo.EmName != row.EnterName) { if (this.userInfo.EmName != row.EnterName) {
this.ValidateOperator(); this.ValidateOperator()
} else { } else {
if (row.OrderStatus != "2") { if (row.OrderStatus != '2') {
if (list && list.length > 1) { if(list&&list.length>1){
let typeList = row.selectedType.split(","); let typeList = row.selectedType.split(',')
if (num == "1" && typeList.length >= 2) { if(num==1&&typeList.length>=2){
let type;
type = num == 1 ? 1 : 2; // 1收款 2退款 3成本anceId2 = num
let $this = this; let $this = this;
row.ReFinanceId2 = num; row.ReFinanceId2 = num
this.MsgBus.$emit("BillMakingOrderBoxOpen", $this.ID, row, true); this.MsgBus.$emit("BillMakingOrderBoxOpen", $this.ID, row, true);
} }if(typeList.length==1&&num=='1'||num=='3'){
if ((typeList.length == 1 && num == "1") || num == "3") { data = [{
let type; path: 'ChoiceAddFinancialDocuments',
type = num == 1 ? 1 : 2; // 1收款 2退款 3成本
let href;
let url = this.domainManager().erpRoutingUrl;
let data = [
{
path: "ChoiceAddFinancialDocuments",
type: type, type: type,
OtherType: 55, OtherType: 55,
ReFinanceId: row.OrderId, ReFinanceId: row.OrderId,
ReFinanceId2: num, ReFinanceId2: num,
GuestId: row.GuestId, GuestId: row.GuestId,
RelevanceFrId: row.selectedType, // 单据类型 RelevanceFrId: row.selectedType, // 单据类型
}, }]
]; href = url + 'automaticLogin?token=' + this.getLocalStorage().token + '&data=' + JSON.stringify(data)
href =
url +
"automaticLogin?token=" +
this.getLocalStorage().token +
"&data=" +
JSON.stringify(data);
window.open(href); window.open(href);
for (let i = 0; i < this.dataList.length; i++) { for(let i=0;i<this.dataList.length;i++){
this.dataList[i].checkList = []; this.dataList[i].checkList = []
this.dataList[i].MultipleChoiceList = []; this.dataList[i].selectedType = ""
this.dataList[i].selectedType = ""; this.dataList[i].actuallyReceived = false
this.dataList[i].actuallyReceived = false; this.dataList[i].cost = false
this.dataList[i].cost = false; }
} }if(num=='2'){
} data = [{
if (num == "2") { path: 'ChoiceAddFinancialDocuments',
let type;
type = num == 1 ? 1 : 2; // 1收款 2退款 3成本
let href;
let url = this.domainManager().erpRoutingUrl;
let data = [
{
path: "ChoiceAddFinancialDocuments",
type: type, type: type,
OtherType: 55, OtherType: 55,
ReFinanceId: row.OrderId, ReFinanceId: row.OrderId,
ReFinanceId2: num, ReFinanceId2: num,
GuestId: row.GuestId, GuestId: row.GuestId,
}, }]
]; href = url + 'automaticLogin?token=' + this.getLocalStorage().token + '&data=' + JSON.stringify(data)
href =
url +
"automaticLogin?token=" +
this.getLocalStorage().token +
"&data=" +
JSON.stringify(data);
window.open(href); window.open(href);
for (let i = 0; i < this.dataList.length; i++) { for(let i=0;i<this.dataList.length;i++){
this.dataList[i].checkList = []; this.dataList[i].checkList = []
this.dataList[i].MultipleChoiceList = []; this.dataList[i].selectedType = ""
this.dataList[i].selectedType = ""; this.dataList[i].actuallyReceived = false
this.dataList[i].actuallyReceived = false; this.dataList[i].cost = false
this.dataList[i].cost = false;
} }
} }
} else {
let type; }else{
type = num == 1 ? 1 : 2; // 1收款 2退款 3成本 if(num==1||num==2){
let href; data = [{
let url = this.domainManager().erpRoutingUrl; path: 'ChoiceAddFinancialDocuments',
let data;
if (num == 1 || num == 2) {
data = [
{
path: "ChoiceAddFinancialDocuments",
type: type, type: type,
OtherType: 55, OtherType: 55,
ReFinanceId: row.OrderId, ReFinanceId: row.OrderId,
ReFinanceId2: num, ReFinanceId2: num,
GuestId: row.GuestId, GuestId: row.GuestId,
RelevanceFrId: row.OrderType, // 单据类型 RelevanceFrId: row.OrderType, // 单据类型
}, }]
];
} }
if (num == 3) { if(num==3){
data = [ data = [{
{ path: 'ChoiceAddFinancialDocuments',
path: "ChoiceAddFinancialDocuments",
type: type, type: type,
OtherType: 55, OtherType: 55,
ReFinanceId: row.OrderId, ReFinanceId: row.OrderId,
ReFinanceId2: num, ReFinanceId2: num,
GuestId: row.GuestId, GuestId: row.GuestId,
}, }]
]; }
} href = url + 'automaticLogin?token=' + this.getLocalStorage().token + '&data=' + JSON.stringify(data)
href =
url +
"automaticLogin?token=" +
this.getLocalStorage().token +
"&data=" +
JSON.stringify(data);
window.open(href); window.open(href);
for (let i = 0; i < this.dataList.length; i++) { for(let i=0;i<this.dataList.length;i++){
this.dataList[i].checkList = []; this.dataList[i].checkList = []
this.dataList[i].MultipleChoiceList = []; this.dataList[i].selectedType = ""
this.dataList[i].selectedType = ""; this.dataList[i].actuallyReceived = false
this.dataList[i].actuallyReceived = false; this.dataList[i].cost = false
this.dataList[i].cost = false;
} }
} }
} }
} }
}, },
...@@ -639,22 +553,18 @@ export default { ...@@ -639,22 +553,18 @@ export default {
// 修改出票状态 // 修改出票状态
modifyStatus(row) { modifyStatus(row) {
if (this.superManage) { if (this.superManage) {
this.ModifyStatusfun(row); this.ModifyStatusfun(row)
} else { } else {
if (this.userInfo.EmName != row.EnterName) { if (this.userInfo.EmName != row.EnterName) {
this.ValidateOperator(); this.ValidateOperator()
} else { } else {
this.ModifyStatusfun(row); this.ModifyStatusfun(row)
} }
} }
}, },
ModifyStatusfun(row) { ModifyStatusfun(row) {
if ( if (row.TicketStatus == 3 || row.TicketStatus == 4 || row.OrderStatus == '2') {
row.TicketStatus == 3 || return
row.TicketStatus == 4 ||
row.OrderStatus == "2"
) {
return;
} else { } else {
this.MsgBus.$emit("reviseTicketOrderBoxOpen", row.GuestId, row, true); this.MsgBus.$emit("reviseTicketOrderBoxOpen", row.GuestId, row, true);
} }
...@@ -662,87 +572,71 @@ export default { ...@@ -662,87 +572,71 @@ export default {
// 取消订单 // 取消订单
cancelOrder(row) { cancelOrder(row) {
if (this.superManage) { if (this.superManage) {
this.cancelOrderfun(row); this.cancelOrderfun(row)
} else { } else {
if (this.userInfo.EmName != row.EnterName) { if (this.userInfo.EmName != row.EnterName) {
this.ValidateOperator(); this.ValidateOperator()
} else { } else {
this.cancelOrderfun(row); this.cancelOrderfun(row)
} }
} }
}, },
cancelOrderfun(row) { cancelOrderfun(row) {
if ( if (row.OrderStatus != '2' && row.IncomeFinance.length == 0 && row.BackFinance.length == 0 && row.PayFinance.length == 0) {
row.OrderStatus != "2" && let tips = '此操作将取消该订单，是否继续取消?'
row.IncomeFinance.length == 0 && this.$confirm(tips, '提示', {
row.BackFinance.length == 0 && confirmButtonText: '确定',
row.PayFinance.length == 0 cancelButtonText: '取消',
) { type: 'warning'
let tips = "此操作将取消该订单，是否继续取消?"; }).then(() => {
this.$confirm(tips, "提示", { this.apipost('/api/Order/SetGuestOrderState', {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.apipost(
"/api/Order/SetGuestOrderState",
{
OrderId: row.OrderId, OrderId: row.OrderId,
Type: "1", Type: '1',
}, }, res => {
(res) => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.$message.success(res.data.message); this.$message.success(res.data.message);
this.getList(); this.getList()
}
} }
);
}) })
.catch(() => { }).catch(() => {
this.$emit("emptyMore"); this.$emit('emptyMore')
this.$message({ this.$message({
type: "info", type: 'info',
message: "已取消", message: '已取消'
}); });
}); });
} else { } else {
this.$emit("emptyMore"); this.$emit('emptyMore')
} }
}, },
// 编辑订单 // 编辑订单
editOrder(row) { editOrder(row) {
if (this.superManage) { if (this.superManage) {
this.editOrderfun(row); this.editOrderfun(row)
} else { } else {
if (this.userInfo.EmName != row.EnterName) { if (this.userInfo.EmName != row.EnterName) {
this.ValidateOperator(); this.ValidateOperator()
} else { } else {
this.editOrderfun(row); this.editOrderfun(row)
} }
} }
}, },
editOrderfun(row) { editOrderfun(row) {
if (row.TicketStatus == 1 && row.OrderStatus == 1) { if (row.TicketStatus == 1 && row.OrderStatus == 1) {
this.MsgBus.$emit( this.MsgBus.$emit("editOrderTicketOrderBoxOpen", row.GuestId, row, true);
"editOrderTicketOrderBoxOpen",
row.GuestId,
row,
true
);
} else { } else {
this.$emit("emptyMore"); this.$emit('emptyMore')
} }
}, },
// 编辑订单金额 // 编辑订单金额
editOrderAmount(row) { editOrderAmount(row) {
if (this.superManage) { if (this.superManage) {
this.editOrderAmountfun(row); this.editOrderAmountfun(row)
} else { } else {
if (this.userInfo.EmName != row.EnterName) { if (this.userInfo.EmName != row.EnterName) {
this.ValidateOperator(); this.ValidateOperator()
} else { } else {
this.editOrderAmountfun(row); this.editOrderAmountfun(row)
} }
} }
}, },
...@@ -750,209 +644,204 @@ export default { ...@@ -750,209 +644,204 @@ export default {
if (row.TicketStatus == 1 && row.OrderStatus == 1) { if (row.TicketStatus == 1 && row.OrderStatus == 1) {
this.MsgBus.$emit("editTicketOrderBoxOpen", row.GuestId, row, true); this.MsgBus.$emit("editTicketOrderBoxOpen", row.GuestId, row, true);
} else { } else {
this.$emit("emptyMore"); this.$emit('emptyMore')
} }
}, },
openDetails(item) { openDetails(item) {
let href; let href
let url = this.domainManager().erpRoutingUrl; let url = this.domainManager().erpRoutingUrl
let data = [ let data = [{
{ path: 'FinancialDocumentsDetail',
path: "FinancialDocumentsDetail", id: item.FrID
id: item.FrID, }]
}, href = url + 'automaticLogin?token=' + this.getLocalStorage().token + '&data=' + JSON.stringify(data)
];
href =
url +
"automaticLogin?token=" +
this.getLocalStorage().token +
"&data=" +
JSON.stringify(data);
window.open(href); window.open(href);
}, },
// 获取出票状态枚举 // 获取出票状态枚举
GetTicketStatusEnumList() { GetTicketStatusEnumList() {
this.msg.GuestId = row.GuestId; this.msg.GuestId = row.GuestId
this.apipost("/api/Order/GetTicketStatusEnumList", {}, (res) => { this.apipost(
"/api/Order/GetTicketStatusEnumList", {},
(res) => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.ticketingStatusList = res.data.data; this.ticketingStatusList = res.data.data;
let data = { let data = {
Name: "全部", Name: '全部',
Id: "0", Id: '0'
}; }
this.ticketingStatusList.unshift(data); this.ticketingStatusList.unshift(data)
} else { } else {
this.$message.error(res.data.message); this.$message.error(res.data.message);
} }
}); }
}, );
}, },
}; }
};
</script> </script>
<style> <style>
li { li {
list-style-type: none; list-style-type: none;
} }
.classorder ul { .classorder ul {
padding: 0px; padding: 0px;
} }
.classorder .price-popup { .classorder .price-popup {
border-radius: 4px; border-radius: 4px;
} }
.classorder .el-range-editor .el-range-input { .classorder .el-range-editor .el-range-input {
background: none; background: none;
} }
.classorder .el-range-editor.el-input__inner { .classorder .el-range-editor.el-input__inner {
background-color: transparent; background-color: transparent;
} }
.classorder .q-mb-md { .classorder .q-mb-md {
margin-bottom: 0; margin-bottom: 0;
} }
.classorder .stics { .classorder .stics {
padding: 10px 20px; padding: 10px 20px;
background: #dddee0; background: #dddee0;
border-radius: 4px; border-radius: 4px;
font-size: 14px; font-size: 14px;
color: #000000; color: #000000;
font-weight: bold; font-weight: bold;
} }
.classorder .stics .stics-name { .classorder .stics .stics-name {
color: #2d2d2d; color: #2d2d2d;
font-weight: 600; font-weight: 600;
margin-right: 10px; margin-right: 10px;
} }
.classorder .tis { .classorder .tis {
margin: 10px 0; margin: 10px 0;
align-items: center; align-items: center;
} }
.classorder .tis .tis-k { .classorder .tis .tis-k {
width: 10px; width: 10px;
height: 10px; height: 10px;
margin-right: 8px; margin-right: 8px;
} }
.classorder .tis span { .classorder .tis span {
font-size: 14px; font-size: 14px;
color: #2d2d2d; color: #2d2d2d;
font-weight: 600; font-weight: 600;
margin-right: 20px; margin-right: 20px;
} }
.classorder table { .classorder table {
padding: 10px 0; padding: 10px 0;
width: 100%; width: 100%;
background-color: #ededed; background-color: #ededed;
border-collapse: collapse; border-collapse: collapse;
border: 1px solid #d2d2d2; border: 1px solid #d2d2d2;
font-size: 12px; font-size: 12px;
} }
.classorder table th { .classorder table th {
background-color: #ededed; background-color: #ededed;
height: 34px; height: 34px;
text-indent: 15px; text-indent: 15px;
} }
.enrollTotalSearchTable td { .enrollTotalSearchTable td {
background-color: #ffffff; background-color: #ffffff;
padding: 9px 15px; padding: 9px 15px;
color: #333333; color: #333333;
border: 1px solid rgba(138, 138, 138, 0.09); border: 1px solid rgba(138, 138, 138, 0.09);
text-align: left; text-align: left;
} }
.classorder table ._color_666 { .classorder table ._color_666 {
color: #666666; color: #666666;
} }
.classorder table tr._color_666 th { .classorder table tr._color_666 th {
padding: 9px 15px; padding: 9px 15px;
} }
.classorder table th { .classorder table th {
background-color: #ededed; background-color: #ededed;
height: 34px; height: 34px;
text-indent: 15px; text-indent: 15px;
} }
.classorder table td { .classorder table td {
background-color: #ffffff; background-color: #ffffff;
padding: 9px 15px; padding: 9px 15px;
color: #333333; color: #333333;
} }
.classorder table ._color_666 { .classorder table ._color_666 {
color: #666666; color: #666666;
} }
.classorder table tr._color_666 th { .classorder table tr._color_666 th {
padding: 9px 15px; padding: 9px 15px;
} }
.classorder .enrollTotalSearchTable { .classorder .enrollTotalSearchTable {
width: 100%; width: 100%;
font-size: 14px; font-size: 14px;
color: #333; color: #333;
border-bottom: 1px solid #cccccc; border-bottom: 1px solid #cccccc;
border-right: 1px solid #cccccc; border-right: 1px solid #cccccc;
border-collapse: collapse; border-collapse: collapse;
} }
.classorder .enrollTotalSearchTable tr { .classorder .enrollTotalSearchTable tr {}
}
.classorder .enrollTotalSearchTable tr th { .classorder .enrollTotalSearchTable tr th {
background: #dddee0; background: #dddee0;
height: 30px; height: 30px;
font-size: 12px; font-size: 12px;
text-align: left; text-align: left;
} }
.classorder .enrollTotalSearchTable tr { .classorder .enrollTotalSearchTable tr {
background: #fff; background: #fff;
text-align: left; text-align: left;
} }
.classorder .enrollTotalSearchTable tbody tr:last-child { .classorder .enrollTotalSearchTable tbody tr:last-child {
border-bottom: 2px solid #ddd; border-bottom: 2px solid #ddd;
} }
.classorder .enrollTotalSearchTable tr:first-child td:first-child { .classorder .enrollTotalSearchTable tr:first-child td:first-child {
border-bottom: 2px solid #ddd; border-bottom: 2px solid #ddd;
} }
.classorder .enrollTotalSearchTable tr td { .classorder .enrollTotalSearchTable tr td {
height: 46px; height: 46px;
padding: 10px; padding: 10px;
} }
.classorder .enrollTotalSearchTable tr td > img { .classorder .enrollTotalSearchTable tr td>img {
width: 32px; width: 32px;
height: 32px; height: 32px;
border-radius: 16px; border-radius: 16px;
vertical-align: middle; vertical-align: middle;
margin-right: 5px; margin-right: 5px;
} }
.classorder .enrollTotalSearchTable tr td p { .classorder .enrollTotalSearchTable tr td p {
line-height: 20px; line-height: 20px;
} }
.classorder .remarks { .classorder .remarks {
font-size: 14px; font-size: 14px;
color: #2d2d2d; color: #2d2d2d;
} }
.classorder .remarks-b { .classorder .remarks-b {
height: 34px; height: 34px;
background: #f0f5fb; background: #f0f5fb;
margin-top: 10px; margin-top: 10px;
...@@ -965,221 +854,220 @@ li { ...@@ -965,221 +854,220 @@ li {
line-height: 20px; line-height: 20px;
-webkit-line-clamp: 4; -webkit-line-clamp: 4;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
} }
.classorder .remarks-b-b { .classorder .remarks-b-b {
text-align: right; text-align: right;
position: absolute; position: absolute;
right: 0px; right: 0px;
bottom: 0px; bottom: 0px;
} }
.classorder .on-left { .classorder .on-left {
margin-right: 5px; margin-right: 5px;
} }
.classorder .finance { .classorder .finance {
padding: 1px 10px; padding: 1px 10px;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
border-radius: 4px; border-radius: 4px;
margin: 5px 3px 3px 0; margin: 5px 3px 3px 0;
} }
.classorder .order_OfferId { .classorder .order_OfferId {
font-size: 18px; font-size: 18px;
color: #2961fe; color: #2961fe;
margin-bottom: 10px; margin-bottom: 10px;
font-weight: bold; font-weight: bold;
text-decoration: underline; text-decoration: underline;
cursor: pointer; cursor: pointer;
} }
.takeContract { .takeContract {
cursor: pointer; cursor: pointer;
color: rgb(41, 97, 254); color: rgb(41, 97, 254);
} }
.Contract_Table { .Contract_Table {
width: 100%; width: 100%;
border-collapse: collapse; border-collapse: collapse;
} }
.Contract_Table th, .Contract_Table th,
.Contract_Table td { .Contract_Table td {
padding: 5px; padding: 5px;
color: #000; color: #000;
text-align: center; text-align: center;
} }
.table-body { .table-body {
overflow-x: hidden; overflow-x: hidden;
overflow-y: auto; overflow-y: auto;
} }
.classorder .redstyle { .classorder .redstyle {
color: var(--q-color-negative); color: var(--q-color-negative);
} }
.order_OferTitle { .order_OferTitle {
font-size: 14px; font-size: 14px;
color: #333333; color: #333333;
margin-bottom: 10px; margin-bottom: 10px;
} }
.tatusText.grey { .tatusText.grey {
color: grey; color: grey;
} }
.tatusText.success { .tatusText.success {
color: #21ba45; color: #21BA45;
} }
.tatusText.error { .tatusText.error {
color: #f2c037; color: #F2C037;
} }
.tatusText.Black { .tatusText.Black {
color: Black; color: Black;
} }
.ToBeReceived.red { .ToBeReceived.red {
color: #fd397a; color: #fd397a;
} }
.ToBeReceived.blue { .ToBeReceived.blue {
color: #409eff; color: #409eff;
} }
.documents-text { .documents-text {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
} }
.documents-left { .documents-left {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
flex-wrap: wrap; flex-wrap: wrap;
margin: 2px 0; margin: 2px 0;
} }
.documents-left span { .documents-left span {
margin-right: 10px; margin-right: 10px;
border-radius: 3px; border-radius: 3px;
padding: 2px 6px; padding: 2px 6px;
} }
.documents-left span:hover { .documents-left span:hover {
cursor: pointer; cursor: pointer;
} }
.documents-left span.one { .documents-left span.one {
background-color: rgba(41, 97, 254, 0.2); background-color: rgba(41, 97, 254, 0.2);
color: rgb(41, 97, 254); color: rgb(41, 97, 254);
} }
.documents-left span.two { .documents-left span.two {
background-color: rgba(242, 140, 29, 0.2); background-color: rgba(242, 140, 29, 0.2);
color: rgb(242, 140, 29); color: rgb(242, 140, 29);
} }
.documents-left span.three { .documents-left span.three {
background-color: rgba(63, 196, 255, 0.2); background-color: rgba(63, 196, 255, 0.2);
color: rgb(63, 196, 255); color: rgb(63, 196, 255);
} }
.documents-left.num span { .documents-left.num span {
background-color: rgba(41, 97, 254, 0); background-color: rgba(41, 97, 254, 0);
color: rgb(41, 97, 254); color: rgb(41, 97, 254);
padding: 0; padding: 0;
} }
.documents-right { .documents-right {
margin-right: 20px; margin-right: 20px;
position: relative; position: relative;
} }
.OrderId-text { .OrderId-text {
font-size: 19px; font-size: 19px;
/* text-decoration:underline; */ /* text-decoration:underline; */
font-weight: bold; font-weight: bold;
color: #2961fe; color: #2961fe;
margin-bottom: 10px; margin-bottom: 10px;
cursor: pointer; cursor: pointer;
} }
.CreateByName-text { .CreateByName-text {
margin-bottom: 10px; margin-bottom: 10px;
} }
.colorblue { .colorblue {
color: #2961fe; color: #2961fe;
} }
.enedit-box { .enedit-box {
display: flex; display: flex;
align-items: center; align-items: center;
} }
.select-right { .select-right {
margin-left: 5px; margin-left: 5px;
} }
.Credentials { .Credentials {
color: #2961fe; color: #2961FE;
} }
.TicketVoucher-box { .TicketVoucher-box {
display: flex; display: flex;
} }
.TicketVoucher-box span { .TicketVoucher-box span {
flex-shrink: 0; flex-shrink: 0;
} }
.TicketVoucher-box i { .TicketVoucher-box i {
margin-left: 5px; margin-left: 5px;
} }
.agreement-IncomeMoney-box { .agreement-IncomeMoney-box{
position: relative; position: relative;
} }
.agreement-IncomeMoney-pop { .agreement-IncomeMoney-pop{
position: absolute; position: absolute;
top: -20px; top: -20px;
left: -270px; left: -270px;
z-index: 1; z-index: 1;
background: #fff; background: #fff;
padding: 10px 19px 10px 19px; padding: 10px 19px 10px 19px;
box-shadow: 5px 5px 10px 5px #ccc; Box-shadow:5px 5px 10px 5px #ccc;
} }
.agreement-Cancel { .agreement-Cancel{
text-align: right; text-align: right;
color: #409eff; color: #409eff;
} }
.agreement-Cancel span:first-child { .agreement-Cancel span:first-child{
color: #999999; color: #999999;
margin-right: 20px; margin-right: 20px;
} }
.agreement-Cancel span:hover { .agreement-Cancel span:hover{
cursor: pointer; cursor: pointer;
} }
.float-flag-shape { .float-flag-shape{
position: absolute; position: absolute;
top: 20px; top:20px;
border: 1px solid #fff; border: 1px solid #fff;
height: 0; height: 0;
width: 0; width: 0;
border-top: 6px solid transparent; border-top: 6px solid transparent;
border-left: 10px solid #fff; border-left: 10px solid #fff;
border-bottom: 3px solid transparent; border-bottom: 3px solid transparent;
right: -11px; right:-11px;
} }
.el-checkbox-group, .el-checkbox-group,.el-radio-group{
.el-radio-group {
display: flex !important; display: flex !important;
margin-bottom: 10px !important; margin-bottom: 10px !important;
} }
.font-color-link { .font-color-link{
cursor: pointer; cursor: pointer;
} }
</style> </style>
\ No newline at end of file
src/components/guestManagement/Agreement.vue
View file @ e4323fce
...@@ -72,15 +72,18 @@ ...@@ -72,15 +72,18 @@
color: #2961FE; color: #2961FE;
} }
.agreement-IncomeMoney-box{ .agreement-IncomeMoney-box{
/* position: relative; */
}
.agreement-IncomeMoney-box .numIcon{
position: relative; position: relative;
} }
.agreement-IncomeMoney-pop{ .agreement-IncomeMoney-pop{
position: absolute; position: absolute;
top: -15px; top: -15px;
left: 80px; left: 30px;
z-index: 1; z-index: 1;
background: #fff; background: #fff;
padding: 3px 19px 5px 19px; padding: 10px 19px 10px 19px;
Box-shadow:5px 5px 10px 5px #ccc; Box-shadow:5px 5px 10px 5px #ccc;
} }
/deep/.el-table .cell{ /deep/.el-table .cell{
...@@ -151,6 +154,7 @@ ...@@ -151,6 +154,7 @@
:data="dataList" :data="dataList"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%" style="width: 100%"
:height="dataList.length > 0 ? '600' : '660'"
row-class-name="font-size-12"> row-class-name="font-size-12">
<el-table-column <el-table-column
fixed fixed
...@@ -158,7 +162,7 @@ ...@@ -158,7 +162,7 @@
show-overflow-tooltip> show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.OrderId}} {{scope.row.OrderId}}
<!-- <p @click="openDetails(scope)" class="font-color-link cp">{{scope.row.OrderId}}</p> --> <!-- <p v-for="(item,index) in scope.row.MultipleChoiceList">{{item.Name}}</p> -->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column fixed label="业务员" show-overflow-tooltip :width="120"> <el-table-column fixed label="业务员" show-overflow-tooltip :width="120">
...@@ -185,7 +189,7 @@ ...@@ -185,7 +189,7 @@
{{scope.row.IncomeMoney}} {{scope.row.IncomeMoney}}
<i v-if="scope.row.OrderStatus==1" <i v-if="scope.row.OrderStatus==1"
@click="makeAdocument(scope.row,scope.$index,1)" @click="makeAdocument(scope.row,scope.$index,1)"
class="iconfont iconjia- numIcon"></i> class="iconfont iconjia- numIcon">
<div v-show="scope.row.actuallyReceived" class="agreement-IncomeMoney-pop"> <div v-show="scope.row.actuallyReceived" class="agreement-IncomeMoney-pop">
<div class="float-flag-shape"></div> <div class="float-flag-shape"></div>
<el-checkbox-group v-model="scope.row.checkList" <el-checkbox-group v-model="scope.row.checkList"
...@@ -194,11 +198,13 @@ ...@@ -194,11 +198,13 @@
:label="item.Id">{{item.Name}}</el-checkbox> :label="item.Id">{{item.Name}}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
<div class="agreement-Cancel"> <div class="agreement-Cancel">
<span @click="popCancelClick(scope.row,scope.$index,1)">取消</span> <span @click.stop="popCancelClick(scope.row,scope.$index,1)">取消</span>
<span @click="popClick(scope.row,scope.$index,1)">确定</span> <span @click.stop="popClick(scope.row,scope.$index,1)">确定</span>
</div> </div>
</div> </div>
</i>
</div> </div>
...@@ -214,7 +220,7 @@ ...@@ -214,7 +220,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<div class="agreement-IncomeMoney-box"> <div class="agreement-IncomeMoney-box">
{{scope.row.PayMoney}}<i v-if="scope.row.OrderStatus==1" {{scope.row.PayMoney}}<i v-if="scope.row.OrderStatus==1"
@click="makeAdocument(scope.row,scope.$index,3)" class="iconfont iconjia- numIcon"></i> @click="makeAdocument(scope.row,scope.$index,3)" class="iconfont iconjia- numIcon">
<div v-show="scope.row.cost" class="agreement-IncomeMoney-pop"> <div v-show="scope.row.cost" class="agreement-IncomeMoney-pop">
<div class="float-flag-shape"></div> <div class="float-flag-shape"></div>
<el-radio-group v-model="scope.row.selectedType" @change="clickMultipleChoice(scope.row,scope.$index,3)"> <el-radio-group v-model="scope.row.selectedType" @change="clickMultipleChoice(scope.row,scope.$index,3)">
...@@ -222,11 +228,15 @@ ...@@ -222,11 +228,15 @@
:label="item.Id">{{item.Name}}</el-radio> :label="item.Id">{{item.Name}}</el-radio>
</el-radio-group> </el-radio-group>
<div class="agreement-Cancel"> <div class="agreement-Cancel">
<span @click="popCancelClick(scope.row,scope.$index,3)">取消</span> <span @click.stop="popCancelClick(scope.row,scope.$index,3)">取消</span>
<span @click="popClick(scope.row,scope.$index,3)">确定</span> <span @click.stop="popClick(scope.row,scope.$index,3)">确定</span>
</div> </div>
</div> </div>
</i>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
...@@ -323,7 +333,7 @@ ...@@ -323,7 +333,7 @@
</el-table> </el-table>
</div> </div>
<div v-if="total>0"> <div v-if="total>0">
<el-pagination class="Mypagination" background @current-change="handleCurrentChange" :page-sizes="[30, 60, 90, 100]" :page-size="msg.pageSize" layout="total, sizes, prev, pager, next" @size-change="handleSizeChange" :total="total"> <el-pagination class="Mypagination" background @current-change="handleCurrentChange" :page-sizes="[10, 30, 60, 90, 100]" :page-size="msg.pageSize" layout="total, sizes, prev, pager, next" @size-change="handleSizeChange" :total="total">
</el-pagination> </el-pagination>
</div> </div>
</div> </div>
...@@ -374,7 +384,7 @@ ...@@ -374,7 +384,7 @@
loading: false, loading: false,
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 30, pageSize: 10,
OrderId: "", OrderId: "",
GuestId: "", GuestId: "",
TicketStatus: '0', TicketStatus: '0',
...@@ -406,7 +416,6 @@ ...@@ -406,7 +416,6 @@
$this.MsgBus.$on("closeBillMaking", function() { $this.MsgBus.$on("closeBillMaking", function() {
for(let i=0;i<$this.dataList.length;i++){ for(let i=0;i<$this.dataList.length;i++){
$this.dataList[i].checkList = [] $this.dataList[i].checkList = []
$this.dataList[i].MultipleChoiceList = []
$this.dataList[i].selectedType = "" $this.dataList[i].selectedType = ""
$this.dataList[i].actuallyReceived = false $this.dataList[i].actuallyReceived = false
$this.dataList[i].cost = false $this.dataList[i].cost = false
...@@ -416,16 +425,11 @@ ...@@ -416,16 +425,11 @@
methods: { methods: {
// 取消 // 取消
popCancelClick(row, index, num){ popCancelClick(row, index, num){
if(num==1){
this.dataList[index].actuallyReceived =false
}
if(num==3){
this.dataList[index].cost =false
}
this.dataList.forEach(item=>{ this.dataList.forEach(item=>{
item.checkList = [] item.checkList = []
item.MultipleChoiceList = []
item.selectedType = '' item.selectedType = ''
item.actuallyReceived =false
item.cost =false
}) })
}, },
// 确定弹窗 // 确定弹窗
...@@ -435,17 +439,8 @@ ...@@ -435,17 +439,8 @@
return return
} }
this.makeAdocumentFun(row, index, num) this.makeAdocumentFun(row, index, num)
if(num==1){
if(this.dataList[index].checkList.length==1){
}else{
this.dataList[index].actuallyReceived =false this.dataList[index].actuallyReceived =false
}
}
if(num==3){
this.dataList[index].cost =false this.dataList[index].cost =false
}
}, },
// 查看出票凭据 // 查看出票凭据
...@@ -529,7 +524,6 @@ ...@@ -529,7 +524,6 @@
}, },
// 制作单据 // 制作单据
makeAdocument(row, index, num) { makeAdocument(row, index, num) {
this.dataList[index].MultipleChoiceList=[]
let list = row.OrderType&&row.OrderType.split(',') let list = row.OrderType&&row.OrderType.split(',')
if(list!=null&&list.length>1&&num==1){ if(list!=null&&list.length>1&&num==1){
this.dataList.forEach(item=>{ this.dataList.forEach(item=>{
...@@ -539,13 +533,6 @@ ...@@ -539,13 +533,6 @@
return item.actuallyReceived = false return item.actuallyReceived = false
}) })
this.dataList[index].actuallyReceived = true this.dataList[index].actuallyReceived = true
for(let j=0;j<list.length;j++){
for(let i=0;i<this.MultipleChoiceList.length;i++){
if(list[j]==this.MultipleChoiceList[i].Id){
this.dataList[index].MultipleChoiceList.push(this.MultipleChoiceList[i])
}
}
}
} }
else if(list!=null&&list.length>1&&num==3){ else if(list!=null&&list.length>1&&num==3){
...@@ -556,18 +543,16 @@ ...@@ -556,18 +543,16 @@
return item.cost = false return item.cost = false
}) })
this.dataList[index].cost = true this.dataList[index].cost = true
for(let j=0;j<list.length;j++){
for(let i=0;i<this.MultipleChoiceList.length;i++){
if(list[j]==this.MultipleChoiceList[i].Id){
this.dataList[index].MultipleChoiceList.push(this.MultipleChoiceList[i])
}
}
}
}else{ }else{
this.makeAdocumentFun(row, index, num) this.makeAdocumentFun(row, index, num)
} }
}, },
makeAdocumentFun(row, index, num){ makeAdocumentFun(row, index, num){
let type
type = num == 1 ? 1 : 2 // 1收款 2退款 3成本
let href
let url = this.domainManager().erpRoutingUrl
let data
let list = row.OrderType&&row.OrderType.split(',') let list = row.OrderType&&row.OrderType.split(',')
if (this.userInfo.EmName != row.EnterName) { if (this.userInfo.EmName != row.EnterName) {
this.ValidateOperator() this.ValidateOperator()
...@@ -576,17 +561,11 @@ ...@@ -576,17 +561,11 @@
if(list&&list.length>1){ if(list&&list.length>1){
let typeList = row.selectedType.split(',') let typeList = row.selectedType.split(',')
if(num=='1'&&typeList.length>=2){ if(num=='1'&&typeList.length>=2){
let type
type = num == 1 ? 1 : 2 // 1收款 2退款 3成本anceId2 = num
let $this = this; let $this = this;
row.ReFinanceId2 = num row.ReFinanceId2 = num
this.MsgBus.$emit("BillMakingOrderBoxOpen", $this.ID, row, true); this.MsgBus.$emit("BillMakingOrderBoxOpen", $this.ID, row, true);
}if(typeList.length==1&&num=='1'||num=='3'){ }if(typeList.length==1&&num=='1'||num=='3'){
let type data = [{
type = num == 1 ? 1 : 2 // 1收款 2退款 3成本
let href
let url = this.domainManager().erpRoutingUrl
let data = [{
path: 'ChoiceAddFinancialDocuments', path: 'ChoiceAddFinancialDocuments',
type: type, type: type,
OtherType: 55, OtherType: 55,
...@@ -599,17 +578,12 @@ ...@@ -599,17 +578,12 @@
window.open(href); window.open(href);
for(let i=0;i<this.dataList.length;i++){ for(let i=0;i<this.dataList.length;i++){
this.dataList[i].checkList = [] this.dataList[i].checkList = []
this.dataList[i].MultipleChoiceList = []
this.dataList[i].selectedType = "" this.dataList[i].selectedType = ""
this.dataList[i].actuallyReceived = false this.dataList[i].actuallyReceived = false
this.dataList[i].cost = false this.dataList[i].cost = false
} }
}if(num=='2'){ }if(num=='2'){
let type data = [{
type = num == 1 ? 1 : 2 // 1收款 2退款 3成本
let href
let url = this.domainManager().erpRoutingUrl
let data = [{
path: 'ChoiceAddFinancialDocuments', path: 'ChoiceAddFinancialDocuments',
type: type, type: type,
OtherType: 55, OtherType: 55,
...@@ -621,7 +595,6 @@ ...@@ -621,7 +595,6 @@
window.open(href); window.open(href);
for(let i=0;i<this.dataList.length;i++){ for(let i=0;i<this.dataList.length;i++){
this.dataList[i].checkList = [] this.dataList[i].checkList = []
this.dataList[i].MultipleChoiceList = []
this.dataList[i].selectedType = "" this.dataList[i].selectedType = ""
this.dataList[i].actuallyReceived = false this.dataList[i].actuallyReceived = false
this.dataList[i].cost = false this.dataList[i].cost = false
...@@ -629,11 +602,6 @@ ...@@ -629,11 +602,6 @@
} }
}else{ }else{
let type
type = num == 1 ? 1 : 2 // 1收款 2退款 3成本
let href
let url = this.domainManager().erpRoutingUrl
let data
if(num==1||num==2){ if(num==1||num==2){
data = [{ data = [{
path: 'ChoiceAddFinancialDocuments', path: 'ChoiceAddFinancialDocuments',
...@@ -659,7 +627,6 @@ ...@@ -659,7 +627,6 @@
window.open(href); window.open(href);
for(let i=0;i<this.dataList.length;i++){ for(let i=0;i<this.dataList.length;i++){
this.dataList[i].checkList = [] this.dataList[i].checkList = []
this.dataList[i].MultipleChoiceList = []
this.dataList[i].selectedType = "" this.dataList[i].selectedType = ""
this.dataList[i].actuallyReceived = false this.dataList[i].actuallyReceived = false
this.dataList[i].cost = false this.dataList[i].cost = false
...@@ -813,6 +780,19 @@ ...@@ -813,6 +780,19 @@
}); });
}; };
addList(data); addList(data);
data.forEach(item=>{
if(item.OrderType){
let list = item.OrderType&&item.OrderType.split(',')
for(let j=0;j<list.length;j++){
for(let i=0;i<this.MultipleChoiceList.length;i++){
if(list[j]==this.MultipleChoiceList[i].Id){
item.MultipleChoiceList.push(this.MultipleChoiceList[i])
}
}
}
}
})
this.dataList = data; this.dataList = data;
this.total = res.data.data.count; this.total = res.data.data.count;
this.loading = false this.loading = false
......
src/components/guestManagement/finance.vue
View file @ e4323fce
...@@ -41,6 +41,10 @@ ...@@ -41,6 +41,10 @@
.income_2{ .income_2{
color: #3FC4FF; color: #3FC4FF;
} }
.finance-content{
height: 600px;
overflow-y: scroll;
}
</style> </style>
<template> <template>
<div class="Business"> <div class="Business">
...@@ -82,6 +86,7 @@ ...@@ -82,6 +86,7 @@
:data="dataList" :data="dataList"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%" style="width: 100%"
:height="dataList.length > 0 ? '600' : '660'"
row-class-name="font-size-12"> row-class-name="font-size-12">
<el-table-column <el-table-column
fixed fixed
...@@ -154,7 +159,7 @@ ...@@ -154,7 +159,7 @@
</div> </div>
<div v-if="total>0"> <div v-if="total>0">
<el-pagination class="Mypagination" background @current-change="handleCurrentChange" <el-pagination class="Mypagination" background @current-change="handleCurrentChange"
:page-sizes="[30, 60, 90, 100]" :page-size="msg.pageSize" layout="total, sizes, prev, pager, next" :page-sizes="[10, 30, 60, 90, 100]" :page-size="msg.pageSize" layout="total, sizes, prev, pager, next"
@size-change="handleSizeChange" :total="total"> @size-change="handleSizeChange" :total="total">
</el-pagination> </el-pagination>
</div> </div>
...@@ -183,7 +188,7 @@ export default { ...@@ -183,7 +188,7 @@ export default {
loading: false, loading: false,
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 30, pageSize: 10,
FrID:"0", FrID:"0",
Type:"-1", Type:"-1",
Status: "-1", Status: "-1",
......
src/components/guestManagement/ticketOrder.vue
View file @ e4323fce
...@@ -507,7 +507,7 @@ ...@@ -507,7 +507,7 @@
<el-col :span="8" v-if="name=='新建机票订单'||name=='编辑机票订单'"> <el-col :span="8" v-if="name=='新建机票订单'||name=='编辑机票订单'">
<div class="MyEditForm-item"> <div class="MyEditForm-item">
<el-form-item label="出行概述" prop="StartCityName"> <el-form-item label="出行概述" prop="StartCityName">
<el-input placeholder="请输入出发时间、出发地、目的地" v-model="form.StartCityName"></el-input> <el-input placeholder="出发时间、出发地、目的地" v-model="form.StartCityName"></el-input>
</el-form-item> </el-form-item>
</div> </div>
</el-col> </el-col>
...@@ -1064,7 +1064,7 @@ ...@@ -1064,7 +1064,7 @@
ground:{ ground:{
title:"地接", title:"地接",
WBMoney:0,//原币总金额 WBMoney:0,//原币总金额
OriginalFee:"",//原币手续费 OriginalFee:0,//原币手续费
RelevanceFrId:"1",//订单类型 1机票 2签证 3地接 4套餐 5其他 RelevanceFrId:"1",//订单类型 1机票 2签证 3地接 4套餐 5其他
TotalCost:"", TotalCost:"",
detailList:[ detailList:[
...@@ -1096,7 +1096,7 @@ ...@@ -1096,7 +1096,7 @@
airTickets:{ airTickets:{
title:"机票", title:"机票",
WBMoney:0,//原币总金额 WBMoney:0,//原币总金额
OriginalFee:"",//原币手续费 OriginalFee:0,//原币手续费
RelevanceFrId:"1",//订单类型 1机票 2签证 3地接 4套餐 5其他 RelevanceFrId:"1",//订单类型 1机票 2签证 3地接 4套餐 5其他
TotalCost:"", TotalCost:"",
detailList:[ detailList:[
...@@ -1213,7 +1213,7 @@ ...@@ -1213,7 +1213,7 @@
}, ], }, ],
StartCityName: [{ StartCityName: [{
required: true, required: true,
message: "请输入出现时间、出发地、目的地", message: "请输入出发时间、出发地、目的地",
trigger: "blur" trigger: "blur"
}, ], }, ],
// EndCityName: [ // EndCityName: [
...@@ -1458,7 +1458,7 @@ ...@@ -1458,7 +1458,7 @@
OtherType:this.BillMaking.OtherType,//默认=55 OtherType:this.BillMaking.OtherType,//默认=55
ReFinanceId:this.obj.OrderId,//订单ID ReFinanceId:this.obj.OrderId,//订单ID
ReFinanceId2:this.obj.ReFinanceId2,//类型 1收款 ReFinanceId2:this.obj.ReFinanceId2,//类型 1收款
GuestId:this.GuestId,//客人ID GuestId:this.obj.GuestId,//客人ID
RelevanceFrId:"",//订单类型 1机票 2签证 3地接 4套餐 5其他 RelevanceFrId:"",//订单类型 1机票 2签证 3地接 4套餐 5其他
vorcherInos:[], vorcherInos:[],
detailList:[] detailList:[]
...@@ -2003,10 +2003,6 @@ ...@@ -2003,10 +2003,6 @@
this.$message.warning('请输入机票单价'); this.$message.warning('请输入机票单价');
return return
} }
if(item.Remark==""){
this.$message.warning('请输入机票备注');
return
}
}) })
this.obj.checkList.indexOf('2')!=-1&&this.visa.detailList.forEach(item=>{ this.obj.checkList.indexOf('2')!=-1&&this.visa.detailList.forEach(item=>{
if(!item.CostTypeId){ if(!item.CostTypeId){
...@@ -2021,10 +2017,6 @@ ...@@ -2021,10 +2017,6 @@
this.$message.warning('请输入签证单价'); this.$message.warning('请输入签证单价');
return return
} }
if(item.Remark==""){
this.$message.warning('请输入签证备注');
return
}
}) })
this.obj.checkList.indexOf('3')!=-1&&this.ground.detailList.forEach(item=>{ this.obj.checkList.indexOf('3')!=-1&&this.ground.detailList.forEach(item=>{
if(!item.CostTypeId){ if(!item.CostTypeId){
...@@ -2131,6 +2123,9 @@ ...@@ -2131,6 +2123,9 @@
} }
this.msgList.push(this.BillMaking) this.msgList.push(this.BillMaking)
} }
// console.log(this.msgList,'=====')
// return
this.clickShow = true
this.apipost2("Financial_post_SetFinanceInfoForCRMIn",this.msgList,(res)=>{ this.apipost2("Financial_post_SetFinanceInfoForCRMIn",this.msgList,(res)=>{
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.clickShow = false this.clickShow = false
...@@ -2147,6 +2142,7 @@ ...@@ -2147,6 +2142,7 @@
}); });
} else { } else {
this.msgList=[]
this.clickShow = false this.clickShow = false
this.$message.error(res.data.message); this.$message.error(res.data.message);
} }
...@@ -2195,7 +2191,6 @@ ...@@ -2195,7 +2191,6 @@
}); });
} }
if(this.name=='制单'){ if(this.name=='制单'){
this.clickShow = true
this.Financial_post_SetFinanceInfoForCRMIn() this.Financial_post_SetFinanceInfoForCRMIn()
} }
......
src/components/planeTicketOrder/index.vue
View file @ e4323fce
...@@ -319,16 +319,10 @@ ...@@ -319,16 +319,10 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div v-if="total>0">
<el-pagination <el-pagination class="Mypagination" background @current-change="handleCurrentChange" :page-sizes="[30, 60, 90, 100]" :page-size="msg.pageSize" layout="total, sizes, prev, pager, next" @size-change="handleSizeChange" :total="total">
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:page-sizes="[30, 60,90,100]"
:page-size="msg.pageSize"
layout="total,prev,sizes,pager,next"
:total="total"
style="margin-top: 12px; float: right">
</el-pagination> </el-pagination>
</div>
</div> </div>
</div> </div>
......
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