Commit 46b76d73 authored by 吴春's avatar 吴春

1

parent 9293ba0e
...@@ -2355,6 +2355,7 @@ class="w135 _border_b_1"> ...@@ -2355,6 +2355,7 @@ class="w135 _border_b_1">
isClientBankAccount:false, isClientBankAccount:false,
clientBankAccountData:{}, clientBankAccountData:{},
helpBranchData:{}, helpBranchData:{},
isSeeOrderLog:0,
} }
}, },
components: { components: {
...@@ -3182,6 +3183,16 @@ else if (Type==2) { ...@@ -3182,6 +3183,16 @@ else if (Type==2) {
} }
}) })
} else if (type == 7) { } else if (type == 7) {
if (this.isSeeOrderLog==1){
this.$router.push({
name: path,
query: {
id: id,
blank: 'y'
}
})
}
else{
this.$router.push({ this.$router.push({
name: path, name: path,
query: { query: {
...@@ -3190,6 +3201,7 @@ else if (Type==2) { ...@@ -3190,6 +3201,7 @@ else if (Type==2) {
blank: 'y' blank: 'y'
} }
}) })
}
} else if (type == 8) { } else if (type == 8) {
this.$router.push({ this.$router.push({
name: path, name: path,
...@@ -4166,6 +4178,9 @@ else if (Type==2) { ...@@ -4166,6 +4178,9 @@ else if (Type==2) {
if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1||ActionMenuCode.indexOf('S_CheckAllOrder') != -1) { if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1||ActionMenuCode.indexOf('S_CheckAllOrder') != -1) {
this.isOrderOP = true this.isOrderOP = true
} }
if(ActionMenuCode.indexOf('SeeOrderLog') != -1){
this.isSeeOrderLog=1
}
}, },
mounted() { mounted() {
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
......
...@@ -1678,6 +1678,7 @@ ...@@ -1678,6 +1678,7 @@
ClientBankAccountTop:0, ClientBankAccountTop:0,
ActionMenuCode: '', ActionMenuCode: '',
typeSystem: 0, typeSystem: 0,
isSeeOrderLog:0,
} }
}, },
components: { components: {
...@@ -1728,6 +1729,9 @@ ...@@ -1728,6 +1729,9 @@
if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1 || ActionMenuCode.indexOf('S_CheckAllOrder') != -1) { if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1 || ActionMenuCode.indexOf('S_CheckAllOrder') != -1) {
this.isOrderOP = true this.isOrderOP = true
} }
if(ActionMenuCode.indexOf('SeeOrderLog') != -1){
this.isSeeOrderLog=1
}
}, },
methods: { methods: {
...@@ -2506,6 +2510,17 @@ ...@@ -2506,6 +2510,17 @@
} }
}) })
} else if (type == 7) { } else if (type == 7) {
if (this.isSeeOrderLog==1){
this.$router.push({
name: path,
query: {
id: id,
blank: 'y'
}
})
}
else{
this.$router.push({ this.$router.push({
name: path, name: path,
query: { query: {
...@@ -2514,6 +2529,8 @@ ...@@ -2514,6 +2529,8 @@
blank: 'y' blank: 'y'
} }
}) })
}
} else if (type == 8) { } else if (type == 8) {
if (OrderID) { if (OrderID) {
this.$router.push({ this.$router.push({
...@@ -2890,6 +2907,7 @@ ...@@ -2890,6 +2907,7 @@
// document.oncontextmenu = function(){return false;} // document.oncontextmenu = function(){return false;}
this.GetAuth(); this.GetAuth();
this.userInfo = this.getLocalStorage(); this.userInfo = this.getLocalStorage();
this.ActionMenuCode = this.userInfo.ActionMenuCode;
this.qjGroupId = this.QjGroupId(); this.qjGroupId = this.QjGroupId();
this.Financial_post_GetDetail(this.ID) this.Financial_post_GetDetail(this.ID)
this.queryMsg.FinanceId = this.$route.query.id; this.queryMsg.FinanceId = this.$route.query.id;
......
...@@ -51,7 +51,7 @@ export default { ...@@ -51,7 +51,7 @@ export default {
props:["dataOrderList", 'dataOrderPreferPrice'], props:["dataOrderList", 'dataOrderPreferPrice'],
data(){ data(){
return{ return{
tableOrderShow:false, tableOrderShow:true,
} }
},watch:{ },watch:{
......
...@@ -386,6 +386,7 @@ export default { ...@@ -386,6 +386,7 @@ export default {
choiceDate: '', choiceDate: '',
EmployeeId:0, EmployeeId:0,
noData:false, noData:false,
isSeeOrderLog:0,
} }
}, },
created(){ created(){
...@@ -419,8 +420,11 @@ export default { ...@@ -419,8 +420,11 @@ export default {
}else{ }else{
this.defaultMonth[0] = t2; this.defaultMonth[0] = t2;
} }
let userinfo = this.getLocalStorage();
let ActionMenuCode = userinfo.ActionMenuCode;
if(ActionMenuCode.indexOf('SeeOrderLog') != -1){
this.isSeeOrderLog=1
}
}, },
components: { components: {
"my-Bill": myBill, "my-Bill": myBill,
...@@ -478,11 +482,26 @@ export default { ...@@ -478,11 +482,26 @@ export default {
}) })
} }
if(type==2){ if(type==2){
if (this.isSeeOrderLog==1){
this.$router.push({
name: path,
query: {
id: tcid,
blank: 'y'
}
})
}
else{
this.$router.push({ this.$router.push({
name: path, name: path,
query: { id:tcid,orderID: id,blank:'y',isShow:false} query: {
id: tcid,
isShow: false,
blank: 'y'
}
}) })
} }
}
}, },
getStartList1() {// 获取出发城市 getStartList1() {// 获取出发城市
this.apipost("city_post_GetList", { this.apipost("city_post_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