Skip to content

C
CRM
Commit dd8eee8d authored by zhengke's avatar zhengke
Browse files
Options

no message

parent efc1450e
Hide whitespace changes
Inline Side-by-side
Showing with 371 additions and 59 deletions
src/components/customerManage/customerOrder.vue
View file @ dd8eee8d
...@@ -346,9 +346,14 @@ ...@@ -346,9 +346,14 @@
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let data = res.data.data.Data.pageData; let data = res.data.data.Data.pageData;
let addList = function(arr) { let addList = function(arr) {
arr.forEach(item => { arr.forEach(item => {
item.More = '' item.More = ''
}); // item.actuallyReceived = false
// item.cost = false
// item.selectedType = ''
// item.checkList = []
// item.MultipleChoiceList = []
});
}; };
addList(data); addList(data);
this.dataList = res.data.data.Data.pageData; this.dataList = res.data.data.Data.pageData;
......
src/components/customerManage/myCustomerOrder.vue
View file @ dd8eee8d
...@@ -327,9 +327,14 @@ ...@@ -327,9 +327,14 @@
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let data = res.data.data.Data.pageData; let data = res.data.data.Data.pageData;
let addList = function(arr) { let addList = function(arr) {
arr.forEach(item => { arr.forEach(item => {
item.More = '' item.More = ''
}); item.actuallyReceived = false
item.cost = false
item.selectedType = ''
item.checkList = []
item.MultipleChoiceList = []
});
}; };
addList(data); addList(data);
this.dataList = res.data.data.Data.pageData; this.dataList = res.data.data.Data.pageData;
......
src/components/customerManage/orderList.vue
View file @ dd8eee8d
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<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">{{item.OrderId}}</p> <p class="OrderId-text" @click="clickSingleNumber(item)">{{item.OrderId}}</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>
...@@ -158,8 +158,21 @@ ...@@ -158,8 +158,21 @@
<div class="documents-right"> <div class="documents-right">
<el-tooltip <el-tooltip
class="item-but" effect="dark" content="制单" placement="top"> class="item-but" effect="dark" content="制单" placement="top">
<i class="iconfont iconwenbenbianji cp blue" @click="makeAdocument(item,1)"></i> <i class="iconfont iconwenbenbianji cp blue" @click="makeAdocument(item,index,1)"></i>
</el-tooltip> </el-tooltip>
<div v-show="item.actuallyReceived" class="agreement-IncomeMoney-pop">
<div class="float-flag-shape"></div>
<el-checkbox-group v-model="item.checkList"
@change="clickMultipleChoice(item,index,1)">
<el-checkbox v-for="(items,indexs) in item.MultipleChoiceList" :key="indexs"
:label="items.Id">{{items.Name}}</el-checkbox>
</el-checkbox-group>
<div class="agreement-Cancel">
<span @click="popCancelClick(item,index,1)">取消</span>
<span @click="popClick(item,index,1)">确定</span>
</div>
</div>
</div> </div>
</div> </div>
<div class="documents-text"> <div class="documents-text">
...@@ -173,7 +186,7 @@ ...@@ -173,7 +186,7 @@
<div class="documents-right"> <div class="documents-right">
<el-tooltip <el-tooltip
class="item-but" effect="dark" content="制单" placement="top"> class="item-but" effect="dark" content="制单" placement="top">
<i class="iconfont iconwenbenbianji cp blue" @click="makeAdocument(item,2)"></i> <i class="iconfont iconwenbenbianji cp blue" @click="makeAdocument(item,index,2)"></i>
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
...@@ -188,8 +201,20 @@ ...@@ -188,8 +201,20 @@
<div class="documents-right"> <div class="documents-right">
<el-tooltip <el-tooltip
class="item-but" effect="dark" content="制单" placement="top"> class="item-but" effect="dark" content="制单" placement="top">
<i class="iconfont iconwenbenbianji cp blue" @click="makeAdocument(item,3)"></i> <i class="iconfont iconwenbenbianji cp blue" @click="makeAdocument(item,index,3)"></i>
</el-tooltip> </el-tooltip>
<div v-show="item.cost" class="agreement-IncomeMoney-pop">
<div class="float-flag-shape"></div>
<el-radio-group v-model="item.selectedType" @change="clickMultipleChoice(item,index,3)">
<el-radio v-for="(item,index) in item.MultipleChoiceList" :key="index"
:label="item.Id">{{item.Name}}</el-radio>
</el-radio-group>
<div class="agreement-Cancel">
<span @click="popCancelClick(item,index,1)">取消</span>
<span @click="popClick(item,index,1)">确定</span>
</div>
</div>
</div> </div>
</div> </div>
</td> </td>
...@@ -202,15 +227,20 @@ ...@@ -202,15 +227,20 @@
<el-drawer :with-header="false" size='70%' :visible.sync="drawer" direction="rtl" :before-close="handleClose"> <el-drawer :with-header="false" size='70%' :visible.sync="drawer" direction="rtl" :before-close="handleClose">
<customerInfoBox :CustomerId="CustomerId" /> <customerInfoBox :CustomerId="CustomerId" />
</el-drawer> </el-drawer>
<!-- <el-drawer :with-header="false" size='70%' :visible.sync="orderDrawer" direction="rtl" :before-close="handleClose">
<orderDetailsDrawer />
</el-drawer> -->
</div> </div>
</template> </template>
<script> <script>
import customerInfoBox from "../guestManagement/customerInfoBox"; import customerInfoBox from "../guestManagement/customerInfoBox";
// import orderDetailsDrawer from "./orderDetailsDrawer";
export default { export default {
components: { components: {
customerInfoBox customerInfoBox,
// orderDetailsDrawer
}, },
props: { props: {
//订单 //订单
...@@ -229,6 +259,21 @@ ...@@ -229,6 +259,21 @@
}, },
data() { data() {
return { return {
MultipleChoiceList: [ //多选项目
{
Name: '机票',
Id: '1'
}, {
Name: '签证',
Id: '2'
}, {
Name: '地接',
Id: '3'
}, {
Name: '套餐',
Id: '4'
}
],
userInfo: {}, userInfo: {},
MoreList: [{ MoreList: [{
Name: '取消订单', Name: '取消订单',
...@@ -245,6 +290,7 @@ ...@@ -245,6 +290,7 @@
}, ], }, ],
clickMore: '', clickMore: '',
drawer: false, drawer: false,
orderDrawer: true,
CustomerId: '', CustomerId: '',
CustomerName: '' CustomerName: ''
}; };
...@@ -262,8 +308,87 @@ ...@@ -262,8 +308,87 @@
}, },
mounted() { mounted() {
this.userInfo = this.getLocalStorage(); this.userInfo = this.getLocalStorage();
let $this = this
$this.MsgBus.$on("closeBillMaking", function() {
for(let i=0;i<$this.dataList.length;i++){
$this.dataList[i].checkList = []
$this.dataList[i].MultipleChoiceList = []
$this.dataList[i].selectedType = ""
}
});
}, },
methods: { methods: {
// 多选发生变化
clickMultipleChoice(row, index, num) {
if(num == 1){
if(row.checkList.slice(-1)[0] == 4){
this.delType(row,1)
this.delType(row,2)
this.delType(row,3)
this.delType(row,5)
row.selectedType = row.checkList.join(',')
}else if(row.checkList.slice(-1)[0] == 5){
this.delType(row,1)
this.delType(row,2)
this.delType(row,3)
this.delType(row,4)
row.selectedType = row.checkList.join(',')
}else{
this.delType(row,4)
this.delType(row,5)
row.selectedType = row.checkList.join(',')
}
}
},
// 删除套餐值
delType(row,item) {
for (let i = 0; i < row.checkList.length; i++) {
if (row.checkList[i] == item) {
row.checkList.splice(i, 1)
}
}
},
// 取消
popCancelClick(row, index, num){
if(num==1){}
this.dataList.forEach(item=>{
return item.actuallyReceived =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){
if(!row.selectedType){
this.$message.warning('请选择类型!');
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
}
},
// 点击单号
clickSingleNumber(item){
this.orderDrawer = true
},
handleClose(done) { handleClose(done) {
done(); done();
}, },
...@@ -312,41 +437,197 @@ ...@@ -312,41 +437,197 @@
this.$emit('emptyMore') this.$emit('emptyMore')
}, },
// 制作单据 // 制作单据
makeAdocument(row, num) { // makeAdocument(row, num) {
if (this.superManage) { // if (this.superManage) {
this.makeAdocumentfun(row, num) // this.makeAdocumentfun(row, num)
} else { // } else {
if (this.userInfo.EmName != row.EnterName) { // if (this.userInfo.EmName != row.EnterName) {
this.ValidateOperator() // this.ValidateOperator()
} else { // } else {
this.makeAdocumentfun(row, num) // this.makeAdocumentfun(row, num)
// }
// }
// },
// makeAdocumentfun(row, num) {
// if (row.OrderStatus != '2') {
// let type
// type = num == 1 ? 1 : 2 // 1收款 2退款 3成本
// let href
// let url
// if (this.isOnline()) {
// url = 'http://yx.oytour.com/#/'
// } else {
// url = 'http://www.test.com:8080/#/'
// }
// let data = [{
// path: 'ChoiceAddFinancialDocuments',
// type: type,
// OtherType: 55,
// ReFinanceId: row.OrderId,
// ReFinanceId2: num,
// GuestId: row.GuestId
// }]
// href = url + 'automaticLogin?token=' + this.getLocalStorage().token + '&data=' + JSON.stringify(data)
// window.open(href);
// }
// },
// 制作单据
makeAdocument(row, index, num) {
this.dataList[index].MultipleChoiceList=[]
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
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{
this.makeAdocumentFun(row, index, num)
} }
}, },
makeAdocumentfun(row, num) { makeAdocumentFun(row, index, num){
if (row.OrderStatus != '2') { let list = row.OrderType&&row.OrderType.split(',')
let type if (this.userInfo.EmName != row.EnterName) {
type = num == 1 ? 1 : 2 // 1收款 2退款 3成本 this.ValidateOperator()
let href } else {
let url if (row.OrderStatus != '2') {
if (this.isOnline()) { if(list&&list.length>1){
url = 'http://yx.oytour.com/#/' let typeList = row.selectedType.split(',')
} else { if(num=='1'&&typeList.length>=2){
url = 'http://www.test.com:8080/#/' let type
type = num == 1 ? 1 : 2 // 1收款 2退款 3成本anceId2 = num
let $this = this;
row.ReFinanceId2 = num
this.MsgBus.$emit("BillMakingOrderBoxOpen", $this.ID, row, true);
}if(typeList.length==1&&num=='1'||num=='3'){
let type
type = num == 1 ? 1 : 2 // 1收款 2退款 3成本
let href
let url
if (this.isOnline()) {
url = 'http://yx.oytour.com/#/'
} else {
url = 'http://www.test.com:8081/#/'
}
let data = [{
path: 'ChoiceAddFinancialDocuments',
type: type,
OtherType: 55,
ReFinanceId: row.OrderId,
ReFinanceId2: num,
GuestId: row.GuestId,
RelevanceFrId: row.selectedType, // 单据类型
}]
href = url + 'automaticLogin?token=' + this.getLocalStorage().token + '&data=' + JSON.stringify(data)
window.open(href);
for(let i=0;i<this.dataList.length;i++){
this.dataList[i].checkList = []
this.dataList[i].MultipleChoiceList = []
this.dataList[i].selectedType = ""
}
}if(num=='2'){
let type
type = num == 1 ? 1 : 2 // 1收款 2退款 3成本
let href
let url
if (this.isOnline()) {
url = 'http://yx.oytour.com/#/'
} else {
url = 'http://www.test.com:8081/#/'
}
let data = [{
path: 'ChoiceAddFinancialDocuments',
type: type,
OtherType: 55,
ReFinanceId: row.OrderId,
ReFinanceId2: num,
GuestId: row.GuestId,
}]
href = url + 'automaticLogin?token=' + this.getLocalStorage().token + '&data=' + JSON.stringify(data)
window.open(href);
for(let i=0;i<this.dataList.length;i++){
this.dataList[i].checkList = []
this.dataList[i].MultipleChoiceList = []
this.dataList[i].selectedType = ""
}
}
}else{
let type
type = num == 1 ? 1 : 2 // 1收款 2退款 3成本
let href
let url
if (this.isOnline()) {
url = 'http://yx.oytour.com/#/'
} else {
url = 'http://www.test.com:8081/#/'
}
let data
if(num==1||num==2){
data = [{
path: 'ChoiceAddFinancialDocuments',
type: type,
OtherType: 55,
ReFinanceId: row.OrderId,
ReFinanceId2: num,
GuestId: row.GuestId,
RelevanceFrId: row.OrderType, // 单据类型
}]
}
if(num==3){
data = [{
path: 'ChoiceAddFinancialDocuments',
type: type,
OtherType: 55,
ReFinanceId: row.OrderId,
ReFinanceId2: num,
GuestId: row.GuestId,
}]
}
href = url + 'automaticLogin?token=' + this.getLocalStorage().token + '&data=' + JSON.stringify(data)
window.open(href);
for(let i=0;i<this.dataList.length;i++){
this.dataList[i].checkList = []
this.dataList[i].MultipleChoiceList = []
this.dataList[i].selectedType = ""
}
}
} }
let data = [{
path: 'ChoiceAddFinancialDocuments',
type: type,
OtherType: 55,
ReFinanceId: row.OrderId,
ReFinanceId2: num,
GuestId: row.GuestId
}]
href = url + 'automaticLogin?token=' + this.getLocalStorage().token + '&data=' + JSON.stringify(data)
window.open(href);
} }
}, },
// 操作日志 // 操作日志
operationLog(row) { operationLog(row) {
this.MsgBus.$emit("logTicketOrderBoxOpen", row.GuestId, row, true); this.MsgBus.$emit("logTicketOrderBoxOpen", row.GuestId, row, true);
...@@ -791,6 +1072,7 @@ ...@@ -791,6 +1072,7 @@
.documents-right { .documents-right {
margin-right: 20px; margin-right: 20px;
position: relative;
} }
.OrderId-text { .OrderId-text {
...@@ -799,6 +1081,7 @@ ...@@ -799,6 +1081,7 @@
font-weight: bold; font-weight: bold;
color: #2961fe; color: #2961fe;
margin-bottom: 10px; margin-bottom: 10px;
cursor: pointer;
} }
.CreateByName-text { .CreateByName-text {
...@@ -837,4 +1120,42 @@ ...@@ -837,4 +1120,42 @@
.TicketVoucher-box i { .TicketVoucher-box i {
margin-left: 5px; margin-left: 5px;
} }
.agreement-IncomeMoney-box{
position: relative;
}
.agreement-IncomeMoney-pop{
position: absolute;
top: -20px;
left: -270px;
z-index: 1;
background: #fff;
padding: 10px 19px 10px 19px;
Box-shadow:5px 5px 10px 5px #ccc;
}
.agreement-Cancel{
text-align: right;
color: #409eff;
}
.agreement-Cancel span:first-child{
color: #999999;
margin-right: 20px;
}
.agreement-Cancel span:hover{
cursor: pointer;
}
.float-flag-shape{
position: absolute;
top:20px;
border: 1px solid #fff;
height: 0;
width: 0;
border-top: 6px solid transparent;
border-left: 10px solid #fff;
border-bottom: 3px solid transparent;
right:-11px;
}
.el-checkbox-group,.el-radio-group{
display: flex !important;
margin-bottom: 10px !important;
}
</style> </style>
\ No newline at end of file
src/components/guestManagement/Agreement.vue
View file @ dd8eee8d
...@@ -516,9 +516,6 @@ ...@@ -516,9 +516,6 @@
row.selectedType = row.checkList.join(',') row.selectedType = row.checkList.join(',')
} }
} }
if(num == 3){
}
}, },
// 删除套餐值 // 删除套餐值
delType(row,item) { delType(row,item) {
......
src/components/guestManagement/ticketOrder.vue
View file @ dd8eee8d
...@@ -2054,23 +2054,7 @@ ...@@ -2054,23 +2054,7 @@
this.$message.warning('请输入地接单价'); this.$message.warning('请输入地接单价');
return return
} }
if(item.Remark==""){
this.$message.warning('请输入地接备注');
return
}
}) })
if(this.obj.checkList.indexOf('1')!=-1&&!this.airTickets.OriginalFee){
this.$message.warning('请输入机票手续费');
return
}
if(this.obj.checkList.indexOf('2')!=-1&&!this.visa.OriginalFee){
this.$message.warning('请输入签证手续费');
return
}
if(this.obj.checkList.indexOf('3')!=-1&&!this.ground.OriginalFee){
this.$message.warning('请输入地接手续费');
return
}
if(this.BillMaking.vorcherInos.length==0){ if(this.BillMaking.vorcherInos.length==0){
this.$message.warning('请上传凭证'); this.$message.warning('请上传凭证');
return return
......
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