1

src/components/FinancialModule/BasicDocuments.vue

@@ -2355,6 +2355,7 @@ class="w135 _border_b_1">
         isClientBankAccount:false,
         clientBankAccountData:{},
         helpBranchData:{},
+        isSeeOrderLog:0,
       }
     },
     components: {
@@ -3182,6 +3183,16 @@ else if (Type==2) {
             }
           })
         } else if (type == 7) {
+          if (this.isSeeOrderLog==1){
+          this.$router.push({
+            name: path,
+            query: {
+              id: id,
+              blank: 'y'
+            }
+          })
+        }
+        else{
           this.$router.push({
             name: path,
             query: {
@@ -3190,6 +3201,7 @@ else if (Type==2) {
               blank: 'y'
             }
           })
+        }
         } else if (type == 8) {
           this.$router.push({
             name: path,
@@ -4166,6 +4178,9 @@ else if (Type==2) {
       if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1||ActionMenuCode.indexOf('S_CheckAllOrder') != -1) {
         this.isOrderOP = true
       }
+      if(ActionMenuCode.indexOf('SeeOrderLog') != -1){
+        this.isSeeOrderLog=1
+      }
     },
     mounted() {
       let userInfo = this.getLocalStorage();

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -1678,6 +1678,7 @@
         ClientBankAccountTop:0,
         ActionMenuCode: '',
         typeSystem: 0,
+        isSeeOrderLog:0,
       }
     },
     components: {
@@ -1728,6 +1729,9 @@
       if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1 || ActionMenuCode.indexOf('S_CheckAllOrder') != -1) {
         this.isOrderOP = true
       }
+      if(ActionMenuCode.indexOf('SeeOrderLog') != -1){
+        this.isSeeOrderLog=1
+      }
     },
     methods: {
 
@@ -2506,7 +2510,18 @@
             }
           })
         } else if (type == 7) {
-          this.$router.push({
+
+          if (this.isSeeOrderLog==1){
+            this.$router.push({
+            name: path,
+            query: {
+              id: id,
+              blank: 'y'
+            }
+          })
+          }
+          else{
+            this.$router.push({
             name: path,
             query: {
               id: id,
@@ -2514,6 +2529,8 @@
               blank: 'y'
             }
           })
+          }
+          
         } else if (type == 8) {
           if (OrderID) {
             this.$router.push({
@@ -2890,6 +2907,7 @@
       // document.oncontextmenu = function(){return false;}
       this.GetAuth();
       this.userInfo = this.getLocalStorage();
+      this.ActionMenuCode = this.userInfo.ActionMenuCode;
       this.qjGroupId = this.QjGroupId();
       this.Financial_post_GetDetail(this.ID)
       this.queryMsg.FinanceId = this.$route.query.id;

src/components/FinancialModule/FinancialSubmodule/OrderFinancialPage.vue

@@ -51,7 +51,7 @@ export default {
     props:["dataOrderList", 'dataOrderPreferPrice'],
     data(){
         return{
-            tableOrderShow:false,
+            tableOrderShow:true,
         }
     },watch:{
         

src/components/FinancialModule/RecPayQueryTeam.vue

@@ -386,6 +386,7 @@ export default {
             choiceDate: '',
             EmployeeId:0,
             noData:false,
+            isSeeOrderLog:0,
         }
     },
     created(){
@@ -419,8 +420,11 @@ export default {
         }else{
             this.defaultMonth[0] = t2;
         }
-
-
+        let userinfo = this.getLocalStorage();
+        let ActionMenuCode =  userinfo.ActionMenuCode;
+        if(ActionMenuCode.indexOf('SeeOrderLog') != -1){
+        this.isSeeOrderLog=1
+      }
     },
     components: {
         "my-Bill": myBill,
@@ -478,10 +482,25 @@ export default {
                 })
             }
             if(type==2){
-                this.$router.push({
-                    name: path,
-                    query: { id:tcid,orderID: id,blank:'y',isShow:false}
-                })
+                if (this.isSeeOrderLog==1){
+            this.$router.push({
+            name: path,
+            query: {
+              id: tcid,
+              blank: 'y'
+            }
+          })
+          }
+          else{
+            this.$router.push({
+            name: path,
+            query: {
+              id: tcid,
+              isShow: false,
+              blank: 'y'
+            }
+          })
+          }
             }
         },
         getStartList1() {// 获取出发城市