Commit 6f81cc36 authored by zhengke's avatar zhengke

no message

parent a407a0ff
...@@ -300,6 +300,14 @@ ...@@ -300,6 +300,14 @@
this.MsgBus.$on("closeGetList", function() { this.MsgBus.$on("closeGetList", function() {
$this.getList() $this.getList()
}); });
$this.MsgBus.$on("closeBillMaking", function() {
for (let i = 0; i < $this.dataList.length; i++) {
$this.dataList[i].checkList = [];
$this.dataList[i].selectedType = "";
$this.dataList[i].actuallyReceived = false;
$this.dataList[i].cost = false;
}
});
this.getList() this.getList()
}, },
methods: { methods: {
...@@ -431,6 +439,11 @@ ...@@ -431,6 +439,11 @@
show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.DueinMoney==0?true:false show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.DueinMoney==0?true:false
}, },
{ {
Name: '订单收损',
Id: '8',
show: true
},
{
Name: "操作日志", Name: "操作日志",
Id: "7", Id: "7",
show: true, show: true,
......
...@@ -281,6 +281,14 @@ ...@@ -281,6 +281,14 @@
this.MsgBus.$on("closeGetList", function() { this.MsgBus.$on("closeGetList", function() {
$this.getList() $this.getList()
}); });
$this.MsgBus.$on("closeBillMaking", function() {
for (let i = 0; i < $this.dataList.length; i++) {
$this.dataList[i].checkList = [];
$this.dataList[i].selectedType = "";
$this.dataList[i].actuallyReceived = false;
$this.dataList[i].cost = false;
}
});
this.getList() this.getList()
}, },
methods: { methods: {
...@@ -412,6 +420,11 @@ ...@@ -412,6 +420,11 @@
show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.DueinMoney==0?true:false show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.DueinMoney==0?true:false
}, },
{ {
Name: '订单收损',
Id: '8',
show: true
},
{
Name: "操作日志", Name: "操作日志",
Id: "7", Id: "7",
show: true, show: true,
......
...@@ -360,9 +360,6 @@ export default { ...@@ -360,9 +360,6 @@ export default {
mounted() { mounted() {
this.userInfo = this.getLocalStorage(); this.userInfo = this.getLocalStorage();
let $this = this; let $this = this;
$this.MsgBus.$on("closeGetList", function() {
$this.getList()
});
$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 = [];
...@@ -484,6 +481,30 @@ export default { ...@@ -484,6 +481,30 @@ export default {
if (row.More == "7") { if (row.More == "7") {
this.operationLog(row); this.operationLog(row);
} }
// 操作日志
if (row.More == "8") {
this.lossOperation(row);
}
},
// 收损
lossOperation(row){
if (this.superManage) {
this.lossOperationfun(row)
}else{
if (this.userInfo.EmName != row.EnterName) {
this.ValidateOperator();
} else {
this.lossOperationfun(row)
}
}
},
lossOperationfun(row){
this.MsgBus.$emit(
"lossOrderBoxOpen",
row.GuestId,
row,
true
);
}, },
// 订单完结 // 订单完结
orderCompleted(row){ orderCompleted(row){
...@@ -510,7 +531,7 @@ export default { ...@@ -510,7 +531,7 @@ export default {
}, 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.MsgBus.$emit("closeGetList");
}else{ }else{
this.$message.warning(res.data.message); this.$message.warning(res.data.message);
} }
......
<style> <style scoped>
.orderProductDetails-box{ .orderProductDetails-box{
padding: 20px 0; padding: 20px 0;
background-color: #fff; background-color: #fff;
......
...@@ -613,6 +613,26 @@ ...@@ -613,6 +613,26 @@
if (row.More == "7") { if (row.More == "7") {
this.operationLog(row); this.operationLog(row);
} }
// 操作日志
if (row.More == "8") {
this.lossOperationfun(row);
}
},
// 收损
lossOperation(row){
if (this.userInfo.EmName != row.EnterName) {
this.ValidateOperator();
} else {
this.lossOperationfun(row)
}
},
lossOperationfun(row){
this.MsgBus.$emit(
"lossOrderBoxOpen",
row.GuestId,
row,
true
);
}, },
// 订单完结 // 订单完结
orderCompleted(row){ orderCompleted(row){
...@@ -1034,6 +1054,11 @@ ...@@ -1034,6 +1054,11 @@
show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.DueinMoney==0?true:false show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.DueinMoney==0?true:false
}, },
{ {
Name: '订单收损',
Id: '8',
show: true
},
{
Name: "操作日志", Name: "操作日志",
Id: "7", Id: "7",
show: true, show: true,
......
...@@ -327,6 +327,12 @@ ...@@ -327,6 +327,12 @@
$this.obj = obj; $this.obj = obj;
$this.dialogTicketOrderVisible = true; $this.dialogTicketOrderVisible = true;
}); });
this.MsgBus.$on("lossOrderBoxOpen", function (GuestId, obj) {
$this.dialogTicketOrderVisibleName = "订单收损";
$this.GuestId = GuestId;
$this.obj = obj;
$this.dialogTicketOrderVisible = true;
});
this.MsgBus.$on("reviseTicketOrderBoxOpen", function (GuestId, obj) { this.MsgBus.$on("reviseTicketOrderBoxOpen", 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