Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

package.json

@@ -64,7 +64,7 @@
     "@babel/eslint-parser": "^7.21.3",
     "@babel/preset-env": "^7.20.2",
     "@babel/preset-stage-2": "^7.8.3",
-    "autoprefixer": "^10.4.14",
+    "autoprefixer": "^10.4.20",
     "babel-helper-vue-jsx-merge-props": "^2.0.3",
     "babel-loader": "^9.1.2",
     "babel-plugin-syntax-jsx": "^6.18.0",
@@ -93,7 +93,7 @@
     "node-notifier": "^10.0.1",
     "ora": "^1.2.0",
     "portfinder": "^1.0.13",
-    "postcss": "^8.4.21",
+    "postcss": "^8.5.3",
     "postcss-import": "^15.1.0",
     "postcss-loader": "^7.1.0",
     "postcss-preset-env": "^8.0.1",
@@ -105,6 +105,7 @@
     "style-loader": "^2.0.0",
     "stylus": "^0.59.0",
     "stylus-loader": "^7.1.0",
+    "tailwindcss": "^4.0.9",
     "thread-loader": "^3.0.4",
     "timers-browserify": "^2.0.12",
     "url-loader": "^4.1.1",

src/components/FinancialModule/OpCommission/OpComPersonDetails.vue

@@ -390,27 +390,15 @@
                 },err=>{})
             },
             goTuanDetails(row) {
-            let name = ''
-            // if (row.IsOneDayOrder == 1) {
-            //   name = 'groupTourOrderByTuanOne'
-            // } else {
-            //   name = 'groupTourOrderByTuan'
-            // }
-            if (row.TravelType == 0) {//正常团
-                name = 'TravelControlList'
-            }else if (row.TravelType == 2) {//当地团
-              name = 'oneDayTrip'
-            } else {//小包团
-              name = 'TravelControlListSale'
-            }
-            this.$router.push({
-              name: name,
-              query: {
-                id: row.TCID,
-                tcmun: row.TCNUM,
-                blank: "y",
-              }
-            });
+              if(row.TCNUM=="-"){return;}
+              this.$router.push({
+                path: 'TeamBalancePayment',//TravelControlList
+                query: {
+                  id: row.TCID,
+                  blank: 'y',
+                  tab: '团队收支'//团控列表
+                }
+              });
           },
         clickUrl(row){
           if(row.OrderType==1||row.OrderType==6){

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -1302,6 +1302,7 @@ export default {
       showID: false,
       active: 1,
       userId: 0,
+      empBranchId: -1,
       //是否显示
       isShowType:true,
       isShowGrounding:true,
@@ -2692,6 +2693,7 @@ export default {
     let userInfo = this.getLocalStorage();
     this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID
     this.userId = userInfo.EmployeeId;
+    this.empBranchId = userInfo.RB_Branch_id;
     if (this.$route.query.BranchId) {
       this.msg.OutBranchId = this.$route.query.BranchId?Number(this.$route.query.BranchId):this.msg.OutBranchId;
     }
@@ -2766,7 +2768,9 @@ export default {
     getChange(val){
       if(this.msg.OutBranchId == -1){
         this.coinGetShow = false
-        this.msg.StandardCurrencyId = val>-1?val:this.coinGetList[0].ID
+        if(this.empBranchId==0){
+          this.msg.StandardCurrencyId = val>-1?val:this.coinGetList[0].ID
+        }
       }else{
         this.coinGetShow = true
         this.msg.StandardCurrencyId = -1
@@ -3518,6 +3522,16 @@ export default {
             }
             if(BranchStatus==-1){
               this.BranchStatus=false;
+            }else if(BranchStatus<-2){
+              this.BranchStatus=false;
+              if(this.msg.LineId<=0){
+                this.msg.OutBranchId=0-BranchStatus;
+                this.msg.StandardCurrencyId=-1;
+                this.CompanyList = this.CompanyList.filter(x=>{
+                  if(x.Id==(0-BranchStatus)){return x;}
+                  else{return;}
+                });
+              }
             }else{
                 this.BranchStatus=true;
                 this.msg.OutBranchId=BranchStatus;

src/components/FinancialModule/TradeCommission/TicketDetails.vue

@@ -437,9 +437,6 @@
             } else {
               name = 'VisaProductEditOrder'
             }
-            this.$router.push({
-              name: name,
-            });
           } else if (row.OrderType == 2) { //跟团 一日游
             if (this.S_CheckBranchOrder || this.S_CheckAllOrder) {
               name = 'enrollTotal'