1

src/components/FinancialModule/BasicDocuments.vue

@@ -916,7 +916,7 @@
           <tr v-for="(o,ox) in GetDetail.TCIDAndTCNUMList" class="_fujiashuoming_tr">
             <td :colspan="3">
               {{o.TCNUM}}（{{o.TCID}}）
-              <template v-if="o.DMCNum&&o.DMCNum!=''">{{o.DMCNum}}</template>
+              <template v-if="o.DMCNum&&o.DMCNum!=''"><span style="cursor: pointer;" @click="goTravelInfo(o.DMCNum)">{{o.DMCNum}}</span>{{(o.MergeNumber>1?' ['+o.MergeNumber+'合]':'')}}</template>
               <span v-if="GetDetail.IsShowGuestUrl && GetDetail.IsShowGuestUrl === 1"
                 @click="goInves('investigationList',o.TCID)" class="FD_yijian">{{$t('objFill.lkyj')}}
                 <span>{{o.GuestSurveyNum?o.GuestSurveyNum:0}}</span>/
@@ -4238,6 +4238,17 @@ else if (Type==2) {
           }
         });
       },
+      goTravelInfo(DMCNum){
+          let query = {
+            CombinationNum: DMCNum,
+            blank: "y",
+          };
+          this.$router.push({
+            path: "/dmcTotalTable",
+            query
+          });
+        
+      },
       goGuideAccount(path, ClientID) {
         if (ClientID == 0) {
           this.Error(this.$t('objFill.lsdywwl'));

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -947,7 +947,7 @@
               <td :colspan="3">
                 {{o.TCNUM}}（{{o.TCID}}）
                 <template v-if="o.TeamTypeNameStr&&o.TeamTypeNameStr!=''">（{{o.TeamTypeNameStr}}）</template>
-                <template v-if="o.DMCNum&&o.DMCNum!=''">{{o.DMCNum}}</template>
+                <template v-if="o.DMCNum&&o.DMCNum!=''"><span style="cursor: pointer;" @click="goTravelInfo(o.DMCNum)">{{o.DMCNum}}</span>{{(o.MergeNumber>1?' ['+o.MergeNumber+'合]':'')}}</template>
                 <span v-if="GetDetail.IsShowGuestUrl && GetDetail.IsShowGuestUrl===1"
                   @click="goInves('investigationList',o.TCID)" class="FD_yijian">{{$t('objFill.lkyj')}}
                   <span>{{o.GuestSurveyNum?o.GuestSurveyNum:0}}</span>/
@@ -2199,6 +2199,16 @@
           }
         });
       },
+      goTravelInfo(DMCNum){
+          let query = {
+            CombinationNum: DMCNum,
+            blank: "y",
+          };
+          this.$router.push({
+            path: "/dmcTotalTable",
+            query
+          });
+      },
       goGuideAccount(path, ClientID) {
         if (ClientID == 0) {
           this.Error(this.$t('objFill.lsdywwl'));

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -1209,7 +1209,7 @@
             </div>
             <div class="TC_remarkContent"
               v-if="item.OPRemark||item.OPInnerRemark||item.DmcRemarkLast||item.OutGroupAuditRemark">
-              <div class="clearfix TCL-redType" v-if="item.OutGroupAuditState==3&&item.OutGroupAuditRemark">
+              <div class="clearfix TCL-redType" v-if="(item.OutGroupAuditState==3 || item.Status ==5)&&item.OutGroupAuditRemark">
                 <div class="TCL_remarkTitle">驳回缘由：</div>
                 <div class="TCL_Content">{{item.OutGroupAuditRemark}} {{item.OutGroupAuditDate}}</div>
               </div>

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -908,7 +908,7 @@
             </div>
             <div class="TC_remarkContent"
               v-if="item.OPRemark||item.OPInnerRemark||item.DmcRemarkLast||item.OutGroupAuditRemark||item.PriceTagList">
-              <div class="clearfix TCL-redType" v-if="item.OutGroupAuditState==3&&item.OutGroupAuditRemark">
+              <div class="clearfix TCL-redType" v-if="(item.OutGroupAuditState==3 || item.Status ==5)&&item.OutGroupAuditRemark">
                 <div class="TCL_remarkTitle">驳回缘由：</div>
                 <div class="TCL_Content">{{item.OutGroupAuditRemark}} {{item.OutGroupAuditDate}}</div>
               </div>

src/components/TravelManager/TravelList/oneDayTrip.vue

@@ -796,7 +796,7 @@
             </div>
             <div class="TC_remarkContent"
               v-if="item.OPRemark||item.OPInnerRemark||item.DmcRemarkLast||item.OutGroupAuditRemark">
-              <div class="clearfix TCL-redType" v-if="item.OutGroupAuditState==3&&item.OutGroupAuditRemark">
+              <div class="clearfix TCL-redType" v-if="(item.OutGroupAuditState==3 || item.Status == 5)&&item.OutGroupAuditRemark">
                 <div class="TCL_remarkTitle">驳回缘由：</div>
                 <div class="TCL_Content">{{item.OutGroupAuditRemark}} {{item.OutGroupAuditDate}}</div>
               </div>

src/components/dmc/manager/dmcTotalTable.vue

@@ -1441,6 +1441,10 @@
       if (userInfo.RB_Group_id == this.QjGroupId()) {
         // this.msg.LineId = 14;
       }
+      if(this.$route.query.CombinationNum){
+        this.msg.CombinationNum = this.$route.query.CombinationNum;
+        this.msg.StartDate='';
+      }
 
       this.getLineList();
       this.getList();