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

src/components/FinancialModule/BasicDocuments.vue

@@ -902,6 +902,9 @@
             @click="ImpressionSingleDetails(isOrderOP?'SingleticketOrderListOP':'SingleticketOrderList')">{{'单项门票订单:'+GetDetail.ReFinanceId}}</div>
           <div v-if="GetDetail.OtherType==67||GetDetail.OtherType==68" class="illustrate-right fygsbumen-box-right"
             @click="ImpressionSingleDetails(isOrderOP?'CharterOrderListOP':'CharterOrderList')">{{'单项车订单:'+GetDetail.ReFinanceId}}</div>
+          <div v-if="GetDetail.OtherType==80" class="illustrate-right fygsbumen-box-right"
+            @click="ImpressionSingleDetails(isOrderOP?'CarDealerOrderListOP':'CarDealerOrderList')">
+            {{'车行订单:'+GetDetail.ReFinanceId}}</div>
 
           <!-- <div v-if="GetDetail.OtherType==63" class="illustrate-right fygsbumen-box-right"
                         @click="ImpressionSingleCommissionDetails('ServiceCommissiondetails',1)">{{'单项销售提成详情'}}</div>
@@ -2588,7 +2591,26 @@ else if (Type==2) {
           67) {
           this.GetCarList(path)
         } else {
-          this.$router.push({
+          if(this.GetDetail.OtherType == 80){
+            if(this.typeSystem>0){
+              let href = this.domainManager().CarUrl
+              window.parent.postMessage({
+              event_id: 'CarDealerOrder',
+              data: {
+                OrderId: this.GetDetail.ReFinanceId,
+              }}, `${href}`)
+            }else{
+              return
+              this.$router.push({
+                path: path,
+                query: {
+                  OrderId: this.GetDetail.ReFinanceId,
+                  blank: 'y'
+                }
+              });
+            }
+          }else {
+            this.$router.push({
             path: path,
             query: {
               OrderType: this.GetDetail.RelevanceFrId == null || !this.GetDetail.RelevanceFrId ? 4 : this.GetDetail
@@ -2597,6 +2619,8 @@ else if (Type==2) {
               blank: 'y'
             }
           });
+          }
+          
         }
 
       },

src/components/administrative/empBankAccount.vue

@@ -697,7 +697,7 @@
           return
         }
         console.log("this.addMsg.Type", this.addMsg.Type);
-        if (this.addMsg.Type != 7 && this.addMsg.Type != 9 && this.addMsg.Type != 10) {
+        if (this.addMsg.Type != 7 && this.addMsg.Type != 9 && this.addMsg.Type != 10 && this.addMsg.Type != 12) {
           if (this.addMsg.DutyNo == '' || this.addMsg.DutyNo == undefined) {
             this.$message.error('请填写税号')
             return