Skip to content

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

no message

parent a615a77a
Hide whitespace changes
Inline Side-by-side
Showing with 429 additions and 43 deletions
src/components/customerManage/customerOrder.vue
View file @ a4de6d75
...@@ -107,6 +107,20 @@ ...@@ -107,6 +107,20 @@
:label="item.Name" :value="item.Id"> </el-option> :label="item.Name" :value="item.Id"> </el-option>
</el-select> </el-select>
</el-col> </el-col>
<el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px"
>出签状态</span
>
<el-select size="mini" v-model="msg.VisaStatus" @change="getList">
<el-option
v-for="(item, index) in VisaList"
:key="index"
:label="item.Name"
:value="item.Id"
>
</el-option>
</el-select>
</el-col>
<el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3"> <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px">订单状态</span> <span class="font-size-12" style="padding-right: 10px">订单状态</span>
<el-select size="mini" v-model="msg.OrderStatus" @change="getList"> <el-select size="mini" v-model="msg.OrderStatus" @change="getList">
...@@ -214,6 +228,11 @@ ...@@ -214,6 +228,11 @@
}, },
data() { data() {
return { return {
VisaList:[
{ Name: "不限", Id: "0" },
{ Name: "未出签", Id: "1" },
{ Name: "已出签", Id: "2" },
],
MultipleChoiceList: [ //多选项目 MultipleChoiceList: [ //多选项目
{ {
Name: '机票', Name: '机票',
...@@ -248,16 +267,14 @@ ...@@ -248,16 +267,14 @@
EndCityName:"",//到达城市 EndCityName:"",//到达城市
EnterID:"",//业务员id EnterID:"",//业务员id
TicketStatus:"0",//出票状态 TicketStatus:"0",//出票状态
OrderStatus:"1",//订单状态 VisaStatus:"0",//出签状态
OrderStatus:"0",//订单状态
Q_IsCollect:"0",//收款状态 Q_IsCollect:"0",//收款状态
StartTime:"", StartTime:"",
EndTime:"" EndTime:""
}, },
ticketingStatusList:[],// 出票状态 ticketingStatusList:[],// 出票状态
OrderStatusList:[ OrderStatusList:[],
{Name:'正常',Id:'1'},
{Name:'取消',Id:'2'}
],
QIsCollectList:[ QIsCollectList:[
{Name:'不限',Id:'0'}, {Name:'不限',Id:'0'},
{Name:'已收齐',Id:'1'}, {Name:'已收齐',Id:'1'},
...@@ -278,6 +295,7 @@ ...@@ -278,6 +295,7 @@
} }
this.Employee() //业务员 this.Employee() //业务员
this.GetTicketStatusEnumList() //出票枚举 this.GetTicketStatusEnumList() //出票枚举
this.GetOrderStatusEnumList() //订单状态枚举
let $this = this let $this = this
this.MsgBus.$on("closeGetList", function() { this.MsgBus.$on("closeGetList", function() {
$this.getList() $this.getList()
...@@ -331,6 +349,21 @@ ...@@ -331,6 +349,21 @@
return item.More = '' return item.More = ''
}) })
}, },
// 获取订单状态枚举
GetOrderStatusEnumList() {
this.apipost("/api/Order/GetOrderStatusEnumList", {}, (res) => {
if (res.data.resultCode == 1) {
this.OrderStatusList = res.data.data;
let data = {
Name: "不限",
Id: "0",
};
this.OrderStatusList.unshift(data);
} else {
this.$message.error(res.data.message);
}
});
},
// 获取出票状态枚举 // 获取出票状态枚举
GetTicketStatusEnumList(){ GetTicketStatusEnumList(){
this.apipost( this.apipost(
......
src/components/customerManage/myCustomerOrder.vue
View file @ a4de6d75
...@@ -90,6 +90,20 @@ ...@@ -90,6 +90,20 @@
:label="item.Name" :value="item.Id"> </el-option> :label="item.Name" :value="item.Id"> </el-option>
</el-select> </el-select>
</el-col> </el-col>
<el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px"
>出签状态</span
>
<el-select size="mini" v-model="msg.VisaStatus" @change="getList">
<el-option
v-for="(item, index) in VisaList"
:key="index"
:label="item.Name"
:value="item.Id"
>
</el-option>
</el-select>
</el-col>
<el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3"> <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px">订单状态</span> <span class="font-size-12" style="padding-right: 10px">订单状态</span>
<el-select size="mini" v-model="msg.OrderStatus" @change="getList"> <el-select size="mini" v-model="msg.OrderStatus" @change="getList">
...@@ -197,6 +211,11 @@ ...@@ -197,6 +211,11 @@
}, },
data() { data() {
return { return {
VisaList:[
{ Name: "不限", Id: "0" },
{ Name: "未出签", Id: "1" },
{ Name: "已出签", Id: "2" },
],
MultipleChoiceList: [ //多选项目 MultipleChoiceList: [ //多选项目
{ {
Name: '机票', Name: '机票',
...@@ -230,16 +249,14 @@ ...@@ -230,16 +249,14 @@
EndCityName:"",//到达城市 EndCityName:"",//到达城市
EnterID:"",//业务员id EnterID:"",//业务员id
TicketStatus:"0",//出票状态 TicketStatus:"0",//出票状态
OrderStatus:"1",//订单状态 VisaStatus:"0",//出签状态
OrderStatus:"0",//订单状态
Q_IsCollect:"0",//收款状态 Q_IsCollect:"0",//收款状态
StartTime:"2022-04-28", StartTime:"2022-04-28",
EndTime:"" EndTime:""
}, },
ticketingStatusList:[],// 出票状态 ticketingStatusList:[],// 出票状态
OrderStatusList:[ OrderStatusList:[],
{Name:'正常',Id:'1'},
{Name:'取消',Id:'2'}
],
QIsCollectList:[ QIsCollectList:[
{Name:'不限',Id:'0'}, {Name:'不限',Id:'0'},
{Name:'已收齐',Id:'1'}, {Name:'已收齐',Id:'1'},
...@@ -259,6 +276,7 @@ ...@@ -259,6 +276,7 @@
} }
this.Employee() //业务员 this.Employee() //业务员
this.GetTicketStatusEnumList() //出票枚举 this.GetTicketStatusEnumList() //出票枚举
this.GetOrderStatusEnumList() //订单状态枚举
let $this = this let $this = this
this.MsgBus.$on("closeGetList", function() { this.MsgBus.$on("closeGetList", function() {
$this.getList() $this.getList()
...@@ -312,6 +330,21 @@ ...@@ -312,6 +330,21 @@
return item.More = '' return item.More = ''
}) })
}, },
// 获取订单状态枚举
GetOrderStatusEnumList() {
this.apipost("/api/Order/GetOrderStatusEnumList", {}, (res) => {
if (res.data.resultCode == 1) {
this.OrderStatusList = res.data.data;
let data = {
Name: "不限",
Id: "0",
};
this.OrderStatusList.unshift(data);
} else {
this.$message.error(res.data.message);
}
});
},
// 获取出票状态枚举 // 获取出票状态枚举
GetTicketStatusEnumList(){ GetTicketStatusEnumList(){
this.apipost( this.apipost(
......
src/components/customerManage/orderList.vue
View file @ a4de6d75
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
<th width="6.5%">手续费</th> <th width="6.5%">手续费</th>
<th width="6.5%">待收</th> <th width="6.5%">待收</th>
<th width="6.5%">出票状态</th> <th width="6.5%">出票状态</th>
<th width="6.5%">签证状态</th>
<th width="6.5%">订单状态</th> <th width="6.5%">订单状态</th>
<th width="100px">操作</th> <th width="100px">操作</th>
</tr> </tr>
...@@ -106,10 +107,24 @@ ...@@ -106,10 +107,24 @@
(item.TicketStatus==4?'Black':'')))"> (item.TicketStatus==4?'Black':'')))">
{{item.TicketStatusName}} {{item.TicketStatusName}}
</span> </span>
<i v-if="item.TicketStatus!=1&&item.TicketVoucherList!=[]&&item.CancelVoucherList!=[]&&item.TicketStatusName!='无需机票'" class="iconfont iconpingzhengchaxun Credentials" <i v-if="item.TicketStatus!=1&&item.TicketVoucherList!=[]&&item.CancelVoucherList!=[]&&item.TicketStatusName!='无需机票'" class="cp iconfont iconpingzhengchaxun Credentials"
@click="viewCredentials(item)"></i> @click="viewCredentials(item)"></i>
</p> </p>
</td>
<td style="border:none">
<p class="TicketVoucher-box">
<span @click="item.VisaStatus=='1'?AmendVisa(item):''"
class="tatusText"
:class="item.VisaStatus==0?'grey':
(item.VisaStatus==2?'success'+' cp':
(item.VisaStatus==1?'Black':''))">
{{item.VisaStatus==1?'未出签':(item.VisaStatus==2?'已出签':'无需签证')}}
</span>
<i v-if="item.VisaStatus==2" class="cp iconfont iconpingzhengchaxun Credentials"
@click="CheckOutDetails(item)"></i>
</p>
</td> </td>
<td style="border:none"> <td style="border:none">
<div style="background: rgba(2, 196, 153, 0.2);width: 70px;border-radius: 2px;text-align: center" <div style="background: rgba(2, 196, 153, 0.2);width: 70px;border-radius: 2px;text-align: center"
...@@ -143,7 +158,7 @@ ...@@ -143,7 +158,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td :colspan="8" style="height: 108px;text-align: left"> <td :colspan="9" style="height: 108px;text-align: left">
<div>备注：</div> <div>备注：</div>
<div class="remarks-b"> <div class="remarks-b">
<div v-if="item.Remark != null || item.Remark != ''"> <div v-if="item.Remark != null || item.Remark != ''">
...@@ -231,7 +246,7 @@ ...@@ -231,7 +246,7 @@
</table> </table>
</div> </div>
<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" :activeNameNum="activeNameNum" :receiptType="receiptType"/>
</el-drawer> </el-drawer>
<!-- 单号抽屉 --> <!-- 单号抽屉 -->
<el-drawer @closed="closeOrderDrawerHandler" :with-header="false" size='70%' :visible.sync="orderDrawer" direction="rtl" :before-close="handleClose"> <el-drawer @closed="closeOrderDrawerHandler" :with-header="false" size='70%' :visible.sync="orderDrawer" direction="rtl" :before-close="handleClose">
...@@ -266,6 +281,7 @@ export default { ...@@ -266,6 +281,7 @@ export default {
}, },
data() { data() {
return { return {
receiptType:{},
activeNameNum:"1", activeNameNum:"1",
MultipleChoiceList: [ //多选项目 MultipleChoiceList: [ //多选项目
{ {
...@@ -598,6 +614,31 @@ export default { ...@@ -598,6 +614,31 @@ export default {
operationLog(row) { operationLog(row) {
this.MsgBus.$emit("logTicketOrderBoxOpen", row.GuestId, row, true); this.MsgBus.$emit("logTicketOrderBoxOpen", row.GuestId, row, true);
}, },
// 修改签证状态
AmendVisa(row){
if (this.superManage) {
this.AmendVisafun(row);
} else {
if (this.userInfo.EmName != row.EnterName) {
this.ValidateOperator();
} else {
this.AmendVisafun(row);
}
}
},
AmendVisafun(row){
this.MsgBus.$emit("AmendVisaOrderBoxOpen", row.GuestId, row, true);
},
// 出签凭证详情
CheckOutDetails(row){
let $this = this;
this.MsgBus.$emit(
"CheckOutDetailsOrderBoxOpen",
$this.ID,
row,
true
);
},
// 修改出票状态 // 修改出票状态
modifyStatus(row) { modifyStatus(row) {
if (this.superManage) { if (this.superManage) {
......
src/components/guestManagement/customerInfoBox.vue
View file @ a4de6d75
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
</el-row> </el-row>
</div> </div>
<div class="content"> <div class="content">
<el-tabs v-model="activeName" @tab-click="handleClick"> <el-tabs v-if="!receiptType.ReFinanceId" v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="活动" name="1"> <el-tab-pane label="活动" name="1">
<Activity v-if="activeName === '1'" :CustomerId="CustomerId" :showType="2" :detailsData="detailsData" /> <Activity v-if="activeName === '1'" :CustomerId="CustomerId" :showType="2" :detailsData="detailsData" />
</el-tab-pane> </el-tab-pane>
...@@ -145,6 +145,12 @@ ...@@ -145,6 +145,12 @@
<Record v-if="activeName === '9'" :CustomerId="CustomerId" /> <Record v-if="activeName === '9'" :CustomerId="CustomerId" />
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<el-tabs v-else v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="财务单据" name="12">
<finance v-if="activeName === '12'" :ID="CustomerId" :receiptType="receiptType"/>
</el-tab-pane>
</el-tabs>
</div> </div>
</div> </div>
</div> </div>
...@@ -172,6 +178,10 @@ ...@@ -172,6 +178,10 @@
guestTeam, guestTeam,
}, },
props: { props: {
documentDetails: {
type: Boolean,
default: false,
},
CustomerId: { CustomerId: {
type: Number, type: Number,
default: 0, default: 0,
...@@ -180,6 +190,14 @@ ...@@ -180,6 +190,14 @@
type: Boolean, type: Boolean,
default: false, default: false,
}, },
activeNameNum: {
type: String,
default: false
},
receiptType: {
type: Object,
default: false
}
}, },
data() { data() {
return { return {
...@@ -192,10 +210,16 @@ ...@@ -192,10 +210,16 @@
CustomerId: { CustomerId: {
handler(val, oldVal) { handler(val, oldVal) {
this.init(); this.init();
this.activeName = "1";
}, },
deep: true, deep: true,
}, },
activeNameNum: {
immediate: true,
handler(val, oldVal) {
this.activeName = val;
},
deep: true,
}
}, },
created() { created() {
......
src/components/guestManagement/finance.vue
View file @ a4de6d75
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
:data="dataList" :data="dataList"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%" style="width: 100%"
:height="dataList.length > 0 ? '600' : '660'" :height="dataList.length > 0 ? '600' : '600'"
row-class-name="font-size-12"> row-class-name="font-size-12">
<el-table-column <el-table-column
fixed fixed
...@@ -167,7 +167,20 @@ ...@@ -167,7 +167,20 @@
</template> </template>
<script> <script>
export default { export default {
props: ["ID", "BusinessType"], props:{
ID:{
type: Number,
default: false
},
BusinessType:{
type: Boolean,
default: false
},
receiptType:{
type: Object,
default: false
}
},
data() { data() {
return { return {
ApprovalStatusList:[ ApprovalStatusList:[
...@@ -192,7 +205,10 @@ export default { ...@@ -192,7 +205,10 @@ export default {
FrID:"0", FrID:"0",
Type:"-1", Type:"-1",
Status: "-1", Status: "-1",
GuestId:"" GuestId:"",
ReFinanceId:"",// 订单ID
ReFinanceId2:"",//1收入 2退款 3成本
RelevanceFrId:"",//收据类型
}, },
total:0 total:0
}; };
...@@ -200,10 +216,24 @@ export default { ...@@ -200,10 +216,24 @@ export default {
watch: { watch: {
ID: { ID: {
handler(val, oldVal) { handler(val, oldVal) {
this.getList(); if(!this.receiptType.ReFinanceId){
this.getList();
}
}, },
deep: true, deep: true,
}, },
receiptType: {
immediate: true,
handler(val, oldVal) {
this.msg.ReFinanceId = val.ReFinanceId
this.msg.ReFinanceId2 = val.ReFinanceId2
this.msg.RelevanceFrId = val.RelevanceFrId
if(val.ReFinanceId){
this.getList()
}
},
deep: true,
}
}, },
mounted() { mounted() {
this.msg.GuestId = this.ID this.msg.GuestId = this.ID
......
src/components/guestManagement/ticketOrder.vue
View file @ a4de6d75
...@@ -504,7 +504,7 @@ ...@@ -504,7 +504,7 @@
<div class="form-box" v-if="show"> <div class="form-box" v-if="show">
<el-form :model="form" ref="form" class="MyEditForm" :rules="rules"> <el-form :model="form" ref="form" class="MyEditForm" :rules="rules">
<p class="form-box-tit" v-if="name!='操作日志'&&name!='凭证图'&&name!='制单'"><span class="radius"></span> <p class="form-box-tit" v-if="name!='操作日志'&&name!='凭证图'&&name!='制单'"><span class="radius"></span>
{{name!='修改出票状态'?' 基本信息':' 上传'+text+'凭证'}}</p> {{name!='修改出票状态'&&name!='修改出签状态'?' 基本信息':' 上传'+text+'凭证'}}</p>
<el-row :gutter="30"> <el-row :gutter="30">
<el-col :span="8" v-if="name=='新建机票订单'||name=='编辑机票订单'"> <el-col :span="8" v-if="name=='新建机票订单'||name=='编辑机票订单'">
<div class="MyEditForm-item"> <div class="MyEditForm-item">
...@@ -621,7 +621,7 @@ ...@@ -621,7 +621,7 @@
<div class="MyEditForm-item"> <div class="MyEditForm-item">
<el-form-item label="凭证/图片" prop=""> <el-form-item label="凭证/图片" prop="">
<div class="certificate-img-box"> <div class="certificate-img-box">
<div class="img-box" v-loding="imgShow" v-for="(item,index) in form.Voucher" :key="index"> <div class="img-box" :loding="imgShow" v-for="(item,index) in form.Voucher" :key="index">
<el-image <el-image
style="width: 100px; height: 100px" style="width: 100px; height: 100px"
:src="item" :src="item"
...@@ -640,6 +640,46 @@ ...@@ -640,6 +640,46 @@
class="upload-demo" class="upload-demo"
drag drag
action="" action=""
:show-file-list="false"
:file-list="fileList"
:http-request="uploadImg"
:multiple="true"
accept="image/jpeg,image/gif,image/png,image/bmp"
:before-upload="handleAvatarUpload"
:on-success="handleAvatarSuccess"
>
<i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
</el-upload>
</el-form-item>
</div>
</el-col>
</el-row>
<el-row v-if="name=='修改出签状态'">
<el-col :span="24">
<div class="MyEditForm-item">
<el-form-item label="凭证/图片" prop="">
<div class="certificate-img-box">
<div class="img-box" :loding="imgShow" v-for="(item,index) in form.Voucher" :key="index">
<el-image
style="width: 100px; height: 100px"
:src="item"
:preview-src-list="form.Voucher">
</el-image>
</div>
</div>
</el-form-item>
</div>
</el-col>
<el-col :span="24">
<div class="MyEditForm-item">
<el-form-item label="上传图片" prop="Voucher">
<el-upload
ref="ticketUpload"
class="upload-demo"
drag
action=""
:show-file-list="false"
:file-list="fileList" :file-list="fileList"
:http-request="uploadImg" :http-request="uploadImg"
:multiple="true" :multiple="true"
...@@ -699,6 +739,18 @@ ...@@ -699,6 +739,18 @@
</div> </div>
</div> </div>
</div> </div>
<div v-if="name=='出签凭证图'" class="Credentials-box">
<div class="Credentials-text">
<div class="Credentialstext-box">
<p>出签凭证</p>
<div class="Credentialsimg-box">
<el-image v-for="(items,index) in obj.VisaVoucherList.map(item=>{return domainManager().ViittoFileUrl + item})" :key="index"
:src="items"
:preview-src-list="obj.VisaVoucherList.map(item=>{return domainManager().ViittoFileUrl + item})"></el-image>
</div>
</div>
</div>
</div>
<div v-if="name=='操作日志'"> <div v-if="name=='操作日志'">
<div v-for="(item,index) in logData" :key="index"> <div v-for="(item,index) in logData" :key="index">
<div class="form-box-log"> <div class="form-box-log">
...@@ -1491,6 +1543,9 @@ ...@@ -1491,6 +1543,9 @@
this.AccountType_post_GetList() this.AccountType_post_GetList()
this.Financial_post_GetCostTypeList() this.Financial_post_GetCostTypeList()
} }
if (this.name == '修改出签状态') {
this.text = '出签'
}
}, },
...@@ -2207,6 +2262,38 @@ ...@@ -2207,6 +2262,38 @@
} }
}) })
}, },
// 修改出签状态
SetOrderVisaState(){
if(this.Voucher.length==0){
this.$message.warning('请上传凭证！');
return
}
let data = {
OrderId:this.obj.OrderId,//订单ID
Voucher:this.Voucher
}
this.clickShow = true
this.apipost("api/Order/SetOrderVisaState",data,(res)=>{
if (res.data.resultCode == 1) {
this.clickShow = false
this.dialogTableVisible = false;
this.Voucher = []
this.MsgBus.$emit("closeBillMaking");
this.$confirm(res.data.message, '提示', {
confirmButtonText: '确定',
cancelButtonText: '',
type: 'warning'
}).then(() => {
}).catch(() => {
});
} else {
this.clickShow = false
this.$message.error(res.data.message);
}
})
},
submitForm(addMsg) { submitForm(addMsg) {
//提交创建、修改表单 //提交创建、修改表单
if (this.name == '新建机票订单' || this.name == '编辑机票订单') { if (this.name == '新建机票订单' || this.name == '编辑机票订单') {
...@@ -2252,6 +2339,13 @@ ...@@ -2252,6 +2339,13 @@
if(this.name=='制单'){ if(this.name=='制单'){
this.Financial_post_SetFinanceInfoForCRMIn() this.Financial_post_SetFinanceInfoForCRMIn()
} }
if(this.name=='修改出签状态'){
this.SetOrderVisaState()
}
if(this.name=='凭证图'||this.name=='出签凭证图'){
this.dialogTableVisible = false;
this.MsgBus.$emit("closeTicketOrderDialogBox");
}
}, },
resetForm(formName) { resetForm(formName) {
......
src/components/planeTicketOrder/index.vue
View file @ a4de6d75
...@@ -85,6 +85,20 @@ ...@@ -85,6 +85,20 @@
</el-option> </el-option>
</el-select> </el-select>
</el-col> </el-col>
<el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px"
>出签状态</span
>
<el-select size="mini" v-model="msg.VisaStatus" @change="getList">
<el-option
v-for="(item, index) in VisaList"
:key="index"
:label="item.Name"
:value="item.Id"
>
</el-option>
</el-select>
</el-col>
<el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3"> <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px" <span class="font-size-12" style="padding-right: 10px"
>订单状态</span >订单状态</span
...@@ -223,7 +237,7 @@ ...@@ -223,7 +237,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<p v-if="scope.row.TicketMoney == 0">-</p> <p v-if="scope.row.TicketMoney == 0">-</p>
<p v-else><span>{{ scope.row.TicketMoney }}</span <p v-else @click="openNameDetails(scope.row,1,1)" class="hover"><span>{{ scope.row.TicketMoney }}</span
>/<span >/<span
:style="{ :style="{
color: color:
...@@ -239,7 +253,7 @@ ...@@ -239,7 +253,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<p v-if="scope.row.VisaMoney == 0">-</p> <p v-if="scope.row.VisaMoney == 0">-</p>
<p v-else> <span>{{ scope.row.VisaMoney }}</span>/<span <p v-else @click="openNameDetails(scope.row,1,2)" class="hover"> <span>{{ scope.row.VisaMoney }}</span>/<span
:style="{ :style="{
color: color:
scope.row.VisaMoney > scope.row.VisaIncome ? 'red' : '#000', scope.row.VisaMoney > scope.row.VisaIncome ? 'red' : '#000',
...@@ -252,7 +266,7 @@ ...@@ -252,7 +266,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<p v-if="scope.row.DiJieMoney == 0">-</p> <p v-if="scope.row.DiJieMoney == 0">-</p>
<p v-else> <span>{{ scope.row.DiJieMoney }}</span <p v-else @click="openNameDetails(scope.row,1,3)" class="hover"> <span>{{ scope.row.DiJieMoney }}</span
>/<span >/<span
:style="{ :style="{
color: color:
...@@ -268,7 +282,7 @@ ...@@ -268,7 +282,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<p v-if="scope.row.MealMoney == 0">-</p> <p v-if="scope.row.MealMoney == 0">-</p>
<p v-else> <p v-else @click="openNameDetails(scope.row,1,4)" class="hover">
<span>{{ scope.row.MealMoney }}</span <span>{{ scope.row.MealMoney }}</span
>/<span >/<span
:style="{ :style="{
...@@ -281,11 +295,39 @@ ...@@ -281,11 +295,39 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="OtherIncome" label="其他收款" width="100"> <el-table-column label="其他收款" width="100">
<template slot-scope="scope">
<p v-if="scope.row.MealMoney == 0">-</p>
<p v-else @click="openNameDetails(scope.row,1,5)" class="hover">
<span>{{ scope.row.OtherIncome }}</span>
</p>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="Money" label="合计应收款" width="100"> <el-table-column label="合计应收款" width="100">
<template slot-scope="scope">
<p v-if="scope.row.Money == 0">-</p>
<p v-else @click="openNameDetails(scope.row,1,'')" class="hover">
<span>{{ scope.row.Money }}</span>
</p>
</template>
</el-table-column>
<el-table-column label="已收款">
<template slot-scope="scope">
<p v-if="scope.row.IncomeMoney == 0">-</p>
<p v-else @click="openNameDetails(scope.row,1,'')" class="hover">
<span>{{ scope.row.IncomeMoney }}</span>
</p>
</template>
</el-table-column>
<el-table-column label="退款费用">
<template slot-scope="scope">
<p v-if="scope.row.BackMoney == 0">-</p>
<p v-else @click="openNameDetails(scope.row,2,'')" class="hover">
<span>{{ scope.row.BackMoney }}</span>
</p>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="IncomeMoney" label="已收款"> </el-table-column>
<el-table-column prop="DueinMoney" label="未收款"> <el-table-column prop="DueinMoney" label="未收款">
<template slot-scope="scope"> <template slot-scope="scope">
<span :style="{color:scope.row.DueinMoney>0?'red':'#000'}">{{scope.row.DueinMoney}}</span> <span :style="{color:scope.row.DueinMoney>0?'red':'#000'}">{{scope.row.DueinMoney}}</span>
...@@ -293,16 +335,55 @@ ...@@ -293,16 +335,55 @@
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="营业成本"> <el-table-column label="营业成本">
<el-table-column prop="TicketCost" label="机票成本"> <el-table-column label="机票成本">
<template slot-scope="scope">
<p v-if="scope.row.TicketCost == 0">-</p>
<p v-else @click="openNameDetails(scope.row,3,1)" class="hover">
<span>{{ scope.row.TicketCost }}</span>
</p>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="VisaCost" label="签证成本"> <el-table-column label="签证成本">
<template slot-scope="scope">
<p v-if="scope.row.VisaCost == 0">-</p>
<p v-else @click="openNameDetails(scope.row,3,2)" class="hover">
<span>{{ scope.row.VisaCost }}</span>
</p>
</template>
</el-table-column>
<el-table-column label="地接成本">
<template slot-scope="scope">
<p v-if="scope.row.DiJieCost == 0">-</p>
<p v-else @click="openNameDetails(scope.row,3,3)" class="hover">
<span>{{ scope.row.DiJieCost }}</span>
</p>
</template>
</el-table-column>
<el-table-column label="套餐成本">
<template slot-scope="scope">
<p v-if="scope.row.MealCost == 0">-</p>
<p v-else @click="openNameDetails(scope.row,3,4)" class="hover">
<span>{{ scope.row.MealCost }}</span>
</p>
</template>
</el-table-column>
<el-table-column label="其他成本">
<template slot-scope="scope">
<p v-if="scope.row.OtherCost == 0">-</p>
<p v-else @click="openNameDetails(scope.row,3,5)" class="hover">
<span>{{ scope.row.OtherCost }}</span>
</p>
</template>
</el-table-column>
<el-table-column label="合计数">
<template slot-scope="scope">
<p v-if="scope.row.MealCost == 0">-</p>
<p v-else @click="openNameDetails(scope.row,3,'')" class="hover">
<span>{{ scope.row.MealCost }}</span>
</p>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="DiJieCost" label="地接成本"> </el-table-column>
<el-table-column prop="MealCost" label="套餐成本"> </el-table-column>
<el-table-column prop="OtherCost" label="其他成本"> </el-table-column>
<el-table-column prop="MealCost" label="合计数"> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column prop="BackMoney" label="退款费用"> </el-table-column>
<el-table-column prop="TaxMoney" label="平台费用"> </el-table-column> <el-table-column prop="TaxMoney" label="平台费用"> </el-table-column>
<el-table-column prop="Profit" label="订单毛利"> <el-table-column prop="Profit" label="订单毛利">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -318,7 +399,7 @@ ...@@ -318,7 +399,7 @@
</div > </div >
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="FinancePayer" label="供应商" width="200"> <el-table-column prop="FinancePayer" label="供应商" width="200" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
{{scope.row.FinancePayer}} {{scope.row.FinancePayer}}
...@@ -333,7 +414,7 @@ ...@@ -333,7 +414,7 @@
</div> </div>
<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" :activeNameNum="activeNameNum" :receiptType="receiptType"/>
</el-drawer> </el-drawer>
<!-- 单号抽屉 --> <!-- 单号抽屉 -->
<el-drawer @closed="closeOrderDrawerHandler" :with-header="false" size='70%' :append-to-body="true" :visible.sync="orderDrawer" direction="rtl" :before-close="handleClose"> <el-drawer @closed="closeOrderDrawerHandler" :with-header="false" size='70%' :append-to-body="true" :visible.sync="orderDrawer" direction="rtl" :before-close="handleClose">
...@@ -358,6 +439,7 @@ export default { ...@@ -358,6 +439,7 @@ export default {
} }
this.Employee(); //业务员 this.Employee(); //业务员
this.GetTicketStatusEnumList(); //出票枚举 this.GetTicketStatusEnumList(); //出票枚举
this.GetOrderStatusEnumList() //订单状态枚举
//监听 //监听
let $this = this; let $this = this;
this.MsgBus.$on("closeGetList", function () { this.MsgBus.$on("closeGetList", function () {
...@@ -379,15 +461,18 @@ export default { ...@@ -379,15 +461,18 @@ export default {
StartCityName: "", //出行概述 StartCityName: "", //出行概述
EnterID: "", //业务员id EnterID: "", //业务员id
TicketStatus: "0", //出票状态 TicketStatus: "0", //出票状态
OrderStatus: "1", //订单状态 VisaStatus:"0",//出签状态
OrderStatus: "0", //订单状态
Q_IsCollect: "0", //收款状态 Q_IsCollect: "0", //收款状态
StartTime: "", StartTime: "",
EndTime: "", EndTime: "",
}, },
OrderStatusList: [ VisaList:[
{ Name: "正常", Id: "1" }, { Name: "不限", Id: "0" },
{ Name: "取消", Id: "2" }, { Name: "未出签", Id: "1" },
{ Name: "已出签", Id: "2" },
], ],
OrderStatusList: [],
QIsCollectList: [ QIsCollectList: [
{ Name: "不限", Id: "0" }, { Name: "不限", Id: "0" },
{ Name: "已收齐", Id: "1" }, { Name: "已收齐", Id: "1" },
...@@ -401,7 +486,13 @@ export default { ...@@ -401,7 +486,13 @@ export default {
activeNameNum:"2", activeNameNum:"2",
drawer:false, drawer:false,
CustomerId:"", CustomerId:"",
CustomerName:"" CustomerName:"",
receiptType:{
ReFinanceId:"",
ReFinanceId2:"",//单据类型
RelevanceFrId:"",//1机票 2签证 3地接 4套餐 5其他
},
}; };
}, },
...@@ -440,6 +531,21 @@ export default { ...@@ -440,6 +531,21 @@ export default {
(err) => {} (err) => {}
); );
}, },
// 获取订单状态枚举
GetOrderStatusEnumList() {
this.apipost("/api/Order/GetOrderStatusEnumList", {}, (res) => {
if (res.data.resultCode == 1) {
this.OrderStatusList = res.data.data;
let data = {
Name: "不限",
Id: "0",
};
this.OrderStatusList.unshift(data);
} else {
this.$message.error(res.data.message);
}
});
},
// 获取出票状态枚举 // 获取出票状态枚举
GetTicketStatusEnumList() { GetTicketStatusEnumList() {
this.apipost("/api/Order/GetTicketStatusEnumList", {}, (res) => { this.apipost("/api/Order/GetTicketStatusEnumList", {}, (res) => {
...@@ -509,10 +615,21 @@ export default { ...@@ -509,10 +615,21 @@ export default {
this.orderDrawer = true; this.orderDrawer = true;
}, },
// 点击客人名称 // 点击客人名称
openNameDetails(item) { openNameDetails(item,ReFinanceId2,RelevanceFrId) {
this.drawer = true; this.drawer = true;
this.CustomerId = item.GuestId; this.CustomerId = item.GuestId;
this.CustomerName = item.GuestName; this.CustomerName = item.GuestName;
if(ReFinanceId2){
this.activeNameNum = '12'
this.receiptType.ReFinanceId = item.OrderId
this.receiptType.ReFinanceId2 = ReFinanceId2?ReFinanceId2:""
this.receiptType.RelevanceFrId = RelevanceFrId
}else{
this.activeNameNum = '1'
this.receiptType.ReFinanceId = ""
this.receiptType.ReFinanceId2 = ""
this.receiptType.RelevanceFrId = ""
}
}, },
//改变状态背景颜色 //改变状态背景颜色
columenStyle({columnIndex}){ columenStyle({columnIndex}){
...@@ -537,6 +654,8 @@ export default { ...@@ -537,6 +654,8 @@ export default {
margin: 10px 0; margin: 10px 0;
} }
.query-box { .query-box {
background-color: #fff;
padding: 15px 10px;
.el-row { .el-row {
.el-col { .el-col {
display: flex; display: flex;
......
src/views/index.vue
View file @ a4de6d75
...@@ -333,6 +333,12 @@ ...@@ -333,6 +333,12 @@
$this.obj = obj; $this.obj = obj;
$this.dialogTicketOrderVisible = true; $this.dialogTicketOrderVisible = true;
}); });
this.MsgBus.$on("AmendVisaOrderBoxOpen", function (GuestId, obj) {
$this.dialogTicketOrderVisibleName = "修改出签状态";
$this.GuestId = GuestId;
$this.obj = obj;
$this.dialogTicketOrderVisible = true;
});
this.MsgBus.$on("logTicketOrderBoxOpen", function (GuestId, obj) { this.MsgBus.$on("logTicketOrderBoxOpen", function (GuestId, obj) {
$this.dialogTicketOrderVisibleName = "操作日志"; $this.dialogTicketOrderVisibleName = "操作日志";
$this.GuestId = GuestId; $this.GuestId = GuestId;
...@@ -351,6 +357,12 @@ ...@@ -351,6 +357,12 @@
$this.obj = obj; $this.obj = obj;
$this.dialogTicketOrderVisible = true; $this.dialogTicketOrderVisible = true;
}); });
this.MsgBus.$on("CheckOutDetailsOrderBoxOpen", function (GuestId, obj) {
$this.dialogTicketOrderVisibleName = "出签凭证图";
$this.GuestId = GuestId;
$this.obj = obj;
$this.dialogTicketOrderVisible = true;
});
this.MsgBus.$on("BillMakingOrderBoxOpen", function (GuestId, obj) { this.MsgBus.$on("BillMakingOrderBoxOpen", function (GuestId, obj) {
$this.dialogTicketOrderVisibleName = "制单"; $this.dialogTicketOrderVisibleName = "制单";
$this.GuestId = GuestId; $this.GuestId = GuestId;
......
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