Skip to content

C
CRM
Commit 130d2365 authored by youjie's avatar youjie
Browse files
Options

no message

parent c13bfd32
Show whitespace changes
Inline Side-by-side
Showing with 175 additions and 22 deletions
src/components/Home.vue
View file @ 130d2365
...@@ -511,6 +511,14 @@ export default { ...@@ -511,6 +511,14 @@ export default {
created() { created() {
this.initRankRangeList(); this.initRankRangeList();
}, },
watch:{
diyDateRange: {
handler(val, oldVal) {
this.diyDateRange = val
this.setDiyDateRange()
},
},
},
mounted() { mounted() {
this.changeRankTypeHandler(); this.changeRankTypeHandler();
this.GetBriefing(); this.GetBriefing();
......
src/components/customerManage/customerOrder.vue
View file @ 130d2365
...@@ -548,6 +548,11 @@ export default { ...@@ -548,6 +548,11 @@ export default {
Id: "7", Id: "7",
show: true, show: true,
}, },
{
Name: "修改日期",
Id: "10",
show: item.OrderType&&item.OrderType.indexOf(1) != -1?true:false,
}
]; ];
}); });
}; };
......
src/components/customerManage/myCustomerOrder.vue
View file @ 130d2365
...@@ -511,6 +511,11 @@ export default { ...@@ -511,6 +511,11 @@ export default {
Id: "7", Id: "7",
show: true, show: true,
}, },
{
Name: "修改日期",
Id: "10",
show: item.OrderType&&item.OrderType.indexOf(1) != -1?true:false,
}
]; ];
}); });
}; };
......
src/components/customerManage/orderList.vue
View file @ 130d2365
...@@ -489,6 +489,15 @@ export default { ...@@ -489,6 +489,15 @@ export default {
if (row.More == "9") { if (row.More == "9") {
this.endOfLoss(row); this.endOfLoss(row);
} }
// 修改日期
if (row.More == "10") {
this.modifiedDate(row);
}
},
// 修改日期
modifiedDate(row){
let $this = this
this.MsgBus.$emit("modifiedDateOrderBoxOpen", $this.ID, row, true);
}, },
// 订单收损完结 // 订单收损完结
endOfLoss(row){ endOfLoss(row){
......
src/components/guestManagement/Agreement.vue
View file @ 130d2365
...@@ -644,6 +644,15 @@ ...@@ -644,6 +644,15 @@
if (row.More == "9") { if (row.More == "9") {
this.endOfLoss(row); this.endOfLoss(row);
} }
// 修改日期
if (row.More == "10") {
this.modifiedDate(row);
}
},
// 修改日期
modifiedDate(row){
let $this = this
this.MsgBus.$emit("modifiedDateOrderBoxOpen", $this.ID, row, true);
}, },
// 订单收损完结 // 订单收损完结
endOfLoss(row) { endOfLoss(row) {
...@@ -1115,6 +1124,11 @@ ...@@ -1115,6 +1124,11 @@
Name: "操作日志", Name: "操作日志",
Id: "7", Id: "7",
show: true, show: true,
},
{
Name: "修改日期",
Id: "10",
show: item.OrderType&&item.OrderType.indexOf(1) != -1?true:false,
} }
] ]
}); });
......
src/components/guestManagement/ticketOrder.vue
View file @ 130d2365
...@@ -492,6 +492,10 @@ ...@@ -492,6 +492,10 @@
.BillMaking-header-center.width{ .BillMaking-header-center.width{
width: 357px; width: 357px;
} }
/deep/.combo-box .el-input__icon{
margin-left: -20px;
margin-top: -12px;
}
</style> </style>
<template> <template>
...@@ -507,7 +511,7 @@ ...@@ -507,7 +511,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">
<template v-if="name!='订单收损'&&name!='出签凭证图'"> <template v-if="name!='订单收损'&&name!='出签凭证图'">
<p class="form-box-tit" v-if="name!='操作日志'&&name!='凭证图'&&name!='制单'"><span class="radius"></span> <p class="form-box-tit" v-if="name!='操作日志'&&name!='凭证图'&&name!='制单'&&name!='修改日期'"><span class="radius"></span>
{{name!='修改出票状态'&&name!='修改出签状态'?' 基本信息':' 上传'+text+'凭证'}}</p> {{name!='修改出票状态'&&name!='修改出签状态'?' 基本信息':' 上传'+text+'凭证'}}</p>
</template> </template>
<el-row :gutter="30"> <el-row :gutter="30">
...@@ -547,13 +551,42 @@ ...@@ -547,13 +551,42 @@
</el-checkbox-group> </el-checkbox-group>
</div> </div>
<div class="MultipleChoice-right"> <div class="MultipleChoice-right">
<div class="MultipleChoice-right-box" <!-- <div class="MultipleChoice-right-box"
:class="AirTicketsShow?'active':''"> :class="AirTicketsShow?'active':''">
<el-form-item label="机票金额" prop="TicketMoney"> <el-form-item label="机票金额" prop="TicketMoney">
<el-input placeholder="请输入机票金额" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" <el-input placeholder="请输入机票金额" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="form.TicketMoney" v-model="form.TicketMoney"
:disabled="AirTicketsShow"></el-input> :disabled="AirTicketsShow"></el-input>
</el-form-item> </el-form-item>
</div> -->
<div class="combo-box MultipleChoice-right-box"
:class="AirTicketsShow?'active':''"
>
<div class="combo-center">
<el-form-item label="机票金额" prop="TicketMoney">
<el-input placeholder="请输入机票金额" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="form.TicketMoney"
:disabled="AirTicketsShow"></el-input>
</el-form-item>
</div>
<div class="combo-center">
<el-form-item label="出发日期" prop="DepartTime"
:rules="AirTicketsShow?[{ required: false}]:rules.DepartTime">
<!-- <el-input placeholder="请选择出发日期"
v-model="form.DepartTime"
:disabled="AirTicketsShow"></el-input> -->
<el-date-picker
v-model="form.DepartTime"
size="mini"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
type="date"
placeholder="出发日期"
:disabled="AirTicketsShow"
>
</el-date-picker>
</el-form-item>
</div>
</div> </div>
<div class="MultipleChoice-right-box" <div class="MultipleChoice-right-box"
:class="visaShow?'active':''"> :class="visaShow?'active':''">
...@@ -571,18 +604,16 @@ ...@@ -571,18 +604,16 @@
:disabled="groundShow"></el-input> :disabled="groundShow"></el-input>
</el-form-item> </el-form-item>
</div> </div>
<div class="combo-box" <div class="combo-box MultipleChoice-right-box"
>
<div class="combo-center"
:class="comboShow?'active':''"> :class="comboShow?'active':''">
<div class="combo-center">
<el-form-item label="套餐金额" prop="MealMoney"> <el-form-item label="套餐金额" prop="MealMoney">
<el-input placeholder="请输入套餐金额" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" <el-input placeholder="请输入套餐金额" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="form.MealMoney" v-model="form.MealMoney"
:disabled="comboShow"></el-input> :disabled="comboShow"></el-input>
</el-form-item> </el-form-item>
</div> </div>
<div class="combo-center" <div class="combo-center">
:class="comboShow?'active':''">
<el-form-item label="说明" prop="MealDescription" <el-form-item label="说明" prop="MealDescription"
:rules="comboShow?[{ required: false}]:rules.MealDescription"> :rules="comboShow?[{ required: false}]:rules.MealDescription">
<el-input placeholder="请输入套餐说明" <el-input placeholder="请输入套餐说明"
...@@ -1263,6 +1294,17 @@ ...@@ -1263,6 +1294,17 @@
</div> </div>
</div> </div>
</div> </div>
<div v-if="name=='修改日期'" style="text-align: center;">
<el-date-picker
v-model="form.DepartTime"
size="mini"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
type="date"
placeholder="出发日期"
>
</el-date-picker>
</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="[10, 20, 60, 90, 100]" :page-size="msg.pageSize" layout="total, sizes, prev, pager, next" :page-sizes="[10, 20, 60, 90, 100]" :page-size="msg.pageSize" layout="total, sizes, prev, pager, next"
...@@ -1498,6 +1540,7 @@ ...@@ -1498,6 +1540,7 @@
OrderType: "", //类型 OrderType: "", //类型
MealDescription: "", //说明 MealDescription: "", //说明
TicketMoney: 0, //机票应收 TicketMoney: 0, //机票应收
DepartTime:'',
VisaMoney: 0, //签证应收 VisaMoney: 0, //签证应收
DiJieMoney: 0, //地接应收 DiJieMoney: 0, //地接应收
MealMoney: 0, //套餐应收 MealMoney: 0, //套餐应收
...@@ -1566,6 +1609,11 @@ ...@@ -1566,6 +1609,11 @@
message: "请输入机票金额", message: "请输入机票金额",
trigger: "blur" trigger: "blur"
}], }],
DepartTime: [{
required: true,
message: "请选择出发日期",
trigger: "blur"
}],
VisaMoney: [{ VisaMoney: [{
required: true, required: true,
message: "请输入签证金额", message: "请输入签证金额",
...@@ -1754,6 +1802,7 @@ ...@@ -1754,6 +1802,7 @@
VisaMoney: this.obj.VisaMoney, //签证应收 VisaMoney: this.obj.VisaMoney, //签证应收
DiJieMoney: this.obj.DiJieMoney, //地接应收 DiJieMoney: this.obj.DiJieMoney, //地接应收
MealMoney: this.obj.MealMoney, //套餐应收 MealMoney: this.obj.MealMoney, //套餐应收
DepartTime: this.obj.DepartTime,
} }
} }
...@@ -1798,7 +1847,8 @@ ...@@ -1798,7 +1847,8 @@
DiJieMoney:this.obj.DiJieMoney, DiJieMoney:this.obj.DiJieMoney,
MealMoney:this.obj.MealMoney, MealMoney:this.obj.MealMoney,
MealDescription:this.obj.MealDescription, MealDescription:this.obj.MealDescription,
Remark:this.obj.Remark Remark:this.obj.Remark,
DepartTime: this.obj.DepartTime,
} }
} }
if (this.name == '凭证图') { if (this.name == '凭证图') {
...@@ -1807,6 +1857,13 @@ ...@@ -1807,6 +1857,13 @@
if (this.name == '出签凭证图') { if (this.name == '出签凭证图') {
this.width = "400px" this.width = "400px"
} }
if (this.name == '修改日期') {
this.width = "300px"
this.form = {
OrderId: this.obj.OrderId,
DepartTime: "",
}
}
if(this.name=='制单'){ if(this.name=='制单'){
this.BillMaking = { this.BillMaking = {
IsPublic:this.BillMaking.IsPublic,// 账户类型 0私账 1公账 IsPublic:this.BillMaking.IsPublic,// 账户类型 0私账 1公账
...@@ -2377,13 +2434,22 @@ ...@@ -2377,13 +2434,22 @@
this.form.OrderId = this.obj.OrderId this.form.OrderId = this.obj.OrderId
} }
if (this.checkList.indexOf('1') != -1 || this.checkList.indexOf('2') != -1 || this.checkList.indexOf('3') != -1 || this.checkList.indexOf('4') != -1) { if (this.checkList.indexOf('1') != -1 || this.checkList.indexOf('2') != -1 || this.checkList.indexOf('3') != -1 || this.checkList.indexOf('4') != -1) {
if (this.checkList.indexOf('1') != -1 && this.form.TicketMoney <= 0) { if (this.checkList.indexOf('1') != -1) {
if(this.form.TicketMoney <= 0){
this.$message({ this.$message({
type: 'warning', type: 'warning',
message: '机票金额请输入大于0的金额!' message: '机票金额请输入大于0的金额!'
}); });
return return
} }
if(!this.form.DepartTime){
this.$message({
type: 'warning',
message: '请选择出发日期'
});
return
}
}
if (this.checkList.indexOf('2') != -1 && this.form.VisaMoney <= 0) { if (this.checkList.indexOf('2') != -1 && this.form.VisaMoney <= 0) {
this.$message({ this.$message({
type: 'warning', type: 'warning',
...@@ -2425,6 +2491,7 @@ ...@@ -2425,6 +2491,7 @@
VisaMoney: this.form.VisaMoney, //签证应收 VisaMoney: this.form.VisaMoney, //签证应收
DiJieMoney: this.form.DiJieMoney, //地接应收 DiJieMoney: this.form.DiJieMoney, //地接应收
MealMoney: this.form.MealMoney, //套餐应收 MealMoney: this.form.MealMoney, //套餐应收
DepartTime: this.form.DepartTime, //出发日期
} }
this.clickShow = true this.clickShow = true
this.apipost("/api/Order/SetGuestOrderMoney", data, (res) => { this.apipost("/api/Order/SetGuestOrderMoney", data, (res) => {
...@@ -2444,13 +2511,22 @@ ...@@ -2444,13 +2511,22 @@
// 新增订单 // 新增订单
addData() { addData() {
if (this.checkList.indexOf('1') != -1 || this.checkList.indexOf('2') != -1 || this.checkList.indexOf('3') != -1 || this.checkList.indexOf('4') != -1) { if (this.checkList.indexOf('1') != -1 || this.checkList.indexOf('2') != -1 || this.checkList.indexOf('3') != -1 || this.checkList.indexOf('4') != -1) {
if (this.checkList.indexOf('1') != -1 && this.form.TicketMoney <= 0) { if (this.checkList.indexOf('1') != -1) {
if(this.form.TicketMoney <= 0){
this.$message({ this.$message({
type: 'warning', type: 'warning',
message: '机票金额请输入大于0的金额!' message: '机票金额请输入大于0的金额!'
}); });
return return
} }
if(!this.form.DepartTime){
this.$message({
type: 'warning',
message: '请选择出发日期'
});
return
}
}
if (this.checkList.indexOf('2') != -1 && this.form.VisaMoney <= 0) { if (this.checkList.indexOf('2') != -1 && this.form.VisaMoney <= 0) {
this.$message({ this.$message({
type: 'warning', type: 'warning',
...@@ -2489,6 +2565,7 @@ ...@@ -2489,6 +2565,7 @@
VisaMoney: this.form.VisaMoney, //签证应收 VisaMoney: this.form.VisaMoney, //签证应收
DiJieMoney: this.form.DiJieMoney, //地接应收 DiJieMoney: this.form.DiJieMoney, //地接应收
MealMoney: this.form.MealMoney, //套餐应收 MealMoney: this.form.MealMoney, //套餐应收
DepartTime: this.form.DepartTime, //出发日期
} }
} }
if (this.name == '编辑机票订单') { if (this.name == '编辑机票订单') {
...@@ -2506,6 +2583,7 @@ ...@@ -2506,6 +2583,7 @@
VisaMoney: this.form.VisaMoney, //签证应收 VisaMoney: this.form.VisaMoney, //签证应收
DiJieMoney: this.form.DiJieMoney, //地接应收 DiJieMoney: this.form.DiJieMoney, //地接应收
MealMoney: this.form.MealMoney, //套餐应收 MealMoney: this.form.MealMoney, //套餐应收
DepartTime: this.form.DepartTime, //出发日期
} }
} }
this.clickShow = true this.clickShow = true
...@@ -2843,6 +2921,30 @@ ...@@ -2843,6 +2921,30 @@
} }
}) })
}, },
// 修改出发日期
SetOrderDepartTime(){
if(!this.form.DepartTime){
this.$message.warning('请选择日期');
return
}
this.clickShow = true
let msg = {
OrderId:this.form.OrderId,
DepartTime: this.form.DepartTime
}
this.apipost("/api/Order/SetOrderDepartTime",msg,(res)=>{
if (res.data.resultCode == 1) {
this.clickShow = false
this.dialogTableVisible = false;
this.MsgBus.$emit("closeBillMaking");
this.MsgBus.$emit("closeGetList");
this.$message.success(res.data.message);
} else {
this.clickShow = false
this.$message.error(res.data.message);
}
})
},
submitForm(addMsg) { submitForm(addMsg) {
//提交创建、修改表单 //提交创建、修改表单
if (this.name == '新建机票订单' || this.name == '编辑机票订单') { if (this.name == '新建机票订单' || this.name == '编辑机票订单') {
...@@ -2899,6 +3001,9 @@ ...@@ -2899,6 +3001,9 @@
if(this.name=='订单收损'){ if(this.name=='订单收损'){
this.SetOrderLoss() this.SetOrderLoss()
} }
if(this.name=='修改日期'){
this.SetOrderDepartTime()
}
}, },
resetForm(formName) { resetForm(formName) {
...@@ -2914,7 +3019,8 @@ ...@@ -2914,7 +3019,8 @@
EndCityName: "", EndCityName: "",
Money: null, Money: null,
Remark: "", Remark: "",
EnterId: "" EnterId: "",
DepartTime: ""
}; };
this.$refs[formName].resetFields(); this.$refs[formName].resetFields();
}, },
......
src/views/index.vue
View file @ 130d2365
...@@ -375,6 +375,12 @@ ...@@ -375,6 +375,12 @@
$this.obj = obj; $this.obj = obj;
$this.dialogTicketOrderVisible = true; $this.dialogTicketOrderVisible = true;
}); });
this.MsgBus.$on("modifiedDateOrderBoxOpen", function (GuestId, obj) {
$this.dialogTicketOrderVisibleName = "修改日期";
$this.GuestId = GuestId;
$this.obj = obj;
$this.dialogTicketOrderVisible = true;
});
this.MsgBus.$on("closeTicketOrderDialogBox", function () { this.MsgBus.$on("closeTicketOrderDialogBox", function () {
$this.dialogTicketOrderVisible = false; $this.dialogTicketOrderVisible = false;
this.$emit("getList"); 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