修改

src/components/FinancialModule/BasicDocuments.vue

@@ -326,7 +326,7 @@
                     <tr v-for="(o,ox) in GetDetail.TCIDAndTCNUMList" class="_fujiashuoming_tr">
                         <td :colspan="3">
                             {{o.TCNUM}}（{{o.TCID}}）
-                            <span v-if="GetDetail.IsShowPlanUrl === 1" @click="goInves('investigationList',o.TCID)" class="FD_yijian">旅客意见/{{o.GuestSurveyNum}}份</span>
+                            <span v-if="GetDetail.IsShowPlanUrl === 1" @click="goInves('investigationList',o.TCID)" class="FD_yijian">旅客意见 {{o.GuestSurveyNum}}/{{o.GuestTotalNum}}份</span>
                         </td>
                         <td @click="jumpPage('TravelControlList',o.TCNUM,1)"> <span class="_jump_page _font_bold">查看团队</span> </td>
                         <td @click="jumpPage('RegistrationList',o.TCID,7)"> <span class="_jump_page _font_bold">查看报名</span> </td>

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -390,7 +390,7 @@
                             <td :colspan="4" v-if="GetDetail.Is_Merge===1">单据号：{{o.FinanceId}}</td>
                             <td :colspan="3">
                                 {{o.TCNUM}}（{{o.TCID}}）
-                                <span v-if="GetDetail.IsShowPlanUrl === 1" @click="goInves('investigationList',o.TCID)" class="FD_yijian">旅客意见/{{o.GuestSurveyNum}}份</span>
+                                <span v-if="GetDetail.IsShowPlanUrl === 1" @click="goInves('investigationList',o.TCID)" class="FD_yijian">旅客意见 {{o.GuestSurveyNum}}/{{o.GuestTotalNum}}份</span>
                             </td>
                             <td @click="jumpPage('TravelControlList',o.TCNUM,1)"> <span class="_jump_page _font_bold">查看团队</span> </td>
                             <td @click="jumpPage('RegistrationList',o.TCID,7)"> <span class="_jump_page _font_bold">查看报名</span> </td>

src/components/TravelManager/TravelList/HotelOrderTotal.vue

@@ -308,6 +308,7 @@
         <th>客户手机号</th>
         <th>创建人</th>
         <th>结束时间</th>
+        <th>操作</th>
       </tr>
       <tbody v-for="(item,index) in dataList">
         <tr>
@@ -332,6 +333,16 @@
             <td>{{item.CustomerPhone}}</td>
             <td>{{item.CreateByStr}}</td>
             <td>{{item.EndTime}}</td>
+            <td>
+                <el-row>
+                  <el-tooltip class="item" effect="dark" content="付款" placement="top-start">
+                      <el-button type="primary" icon="iconfont icon-fukuan2" @click="getShouKuan(item)" circle></el-button>
+                  </el-tooltip>
+                  <el-tooltip class="item" v-if="item.ShowBtn" effect="dark" content="取消" placement="top-start">
+                      <el-button type="danger" icon="iconfont icon-quxiao1" circle @click="cancelHTorder(item.ThirdOrderNo)"></el-button>
+                  </el-tooltip>	                        					
+                </el-row>
+            </td>
         </tr>
         <tr>
             <td colspan="8" style="text-align:left;width:600px">
@@ -344,7 +355,7 @@
                     </div>
                 </div>
             </td>
-            <td colspan="8" style="text-align:left;width:600px">
+            <td colspan="9" style="text-align:left;width:600px">
                 <div class="SH_OrderDan">
                     <div>收款单据：</div>
                     <div>
@@ -440,15 +451,15 @@ export default {
       orderStatus:[{
           Name:'全部',
           Id:0
-      },{
-          Name:'待支付',
-          Id:1
-      },{
-          Name:'交易完成',
-          Id:2
-      },{
-          Name:'取消',
-          Id:3
+        },{
+            Name:'待支付',
+            Id:1
+        },{
+            Name:'交易完成',
+            Id:2
+        },{
+            Name:'取消',
+            Id:3
       }],
       dataList: [],
       getCompanyMsg:{  // 公司
@@ -488,6 +499,16 @@ export default {
           if (res.data.resultCode == 1) {
              this.dataList = res.data.data.pageData;
              this.total = res.data.data.count;
+             console.log(this.dataList,'datalist');
+             let userInfo = this.getLocalStorage();
+             let EmployeeId = userInfo.EmployeeId; 
+             this.dataList.forEach(x=>{
+               if(x.CreateBy==EmployeeId||EmployeeId==1){
+                 x.ShowBtn = true;
+               }else{
+                 x.ShowBtn = false;
+               }
+             })
           } else {
               this.Error(res.data.message);
           }
@@ -540,7 +561,51 @@ export default {
         }
       }, err => {})
     },
-
+   //点击取消操作
+   cancelHTorder(ThirdOrderNo){
+      let userInfo = this.getLocalStorage();
+      let customerId = userInfo.customerId;
+      let msg ={
+          bookingNumber:ThirdOrderNo,
+          CancelBy:customerId,
+          CancelType:1
+      }
+      this.apipost(
+      "dmc_post_Get_GetJAPAN_GetJAPAN_ReservationCancallation",
+      msg,
+      res => {
+        if (res.data.resultCode == 1) { 
+            this.Success('取消成功');
+            this.getList();
+        } else {
+          this.Error(res.data.message);
+        }
+      },
+      null
+    );
+   },
+   //点击收款
+   getShouKuan(obj){
+        let orderObj = {
+          OrderID:obj.OrderID,
+          OrderSource:1,
+          Obj: {},
+          SourceID:null,
+          TCIDList: []
+        }
+        this.$router.push({
+          name: 'ChoiceAddFinancialDocuments',
+          query:{
+            "Type":1,
+            "companyID":obj.RB_Branch_id,
+            "path": "",
+            'blank':'y',
+            'orderObj':JSON.stringify(orderObj),
+            'tradeWay':1,
+            'platformAccount':0
+          }
+        });
+   }
   },
   mounted() {
     let userInfo=this.getLocalStorage();

src/components/leaderPay2.vue

@@ -896,7 +896,7 @@ export default {
         money = money + Math.round(list[i].OriginalMoney * (list[i].Rate - list[i].Fee) * 100) / 100
       }
       console.log(money)
-      if (money <= 0) {
+      if (money != 0) {
         this.$message.error('金额小于0，无法制单')
         return
       } else {