Skip to content

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

no message

parent 95f5031a
Hide whitespace changes
Inline Side-by-side
Showing with 412 additions and 95 deletions
src/App.vue
View file @ ddb5cc70
......@@ -26,7 +26,7 @@ export default {
<style>
@import "./assets/css/tablevoerride.css";
@import "./assets/global/font.css";
@import "//at.alicdn.com/t/font_1627123_khj62ff3f6k.css";
@import "//at.alicdn.com/t/font_1627123_tcs57r3ak3a.css";
@import url("//at.alicdn.com/t/font_1627123_grz80mbm3sv.css");
/* @import './assets/css/common.css'; */
@import "./assets/css/init.css";
......
src/components/guestManagement/Agreement.vue
View file @ ddb5cc70
......@@ -6,6 +6,29 @@
.add-Enclosure-left{
display: flex;
}
.tem-but-box{
display: flex;
}
.item-but{
margin-right: 10px;
}
.numIcon{
font-size: 12px;
padding: 5px;
color: #409eff;
}
.tatusText.grey{
color: grey;
}
.tatusText.success{
color: #21BA45;
}
.tatusText.error{
color: #F2C037;
}
.tatusText.Black{
color: Black;
}
</style>
<template>
<div class="Business">
......@@ -14,13 +37,21 @@
<el-col :span="8">
<el-input size="mini" placeholder="输入订单ID" v-model="msg.OrderId" label="订单ID" @blur="getList"></el-input>
</el-col>
<el-col :span="8">
<el-col :span="4">
<el-select size="mini" width="200" v-model="msg.TicketStatus" placeholder="请选择"
@change="getList">
<el-option
v-for="item in ticketingStatusList"
:key="item.id" :label="item.Name" :value="item.Id"></el-option>
</el-select>
@change="getList">
<el-option
v-for="item in ticketingStatusList"
:key="item.Id" :label="item.Name" :value="item.Id"></el-option>
</el-select>
</el-col>
<el-col :span="4">
<el-select size="mini" width="200" v-model="msg.OrderStatus" placeholder="请选择"
@change="getList">
<el-option
v-for="item in orderStatusList"
:key="item.Id" :label="item.Name" :value="item.Id"></el-option>
</el-select>
</el-col>
</el-row>
<el-button plain icon="el-icon-plus" type="primary" size="mini" class="margin-right0" @click="addBusiness">创建订单</el-button>
......@@ -35,12 +66,14 @@
style="width: 100%"
row-class-name="font-size-12">
<el-table-column
fixed
prop="CreateByName"
label="下单人"
show-overflow-tooltip>
</el-table-column>
<el-table-column
<el-table-column
fixed
label="订单号"
show-overflow-tooltip>
<template slot-scope="scope">
......@@ -71,24 +104,31 @@
label="订单金额"
show-overflow-tooltip>
<template slot-scope="scope">
<!-- Edit order amount -->
<p @click="editOrderAmount(scope)" class="font-color-link cp">{{scope.row.Money}}</p>
<p @click="editOrderAmount(scope.row)" class="font-color-link cp">{{scope.row.Money}}</p>
</template>
</el-table-column>
<el-table-column
prop="IncomeMoney"
label="实收"
show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.IncomeMoney}}<i class="iconfont iconjia- numIcon"></i>
</template>
</el-table-column>
<el-table-column
prop="PayMoney"
label="付款"
show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.PayMoney}}<i class="iconfont iconjia- numIcon"></i>
</template>
</el-table-column>
<el-table-column
prop="BackMoney"
label="退款"
show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.BackMoney}}<i class="iconfont iconjia- numIcon"></i>
</template>
</el-table-column>
<el-table-column
prop="TaxMoney"
......@@ -96,7 +136,7 @@
show-overflow-tooltip>
</el-table-column>
<el-table-column
prop=""
prop="DueinMoney"
label="待收"
show-overflow-tooltip>
</el-table-column>
......@@ -121,9 +161,18 @@
show-overflow-tooltip>
</el-table-column>
<el-table-column
prop="TicketStatusName"
label="出票状态"
show-overflow-tooltip>
<template slot-scope="scope">
<p @click="modifyStatus(scope.row)"
class="cp tatusText"
:class="scope.row.TicketStatus==1?'grey':
(scope.row.TicketStatus==2?'success':
(scope.row.TicketStatus==3?'error':
(scope.row.TicketStatus==4?'Black':'')))">
{{scope.row.TicketStatusName}}
</p>
</template>
</el-table-column>
<el-table-column
prop="Remark"
......@@ -140,9 +189,22 @@
label="下单时间"
show-overflow-tooltip>
</el-table-column>
<el-table-column
<el-table-column
fixed="right"
label="操作"
show-overflow-tooltip>
<template slot-scope="scope">
<div class="item-but-box">
<el-tooltip
v-if="scope.row.TicketStatus==1&&scope.row.OrderStatus==1"
class="item-but" effect="dark" content="取消订单" placement="top">
<i class="iconfont iconquxiao cp" @click="cancelOrder(scope.row)"></i>
</el-tooltip>
<!-- <el-tooltip class="item-but" effect="dark" content="财务" placement="top">
<i class="iconfont iconcaiwuzhongxin cp"></i>
</el-tooltip> -->
</div>
</template>
</el-table-column>
</el-table>
</div>
......@@ -159,7 +221,11 @@ export default {
props: ["ID", "BusinessType"],
data() {
return {
ticketingStatusList:[],
orderStatusList:[
{Name:'正常',Id:'1'},
{Name:'取消',Id:'2'}
],//订单状态
ticketingStatusList:[],// 出票状态
dataList: [],
loading: false,
msg: {
......@@ -168,7 +234,7 @@ export default {
OrderId:"",
GuestId:"",
TicketStatus: '0',
OrderStatus:"",
OrderStatus:"1",
StartCityName: "",
EndCityName: "",
EnterID: ""
......@@ -188,13 +254,89 @@ export default {
this.getList();
this.GetTicketStatusEnumList()
let $this = this
this.MsgBus.$on("closeGetList", function() {
$this.getList()
});
},
methods: {
// 修改出票状态
modifyStatus(row){
if(row.OrderStatus==2){
let tips = '该订单已取消，不能修改出票状态'
this.$confirm(tips, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
}).catch(() => {
});
}else{
if(row.TicketStatus==4){
return
}else{
let $this = this;
this.MsgBus.$emit("reviseTicketOrderBoxOpen", $this.ID, row, true);
}
}
},
// 取消订单
cancelOrder(row){
let tips = '此操作将取消该订单，是否继续取消?'
this.$confirm(tips, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.apipost('/api/Order/SetGuestOrderState', {
OrderId: row.OrderId,
Type: '1',
}, res=>{
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.getList()
}
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消'
});
});
},
// 编辑订单金额
editOrderAmount(scope){
console.log(scope.row, '111111')
let $this = this;
this.MsgBus.$emit("editTicketOrderBoxOpen", $this.ID, scope.row, true);
editOrderAmount(row){
if(row.TicketStatus==1&&row.OrderStatus==1){
let $this = this;
this.MsgBus.$emit("editTicketOrderBoxOpen", $this.ID, row, true);
}else{
let tips = ''
if(row.TicketStatus==2&&row.OrderStatus==1){
tips = '已出票'
}
if(row.TicketStatus==3&&row.OrderStatus==1){
tips = '航班熔断'
}
if(row.TicketStatus==4&&row.OrderStatus==1){
tips = '用户取消航班'
}
if(row.OrderStatus==2){
tips = '已取消'
}
this.$confirm('此订单'+tips+'，无法编辑订单金额?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
}).catch(() => {
});
}
},
openDetails(scope) {
console.log(scope.row.ID);
......
src/components/guestManagement/ticketOrder.vue
View file @ ddb5cc70
<style>
<style scoped>
.customerDialogBox.add-box .add-tit {
display: flex;
justify-content: space-between;
......@@ -130,6 +130,18 @@
text-align: center;
line-height: 140px;
}
.el-upload-dragger{
width: 100% !important;
}
.certificate-img-box{
display: flex;
flex-wrap: wrap;
}
.img-box{
width: 100px;
height: 100px;
margin-right: 10px;
}
</style>
<template>
<el-dialog :visible.sync="dialogTableVisible" @closed="closedDialog" :close-on-click-modal="false" class="add-box add-box1 customerDialogBox">
......@@ -139,8 +151,9 @@
</div>
<div class="form-box" v-if="show">
<el-form :model="form" ref="form" class="MyEditForm" :rules="rules">
<p class="form-box-tit"><span class="radius"></span> 基本信息</p>
<el-row :gutter="30">
<p class="form-box-tit"><span class="radius"></span>
{{name!='修改出票状态'?' 基本信息':' 上传'+text+'凭证'}}</p>
<el-row :gutter="30" v-if="name=='新建机票订单'">
<el-col :span="8">
<div class="MyEditForm-item">
<el-form-item label="预计人数" prop="GuestCount">
......@@ -162,38 +175,9 @@
</el-form-item>
</div>
</el-col>
<!-- <el-col :span="8">
<div class="MyEditForm-item">
<el-form-item label="商机名称" prop="BusinessName">
<el-input placeholder="请输入商机名称" v-model="form.BusinessName"></el-input>
</el-form-item>
</div>
</el-col>
<el-col :span="8">
<div class="MyEditForm-item">
<el-form-item label="客户名称" prop="CustomerId">
<el-select v-model="form.CustomerId" :disabled="type==='1' ? true : false" placeholder="请选择客户" v-if="!isGuest">
<el-option
v-for="item in CustomerList"
:key="item.CustomerId"
:label="item.CustomerName"
:value="item.CustomerId">
</el-option>
</el-select>
<el-select v-model="form.CustomerId" :disabled="type==='1' ? true : false" placeholder="请选择客户" v-else>
<el-option
v-for="item in CustomerList"
:key="item.Id"
:label="item.GuestName"
:value="item.Id">
</el-option>
</el-select>
</el-form-item>
</div>
</el-col> -->
</el-row>
<el-row :gutter="30">
<el-row :gutter="30" v-if="name!='修改出票状态'">
<el-col :span="8">
<div class="MyEditForm-item">
<el-form-item label="报价金额" prop="Money">
......@@ -202,15 +186,70 @@
</div>
</el-col>
</el-row>
<el-row>
<el-row v-if="name=='新建机票订单'||name=='编辑订单金额'">
<el-col :span="24">
<div class="MyEditForm-item label-pad-left">
<el-form-item label="备注">
<el-form-item v-if="name=='新建机票订单'" label="备注">
<el-input type="textarea" placeholder="订单备注" v-model="form.Remark"></el-input>
</el-form-item>
<el-form-item v-if="name=='编辑订单金额'" label="备注" prop="Remark">
<el-input type="textarea" placeholder="订单备注" v-model="form.Remark"></el-input>
</el-form-item>
</div>
</el-col>
</el-row>
<el-row v-if="name=='修改出票状态'">
<el-col v-if="obj.TicketStatus==2" :span="24">
<div class="MyEditForm-item">
<el-form-item label="出票状态" prop="Type">
<el-radio-group v-model="form.Type">
<el-radio v-for="(item,index) in radioList"
@change="radioChange"
:key="index"
:label="item.id">{{item.name}}</el-radio>
</el-radio-group>
</el-form-item>
</div>
</el-col>
<el-col :span="24">
<div class="MyEditForm-item">
<el-form-item label="凭证/图片" prop="">
<div class="certificate-img-box">
<div class="img-box" 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=""
:file-list="fileList"
:http-request="uploadImg"
:multiple="true"
accept="image/jpeg,image/gif,image/png,image/bmp"
:on-success="handleAvatarSuccess"
>
<i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
<!-- <div class="el-upload__tip" slot="tip">只能上传jpg/png文件，且不超过500kb</div> -->
</el-upload>
</el-form-item>
</div>
</el-col>
</el-row>
</el-form>
</div>
<div slot="footer" class="dialog-footer">
......@@ -221,19 +260,41 @@
</template>
<script>
export default {
props: [
"ID",
"name",
"CustomerId",
"ContactId",
"type",
"isGuest",
"TicketOrderId",
"GuestId",
"OrderId"
],
props:{
ID:{
type: Number,
default : 0
},
name:{
type: String,
default : ""
},
CustomerId:{
type: Number,
default : 0
},
GuestId:{
type: Number,
default : 0
},
OrderId:{
type: String,
default : ""
},
obj:{
type: Object,
default : {}
}
},
data() {
return {
Voucher:[],
fileList:[],
radioList:[
{name:'航班熔断',id:'3'},
{name:'用户取消航班',id:'4'},
],
text:'',
CustomerList: [],
LineList: [],
LineTeamList: [],
......@@ -246,6 +307,8 @@ export default {
EndCityName: "",
Money: null,
Remark: "",
Type: "",
Voucher: []
},
BusinessStatusEnum: [],
rules: {
......@@ -262,6 +325,10 @@ export default {
{ required: true, message: "请输入报价金额", trigger: "change" },
],
Remark: [{ required: true, message: "请输入备注", trigger: "blur" }],
Type: [
{ required: true, message: "选择出票状态", trigger: "change" },
],
Voucher: [{ required: true, message: "上传凭据", trigger: "blur" }],
},
show: true,
};
......@@ -269,8 +336,7 @@ export default {
watch: {
ID: {
handler(val, oldVal) {
// console.log(val,'-1-11-');
// this.form.GuestId = val
},
deep: true,
},
......@@ -287,11 +353,11 @@ export default {
deep: true,
},
},
mounted() {
mounted() {
this.form.GuestId = this.GuestId
this.form.OrderId = this.OrderId
// console.log(this.GuestId, '----------')
if(this.obj.TicketStatus==1){
this.text = '出票'
}
let $this = this;
setTimeout(() => {
$this.dialogTableVisible = true;
......@@ -301,43 +367,146 @@ export default {
closedDialog() {
this.MsgBus.$emit("closeTicketOrderDialogBox");
},
addData() {
this.apipost("/api/Order/SetGuestOrderInfo", this.form, (res) => {
//上传文件后清空文件队列
handleAvatarSuccess(res, file) {
this.$refs.ticketUpload.clearFiles();
if (res.resultCode == 1) {
this.Success(res.message);
}
},
//上传图片
uploadImg(file) {
let newArr = [];
newArr.push(file.file);
let path = "/Upload/Temporary/";
this.UploadSelfFileT(path, newArr, (x) => {
let url = this.domainManager().ViittoFileUrl + x.data.FilePath;
let data = x.data.FilePath
// this.form.Voucher.push({
// name: file.file.name,
// url: url,
// size: (file.file.size / 1024).toFixed(2) + "kb",
// });
this.Voucher.push(data)
this.form.Voucher.push(url);
});
},
radioChange(){
if(this.form.Type=='3'){
this.text = '航班熔断'
}if(this.form.Type=='4'){
this.text = '用户取消航班'
}
},
// 修改订单状态
reviseData() {
if(this.obj.TicketStatus==1){
this.form.Type = '2'
}
if(this.obj.OrderId){
this.form.OrderId = this.obj.OrderId
}
let data = {
OrderId: this.form.OrderId,
Type: this.form.Type,
Voucher: this.Voucher
}
this.apipost("/api/Order/SetGuestOrderState", data, (res) => {
if (res.data.resultCode == 1) {
this.dialogTableVisible = false;
this.$message.success("操作成功");
this.MsgBus.$emit("closeTicketOrderDialogBox");
this.MsgBus.$emit("closeGetList");
this.resetForm("form");
} else {
this.$message.error(res.data.message);
}
});
},
submitForm(addMsg) {
// console.log(this.form, '-----')
// return
//提交创建、修改表单
this.$refs[addMsg].validate((valid) => {
if (valid) {
this.addData();
// 编辑金额
editData(){
if(this.obj.OrderId){
this.form.OrderId = this.obj.OrderId
}
let data = {
OrderId: this.form.OrderId,
Money: this.form.Money,
Remark: this.form.Remark
}
this.apipost("/api/Order/SetGuestOrderMoney", data, (res) => {
if (res.data.resultCode == 1) {
this.dialogTableVisible = false;
this.$message.success("操作成功");
this.MsgBus.$emit("closeTicketOrderDialogBox");
this.MsgBus.$emit("closeGetList");
this.resetForm("form");
} else {
this.$message.error(res.data.message);
}
});
},
// 新增订单
addData() {
let data = {
OrderId: this.form.OrderId,
GuestId: this.form.GuestId,
GuestCount: this.form.GuestCount,
StartCityName: this.form.StartCityName,
EndCityName: this.form.EndCityName,
Money: this.form.Money,
Remark: this.form.Remark,
}
this.apipost("/api/Order/SetGuestOrderInfo", data, (res) => {
if (res.data.resultCode == 1) {
this.dialogTableVisible = false;
this.$message.success("操作成功");
this.MsgBus.$emit("closeTicketOrderDialogBox");
this.MsgBus.$emit("closeGetList");
this.resetForm("form");
} else {
return false;
this.$message.error(res.data.message);
}
});
},
submitForm(addMsg) {
//提交创建、修改表单
if(this.name=='新建机票订单'){
this.$refs[addMsg].validate((valid) => {
if (valid) {
this.addData();
} else {
return false;
}
});
}if(this.name=='编辑订单金额'){
this.$refs[addMsg].validate((valid) => {
if (valid) {
this.editData();
} else {
return false;
}
});
}if(this.name=='修改出票状态'){
this.$refs[addMsg].validate((valid) => {
if (valid) {
this.reviseData();
} else {
return false;
}
});
}
},
resetForm(formName) {
this.MsgBus.$emit("closeTicketOrderDialogBox");
// 重置表单
this.form = {
ID: 0,
CustomerId: 0,
BudgetPrice: "",
LineId: "",
BusinessName: "",
BusinessStatus: "",
LineteamId: "",
DepartTime: "",
GuestCount: 0,
OrderId: 0,
GuestId: null,
GuestCount: 1,
StartCityName: "",
EndCityName: "",
Money: null,
Remark: "",
};
this.$refs[formName].resetFields();
......
src/plugins/index.js
View file @ ddb5cc70
......@@ -17,7 +17,7 @@ export default {
//domainUrl = "http://localhost:5003";
let locationName = window.location.hostname;
//旅游ERPApi
let domainPostUrl = "http://192.168.10.214"
let domainPostUrl = "http://192.168.10.2:8083"
if (this.isOnline()) {
if (window.location.host.indexOf('fcrmyx.oytour.com') != -1) {
domainUrl = "http://crm.oytour.com"
......@@ -44,9 +44,9 @@ export default {
//常用提交数据URL
PostUrl: domainUrl,
PostUrl2: domainPostUrl + "/api/common/post",
javaUrl: locationName.indexOf('testb2b') == -1 ? "http://efficient.oytour.com" : locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://47.96.12.235:9001" : "http://192.168.2.215:9000",
ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://staticfile.oytour.com" : 'http://192.168.2.214:8130',
UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://uploadfile.oytour.com" : "http://192.168.2.214:8130",
javaUrl: locationName.indexOf('testb2b') == -1 ? "http://efficient.oytour.com" : locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://47.96.12.235:9001" : "http://192.168.10.215:9000",
ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://staticfile.oytour.com" : 'http://192.168.10.214:8130',
UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://uploadfile.oytour.com" : "http://192.168.10.214:8120",
LocalFileStreamDownLoadUrl: domainUrl + "/api/file/GetFileFromWebApi",
};
return obj;
......
src/views/index.vue
View file @ ddb5cc70
......@@ -330,6 +330,12 @@ export default {
$this.obj = obj;
$this.dialogTicketOrderVisible = true;
});
this.MsgBus.$on("reviseTicketOrderBoxOpen", function(GuestId,obj) {
$this.dialogTicketOrderVisibleName = "修改出票状态";
$this.GuestId = GuestId;
$this.obj = obj;
$this.dialogTicketOrderVisible = true;
});
this.MsgBus.$on("closeTicketOrderDialogBox", function() {
$this.dialogTicketOrderVisible = false;
this.$emit("getList");
......
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