1

src/components/Hotel/reservation/HotelOrderList.vue

@@ -334,6 +334,7 @@
                     CostMoney: item.CostMoney,
                     PlatformTax: item.PlatformTax,
                     Refund: item.Refund,
+                    PlatformMoney:item.PlatformMoney,
                     HandFittingIncome: item.HandFittingIncome,
                     HandFittingTax: item.HandFittingTax
                   }

src/components/Hotel/reservation/OrderList.vue

@@ -311,27 +311,49 @@
 
 <template>
   <div>
-    <div
+    <div style="text-align: right;position: fixed;top:  62px; right: 89px;">
+      <el-button class="hollowFixedBtn" v-if="pagesTitle=='OP'" @click="setCompleted"
+        :loading="CompletedLoading">一键完结</el-button>
+    </div>
+    <el-table ref="multipleTable" :data="OrderList" tooltip-effect="dark" style="width: 100%" row-key="OrderId"
+      @selection-change="handleSelectionChange">
+      <el-table-column type="selection" :selectable="selectable" :reserve-selection="true"
+        v-if="pagesTitle=='OP'">
+      </el-table-column>
+      <el-table-column :label="pagesTitle=='OP'?'全选':''">
+    <!-- <div
       v-for="(item, index) in OrderList" :key="index"
       class="column bgf radius5 px15 mb20"
-    >
+    > -->
+    <template slot-scope="scope">
       <div class="row-c justify-sb align-c py">
         <div class="row-c">
           <div>
             <div
               class="orderType cf fz12"
-              :class="{ active: item.OrderType == 1 }"
+              :class="{ active: scope.row.OrderType == 1 }"
             >
-              {{ item.OrderType == 1 ? "散拼订房" : "团队订房" }}
+              {{ scope.row.OrderType == 1 ? "散拼订房" : "团队订房" }}
+            </div>
+
+            
           </div>
+          <div class="cblack fz14 mr"
+                :class="{ cF1416C: scope.row.IsFinish == 0,c20C997: scope.row.IsFinish == 1 }">
+                <template v-if="scope.row.IsFinish == 1">
+                  已完结 <template v-if="scope.row.FinishTime">/ {{scope.row.FinishTime}}</template>
+                </template>
+                <template v-else>
+                  未完结
+                </template>
               </div>
           <div class="c9e fz12">
             <span>订单编号：</span>
-            <span>{{ item.OrderNo }}({{ item.OrderId}})</span>
+            <span>{{ scope.row.OrderNo }}({{ scope.row.OrderId}})</span>
             <span
               class="copy cblack cursor-pointer"
-              v-if="copyId != item.OrderId"
-              @click="CopyHandler(item)"
+              v-if="copyId != scope.row.OrderId"
+              @click="CopyHandler(iscope.row)"
               >复制</span
             >
             <span class="copy c059FF6 bgD9F3FF cursor-pointer" v-else
@@ -340,45 +362,45 @@
           </div>
         </div>
         <div class="c9e fz12">
-          <span v-if="item.OrderType == 1"
-            >联系人信息：{{ item.ContactName }}/{{ item.ContactNumber }}</span
+          <span v-if="scope.row.OrderType == 1"
+            >联系人信息：{{ scope.row.ContactName }}/{{ scope.row.ContactNumber }}</span
           >
-          <span v-else>组团号：{{ item.TCNum }}</span>
+          <span v-else>组团号：{{ scope.row.TCNum }}</span>
         </div>
         <div class="row c9e fz12">
-          <span class="mr" v-if="item.LureEmpName">引流人：{{ item.LureEmpName }}</span>
-          <span class="mr">销售：{{ item.SaleName }}</span>
-          <span class="mr" v-if="item.OpName&&pagesTitle=='OP'">关联OP：{{ item.OpName }}</span>
-          <span class="mr" v-if="item.CustomerName">创建人：{{ item.CustomerName }} ({{ item.CustomerContact }}/{{
-              item.CustomerTel
+          <span class="mr" v-if="scope.row.LureEmpName">引流人：{{ scope.row.LureEmpName }}</span>
+          <span class="mr">销售：{{ scope.row.SaleName }}</span>
+          <span class="mr" v-if="scope.row.OpName&&pagesTitle=='OP'">关联OP：{{ scope.row.OpName }}</span>
+          <span class="mr" v-if="scope.row.CustomerName">创建人：{{ scope.row.CustomerName }} ({{ scope.row.CustomerContact }}/{{
+              scope.row.CustomerTel
             }}</span>
-          <span class="mr">下单时间：{{ item.CreateTime }}</span>
+          <span class="mr">下单时间：{{ scope.row.CreateTime }}</span>
           <div class="">
             <i
               class="mx5"
               :class="{
-                'el-icon-alarm-clock c20C997': item.OrderStatus == 1,
-                'el-icon-check cblack': item.OrderStatus == 2,
-                'el-icon-warning cff9800': item.OrderStatus == 3,
-                'el-icon-refresh cF1416C': item.OrderStatus == 4
+                'el-icon-alarm-clock c20C997': scope.row.OrderStatus == 1,
+                'el-icon-check cblack': scope.row.OrderStatus == 2,
+                'el-icon-warning cff9800': scope.row.OrderStatus == 3,
+                'el-icon-refresh cF1416C': scope.row.OrderStatus == 4
               }"
             ></i>
             <span
               class="fz12 cblack"
               :class="{
-                c20C997: item.OrderStatus == 1,
-                cblack: item.OrderStatus == 2,
-                cff9800: item.OrderStatus == 3,
-                cF1416C: item.OrderStatus == 4
+                c20C997: scope.row.OrderStatus == 1,
+                cblack: scope.row.OrderStatus == 2,
+                cff9800: scope.row.OrderStatus == 3,
+                cF1416C: scope.row.OrderStatus == 4
               }"
             >
-              {{ item.OrderStatusName }}
+              {{ scope.row.OrderStatusName }}
             </span>
           </div>
         </div>
       </div>
       <div class="mb">
-        <el-table :data="item.NewDetailList" style="width:100%" border>
+        <el-table :data="scope.row.NewDetailList" style="width:100%" border>
           <el-table-column
             label="入住日期"
             min-width="100"
@@ -472,27 +494,32 @@
             style="background:#EAEAEA"
           >
             <template slot-scope="scope">
-              <span class="fz15 fbold">{{ item.HandFittingFee ? item.HandFittingFee : "-" }}</span>
+              <span class="fz15 fbold">{{ scope.row.HandFittingFee ? scope.row.HandFittingFee : "-" }}</span>
             </template>
           </el-table-column>
-          <template slot="append" v-if="item.Remark||item.OPRemark||item.isMore||(item.OrderStatus>1||item.OrderStatus!=3)">
-            <div style="padding:10px;color:#f1416c">客户备注：{{item.Remark}}
-              <i v-if="pagesTitle=='销售'&&item.OrderStatus>1&&item.OrderStatus!=3" class="el-icon-edit cursor-pointer c059FF6 mx" @click="editRemark(item)"></i></div>
+          <template slot="append" v-if="scope.row.Remark||scope.row.OPRemark||scope.row.isMore||(scope.row.OrderStatus>1||scope.row.OrderStatus!=3)">
+            <div style="padding:10px;color:#f1416c">客户备注：{{scope.row.Remark}}
+              <i v-if="pagesTitle=='销售'&&scope.row.OrderStatus>1&&scope.row.OrderStatus!=3" class="el-icon-edit cursor-pointer c059FF6 mx" @click="editRemark(scope.row)"></i></div>
             <div style="padding:10px;color:#f1416c"
-            :style="{'padding':item.isMore?'0 10px 30px 10px':'0 10px 10px 10px'}">
-              OP备注：{{item.OPRemark}}
-              <i v-if="pagesTitle=='OP'&&item.OrderStatus>1&&item.OrderStatus!=3" class="el-icon-edit cursor-pointer c059FF6 mx" @click="editRemark(item)"></i>
+            :style="{'padding':scope.row .isMore?'0 10px 30px 10px':'0 10px 10px 10px'}">
+              OP备注：{{scope.row.OPRemark}}
+              <i v-if="pagesTitle=='OP'&&scope.row.OrderStatus>1&&scope.row.OrderStatus!=3" class="el-icon-edit cursor-pointer c059FF6 mx" @click="editRemark(scope.row)"></i>
             </div>
-            <more v-if="item.isMore" @change="ViewMore(item,index)" :upIcon="item.upIcon"></more>
+            <more v-if="scope.row.isMore" @change="ViewMore(scope.row,index)" :upIcon="scope.row.upIcon"></more>
           </template>
         </el-table>
       </div>
-      <el-table :data="item.list" style="width:100%" border v-if="item.OrderStatus!=3">
+      <el-table :data="scope.row.list" style="width:100%" border v-if="scope.row.OrderStatus!=3">
         <el-table-column label="实收" min-width="100">
           <template slot-scope="scope">
             <span class="fz15 fbold">{{ scope.row.Income ? scope.row.Income : "-" }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="在途金额" min-width="100">
+          <template slot-scope="scope">
+            <span class="fz15 fbold">{{ scope.row.PlatformMoney ? scope.row.PlatformMoney : "-" }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="成本" min-width="100">
           <template slot-scope="scope">
             <span class="fz15 fbold">{{ scope.row.CostMoney ? scope.row.CostMoney : "-" }}</span>
@@ -535,20 +562,20 @@
             <span class="fz15 fbold">{{ scope.row.Income-scope.row.CostMoney-scope.row.Refund>0?(scope.row.Income-scope.row.CostMoney-scope.row.Refund).toFixed(2):'-' }}</span>
           </template>
         </el-table-column>
-        <el-table-column v-if="(item.SellCommission&&item.SellCommission>0)||(item.OPCommission&&item.OPCommission>0)" label="提成" style="background:#EAEAEA">
+        <el-table-column v-if="(scope.row.SellCommission&&scope.row.SellCommission>0)||(scope.row.OPCommission&&scope.row.OPCommission>0)" label="提成" style="background:#EAEAEA">
           <template slot-scope="scope">
-            <div class="width100-float-l" v-if="item.SellCommission&&item.SellCommission>0"><span class="float-l">销售：</span>
-              <commissionDialog :objNew="item" :OP="0"></commissionDialog>
+            <div class="width100-float-l" v-if="scope.row.SellCommission&&scope.row.SellCommission>0"><span class="float-l">销售：</span>
+              <commissionDialog :objNew="scope.row" :OP="0"></commissionDialog>
             </div>
-            <div class="width100-float-l" v-if="item.OPCommission&&item.OPCommission>0"><span class="float-l">OP：</span>
-              <commissionDialog :objNew="item" :OP="1"></commissionDialog>
+            <div class="width100-float-l" v-if="scope.row.OPCommission&&scope.row.OPCommission>0"><span class="float-l">OP：</span>
+              <commissionDialog :objNew="scope.row" :OP="1"></commissionDialog>
             </div>
           </template>
         </el-table-column>
       </el-table>
-      <div class="row justify-sb mt mb20" v-if="item.OrderStatus!=3">
+      <div class="row justify-sb mt mb20" v-if="scope.row.OrderStatus!=3">
         <div class="row pt20" style="margin-right: 10px;width: 300px;"
-        v-if="item.GuestFileList.length > 0||((item.CustomerPayType==1 || item.CustomerPayType==3)&&pagesTitle)">
+        v-if="scope.row.GuestFileList.length > 0||((scope.row.CustomerPayType==1 || scope.row.CustomerPayType==3)&&pagesTitle)">
           <!-- <i class="el-icon-warning cF57A98 fz15 mr"></i> -->
           <div class="column">
             <!-- <div class="wrap fz12 c9e" v-if="x.CustomerPayType == 2 || x.CustomerPayType == 3">
@@ -558,19 +585,19 @@
                 <span class="cF1416C">{{item.FinalPaymentDate}}</span>
                 日前支付尾款
               </div> -->
-            <template v-if="item.GuestFileList.length > 0">
+            <template v-if="scope.row.GuestFileList.length > 0">
             <div class="wrap fz12 c9e">
               旅客名单
             </div>
             <div class="row fz12 see-rec mt">
               <div class="text-accent q-mr-md c">
-                {{ item.GuestFileList[0].split("/").at(-1) }}
+                {{ scope.row.GuestFileList[0].split("/").at(-1) }}
               </div>
               <div class="cursor-pointer ml mr rec cf">
                 <a
                   class="cf"
                   style="text-decoration:none"
-                  :href="item.GuestFileList[0]"
+                  :href="scope.row.GuestFileList[0]"
                   >下载</a
                 >
               </div>
@@ -578,10 +605,10 @@
                 <div class="cursor-pointer ml rec cf">提交付费凭证</div> -->
             </div>
             </template>
-            <template v-if="(item.CustomerPayType==1 || item.CustomerPayType==3)&&pagesTitle">
+            <template v-if="(scope.row.CustomerPayType==1 || scope.row.CustomerPayType==3)&&pagesTitle">
                 <div class="fz12 mt c9e">
                   到店自付酒店，需要您于
-                  <span class="cff9800">{{item.UploadGuestDate}}</span>
+                  <span class="cff9800">{{scope.row.UploadGuestDate}}</span>
                 </div>
                 <div class="row fz12 see-rec mt">
                   <el-upload ref="my-upload" :http-request="uploadFileBtn" v-loading="loading"
@@ -589,7 +616,7 @@
                   :show-file-list="false" action="">
                     <div :class="{'cursor-pointer seeLK c059FF6':!loading,
                     'cursor-pointer see c04C8C8':loading}"
-                    @click="uploadOrderId=item.OrderId">上车旅客名单</div>
+                    @click="uploadOrderId=scope.row.OrderId">上车旅客名单</div>
                   </el-upload>
                 </div>
               </template>
@@ -602,16 +629,16 @@
             class="cursor-pointer radius5 mr px5"
             :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
             'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
-              v-for="(x, i) in item.IncomeList"
+              v-for="(x, i) in scope.row.IncomeList"
               @click="openDetails(x)"
               >{{ x.FrID }}</span
             >
-            <span v-if="item.IncomeList.length == 0" class="c9e fz12">
+            <span v-if="scope.row.IncomeList.length == 0" class="c9e fz12">
               暂无收款单据
             </span>
           </div>
           <el-tooltip
-            v-if="item.OrderStatus == 2"
+            v-if="scope.row.OrderStatus == 2"
             class="item"
             effect="dark"
             content="制单"
@@ -619,7 +646,7 @@
           >
             <i
               class="absolute right20 bottom20 el-icon-circle-plus cursor-pointer c059FF6"
-              @click="makeAdocument(item, index, 1)"
+              @click="makeAdocument(scope.row, index, 1)"
             ></i>
           </el-tooltip>
         </div>
@@ -630,16 +657,16 @@
             class="cursor-pointer radius5 mr px5"
             :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
             'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
-              v-for="(x, i) in item.RefundList"
+              v-for="(x, i) in scope.row.RefundList"
               @click="openDetails(x)"
               >{{ x.FrID }}</span
             >
-            <span v-if="item.RefundList.length == 0" class="c9e fz12">
+            <span v-if="scope.row.RefundList.length == 0" class="c9e fz12">
               暂无退款单据
             </span>
           </div>
           <el-tooltip
-            v-if="item.OrderStatus == 2"
+            v-if="scope.row.OrderStatus == 2"
             class="item"
             effect="dark"
             content="制单"
@@ -647,7 +674,7 @@
           >
             <i
               class="absolute right20 bottom20 el-icon-circle-plus cursor-pointer c059FF6"
-              @click="makeAdocument(item, index, 2)"
+              @click="makeAdocument(scope.row, index, 2)"
             ></i>
           </el-tooltip>
         </div>
@@ -658,23 +685,23 @@
             class="cursor-pointer radius5 mr px5"
             :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
             'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
-              v-for="(x, i) in item.CostList"
+              v-for="(x, i) in scope.row.CostList"
               @click="openDetails(x)"
               >{{ x.FrID }}</span
             >
-            <span v-if="item.CostList.length == 0" class="c9e fz12">
+            <span v-if="scope.row.CostList.length == 0" class="c9e fz12">
               暂无成本单据
             </span>
           </div>
-          <div class="item absolute right20 bottom20" v-if="item.OrderStatus == 2 && pagesTitle != '销售'">
+          <div class="item absolute right20 bottom20" v-if="scope.row.OrderStatus == 2 && pagesTitle != '销售'">
             <el-tooltip class="" effect="dark" content="制单"
             placement="top">
             <i class="el-icon-circle-plus cursor-pointer c059FF6"
-              @click="makeAdocument(item, index, 3)"></i>
+              @click="makeAdocument(scope.row, index, 3)"></i>
           </el-tooltip>
-            <el-tooltip v-if="item.OrderStatus == 2" class="" effect="dark" content="冲抵" placement="top">
+            <el-tooltip v-if="scope.row.OrderStatus == 2" class="" effect="dark" content="冲抵" placement="top">
               <i class="el-icon-circle-plus cursor-pointer c3FC4FF"
-                @click="isOffset(item, index, 3,null)"></i>
+                @click="isOffset(scope.row, index, 3,null)"></i>
             </el-tooltip>
           </div>
         </div>
@@ -687,11 +714,11 @@
             'bjFFF3E0':x.InvoiceApplyState===2||x.InvoiceApplyState===4||x.InvoiceApplyState===5,
             'c3FC4FF':x.InvoiceApplyState===6,'cF1416C':x.InvoiceApplyState===1||x.InvoiceApplyState===3,
             'cff9800':x.InvoiceApplyState===2||x.InvoiceApplyState===4||x.InvoiceApplyState===5}"
-              v-for="(x, i) in item.InvoiceApplyList"
+              v-for="(x, i) in scope.row.InvoiceApplyList"
               @click="openDetails(x)"
               >{{ x.ID }}</span
             >
-            <span v-if="item.InvoiceApplyList&&item.InvoiceApplyList.length == 0" class="c9e fz12">
+            <span v-if="scope.row.InvoiceApplyList&&scope.row.InvoiceApplyList.length == 0" class="c9e fz12">
               暂无发票单据
             </span>
           </div>
@@ -731,28 +758,28 @@
           <div class="row-c justify-sb borderD pb5">
             <span class="fz12 c9e">订单总金额</span>
             <div class="ml">
-              <span class="fz15 fbold">{{ item.Money.toFixed(2) }}</span>
-              <span class="fz12 ml">{{ item.CurrencyName }}</span>
+              <span class="fz15 fbold">{{ scope.row.Money.toFixed(2) }}</span>
+              <span class="fz12 ml">{{ scope.row.CurrencyName }}</span>
             </div>
           </div>
           <div
             class="row-c justify-sb borderD py5"
-            v-if="(item.CustomerPayType == 1 || item.CustomerPayType == 3)&&pagesTitle!='销售'"
+            v-if="(scope.row.CustomerPayType == 1 || scope.row.CustomerPayType == 3)&&pagesTitle!='销售'"
           >
             <span class="fz12 c9e">到店自付</span>
             <div class="ml">
-              <span class="fz14">{{ item.SelfPayMoney.toFixed(2) }}</span>
-              <span class="fz12 ml">{{ item.CurrencyName }}</span>
+              <span class="fz14">{{ scope.row.SelfPayMoney.toFixed(2) }}</span>
+              <span class="fz12 ml">{{ scope.row.CurrencyName }}</span>
             </div>
           </div>
           <div
             class="row-c justify-sb py5"
-            v-if="item.CustomerPayType == 2 || item.CustomerPayType == 3"
+            v-if="scope.row.CustomerPayType == 2 || scope.row.CustomerPayType == 3"
           >
             <span class="fz12 c9e">出发前付款</span>
             <div class="ml">
-              <span class="fz14">{{ item.BeforeMoney.toFixed(2) }}</span>
-              <span class="fz12 ml">{{ item.CurrencyName }}</span>
+              <span class="fz14">{{ scope.row.BeforeMoney.toFixed(2) }}</span>
+              <span class="fz12 ml">{{ scope.row.CurrencyName }}</span>
             </div>
           </div>
         </div>
@@ -762,66 +789,66 @@
         >
           <div
             v-if="
-              item.OrderStatus == 1 &&
-                item.IncomeList.length == 0 &&
-                  item.RefundList.length == 0 &&
-                  item.CostList.length == 0 &&
-                  item.HandFittingFinanceList.length == 0
+              scope.row.OrderStatus == 1 &&
+              scope.row.IncomeList.length == 0 &&
+              scope.row.RefundList.length == 0 &&
+              scope.row.CostList.length == 0 &&
+              scope.row.HandFittingFinanceList.length == 0
             "
             class="row-c cursor-pointer radius5 cancel py5"
-            @click="clickRightButtom(item, 0)"
+            @click="clickRightButtom(scope.row, 0)"
           >
-            <i v-loading="msg.OrderId==item.OrderId&&loading0"></i>
+            <i v-loading="msg.OrderId==scope.row.OrderId&&loading0"></i>
             <span class="cF1416C">取消订单</span>
           </div>
           <div
-            v-if="item.OrderStatus == 1&&pagesTitle!='销售'"
+            v-if="scope.row.OrderStatus == 1&&pagesTitle!='销售'"
             class="row-c cursor-pointer radius5 confirm py5"
-            @click="clickRightButtom(item, 1)"
+            @click="clickRightButtom(scope.row, 1)"
           >
-            <i v-loading="msg.OrderId==item.OrderId&&loading1"></i>
+            <i v-loading="msg.OrderId==scope.row.OrderId&&loading1"></i>
             <span class="c20C997">确认订单</span>
           </div>
           <div
-            v-if="item.OrderStatus == 2 || item.OrderStatus == 4"
+            v-if="scope.row.OrderStatus == 2 || scope.row.OrderStatus == 4"
             class="row-c cursor-pointer radius5 change py5"
-            @click="goRoomDetails(item, '订房详情')"
+            @click="goRoomDetails(scope.row, '订房详情')"
           >
             <span class="c059FF6">明细/编辑</span>
           </div>
           <div
-            v-if="item.OrderStatus == 1&&pagesTitle=='销售'"
+            v-if="scope.row.OrderStatus == 1&&pagesTitle=='销售'"
             class="row-c cursor-pointer radius5 change py5"
-            @click="goRoomDetails(item, '酒店预定变更')"
+            @click="goRoomDetails(scope.row, '酒店预定变更')"
           >
             <span class="c059FF6">订单变更</span>
           </div>
           <div
-            v-if="item.OrderStatus == 2"
+            v-if="scope.row.OrderStatus == 2"
             class="row-c cursor-pointer radius5 change1 py5"
-            @click="clickRightButtom(item, 2)"
+            @click="clickRightButtom(scope.row, 2)"
           >
-            <i v-loading="msg.OrderId==item.OrderId&&loading2"></i>
+            <i v-loading="msg.OrderId==scope.row.OrderId&&loading2"></i>
             <span class="c20C997">收损</span>
           </div>
           <div
-            v-if="item.OrderStatus >1 && item.OrderStatus != 3
+            v-if="scope.row.OrderStatus >1 && scope.row.OrderStatus != 3
             &&pagesTitle=='OP'&&is_correlationOP"
             class="row-c cursor-pointer radius5 change py5"
-            @click="clickCorrelation(item, 1)"
+            @click="clickCorrelation(scope.row, 1)"
           >
             <span class="c059FF6">编辑关联OP</span>
           </div>
           <div
-            v-if="item.OrderStatus != 3
+            v-if="scope.row.OrderStatus != 3
             &&pagesTitle=='OP'"
             class="row-c cursor-pointer radius5 change py5"
-            @click="clickCorrelation(item,2)"
+            @click="clickCorrelation(scope.row,2)"
           >
             <span class="c059FF6">编辑总金额</span>
           </div>
           <!-- 申请发票 -->
-          <ApplyFoInvoice v-if="userInfo.EmployeeId==item.EnterID" :obj="item" :type="6"></ApplyFoInvoice>
+          <ApplyFoInvoice v-if="userInfo.EmployeeId==scope.row.EnterID" :obj="scope.row" :type="6"></ApplyFoInvoice>
         </div>
         <!-- <div v-if="item.OrderStatus==2" class="column-jac px15 bgE8F5E9 radius5 ml fz12 pa20 flex-s c20C997">
             <div class="mb5">已支付</div>
@@ -836,15 +863,16 @@
             </div>
           </div> -->
       </div>
-      <div class="mt mb20 bgf5 pa15 row-c" v-if="item.CancelRemark">
+      <div class="mt mb20 bgf5 pa15 row-c" v-if="scope.row.CancelRemark">
         <div style="font-size:16px;font-weight:bold;font-family: pingfangR;">取消理由：</div>
-        <div style="margin-left:12px;font-size:12px;color: grey; font-family: microsoft yahei;">{{item.CancelRemark}}</div>
+        <div style="margin-left:12px;font-size:12px;color: grey; font-family: microsoft yahei;">{{scope.row.CancelRemark}}</div>
         <div style="margin-left:12px;font-size:12px;font-family: microsoft yahei;">
-          {{item.CancelEmpName}} {{item.CancelTime}}
-        </div>
+          {{scope.row.CancelEmpName}} {{scope.row.CancelTime}}
         </div>
       </div>
-
+    </template>
+  </el-table-column>
+    </el-table>
     <el-dialog
       custom-class="w400"
       title="修改收损金额"
@@ -958,6 +986,8 @@ export default {
       isShowRemark: false,
       queryObj:null,
       cdState: false,
+      CompletedLoading: false,
+      multipleSelection: [],
       copyId: 0,
       loading0: false,
       loading1: false,
@@ -1054,6 +1084,74 @@ export default {
           }
         })
     },
+    selectable(row, index) {
+        if (((this.OrderList[index].IsFinish != 1 && this.OrderList[index].Income > 0 && this.OrderList[index]
+          .DueInMoney == 0)||(this.OrderList[index].Money==0&&this.OrderList[index].Income==0
+          &&this.OrderList[index].CostMoney==0&&this.OrderList[index].Refund==0
+          &&this.OrderList[index].PlatformTax==0&&this.OrderList[index].IncomeList
+          &&this.OrderList[index].IncomeList.length>0))) {
+          return true;
+        } else {
+          return false;
+        }
+      },
+      handleSelectionChange(val) {
+        this.multipleSelection = val.map(x => {
+          return x.OrderId
+        });
+      },
+      setCompleted(id, row) {
+        let ids = ''
+        if (id > 0) {
+          ids = id
+        } else {
+          if (this.multipleSelection.length == 0) return this.$message.error('请勾选需要完结的数据')
+          ids = this.multipleSelection.join(',')
+        }
+        if (ids == '') {
+          this.$message.error('请勾选需要完结的数据')
+        }
+        this.$confirm('是否确认完结?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          if (id > 0) {
+            row.loading = true
+          } else {
+            this.CompletedLoading = true
+          }
+          this.apipost('dict_post_SetHotelOrderFinish', {
+            HotelOrderIds: ids
+          }, res => {
+            if (res.data.resultCode == 1) {
+              if (id > 0) {
+                row.loading = false
+              } else {
+                this.CompletedLoading = false
+              }
+              for (let i = 0; i < this.OrderList.length; i++) {
+                this.$refs.multipleTable.toggleRowSelection(
+                  this.OrderList[i],
+                  false
+                );
+              }
+              this.multipleSelection = []
+              this.$message.success('操作成功！');
+              this.$emit('success')
+            } else {
+              if (id > 0) {
+                row.loading = false
+              } else {
+                this.CompletedLoading = false
+              }
+              this.$message.error(res.data.message);
+            }
+          }, err => {})
+        }).catch(() => {
+          this.$message.info('已取消！');
+        });
+      },
     ViewMore(x,index){
         x.upIcon = !x.upIcon
         if(x.upIcon){

src/components/SingleAirTicket/components/OrderList.vue

@@ -668,6 +668,11 @@
               {{ scope.row.IncomeMoney }}
             </template>
           </el-table-column>
+          <el-table-column label="在途金额">
+            <template slot-scope="scope">
+              {{ scope.row.PlatformMoney }}
+            </template>
+          </el-table-column>
           <el-table-column label="退款">
             <template slot-scope="scope">
               {{ scope.row.BackMoney }}

src/components/busManagement/BookAcar/components/orderList.vue

@@ -384,35 +384,50 @@
   border-bottom: 1px solid #ebeef5;
 }
 </style>
-
     <template>
   <div>
-    <div
-      v-for="(item, index) in OrderList"
-      class="column bgf radius5 px15 mb20"
-    >
+    <div style="text-align: right;position: fixed;top:  62px; right: 89px;">
+      <el-button class="hollowFixedBtn" v-if="pagesTitle=='OP'" @click="setCompleted"
+        :loading="CompletedLoading">一键完结</el-button>
+    </div>
+    <el-table ref="multipleTable" :data="OrderList" tooltip-effect="dark" style="width: 100%" row-key="OrderId"
+      @selection-change="handleSelectionChange">
+      <el-table-column type="selection" :selectable="selectable" :reserve-selection="true"
+        v-if="pagesTitle=='OP'">
+      </el-table-column>
+      <el-table-column :label="pagesTitle=='OP'?'全选':''">
+     <template slot-scope="scope">
       <div class="row-c justify-sb align-c py">
         <div class="row-c">
           <div>
             <div
               class="orderType cf fz12"
               :class="{
-                active: item.OrderType == 1,
-                activeB: item.OrderType == 3,
+                active: scope.row.OrderType == 1,
+                activeB: scope.row.OrderType == 3,
               }"
             >
-              <template v-if="item.OrderType == 1">接机</template>
-              <template v-if="item.OrderType == 2">送机</template>
-              <template v-if="item.OrderType == 3">包车</template>
+              <template v-if="scope.row.OrderType == 1">接机</template>
+              <template v-if="scope.row.OrderType == 2">送机</template>
+              <template v-if="scope.row.OrderType == 3">包车</template>
             </div>
           </div>
+          <div class="cblack fz14 mr"
+                :class="{ cF1416C: scope.row.IsFinish == 0,c20C997: scope.row.IsFinish == 1 }">
+                <template v-if="scope.row.IsFinish == 1">
+                  已完结 <template v-if="scope.row.FinishTime">/ {{scope.row.FinishTime}}</template>
+                </template>
+                <template v-else>
+                  未完结
+                </template>
+              </div>
           <div class="c9e fz12">
             <span>订单编号：</span>
-            <span>{{ item.OrderNo }}({{ item.OrderId }})</span>
+            <span>{{ scope.row.OrderNo }}({{ scope.row.OrderId }})</span>
             <span
               class="copy cblack cursor-pointer"
-              v-if="copyId != item.OrderId"
-              @click="CopyHandler(item)"
+              v-if="copyId != scope.row.OrderId"
+              @click="CopyHandler(scope.row)"
               >复制</span
             >
             <span class="copy c059FF6 bgD9F3FF cursor-pointer" v-else
@@ -422,61 +437,61 @@
         </div>
         <div class="c9e fz12">
           <span
-            >客人信息：{{ item.SurName }}{{ item.Name }}/{{ item.Mobile }}</span
+            >客人信息：{{ scope.row.SurName }}{{ scope.row.Name }}/{{ scope.row.Mobile }}</span
           >
           <span v-if="pagesTitle != '销售'">
-            <template v-if="item.SurName || item.Name"> /</template
-            >来源<template v-if="!item.OrderSource && !item.CustomerId"
+            <template v-if="scope.row.SurName || scope.row.Name"> /</template
+            >来源<template v-if="!scope.row.OrderSource && !scope.row.CustomerId"
               >销售</template
             >
-            <template v-if="!item.OrderSource && item.CustomerId > 0"
+            <template v-if="!scope.row.OrderSource && scope.row.CustomerId > 0"
               >B2B</template
             >
-            <template v-if="item.OrderSource == 1">B2C</template>
+            <template v-if="scope.row.OrderSource == 1">B2C</template>
           </span>
         </div>
         <div class="row c9e fz12">
-          <span class="mr" v-if="item.LureEmpName"
-            >引流人：{{ item.LureEmpName }}</span
+          <span class="mr" v-if="scope.row.LureEmpName"
+            >引流人：{{ scope.row.LureEmpName }}</span
           >
-          <span class="mr">销售：{{ item.SaleName }}</span>
-          <span class="mr" v-if="item.OpName && pagesTitle == 'OP'"
-            >关联OP：{{ item.OpName }}</span
+          <span class="mr">销售：{{ scope.row.SaleName }}</span>
+          <span class="mr" v-if="scope.row.OpName && pagesTitle == 'OP'"
+            >关联OP：{{ scope.row.OpName }}</span
           >
-          <span class="mr" v-if="item.CustomerName">创建人：</span>
-          <span class="mr" v-if="item.CustomerName"
-            >{{ item.CustomerName }} ({{ item.CustomerContact }}/{{
-              item.CustomerTel
+          <span class="mr" v-if="scope.row.CustomerName">创建人：</span>
+          <span class="mr" v-if="scope.row.CustomerName"
+            >{{ scope.row.CustomerName }} ({{ scope.row.CustomerContact }}/{{
+              scope.row.CustomerTel
             }})</span
           >
           <span>下单时间：</span>
-          <span class="mr">{{ item.CreateTime }}</span>
+          <span class="mr">{{ scope.row.CreateTime }}</span>
           <div class="">
             <i
               class="mx5"
               :class="{
-                'el-icon-alarm-clock c20C997': item.OrderStatus == 1,
-                'el-icon-check cblack': item.OrderStatus == 2,
-                'el-icon-warning cff9800': item.OrderStatus == 3,
-                'el-icon-refresh cF1416C': item.OrderStatus == 4,
+                'el-icon-alarm-clock c20C997': scope.row.OrderStatus == 1,
+                'el-icon-check cblack': scope.row.OrderStatus == 2,
+                'el-icon-warning cff9800': scope.row.OrderStatus == 3,
+                'el-icon-refresh cF1416C': scope.row.OrderStatus == 4,
               }"
             ></i>
             <span
               class="fz12 cblack"
               :class="{
-                c20C997: item.OrderStatus == 1,
-                cblack: item.OrderStatus == 2,
-                cff9800: item.OrderStatus == 3,
-                cF1416C: item.OrderStatus == 4,
+                c20C997: scope.row.OrderStatus == 1,
+                cblack: scope.row.OrderStatus == 2,
+                cff9800: scope.row.OrderStatus == 3,
+                cF1416C: scope.row.OrderStatus == 4,
               }"
             >
-              {{ item.OrderStatusName }}
+              {{ scope.row.OrderStatusName }}
             </span>
           </div>
         </div>
       </div>
       <div class="mb">
-        <el-table :data="[item]" style="width: 100%" border>
+        <el-table :data="[scope.row]" style="width: 100%" border>
           <el-table-column
             label="产品名称(出发日期)"
             min-width="100"
@@ -490,7 +505,7 @@
             </template>
           </el-table-column>
           <el-table-column
-            v-if="item.OrderType != 3"
+            v-if="scope.row.OrderType != 3"
             label="航班信息"
             style="background: #eaeaea"
           >
@@ -519,7 +534,7 @@
             </template>
           </el-table-column>
           <el-table-column
-            v-if="item.OrderType != 3"
+            v-if="scope.row.OrderType != 3"
             label="行李"
             style="background: #eaeaea"
           >
@@ -562,59 +577,59 @@
           <template
             slot="append"
             v-if="
-              item.Remark ||
-              item.OPRemark ||
-              item.isMore ||
-              (item.OrderStatus > 1 && item.OrderStatus != 3)
+              scope.row.Remark ||
+              scope.row.OPRemark ||
+              scope.row.isMore ||
+              (scope.row.OrderStatus > 1 && scope.row.OrderStatus != 3)
             "
           >
             <div
               v-if="
-                (item.OrderStatus > 1 && item.OrderStatus != 3) || item.Remark
+                (scope.row.OrderStatus > 1 && scope.row.OrderStatus != 3) || scope.row.Remark
               "
               style="padding: 10px; color: #f1416c"
             >
-              客户备注：{{ item.Remark }}
+              客户备注：{{ scope.row.Remark }}
               <i
                 v-if="
                   pagesTitle == '销售' &&
-                  item.OrderStatus > 1 &&
-                  item.OrderStatus != 3
+                  scope.row.OrderStatus > 1 &&
+                  scope.row.OrderStatus != 3
                 "
                 class="el-icon-edit cursor-pointer c059FF6 mx"
-                @click="editRemark(item)"
+                @click="editRemark(scope.row)"
               ></i>
             </div>
             <div
               v-if="
-                (item.OrderStatus > 1 && item.OrderStatus != 3) || item.OPRemark
+                (scope.row.OrderStatus > 1 && scope.row.OrderStatus != 3) || scope.row.OPRemark
               "
               style="padding: 10px; color: #f1416c"
               :style="{
                 padding:
-                  item.Remark
+                scope.row.Remark
                     ? '0 10px 10px 10px':'10px',
               }"
             >
-              OP备注：{{ item.OPRemark }}
+              OP备注：{{ scope.row.OPRemark }}
               <i
                 v-if="
                   pagesTitle == 'OP' &&
-                  item.OrderStatus > 1 &&
-                  item.OrderStatus != 3
+                  scope.row.OrderStatus > 1 &&
+                  scope.row.OrderStatus != 3
                 "
                 class="el-icon-edit cursor-pointer c059FF6 mx"
-                @click="editRemark(item)"
+                @click="editRemark(scope.row)"
               ></i>
             </div>
           </template>
         </el-table>
       </div>
       <el-table
-        :data="[item]"
+        :data="[scope.row]"
         style="width: 100%"
         border
-        v-if="item.OrderStatus != 3"
+        v-if="scope.row.OrderStatus != 3"
       >
         <el-table-column label="实收" min-width="100">
           <template slot-scope="scope">
@@ -623,6 +638,13 @@
             }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="在途金额" min-width="100">
+          <template slot-scope="scope">
+            <span class="fz15 fbold">{{
+              scope.row.PlatformMoney ? scope.row.PlatformMoney : "-"
+            }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="成本" min-width="100">
           <template slot-scope="scope">
             <span class="fz15 fbold">{{
@@ -663,16 +685,16 @@
           </template>
         </el-table-column>
         <el-table-column
-          v-if="(item.SellCommission&&item.SellCommission>0)||(item.OPCommission&&item.OPCommission>0)"
+          v-if="(scope.row.SellCommission&&scope.row.SellCommission>0)||(scope.row.OPCommission&&scope.row.OPCommission>0)"
           label="提成"
           style="background: #eaeaea"
         >
           <template slot-scope="scope">
-            <div class="width100-float-l" v-if="item.SellCommission&&item.SellCommission>0"><span class="float-l">销售：</span>
-              <commissionDialog :objNew="item" :OP="0"></commissionDialog>
+            <div class="width100-float-l" v-if="scope.row.SellCommission&&scope.row.SellCommission>0"><span class="float-l">销售：</span>
+              <commissionDialog :objNew="scope.row" :OP="0"></commissionDialog>
             </div>
-            <div class="width100-float-l" v-if="item.OPCommission&&item.OPCommission>0"><span class="float-l">OP：</span>
-              <commissionDialog :objNew="item" :OP="1"></commissionDialog>
+            <div class="width100-float-l" v-if="scope.row.OPCommission&&scope.row.OPCommission>0"><span class="float-l">OP：</span>
+              <commissionDialog :objNew="scope.row" :OP="1"></commissionDialog>
             </div>
           </template>
         </el-table-column>
@@ -691,16 +713,16 @@
                 cF1416C: x.Status == 2,
                 cff9800: x.Status == 3,
               }"
-              v-for="(x, i) in item.IncomeList"
+              v-for="(x, i) in scope.row.IncomeList"
               @click="openDetails(x)"
               >{{ x.FrID }}</span
             >
-            <span v-if="item.IncomeList.length == 0" class="c9e fz12">
+            <span v-if="scope.row.IncomeList.length == 0" class="c9e fz12">
               暂无收款单据
             </span>
           </div>
           <el-tooltip
-            v-if="item.OrderStatus == 2"
+            v-if="scope.row.OrderStatus == 2"
             class="item"
             effect="dark"
             content="制单"
@@ -708,7 +730,7 @@
           >
             <i
               class="absolute right20 bottom20 el-icon-circle-plus cursor-pointer c059FF6"
-              @click="makeAdocument(item, index, 1)"
+              @click="makeAdocument(scope.row, index, 1)"
             ></i>
           </el-tooltip>
         </div>
@@ -725,16 +747,16 @@
                 cF1416C: x.Status == 2,
                 cff9800: x.Status == 3,
               }"
-              v-for="(x, i) in item.RefundList"
+              v-for="(x, i) in scope.row.RefundList"
               @click="openDetails(x)"
               >{{ x.FrID }}</span
             >
-            <span v-if="item.RefundList.length == 0" class="c9e fz12">
+            <span v-if="scope.row.RefundList.length == 0" class="c9e fz12">
               暂无退款单据
             </span>
           </div>
           <el-tooltip
-            v-if="item.OrderStatus == 2"
+            v-if="scope.row.OrderStatus == 2"
             class="item"
             effect="dark"
             content="制单"
@@ -742,7 +764,7 @@
           >
             <i
               class="absolute right20 bottom20 el-icon-circle-plus cursor-pointer c059FF6"
-              @click="makeAdocument(item, index, 2)"
+              @click="makeAdocument(scope.row, index, 2)"
             ></i>
           </el-tooltip>
         </div>
@@ -759,28 +781,28 @@
                 cF1416C: x.Status == 2,
                 cff9800: x.Status == 3,
               }"
-              v-for="(x, i) in item.CostList"
+              v-for="(x, i) in scope.row.CostList"
               @click="openDetails(x)"
               >{{ x.FrID }}</span
             >
-            <span v-if="item.CostList.length == 0" class="c9e fz12">
+            <span v-if="scope.row.CostList.length == 0" class="c9e fz12">
               暂无成本单据
             </span>
           </div>
           <div
             class="item absolute right20 bottom20"
-            v-if="item.OrderStatus == 2 && pagesTitle != '销售'"
+            v-if="scope.row.OrderStatus == 2 && pagesTitle != '销售'"
           >
             <el-tooltip class="" effect="dark" content="制单" placement="top">
               <i
                 class="el-icon-circle-plus cursor-pointer c059FF6"
-                @click="makeAdocument(item, index, 3)"
+                @click="makeAdocument(scope.row, index, 3)"
               ></i>
             </el-tooltip>
             <el-tooltip class="" effect="dark" content="冲抵" placement="top">
               <i
                 class="el-icon-circle-plus cursor-pointer c3FC4FF"
-                @click="isOffset(item, index, 3)"
+                @click="isOffset(scope.row, index, 3)"
               ></i>
             </el-tooltip>
           </div>
@@ -794,11 +816,11 @@
             'bjFFF3E0':x.InvoiceApplyState===2||x.InvoiceApplyState===4||x.InvoiceApplyState===5,
             'c3FC4FF':x.InvoiceApplyState===6,'cF1416C':x.InvoiceApplyState===1||x.InvoiceApplyState===3,
             'cff9800':x.InvoiceApplyState===2||x.InvoiceApplyState===4||x.InvoiceApplyState===5}"
-              v-for="(x, i) in item.InvoiceApplyList"
+              v-for="(x, i) in scope.row.InvoiceApplyList"
               @click="openDetails(x)"
               >{{ x.ID }}</span
             >
-            <span v-if="item.InvoiceApplyList&&item.InvoiceApplyList.length == 0" class="c9e fz12">
+            <span v-if="scope.row.InvoiceApplyList&&scope.row.InvoiceApplyList.length == 0" class="c9e fz12">
               暂无发票单据
             </span>
           </div>
@@ -809,21 +831,21 @@
         >
           <div
             class="row-c justify-sb pb5"
-            :class="{ borderD: item.DiscountsMoney > 0 }"
+            :class="{ borderD: scope.row.DiscountsMoney > 0 }"
           >
             <span class="fz12 c9e">订单总金额</span>
             <div class="ml">
-              <span class="fz15 fbold">{{ item.Money.toFixed(2) }}</span>
+              <span class="fz15 fbold">{{ scope.row.Money.toFixed(2) }}</span>
               <span class="fz12 ml">
-                {{ item.CurrencyName }}
+                {{ scope.row.CurrencyName }}
               </span>
             </div>
           </div>
-          <div class="row-c justify-sb py5" v-if="item.DiscountsMoney > 0">
+          <div class="row-c justify-sb py5" v-if="scope.row.DiscountsMoney > 0">
             <span class="fz12 c9e">优惠金额</span>
             <div class="ml">
-              <span class="fz14">{{ item.DiscountsMoney.toFixed(2) }}</span>
-              <span class="fz12">{{ item.CurrencyName }}</span>
+              <span class="fz14">{{ scope.row.DiscountsMoney.toFixed(2) }}</span>
+              <span class="fz12">{{ scope.row.CurrencyName }}</span>
             </div>
           </div>
         </div>
@@ -837,69 +859,69 @@
         >
           <div
             v-if="
-              item.OrderStatus == 1 &&
-              item.IncomeList.length == 0 &&
-              item.RefundList.length == 0 &&
-              item.CostList.length == 0 &&
-              item.OrderSource != 1
+              scope.row.OrderStatus == 1 &&
+              scope.row.IncomeList.length == 0 &&
+              scope.row.RefundList.length == 0 &&
+              scope.row.CostList.length == 0 &&
+              scope.row.OrderSource != 1
             "
             class="row-c cursor-pointer radius5 cancel py5"
-            @click="clickRightButtom(item, 0)"
+            @click="clickRightButtom(scope.row, 0)"
           >
-            <i v-loading="msg.OrderId == item.OrderId && loading0"></i>
+            <i v-loading="msg.OrderId == scope.row.OrderId && loading0"></i>
             <span class="cF1416C">取消订单</span>
           </div>
           <div
             v-if="
-              item.OrderStatus == 1 &&
+              scope.row.OrderStatus == 1 &&
               pagesTitle != '销售' &&
-              item.OrderSource != 1
+              scope.row.OrderSource != 1
             "
             class="row-c cursor-pointer radius5 confirm py5"
-            @click="clickRightButtom(item, 1)"
+            @click="clickRightButtom(scope.row, 1)"
           >
-            <i v-loading="msg.OrderId == item.OrderId && loading1"></i>
+            <i v-loading="msg.OrderId == scope.row.OrderId && loading1"></i>
             <span class="c20C997">确认订单</span>
           </div>
           <div
-            v-if="item.OrderStatus == 1 && pagesTitle == '销售'"
+            v-if="scope.row.OrderStatus == 1 && pagesTitle == '销售'"
             class="row-c cursor-pointer radius5 change py5"
-            @click="goRoomDetails(item, '变更订单')"
+            @click="goRoomDetails(scope.row, '变更订单')"
           >
             <span class="c059FF6">订单变更</span>
           </div>
           <div
-            v-if="item.OrderStatus > 1"
+            v-if="scope.row.OrderStatus > 1"
             class="row-c cursor-pointer radius5 change1 py5"
-            @click="clickRightButtom(item, 2)"
+            @click="clickRightButtom(scope.row, 2)"
           >
-            <i v-loading="msg.OrderId == item.OrderId && loading2"></i>
+            <i v-loading="msg.OrderId == scope.row.OrderId && loading2"></i>
             <span class="c20C997">收损</span>
           </div>
           <div
             v-if="
-              item.OrderStatus > 1 &&
-              item.OrderStatus != 3 &&
+              scope.row.OrderStatus > 1 &&
+              scope.row.OrderStatus != 3 &&
               pagesTitle != '销售' &&
               is_correlationOP
             "
             class="row-c cursor-pointer radius5 change py5"
-            @click="clickCorrelation(item, 1)"
+            @click="clickCorrelation(scope.row, 1)"
           >
             <span class="c059FF6">编辑关联OP</span>
           </div>
           <div
-            v-if="item.OrderStatus != 3 && pagesTitle == 'OP'"
+            v-if="scope.row.OrderStatus != 3 && pagesTitle == 'OP'"
             class="row-c cursor-pointer radius5 change py5"
-            @click="clickCorrelation(item, 2)"
+            @click="clickCorrelation(scope.row, 2)"
           >
             <span class="c059FF6">编辑总金额</span>
           </div>
           <!-- 申请发票 -->
-          <ApplyFoInvoice v-if="userInfo.EmployeeId==item.EnterID" :obj="item" :type="5"></ApplyFoInvoice>
+          <ApplyFoInvoice v-if="userInfo.EmployeeId==scope.row.EnterID" :obj="scope.row" :type="5"></ApplyFoInvoice>
         </div>
       </div>
-      <div class="mt mb20 bgf5 pa15 row-c" v-if="item.CancelRemark">
+      <div class="mt mb20 bgf5 pa15 row-c" v-if="scope.row.CancelRemark">
         <div style="font-size: 16px; font-weight: bold; font-family: pingfangR">
           取消理由：
         </div>
@@ -911,7 +933,7 @@
             font-family: microsoft yahei;
           "
         >
-          {{ item.CancelRemark }}
+          {{ scope.row.CancelRemark }}
         </div>
         <div
           style="
@@ -920,11 +942,12 @@
             font-family: microsoft yahei;
           "
         >
-          {{ item.CancelEmpName }} {{ item.CancelTime }}
+          {{ scope.row.CancelEmpName }} {{ scope.row.CancelTime }}
         </div>
       </div>
-    </div>
-
+    </template>
+    </el-table-column>
+    </el-table>
     <el-dialog
       custom-class="w400"
       title="设置收损金额"
@@ -1046,6 +1069,8 @@ export default {
       queryObj: null,
       cdState: false,
       copyId: 0,
+      CompletedLoading: false,
+      multipleSelection: [],
       loading0: false,
       loading1: false,
       loading2: false,
@@ -1195,6 +1220,74 @@ export default {
         this.pagesTitle == "销售" ? item.Remark : item.OPRemark;
       this.isShowRemark = true;
     },
+    selectable(row, index) {
+        if (((this.OrderList[index].IsFinish != 1 && this.OrderList[index].Income > 0 && this.OrderList[index]
+          .DueInMoney == 0)||(this.OrderList[index].Money==0&&this.OrderList[index].Income==0
+          &&this.OrderList[index].CostMoney==0&&this.OrderList[index].Refund==0
+          &&this.OrderList[index].PlatformTax==0&&this.OrderList[index].IncomeList
+          &&this.OrderList[index].IncomeList.length>0))) {
+          return true;
+        } else {
+          return false;
+        }
+      },
+      handleSelectionChange(val) {
+        this.multipleSelection = val.map(x => {
+          return x.OrderId
+        });
+      },
+      setCompleted(id, row) {
+        let ids = ''
+        if (id > 0) {
+          ids = id
+        } else {
+          if (this.multipleSelection.length == 0) return this.$message.error('请勾选需要完结的数据')
+          ids = this.multipleSelection.join(',')
+        }
+        if (ids == '') {
+          this.$message.error('请勾选需要完结的数据')
+        }
+        this.$confirm('是否确认完结?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          if (id > 0) {
+            row.loading = true
+          } else {
+            this.CompletedLoading = true
+          }
+          this.apipost('CarSingle_post_SetCarOrderFinish', {
+            CarOrderIds: ids
+          }, res => {
+            if (res.data.resultCode == 1) {
+              if (id > 0) {
+                row.loading = false
+              } else {
+                this.CompletedLoading = false
+              }
+              for (let i = 0; i < this.OrderList.length; i++) {
+                this.$refs.multipleTable.toggleRowSelection(
+                  this.OrderList[i],
+                  false
+                );
+              }
+              this.multipleSelection = []
+              this.$message.success('操作成功！');
+              this.$emit('success')
+            } else {
+              if (id > 0) {
+                row.loading = false
+              } else {
+                this.CompletedLoading = false
+              }
+              this.$message.error(res.data.message);
+            }
+          }, err => {})
+        }).catch(() => {
+          this.$message.info('已取消！');
+        });
+      },
     submitEditRemark() {
       if (!this.postMsg.Remark) {
         this.$message.error("OP备注不能为空");

src/components/myOrdersAllType/components/OrderList.vue

@@ -52,6 +52,8 @@
     </el-table-column>
     <el-table-column sortable prop="Income" label="实收">
     </el-table-column>
+    <el-table-column sortable prop="PlatformMoney" label="在途金额" min-width="100">
+    </el-table-column>
     <el-table-column sortable prop="PreferTipAmount" label="人头小费" min-width="101">
     </el-table-column>
     <el-table-column sortable prop="PlatformTax" label="手续费" min-width="100">

src/components/scenicSpot/reservation/OrderList.vue

@@ -501,64 +501,84 @@
 
 <template>
   <div>
-    <div v-for="(item, index) in OrderList" class="column bgf radius5 px15 mb20">
+
+    <div style="text-align: right;position: fixed;top:  62px; right: 89px;">
+      <el-button class="hollowFixedBtn" v-if="pagesTitle=='OP'" @click="setCompleted"
+        :loading="CompletedLoading">一键完结</el-button>
+    </div>
+    <el-table ref="multipleTable" :data="OrderList" tooltip-effect="dark" style="width: 100%" row-key="OrderId"
+      @selection-change="handleSelectionChange">
+      <el-table-column type="selection" :selectable="selectable" :reserve-selection="true"
+        v-if="pagesTitle=='OP'">
+      </el-table-column>
+      <el-table-column :label="pagesTitle=='OP'?'全选':''">
+        <template slot-scope="scope">
     <div class="row-c justify-sb align-c py">
         <div class="row-c">
           <div>
-            <div class="orderType cf fz12" :class="{ active: item.MailingState == 1,activeNo: item.MailingState == 4 }">
-              <template v-if="item.MailingState == 1">自行取件</template>
-              <template v-if="item.MailingState > 1&&item.MailingState < 4">邮寄票券</template>
-              <template v-if="item.MailingState == 4">电子券</template>
+            <div class="orderType cf fz12" :class="{ active: scope.row.MailingState == 1,activeNo: scope.row.MailingState == 4 }">
+              <template v-if="scope.row.MailingState == 1">自行取件</template>
+              <template v-if="scope.row.MailingState > 1&&scope.row.MailingState < 4">邮寄票券</template>
+              <template v-if="scope.row.MailingState == 4">电子券</template>
             </div>
           </div>
+          <div class="cblack fz14 mr"
+                :class="{ cF1416C: scope.row.IsFinish == 0,c20C997: scope.row.IsFinish == 1 }">
+                <template v-if="scope.row.IsFinish == 1">
+                  已完结 <template v-if="scope.row.FinishTime">/ {{scope.row.FinishTime}}</template>
+                </template>
+                <template v-else>
+                  未完结
+                </template>
+              </div>
           <div class="c9e fz12">
             <span>订单编号：</span>
-            <span>{{ item.OrderNo }}({{ item.OrderId}})</span>
-            <span class="copy cblack cursor-pointer" v-if="copyId != item.OrderId" @click="CopyHandler(item)">复制</span>
+            <span>{{ scope.row.OrderNo }}({{ scope.row.OrderId}})</span>
+            <span class="copy cblack cursor-pointer" v-if="copyId != scope.row.OrderId" @click="CopyHandler(scope.row)">复制</span>
             <span class="copy c059FF6 bgD9F3FF cursor-pointer" v-else><i class="el-icon-check mr"></i>已复制</span>
           </div>
         </div>
         <div class="c9e fz12">
-          <span v-if="item.Name||item.EName">客人信息：{{ item.Name }}({{ item.EName }})<template v-if="item.Mobile"> /{{ item.Mobile }}</template></span>
+          <span v-if="scope.row.Name||scope.row.EName">客人信息：{{ scope.row.Name }}({{ scope.row.EName }})<template v-if="scope.row.Mobile"> /{{ scope.row.Mobile }}</template></span>
           <span v-if="pagesTitle!='销售'">
-            <template v-if="item.Name||item.EName"> /</template>来源<template v-if="!item.OrderSource&&!item.CustomerId">销售</template>
-            <template v-if="!item.OrderSource&&item.CustomerId>0">B2B</template>
-            <template v-if="item.OrderSource==1">B2C</template>
+            <template v-if="scope.row.Name||scope.row.EName"> /</template>来源<template v-if="!scope.row.OrderSource&&!scope.row.CustomerId">销售</template>
+            <template v-if="!scope.row.OrderSource&&scope.row.CustomerId>0">B2B</template>
+            <template v-if="scope.row.OrderSource==1">B2C</template>
           </span>
         </div>
         <div class="row c9e fz12">
-          <span class="mr" v-if="item.LureEmpName">引流人：{{ item.LureEmpName }}</span>
-          <span class="mr">销售：{{ item.SaleName }}</span>
-          <span class="mr" v-if="item.OpName&&pagesTitle=='OP'">关联OP：{{ item.OpName }}</span>
-          <span class="mr" v-if="item.CustomerName">创建人：{{ item.CustomerName }} ({{ item.CustomerContact }}<template v-if="item.CustomerTel">/{{
-            item.CustomerTel
+          <span class="mr" v-if="scope.row.LureEmpName">引流人：{{ scope.row.LureEmpName }}</span>
+          <span class="mr">销售：{{ scope.row.SaleName }}</span>
+          <span class="mr" v-if="scope.row.OpName&&pagesTitle=='OP'">关联OP：{{ scope.row.OpName }}</span>
+          <span class="mr" v-if="scope.row.CustomerName">创建人：{{ scope.row.CustomerName }} ({{ scope.row.CustomerContact }}<template v-if="scope.row.CustomerTel">/{{
+            scope.row.CustomerTel
           }}</template>)</span>
-          <span class="mr">下单时间：{{ item.CreateTime }}</span>
+          <span class="mr">下单时间：{{ scope.row.CreateTime }}</span>
           <div class="">
             <i class="mx5" :class="{
-              'el-icon-alarm-clock c20C997': item.OrderStatus == 1,
-              'el-icon-check cblack': item.OrderStatus == 2,
-              'el-icon-warning cff9800': item.OrderStatus == 3,
-              'el-icon-refresh cF1416C': item.OrderStatus == 4
+              'el-icon-alarm-clock c20C997': scope.row.OrderStatus == 1,
+              'el-icon-check cblack': scope.row.OrderStatus == 2,
+              'el-icon-warning cff9800': scope.row.OrderStatus == 3,
+              'el-icon-refresh cF1416C': scope.row.OrderStatus == 4
             }"></i>
             <span class="fz12 cblack" :class="{
-              c20C997: item.OrderStatus == 1,
-              cblack: item.OrderStatus == 2,
-              cff9800: item.OrderStatus == 3,
-              cF1416C: item.OrderStatus == 4
+              c20C997: scope.row.OrderStatus == 1,
+              cblack: scope.row.OrderStatus == 2,
+              cff9800: scope.row.OrderStatus == 3,
+              cF1416C: scope.row.OrderStatus == 4
             }">
-              {{ item.OrderStatusName }}
+              {{ scope.row.OrderStatusName }}
             </span>
           </div>
         </div>
       </div>
       <div class="mb">
-        <el-table :data="item.DetailList" style="width:100%" border>
+        <el-table :data="scope.row.DetailList" style="width:100%" border>
           <el-table-column label="景区名称(日期)" min-width="100" style="background:#EAEAEA">
-            <template slot-scope="scope" v-if="scope.$index == 0" :row="item.DetailList.length">
+            <template slot-scope="scope" v-if="scope.$index == 0" :row="scope.row.DetailList.length">
               <template>
-                <div>{{ item.CouponsName }}</div>
-                <span style="color: #999999;">{{ item.UseDate }}</span>
+                <div>{{ scope.row.CouponsName }}</div>
+                <span style="color: #999999;">{{ scope.row.UseDate }}</span>
               </template>
             </template>
           </el-table-column>
@@ -577,19 +597,19 @@
               <span class="fz15 fbold">{{ scope.row.Money.toFixed(2) }}</span>
             </template>
           </el-table-column>
-          <template slot="append" v-if="(item.Remark||item.OPRemark||item.isMore)||(item.OrderStatus>1&&item.OrderStatus!=3)">
-            <div v-if="(item.OrderStatus>1&&item.OrderStatus!=3)||item.Remark" style="padding:10px;color:#f1416c">客户备注：{{item.Remark}}
-              <i v-if="pagesTitle=='销售'&&item.OrderStatus>1&&item.OrderStatus!=3" class="el-icon-edit cursor-pointer c059FF6 mx" @click="editRemark(item)"></i></div>
-            <div v-if="(item.OrderStatus>1&&item.OrderStatus!=3)||item.OPRemark" style="padding:10px;color:#f1416c"
-            :style="{'padding':!item.Remark&&item.isMore?'0 10px 30px 10px':'0 10px 10px 10px'}">
-              OP备注：{{item.OPRemark}}
-              <i v-if="pagesTitle=='OP'&&item.OrderStatus>1&&item.OrderStatus!=3" class="el-icon-edit cursor-pointer c059FF6 mx" @click="editRemark(item)"></i>
+          <template slot="append" v-if="(scope.row.Remark||scope.row.OPRemark||scope.row.isMore)||(scope.row.OrderStatus>1&&scope.row.OrderStatus!=3)">
+            <div v-if="(scope.row.OrderStatus>1&&scope.row.OrderStatus!=3)||scope.row.Remark" style="padding:10px;color:#f1416c">客户备注：{{scope.row.Remark}}
+              <i v-if="pagesTitle=='销售'&&scope.row.OrderStatus>1&&scope.row.OrderStatus!=3" class="el-icon-edit cursor-pointer c059FF6 mx" @click="editRemark(scope.row)"></i></div>
+            <div v-if="(scope.row.OrderStatus>1&&scope.row.OrderStatus!=3)||scope.row.OPRemark" style="padding:10px;color:#f1416c"
+            :style="{'padding':!scope.row.Remark&&scope.row.isMore?'0 10px 30px 10px':'0 10px 10px 10px'}">
+              OP备注：{{scope.row.OPRemark}}
+              <i v-if="pagesTitle=='OP'&&scope.row.OrderStatus>1&&scope.row.OrderStatus!=3" class="el-icon-edit cursor-pointer c059FF6 mx" @click="editRemark(scope.row)"></i>
             </div>
           </template>
         </el-table>
       </div>
 
-      <el-table :data="item.list" style="width:100%" border v-if="item.OrderStatus!=3">
+      <el-table :data="scope.row.list" style="width:100%" border v-if="scope.row.OrderStatus!=3">
         <el-table-column label="实收" min-width="100">
           <template slot-scope="scope">
             <span class="fz15 fbold">{{ scope.row.Income ? scope.row.Income : "-" }}</span>
@@ -620,8 +640,8 @@
         <el-table-column label="待收" min-width="100">
           <template slot-scope="scope">
             <span class="fz15 fbold"
-            :class="{'cF1416C':item.DaiShou>0}">
-            {{item.DaiShou}}
+            :class="{'cF1416C':scope.row.DaiShou>0}">
+            {{scope.row.DaiShou}}
           </span>
           </template>
         </el-table-column>
@@ -630,13 +650,13 @@
             <span class="fz15 fbold">{{ scope.row.Income-scope.row.CostMoney-scope.row.Refund>0?(scope.row.Income-scope.row.CostMoney-scope.row.Refund).toFixed(2):'-' }}</span>
           </template>
         </el-table-column>
-        <el-table-column v-if="(item.SellCommission&&item.SellCommission>0)||(item.OPCommission&&item.OPCommission>0)" label="提成" style="background:#EAEAEA">
+        <el-table-column v-if="(scope.row.SellCommission&&scope.row.SellCommission>0)||(scope.row.OPCommission&&scope.row.OPCommission>0)" label="提成" style="background:#EAEAEA">
           <template slot-scope="scope">
-            <div class="width100-float-l" v-if="item.SellCommission&&item.SellCommission>0"><span class="float-l">销售：</span>
-              <commissionDialog :objNew="item" :OP="0"></commissionDialog>
+            <div class="width100-float-l" v-if="scope.row.SellCommission&&scope.row.SellCommission>0"><span class="float-l">销售：</span>
+              <commissionDialog :objNew="scope.row" :OP="0"></commissionDialog>
             </div>
-            <div class="width100-float-l" v-if="item.OPCommission&&item.OPCommission>0"><span class="float-l">OP：</span>
-              <commissionDialog :objNew="item" :OP="1"></commissionDialog>
+            <div class="width100-float-l" v-if="scope.row.OPCommission&&scope.row.OPCommission>0"><span class="float-l">OP：</span>
+              <commissionDialog :objNew="scope.row" :OP="1"></commissionDialog>
             </div>
           </template>
         </el-table-column>
@@ -644,49 +664,49 @@
 
       <div class="row justify-sb mt mb20">
         <div class="column px15 bjFFF3E0 radius5 flex-g pa relative" style="max-width: 300px;min-width: 150px;">
-          <div class="fz12 row justify-sb" v-if="item.MailingState != 4">
-            <span>{{ item.MailingState > 1 ? '收货地址：' : '自取地址：' }}</span>
-            <div :class="{ 'cF1416C': item.MailingState == 2, 'c02C854': item.MailingState == 3 }">
-              <template v-if="item.MailingState == 2">
+          <div class="fz12 row justify-sb" v-if="scope.row.MailingState != 4">
+            <span>{{ scope.row.MailingState > 1 ? '收货地址：' : '自取地址：' }}</span>
+            <div :class="{ 'cF1416C': scope.row.MailingState == 2, 'c02C854': scope.row.MailingState == 3 }">
+              <template v-if="scope.row.MailingState == 2">
                 等待配送
               </template>
-              <template v-if="item.MailingState == 3">
+              <template v-if="scope.row.MailingState == 3">
                 已配送
               </template>
             </div>
           </div>
           <div class="row wrap orderNo fz12 c9e">
-            <template v-if="item.MailingState == 2 || item.MailingState == 3">
-              {{ item.MailingAddress }}
+            <template v-if="scope.row.MailingState == 2 || scope.row.MailingState == 3">
+              {{ scope.row.MailingAddress }}
             </template>
             <template v-else>
-              <template v-if="item.MailingState == 1">
-                {{ item.SelffetchAddress ? item.SelffetchAddress : '等待操作确认后，才能看到自取地址' }}
+              <template v-if="scope.row.MailingState == 1">
+                {{ scope.row.SelffetchAddress ? scope.row.SelffetchAddress : '等待操作确认后，才能看到自取地址' }}
               </template>
-              <div class="row" style="margin-right: 10px;" v-if="item.MailingState==4">
+              <div class="row" style="margin-right: 10px;" v-if="scope.row.MailingState==4">
                 <div class="column">
-                  <template v-if="item.TicketCodeFile">
+                  <template v-if="scope.row.TicketCodeFile">
                   <div class="wrap fz12 c9e">
                     电子券
                   </div>
                   <div class="row fz12 see-rec mt">
                     <div class="text-accent q-mr-md c">
-                      {{ item.TicketCodeFile.split("/").at(-1) }}
+                      {{ scope.row.TicketCodeFile.split("/").at(-1) }}
                     </div>
                     <div class="cursor-pointer ml mr rec cf">
                       <a
                         class="cf"
                         style="text-decoration:none"
-                        :href="item.TicketCodeFile"
+                        :href="scope.row.TicketCodeFile"
                         >下载</a
                       >
                     </div>
                   </div>
                   </template>
-                  <template v-if="item.MailingState==4&&pagesTitle!='销售'&&!item.TicketCodeFile">
+                  <template v-if="scope.row.MailingState==4&&pagesTitle!='销售'&&!scope.row.TicketCodeFile">
                       <div class="fz12 mt c9e">
                         电子券，需要您于
-                        <span class="cff9800">{{item.UseDate}}</span> 前
+                        <span class="cff9800">{{scope.row.UseDate}}</span> 前
                       </div>
                       <div class="row fz12 see-rec mt">
                         <el-upload ref="my-upload"
@@ -696,11 +716,11 @@
                           :show-file-list="false" action="">
                             <div :class="{'cursor-pointer seeLK c059FF6':!loadingDZP,
                             'cursor-pointer see c04C8C8':loadingDZP}"
-                            @click="uploadOrderId=item.OrderId">上传电子券</div>
+                            @click="uploadOrderId=scope.row.OrderId">上传电子券</div>
                           </el-upload>
                       </div>
                   </template>
-                  <template v-if="item.MailingState==4&&pagesTitle=='销售'&&!item.TicketCodeFile">
+                  <template v-if="scope.row.MailingState==4&&pagesTitle=='销售'&&!scope.row.TicketCodeFile">
                     '等待操作确认后，才能看到电子券地址'
                   </template>
                 </div>
@@ -713,15 +733,15 @@
           <div class="row wrap orderNo fz12 py">
             <span class="cursor-pointer radius5 mr mb px5"
             :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
-            'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" v-for="(x, i) in item.IncomeList"
+            'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" v-for="(x, i) in scope.row.IncomeList"
               @click="openDetails(x)">{{ x.FrID }}</span>
-            <span v-if="item.IncomeList.length == 0" class="c9e fz12">
+            <span v-if="scope.row.IncomeList.length == 0" class="c9e fz12">
               暂无收款单据
             </span>
           </div>
-          <el-tooltip v-if="item.OrderStatus == 2" class="item" effect="dark" content="制单" placement="top">
+          <el-tooltip v-if="scope.row.OrderStatus == 2" class="item" effect="dark" content="制单" placement="top">
             <i class="absolute right20 bottom20 el-icon-circle-plus cursor-pointer c059FF6"
-              @click="makeAdocument(item, index, 1)"></i>
+              @click="makeAdocument(scope.row, index, 1)"></i>
           </el-tooltip>
         </div>
         <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px">
@@ -729,15 +749,15 @@
           <div class="row wrap orderNo fz12 py">
             <span class="cursor-pointer radius5 mr mb px5"
             :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
-            'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" v-for="(x, i) in item.RefundList"
+            'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" v-for="(x, i) in scope.row.RefundList"
               @click="openDetails(x)">{{ x.FrID }}</span>
-            <span v-if="item.RefundList.length == 0" class="c9e fz12">
+            <span v-if="scope.row.RefundList.length == 0" class="c9e fz12">
               暂无退款单据
             </span>
           </div>
-          <el-tooltip v-if="item.OrderStatus == 2" class="item" effect="dark" content="制单" placement="top">
+          <el-tooltip v-if="scope.row.OrderStatus == 2" class="item" effect="dark" content="制单" placement="top">
             <i class="absolute right20 bottom20 el-icon-circle-plus cursor-pointer c059FF6"
-              @click="makeAdocument(item, index, 2)"></i>
+              @click="makeAdocument(scope.row, index, 2)"></i>
           </el-tooltip>
         </div>
         <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px">
@@ -745,21 +765,21 @@
           <div class="row wrap orderNo fz12 py">
             <span class="cursor-pointer radius5 mr mb px5"
             :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
-            'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" v-for="(x, i) in item.CostList"
+            'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" v-for="(x, i) in scope.row.CostList"
               @click="openDetails(x)">{{ x.FrID }}</span>
-            <span v-if="item.CostList.length == 0" class="c9e fz12">
+            <span v-if="scope.row.CostList.length == 0" class="c9e fz12">
               暂无成本单据
             </span>
           </div>
-          <div class="item absolute right20 bottom20" v-if="item.OrderStatus == 2 && pagesTitle != '销售'">
+          <div class="item absolute right20 bottom20" v-if="scope.row.OrderStatus == 2 && pagesTitle != '销售'">
             <el-tooltip class="" effect="dark" content="制单"
             placement="top">
             <i class="el-icon-circle-plus cursor-pointer c059FF6"
-              @click="makeAdocument(item, index, 3)"></i>
+              @click="makeAdocument(scope.row, index, 3)"></i>
           </el-tooltip>
-            <el-tooltip v-if="item.OrderStatus == 2" class="" effect="dark" content="冲抵" placement="top">
+            <el-tooltip v-if="scope.row.OrderStatus == 2" class="" effect="dark" content="冲抵" placement="top">
               <i class="el-icon-circle-plus cursor-pointer c3FC4FF"
-                @click="isOffset(item, index, 3)"></i>
+                @click="isOffset(scope.row, index, 3)"></i>
             </el-tooltip>
           </div>
         </div>
@@ -772,42 +792,42 @@
             'bjFFF3E0':x.InvoiceApplyState===2||x.InvoiceApplyState===4||x.InvoiceApplyState===5,
             'c3FC4FF':x.InvoiceApplyState===6,'cF1416C':x.InvoiceApplyState===1||x.InvoiceApplyState===3,
             'cff9800':x.InvoiceApplyState===2||x.InvoiceApplyState===4||x.InvoiceApplyState===5}"
-              v-for="(x, i) in item.InvoiceApplyList"
+              v-for="(x, i) in scope.row.InvoiceApplyList"
               @click="openDetails(x)"
               >{{ x.ID }}</span
             >
-            <span v-if="item.InvoiceApplyList&&item.InvoiceApplyList.length == 0" class="c9e fz12">
+            <span v-if="scope.row.InvoiceApplyList&&scope.row.InvoiceApplyList.length == 0" class="c9e fz12">
               暂无发票单据
             </span>
           </div>
         </div>
         <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="min-width: 230px;">
-          <div class="row-c justify-sb pb5" :class="{'borderD':item.MailingMoney>0||item.DiscountsMoney>0}">
+          <div class="row-c justify-sb pb5" :class="{'borderD':scope.row.MailingMoney>0||scope.row.DiscountsMoney>0}">
             <span class="fz12 c9e">订单总金额</span>
             <div class="ml">
-              <span class="fz15 fbold">{{ item.Money.toFixed(2) }}</span>
-              <span class="fz12">{{ item.CurrencyName }}</span>
+              <span class="fz15 fbold">{{ scope.row.Money.toFixed(2) }}</span>
+              <span class="fz12">{{ scope.row.CurrencyName }}</span>
             </div>
           </div>
           <div
             class="row-c justify-sb py5"
-            v-if="item.MailingMoney>0"
-            :class="{'borderD':item.DiscountsMoney>0}"
+            v-if="scope.row.MailingMoney>0"
+            :class="{'borderD':scope.row.DiscountsMoney>0}"
           >
             <span class="fz12 c9e">邮寄费</span>
             <div class="ml">
-              <span class="fz14">{{ item.MailingMoney.toFixed(2) }}</span>
-              <span class="fz12 ml">{{ item.CurrencyName }}</span>
+              <span class="fz14">{{ scope.row.MailingMoney.toFixed(2) }}</span>
+              <span class="fz12 ml">{{ scope.row.CurrencyName }}</span>
             </div>
           </div>
           <div
             class="row-c justify-sb py5"
-            v-if="item.DiscountsMoney>0"
+            v-if="scope.row.DiscountsMoney>0"
             >
               <span class="fz12 c9e">优惠金额</span>
               <div class="ml">
-                <span class="fz14">{{ item.DiscountsMoney.toFixed(2) }}</span>
-                <span class="fz12">{{ item.CurrencyName }}</span>
+                <span class="fz14">{{ scope.row.DiscountsMoney.toFixed(2) }}</span>
+                <span class="fz12">{{ scope.row.CurrencyName }}</span>
               </div>
           </div>
         </div>
@@ -815,22 +835,22 @@
         <div
           class="row-c wrap justify-c px15 bgE8F5E9 radius5 ml fz12 orderop flex-s">
           <div v-if="
-            item.OrderStatus == 1 &&
-            item.IncomeList.length == 0 &&
-            item.RefundList.length == 0 &&
-            item.CostList.length == 0 && item.OrderSource!=1
-          " class="row-c cursor-pointer radius5 cancel py5" @click="clickRightButtom(item, 0)">
-            <i v-loading="msg.OrderId == item.OrderId && loading0"></i>
+            scope.row.OrderStatus == 1 &&
+            scope.row.IncomeList.length == 0 &&
+            scope.row.RefundList.length == 0 &&
+            scope.row.CostList.length == 0 && scope.row.OrderSource!=1
+          " class="row-c cursor-pointer radius5 cancel py5" @click="clickRightButtom(scope.row, 0)">
+            <i v-loading="msg.OrderId == scope.row.OrderId && loading0"></i>
             <span class="cF1416C">取消订单</span>
           </div>
-          <div v-if="item.OrderStatus == 1 && pagesTitle != '销售' && item.OrderSource!=1" class="row-c cursor-pointer radius5 confirm py5"
-            @click="clickRightButtom(item, 1)">
-            <i v-loading="msg.OrderId == item.OrderId && loading1"></i>
+          <div v-if="scope.row.OrderStatus == 1 && pagesTitle != '销售' && scope.row.OrderSource!=1" class="row-c cursor-pointer radius5 confirm py5"
+            @click="clickRightButtom(scope.row, 1)">
+            <i v-loading="msg.OrderId == scope.row.OrderId && loading1"></i>
             <span class="c20C997">确认订单</span>
           </div>
-          <div v-if="item.OrderStatus == 2 && item.MailingState == 2 && pagesTitle != '销售'"
-            class="row-c cursor-pointer radius5 cancel py5" @click="clickRightButtom(item, 2)">
-            <i v-loading="msg.OrderId == item.OrderId && loading1"></i>
+          <div v-if="scope.row.OrderStatus == 2 && scope.row.MailingState == 2 && pagesTitle != '销售'"
+            class="row-c cursor-pointer radius5 cancel py5" @click="clickRightButtom(scope.row, 2)">
+            <i v-loading="msg.OrderId == scope.row.OrderId && loading1"></i>
             <span class="cF1416C">邮寄</span>
           </div>
           <!-- <div v-if="item.OrderStatus == 2 && item.MailingState == 1 && pagesTitle != '销售'"
@@ -845,35 +865,35 @@
           >
             <span class="c059FF6">明细/编辑</span>
           </div> -->
-          <div v-if="(item.OrderStatus == 1 && pagesTitle == '销售')||(item.OrderStatus >1 && item.OrderStatus != 3
+          <div v-if="(scope.row.OrderStatus == 1 && pagesTitle == '销售')||(scope.row.OrderStatus >1 && scope.row.OrderStatus != 3
             &&pagesTitle=='OP'&&is_correlationOP)" class="row-c cursor-pointer radius5 change py5"
-            @click="goRoomDetails(item, pagesTitle=='销售'?'门票预定变更':'编辑取票方式')">
+            @click="goRoomDetails(scope.row, pagesTitle=='销售'?'门票预定变更':'编辑取票方式')">
             <span class="c059FF6">{{pagesTitle=='销售'?'订单变更':'编辑取票方式'}}</span>
           </div>
-          <div v-if="item.OrderStatus > 1" class="row-c cursor-pointer radius5 change1 py5"
-            @click="clickRightButtom(item, 4)">
-            <i v-loading="msg.OrderId == item.OrderId && loading2"></i>
+          <div v-if="scope.row.OrderStatus > 1" class="row-c cursor-pointer radius5 change1 py5"
+            @click="clickRightButtom(scope.row, 4)">
+            <i v-loading="msg.OrderId == scope.row.OrderId && loading2"></i>
             <span class="c20C997">收损</span>
           </div>
           <div
-            v-if="item.OrderStatus >1 && item.OrderStatus != 3
-            && item.OrderStatus != 4
+            v-if="scope.row.OrderStatus >1 && scope.row.OrderStatus != 3
+            && scope.row.OrderStatus != 4
             &&pagesTitle=='OP'&&is_correlationOP"
             class="row-c cursor-pointer radius5 change py5"
-            @click="clickCorrelation(item,1)"
+            @click="clickCorrelation(scope.row,1)"
           >
             <span class="c059FF6">编辑关联OP</span>
           </div>
           <div
-            v-if="item.OrderStatus != 3
+            v-if="scope.row.OrderStatus != 3
             &&pagesTitle=='OP'"
             class="row-c cursor-pointer radius5 change py5"
-            @click="clickCorrelation(item,2)"
+            @click="clickCorrelation(scope.row,2)"
           >
             <span class="c059FF6">编辑总金额</span>
           </div>
           <!-- 申请发票 -->
-          <ApplyFoInvoice v-if="userInfo.EmployeeId==item.EnterID" :obj="item" :type="7"></ApplyFoInvoice>
+          <ApplyFoInvoice v-if="userInfo.EmployeeId==scope.row.EnterID" :obj="scope.row" :type="7"></ApplyFoInvoice>
           <!-- <template v-if="item.OrderStatus==2">
             <div class="column-jac fz12 flex-s c20C997">
               <div class="mb5">已支付</div>
@@ -885,15 +905,17 @@
           </template> -->
         </div>
       </div>
-      <div class="mt mb20 bgf5 pa15 row-c" v-if="item.CancelRemark">
+      <div class="mt mb20 bgf5 pa15 row-c" v-if="scope.row.CancelRemark">
         <div style="font-size:16px;font-weight:bold;font-family: pingfangR;">取消理由：</div>
-        <div style="margin-left:12px;font-size:12px;color: grey; font-family: microsoft yahei;">{{ item.CancelRemark }}
+        <div style="margin-left:12px;font-size:12px;color: grey; font-family: microsoft yahei;">{{ scope.row.CancelRemark }}
         </div>
         <div style="margin-left:12px;font-size:12px;font-family: microsoft yahei;">
-          {{ item.CancelEmpName }} {{ item.CancelTime }}
-        </div>
+          {{ scope.row.CancelEmpName }} {{ scope.row.CancelTime }}
         </div>
       </div>
+    </template>
+  </el-table-column>
+    </el-table>
 
     <el-dialog custom-class="w400" :title="typeState == 3 ? '设置自提地址' : '设置收损金额'" :visible.sync="outerVisible">
       <div>
@@ -1054,6 +1076,8 @@
       queryObj:null,
       cdState: false,
       copyId: 0,
+      CompletedLoading: false,
+      multipleSelection: [],
       loading0: false,
       loading1: false,
       loading2: false,
@@ -1201,6 +1225,74 @@
       this.postMsg.Remark = this.pagesTitle=='销售'?item.Remark:item.OPRemark
       this.isShowRemark = true
     },
+    selectable(row, index) {
+        if (((this.OrderList[index].IsFinish != 1 && this.OrderList[index].Income > 0 && this.OrderList[index]
+          .DueInMoney == 0)||(this.OrderList[index].Money==0&&this.OrderList[index].Income==0
+          &&this.OrderList[index].CostMoney==0&&this.OrderList[index].Refund==0
+          &&this.OrderList[index].PlatformTax==0&&this.OrderList[index].IncomeList
+          &&this.OrderList[index].IncomeList.length>0))) {
+          return true;
+        } else {
+          return false;
+        }
+      },
+      handleSelectionChange(val) {
+        this.multipleSelection = val.map(x => {
+          return x.OrderId
+        });
+      },
+      setCompleted(id, row) {
+        let ids = ''
+        if (id > 0) {
+          ids = id
+        } else {
+          if (this.multipleSelection.length == 0) return this.$message.error('请勾选需要完结的数据')
+          ids = this.multipleSelection.join(',')
+        }
+        if (ids == '') {
+          this.$message.error('请勾选需要完结的数据')
+        }
+        this.$confirm('是否确认完结?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          if (id > 0) {
+            row.loading = true
+          } else {
+            this.CompletedLoading = true
+          }
+          this.apipost('ticket_post_SetTicketOrderFinish', {
+            TticketOrderIds: ids
+          }, res => {
+            if (res.data.resultCode == 1) {
+              if (id > 0) {
+                row.loading = false
+              } else {
+                this.CompletedLoading = false
+              }
+              for (let i = 0; i < this.OrderList.length; i++) {
+                this.$refs.multipleTable.toggleRowSelection(
+                  this.OrderList[i],
+                  false
+                );
+              }
+              this.multipleSelection = []
+              this.$message.success('操作成功！');
+              this.$emit('success')
+            } else {
+              if (id > 0) {
+                row.loading = false
+              } else {
+                this.CompletedLoading = false
+              }
+              this.$message.error(res.data.message);
+            }
+          }, err => {})
+        }).catch(() => {
+          this.$message.info('已取消！');
+        });
+      },
     submitEditRemark(){
       if(!this.postMsg.Remark){
         this.$message.error('OP备注不能为空');