签证制单、成本冲抵单

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -475,7 +475,8 @@
                             <td @click="jumpPage('RegistrationList',o.TCID,7)"> <span class="_jump_page _font_bold">查看报名</span> </td>
                             <td v-if="qjGroupId==userInfo.RB_Group_id || TeamShouZhi" @click="GetDetail.TCIDAndTCNUMList.length==1?jumpPage('TeamBalancePayment',o.TCID,5):jumpPage('TeamBalancePayment',o.TCID,6)"> <span class="_jump_page _font_bold">团队收支</span> </td>
                             <td v-if="OrderSource==9&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail,2)"> <span class="_jump_page _font_bold">国内票务</span> </td>
-                            <td v-else-if="OrderSource==10&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail,3)"> <span class="_jump_page _font_bold">签证收支</span> </td>
+                            <td v-else-if="OrderSource==10&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail,3)"> 
+                                <span class="_jump_page _font_bold">签证收支</span></td>
                             <td v-else-if="OrderSource==4&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail,4)"> <span class="_jump_page _font_bold">机票收支</span> </td>
                             <td v-if="GetDetail.TemplateId === 43 || GetDetail.TemplateId === 48 || GetDetail.TemplateId === 53|| GetDetail.TemplateId === 56
                             || GetDetail.TemplateId === 49 || GetDetail.TemplateId === 50 || GetDetail.TemplateId === 51|| GetDetail.TemplateId === 52
@@ -489,6 +490,7 @@
                         <tr class="_fujiashuoming_tr">
                             <td>签证产品编号：<span @click="jumpPage('VisaProductOrder',GetDetail,8)" class="_jump_page _font_bold">{{GetDetail.SourceID}}</span></td>
                             <td @click="jumpPage('FinancialOrder',GetDetail,3)"> <span class="_jump_page _font_bold">签证收支</span></td>
+                            <td v-if="GetDetail.OrderID">签证订单：<span @click="jumpPage('VisaProductOrder',GetDetail,8,GetDetail.OrderID)" class="_jump_page _font_bold">{{GetDetail.OrderID}}</span></td>
                         </tr>
                     </table>
                     <table border="1" borderCashierDetailcolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" v-else-if="OrderSource==9">
@@ -1420,7 +1422,7 @@ export default {
                 }
             }, null)
         },
-        jumpPage(path,id,type){
+        jumpPage(path,id,type,OrderID){
             if(type==1){
                 // let routeData = this.$router.resolve({
                 //     name: path,
@@ -1497,10 +1499,18 @@ export default {
                 //     query: {VisaID:id.SourceID,isFinacial:0}
                 // });
                 // window.open(routeData.href, "_blank");
-                this.$router.push({
-                    name: path,
-                    query: { id:id.SourceID,isFinacial:0,blank:'y'}
-                })
+                if(OrderID){
+                    this.$router.push({
+                        name: path,
+                        query: { id:id.SourceID,isFinacial:0,blank:'y',OrderId:OrderID}
+                    })
+                }else{
+                    this.$router.push({
+                        name: path,
+                        query: { id:id.SourceID,isFinacial:0,blank:'y',}
+                    })
+                }
+                
             }
         },
         //跳转至手配详情

src/components/FinancialModule/FinancialSubmodule/ReceivablesModule.vue

@@ -237,7 +237,7 @@
                     <td colspan="2">
                         <span class="_color_b _font_size12">{{GetDetail.AccountNumber}}</span>
                     </td>
-                    <td class="">{{GetDetail&&GetDetail.CashierDetail[0]&&GetDetail.CashierDetail[0].AccountTypeId==12&&GetDetail.CashierDetail[0].AccountId==95?'最晚兑付日期':$t('fnc.hkshijian')}}</td>
+                    <td class="">{{GetDetail&&GetDetail.CashierDetail&&GetDetail.CashierDetail[0]&&GetDetail.CashierDetail[0].AccountTypeId==12&&GetDetail.CashierDetail[0].AccountId==95?'最晚兑付日期':$t('fnc.hkshijian')}}</td>
                     <td colspan="3">
                         <span class="_color_b _font_size12">{{GetDetail.TradeDate}}</span>
                     </td>

src/components/FinancialModule/FinancialSubmodule/czBillModule.vue

@@ -17,7 +17,7 @@
 </style>
 <template> 
    <div class="m_TicketingModule">
-        <div  v-if="OtherType==7||OtherType==65">
+        <div  v-if="OtherType==7||OtherType==65||details.MatchFrId>0">
             <div class="_tit">
                 <span class="_text">预付款单据</span>
                 <div>
@@ -259,7 +259,7 @@ export default {
                 this.IsAdvanceFinance=data.IsAdvanceFinance;
                 this.ECommerceGoodsModel=data.ECommerceGoodsModel;
                 this.details=data;
-                if(this.OtherType==7){
+                if(this.OtherType==7||this.details.MatchFrId>0){
                     this.getDetails()
                 }else if(this.OtherType==65){
                     this.getyfTableList()
@@ -319,10 +319,11 @@ export default {
         let msg={
           pageIndex:1,
           pageSize:100,
-          FrID:this.details.ReFinanceId
+          FrID:this.details.ReFinanceId,
         };
         this.cdtotal=0;
         this.apipost('Financial_get_GetAdvanceFinancePageList', msg, res => {
+            
             this.loading = false
             if (res.data.resultCode == 1) {
                 let data=res.data.data.pageData;
@@ -339,11 +340,12 @@ export default {
         let msg={
             pageIndex:1,
             pageSize:20,
-            FrID:this.ReFinanceId,
+            FrID:this.details.MatchFrId>0?this.details.MatchFrId:this.ReFinanceId,//MatchFrId单项成本冲抵单号
             CostTypeID:'',
             sTradeDate:'',
             eTradeDate:'',
         };
+        
         this.apipost('Financial_get_GetAdvanceFinancePageList', msg, res=>{ 
           if(res.data.resultCode == 1) {
             this.loading = false

src/components/FinancialModule/addFinancialDocuments.vue

@@ -966,6 +966,7 @@ export default {
                this.msg.OtherType = this.tradeObj.OtherType?this.tradeObj.OtherType:0;
                this.msg.ReFinanceId = this.tradeObj.ReFinanceId?this.tradeObj.ReFinanceId:0;
                this.msg.ReFinanceId2 = this.tradeObj.ReFinanceId2?this.tradeObj.ReFinanceId2:0;
+               this.msg.MatchFrId = this.tradeObj.MatchFrId?this.tradeObj.MatchFrId:0;
            }
            // crm自动登陆传过来的参数
            if(this.crmOrderObj){

src/components/Hotel/reservation/OrderList.vue

@@ -529,7 +529,8 @@
         </el-table-column>
       </el-table>
       <div class="row justify-sb mt mb20" v-if="item.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)">
+        <div class="row pt20" style="margin-right: 10px;width: 300px;" 
+        v-if="item.GuestFileList.length > 0||((item.CustomerPayType==1 || item.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">
@@ -576,7 +577,7 @@
               </template>
           </div>
         </div>
-        <div class="column px15 bgf5 radius5 flex-g pa relative" style="min-width: 300px;">
+        <div class="column px15 bgf5 radius5 flex-g pa relative" style="min-width: 150px;">
           <div class="fz12">收款单据</div>
           <div class="row wrap orderNo fz12 py">
             <span
@@ -604,7 +605,7 @@
             ></i>
           </el-tooltip>
         </div>
-        <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 300px;">
+        <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;">
           <div class="fz12">退款单据</div>
           <div class="row wrap orderNo fz12 py">
             <span
@@ -632,7 +633,7 @@
             ></i>
           </el-tooltip>
         </div>
-        <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 300px;">
+        <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;">
           <div class="fz12">成本单据</div>
           <div class="row wrap orderNo fz12 py">
             <span
@@ -647,20 +648,19 @@
               暂无成本单据
             </span>
           </div>
-          <el-tooltip
-            v-if="item.OrderStatus == 2&&pagesTitle!='销售'"
-            class="item"
-            effect="dark"
-            content="制单"
-            placement="top"
-          >
-            <i
-              class="absolute right20 bottom20 el-icon-circle-plus cursor-pointer c059FF6"
-              @click="makeAdocument(item, index, 3)"
-            ></i>
+          <div class="item absolute right20 bottom20" v-if="item.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>
           </el-tooltip>
+            <el-tooltip v-if="item.OrderStatus == 2" class="" effect="dark" content="冲抵" placement="top">
+              <i class="el-icon-circle-plus cursor-pointer c3FC4FF"
+                @click="isOffset(item, index, 3,null)"></i>
+            </el-tooltip>
+          </div>
         </div>
-        <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 300px;">
+        <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;">
           <div class="fz12">手配费单据</div>
           <div class="row wrap orderNo fz12 py">
             <span
@@ -867,15 +867,19 @@
           <button type="button" class="normalBtn" @click="saveVisa(item)">{{$t('pub.saveBtn')}}</button>
         </div>
       </div> -->
+    <offset :isShow="cdState" :obj="queryObj" @close="cdState=false"></offset>
   </div>
 </template>
 <script>
+  import offset from '../../public/offset.vue';
   import more from '../../public/more.vue';
 export default {
-  components: { more },
+  components: { offset, more },
   props: ["OrderList","pagesTitle"],
   data() {
     return {
+      queryObj:null,
+      cdState: false,
       copyId: 0,
       loading0: false,
       loading1: false,
@@ -923,6 +927,13 @@ export default {
     }
   },
   methods: {
+    isOffset(row, index, num,name){
+      this.makeAdocument(row, index, num, name, 'Offset')
+      setTimeout(()=>{
+        this.cdState = true
+      },100)
+      
+    },
     ViewMore(x,index){
         x.upIcon = !x.upIcon
         if(x.upIcon){
@@ -987,7 +998,7 @@ export default {
       });
     },
     // 制作单据
-    makeAdocument(row, index, num, name) {
+    makeAdocument(row, index, num, name,Offset) {
       let type = 0
       if(num==3){
         type = 2
@@ -1014,11 +1025,14 @@ export default {
         Type: type,
         tradeObj: JSON.stringify(this.BillMakingMsg)
       };
-      this.$store.commit("ChoiceAddFinancialDocuments");
-      this.$router.push({
-        path: "/ChoiceAddFinancialDocuments",
-        query
-      });
+      this.queryObj = query
+      if(!Offset){
+        this.$store.commit("ChoiceAddFinancialDocuments");
+        this.$router.push({
+          path: "/ChoiceAddFinancialDocuments",
+          query
+        });
+      }
     },
     // 订单明细
     goRoomDetails(obj, title) {

src/components/Hotel/singleProduct/components/OrderList.vue

@@ -562,7 +562,7 @@
               </template> -->
           </div>
         </div>
-        <div class="column px15 bgf5 radius5 flex-g pa relative" style="min-width: 300px;">
+        <div class="column px15 bgf5 radius5 flex-g pa relative" style="min-width: 150px;">
           <div class="fz12">收款单据</div>
           <div class="row wrap orderNo fz12 py c3FC4FF">
             <span
@@ -588,7 +588,7 @@
             ></i>
           </el-tooltip>
         </div>
-        <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 300px;">
+        <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;">
           <div class="fz12">退款单据</div>
           <div class="row wrap orderNo fz12 py c3FC4FF">
             <span
@@ -614,7 +614,7 @@
             ></i>
           </el-tooltip>
         </div>
-        <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 300px;">
+        <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;">
           <div class="fz12">成本单据</div>
           <div class="row wrap orderNo fz12 py c3FC4FF">
             <span
@@ -627,20 +627,19 @@
               暂无成本单据
             </span>
           </div>
-          <el-tooltip
-            v-if="item.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, 3)"
-            ></i>
+          <div class="item absolute right20 bottom20" v-if="item.OrderStatus == 2">
+            <el-tooltip class="" effect="dark" content="制单"
+            placement="top">
+            <i class="el-icon-circle-plus cursor-pointer c059FF6"
+              @click="makeAdocument(item, index, 3)"></i>
           </el-tooltip>
+            <el-tooltip v-if="item.OrderStatus == 2" class="" effect="dark" content="冲抵" placement="top">
+              <i class="el-icon-circle-plus cursor-pointer c3FC4FF"
+                @click="isOffset(item, index, 3,null)"></i>
+            </el-tooltip>
+          </div>
         </div>
-        <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 300px;">
+        <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;">
           <div class="fz12">手配费单据</div>
           <div class="row wrap orderNo fz12 py c3FC4FF">
             <span
@@ -844,13 +843,18 @@
           <button type="button" class="normalBtn" @click="saveVisa(item)">{{$t('pub.saveBtn')}}</button>
         </div>
       </div> -->
+      <offset :isShow="cdState" :obj="queryObj" @close="cdState=false"></offset>
   </div>
 </template>
 <script>
+  import offset from '../../../public/offset.vue';
 export default {
+  components: { offset },
   props: ["OrderList"],
   data() {
     return {
+      queryObj:null,
+      cdState: false,
       copyId: 0,
       loading0: false,
       loading1: false,
@@ -885,6 +889,13 @@ export default {
   },
 
   methods: {
+    isOffset(row, index, num,name){
+      this.makeAdocument(row, index, num, name, 'Offset')
+      setTimeout(()=>{
+        this.cdState = true
+      },100)
+      
+    },
     // 单据详情
     openDetails(item) {
       let query = {
@@ -896,7 +907,7 @@ export default {
       });
     },
     // 制作单据
-    makeAdocument(row, index, num, name) {
+    makeAdocument(row, index, num, name,Offset) {
       let type = 0
       if(num==3){
         type = 2
@@ -925,11 +936,14 @@ export default {
         Type: type,
         tradeObj: JSON.stringify(this.BillMakingMsg)
       };
-      this.$store.commit("ChoiceAddFinancialDocuments");
-      this.$router.push({
-        path: "/ChoiceAddFinancialDocuments",
-        query
-      });
+      this.queryObj = query
+      if(!Offset){
+        this.$store.commit("ChoiceAddFinancialDocuments");
+        this.$router.push({
+          path: "/ChoiceAddFinancialDocuments",
+          query
+        });
+      }
     },
     // 订单明细
     goRoomDetails(obj, title) {

src/components/SalesVisa/VisaProduct.vue

@@ -299,6 +299,7 @@
 
     <table class="VisaProductTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
       <tr>
+        <th width="5%">公司</th>
         <th width="10%">产品名称</th>
         <th width="5%">签证类型</th>
         <th width="12%">价格有效日期</th>
@@ -309,11 +310,12 @@
         <th width="6%">订单数</th>
         <!-- <th width="12%">总人数（剩余人数）</th> -->
         <th width="8%">创建者</th>
-        <th width="10%">广告图</th>
-        <th width="10%">申请表</th>
+        <th width="8%">广告图</th>
+        <th width="7%">申请表</th>
         <th width="14%">操作</th>
       </tr>
       <tr v-for="item in dataList">
+        <td>{{item.BranchName}}</td>
         <td>{{item.Name}}</td>
         <td>
           <span v-if="item.VisaType==1" class="geqian">个签</span>
@@ -446,7 +448,7 @@
                   </el-tooltip>
             </div>
             
-            <el-tooltip effect="dark" content="查看" placement="top-start" v-if="msg.isFinacial==1">
+            <el-tooltip effect="dark" content="查看报名单" placement="top-start" v-if="msg.isFinacial==1">
               <el-button
                 type="primary"
                 style="background:#25C1C3; border-color:#25C1C3"

src/components/SalesVisa/VisaProductAddOrder.vue

@@ -32,7 +32,7 @@
   .page_MyCustomer ._mc_edit {
     overflow: auto;
     display: none;
-    position: absolute;
+    position: fixed;
     z-index: 50;
     bottom: 0;
     left: 0;
@@ -291,6 +291,7 @@
     </div>
     <table class="saleDepartmetTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
       <tr>
+        <th width="10%">公司</th>
         <th width="15%">{{$t('hotel.product_name')}}</th>
         <th width="10%">{{$t('visa.v_visaType')}}</th>
         <th width="15%">{{$t('Operation.Op_tradePrice')}}</th>
@@ -302,6 +303,7 @@
         <th width="15%">{{$t('system.table_operation')}}</th>
       </tr>
       <tr v-for='(item,index) in dataList' :key="index">
+        <td>{{item.branchName}}</td>
         <td><span style="cursor:pointer;" @click="goUrlX('签证资料',item)">{{item.name}}</span></td>
         <td>
           <span v-if="item.visaType==1" class="geqian">{{$t('visa.v_gvisa')}}</span>
@@ -314,8 +316,14 @@
         <td>{{item.createByName}}</td>
         <td>
           <p v-if="item.advertisingFileList.length>0" v-for='(item2, index2) in item.advertisingFileList' :key="index2">
-            <span style="cursor:pointer;text-decoration: underline;" @click="downloadFile(item2)">{{item2.name}}
-              {{$t('adm.adm_download')}}</span>
+            <el-image 
+              style="width: 20px; height: 20px;border-radius: 50%;"
+              :src="item2.fullUrl" 
+              :preview-src-list="[item2.fullUrl]">
+            </el-image>
+            <span style="cursor:pointer;text-decoration: underline;" @click="downloadFile(item2)">{{$t('adm.adm_download')}}</span>
+            <!-- <span style="cursor:pointer;text-decoration: underline;" @click="downloadFile(item2)">{{item2.name}}
+              {{$t('adm.adm_download')}}</span> -->
           </p>
           <p v-if="item.advertisingFileList.length==0"><span
               style="cursor:pointer;">{{$t('salesModule.UploadAds')}}</span></p>
@@ -328,7 +336,7 @@
         </td>
       </tr>
       <tr v-show="dataList.length==0">
-        <td v-show="dataList.length==0" colspan="7" align="center">{{$t('system.content_noData')}}</td>
+        <td v-show="dataList.length==0" colspan="8" align="center">{{$t('system.content_noData')}}</td>
       </tr>
     </table>
 
@@ -662,6 +670,13 @@
             this.loading = false;
             this.dataList = []
           } else {
+            res.data.data.pageData.forEach(item=>{
+              item.advertisingFileList.forEach(x=>{
+                x.url = ''
+                let reg = /^http(s)?:\/\/(.*?)\//
+                this.downloadFileRename(x.fullUrl.replace(reg, ''), x.name);
+              })
+            })
             this.dataList = res.data.data.pageData;
             this.total = res.data.data.count;
             this.loading = false;

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

@@ -437,7 +437,7 @@
                   item.CustomerTel
                 }})</span>
               <span>下单时间：</span>
-              <span class="mr">{{ item.CreateTime }}</span>
+              <span class="mr">{{ item.OrderDate }}</span>
               <div class="">
                 <i
                   class="mx5"
@@ -644,18 +644,17 @@
                   暂无成本单据
                 </span>
               </div>
-              <el-tooltip
-                v-if="item.OrderStatus == 2&&pagesTitle!='销售'"
-                class="item"
-                effect="dark"
-                content="制单"
-                placement="top"
-              >
-                <i
-                  class="absolute right20 bottom20 el-icon-circle-plus cursor-pointer c059FF6"
-                  @click="makeAdocument(item, index, 3)"
-                ></i>
+              <div class="item absolute right20 bottom20" v-if="item.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>
               </el-tooltip>
+                <el-tooltip class="" effect="dark" content="冲抵" placement="top">
+                  <i class="el-icon-circle-plus cursor-pointer c3FC4FF"
+                    @click="isOffset(item, index, 3)"></i>
+                </el-tooltip>
+              </div>
             </div>
             <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20">
               <div class="row-c justify-sb pb5" :class="{'borderD':item.DiscountsMoney>0}">
@@ -799,13 +798,18 @@
             </el-row>
           </div>
         </el-dialog>
+        <offset :isShow="cdState" :obj="queryObj" @close="cdState=false"></offset>
       </div>
     </template>
     <script>
+      import offset from '../../../public/offset.vue';
     export default {
+      components: { offset },
       props: ["OrderList","pagesTitle"],
       data() {
         return {
+          queryObj:null,
+          cdState: false,
           copyId: 0,
           loading0: false,
           loading1: false,
@@ -920,6 +924,12 @@
         }
       },
       methods: {
+        isOffset(row, index, num){
+          this.makeAdocument(row, index, num,'Offset')
+          setTimeout(()=>{
+            this.cdState = true
+          },100)
+        },
         submit2(){
           if(this.loading3) return
           this.$refs['msgParameter'].validate((valid) => {
@@ -1017,7 +1027,7 @@
           });
         },
         // 制作单据
-        makeAdocument(row, index, num, name) {
+        makeAdocument(row, index, num, Offset) {
           let type = 0
         if(num==3){
           type = 2
@@ -1042,11 +1052,14 @@
             Type: type,
             tradeObj: JSON.stringify(this.BillMakingMsg)
           };
-          this.$store.commit("ChoiceAddFinancialDocuments");
-          this.$router.push({
-            path: "/ChoiceAddFinancialDocuments",
-            query
-          });
+          this.queryObj = query
+          if(!Offset){
+            this.$store.commit("ChoiceAddFinancialDocuments");
+            this.$router.push({
+              path: "/ChoiceAddFinancialDocuments",
+              query
+            });
+          }
         },
         // 订单明细
         goRoomDetails(obj, title) {

src/components/busManagement/BookAcar/components/tripBusOrderList.vue

@@ -612,18 +612,17 @@
                   暂无成本单据
                 </span>
               </div>
-              <el-tooltip
-                v-if="item.OfferState == 2&&pagesTitle!='销售'"
-                class="item"
-                effect="dark"
-                content="制单"
-                placement="top"
-              >
-                <i
-                  class="absolute right20 bottom20 el-icon-circle-plus cursor-pointer c059FF6"
-                  @click="makeAdocument(item, index, 3)"
-                ></i>
+              <div class="item absolute right20 bottom20" v-if="item.OfferState == 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>
               </el-tooltip>
+                <el-tooltip class="" effect="dark" content="冲抵" placement="top">
+                  <i class="el-icon-circle-plus cursor-pointer c3FC4FF"
+                    @click="isOffset(item, index, 3)"></i>
+                </el-tooltip>
+              </div>
             </div>
             <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20">
               <div class="row-c justify-sb pb5" :class="{'borderD':item.DiscountsMoney>0}">
@@ -958,13 +957,20 @@
             <el-button type="primary" @click="driverdetermine('drivermsg')">确 定</el-button>
           </span>
         </el-dialog>
+        <offset :isShow="cdState" :obj="queryObj" @close="cdState=false"></offset>
       </div>
     </template>
     <script>
+      import offset from '../../../public/offset.vue';
     export default {
+      components: {
+        offset
+      },
       props: ["OrderList","pagesTitle"],
       data() {
         return {
+          queryObj:null,
+          cdState: false,
           isShowRemark: false,
           drivermsg: {
             Id: '',
@@ -1095,6 +1101,13 @@
         }
       },
       methods: {
+        isOffset(row, index, num){
+          this.makeAdocument(row, index, num,'Offset')
+          setTimeout(()=>{
+            this.cdState = true
+          },100)
+          
+        },
         editRemark(item){
           this.postMsg.Id = item.Id
           this.postMsg.Remark = item.Remark
@@ -1179,7 +1192,7 @@
           });
         },
         // 制作单据
-        makeAdocument(row, index, num, name) {
+        makeAdocument(row, index, num, Offset) {
           let type = 0
           if(num==3){
             type = 2
@@ -1204,11 +1217,14 @@
             Type: type,
             tradeObj: JSON.stringify(this.BillMakingMsg)
           };
-          this.$store.commit("ChoiceAddFinancialDocuments");
-          this.$router.push({
-            path: "/ChoiceAddFinancialDocuments",
-            query
-          });
+          this.queryObj = query
+          if(!Offset){
+            this.$store.commit("ChoiceAddFinancialDocuments");
+            this.$router.push({
+              path: "/ChoiceAddFinancialDocuments",
+              query
+            });
+          }
         },
         // 编辑订单
         goRoomDetails(obj, title) {

src/components/scenicSpot/reservation/OrderList.vue

@@ -616,7 +616,7 @@
       </el-table>
       
       <div class="row justify-sb mt mb20">
-        <div class="column px15 bjFFF3E0 radius5 flex-g pa relative" style="width: 300px;">
+        <div class="column px15 bjFFF3E0 radius5 flex-g pa relative">
           <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 }">
@@ -681,7 +681,7 @@
             </template>
           </div>
         </div>
-        <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 300px;">
+        <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;">
           <div class="fz12">收款单据</div>
           <div class="row wrap orderNo fz12 py">
             <span class="cursor-pointer radius5 mr px5" 
@@ -697,7 +697,7 @@
               @click="makeAdocument(item, index, 1)"></i>
           </el-tooltip>
         </div>
-        <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 300px;">
+        <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;">
           <div class="fz12">退款单据</div>
           <div class="row wrap orderNo fz12 py">
             <span class="cursor-pointer radius5 mr px5" 
@@ -713,7 +713,7 @@
               @click="makeAdocument(item, index, 2)"></i>
           </el-tooltip>
         </div>
-        <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 300px;">
+        <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;">
           <div class="fz12">成本单据</div>
           <div class="row wrap orderNo fz12 py">
             <span class="cursor-pointer radius5 mr px5" 
@@ -724,11 +724,18 @@
               暂无成本单据
             </span>
           </div>
-          <el-tooltip v-if="item.OrderStatus == 2 && pagesTitle != '销售'" class="item" effect="dark" content="制单"
+          <div class="item absolute right20 bottom20" v-if="item.OrderStatus == 2 && pagesTitle != '销售'">
+            <el-tooltip class="" effect="dark" content="制单"
             placement="top">
-            <i class="absolute right20 bottom20 el-icon-circle-plus cursor-pointer c059FF6"
+            <i class="el-icon-circle-plus cursor-pointer c059FF6"
               @click="makeAdocument(item, index, 3)"></i>
           </el-tooltip>
+            <el-tooltip v-if="item.OrderStatus == 2" class="" effect="dark" content="冲抵" placement="top">
+              <i class="el-icon-circle-plus cursor-pointer c3FC4FF"
+                @click="isOffset(item, index, 3)"></i>
+            </el-tooltip>
+          </div>
+          
         </div>
         <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20">
           <div class="row-c justify-sb pb5" :class="{'borderD':item.MailingMoney>0||item.DiscountsMoney>0}">
@@ -942,13 +949,20 @@
         </el-row>
       </div>
     </el-dialog>
+    <offset :isShow="cdState" :obj="queryObj" @close="cdState=false"></offset>
   </div>
 </template>
 <script>
+  import offset from '../../public/offset.vue';
 export default {
+  components: {
+    offset
+    },
   props: ["OrderList", "pagesTitle"],
   data() {
     return {
+      queryObj:null,
+      cdState: false,
       copyId: 0,
       loading0: false,
       loading1: false,
@@ -1065,6 +1079,13 @@ export default {
     }
   },
   methods: {
+    isOffset(row, index, num){
+      this.makeAdocument(row, index, num,'Offset')
+      setTimeout(()=>{
+        this.cdState = true
+      },100)
+      
+    },
     submit2() {
       if (this.loading3) return
       this.$refs['msgParameter'].validate((valid) => {
@@ -1162,7 +1183,7 @@ export default {
       });
     },
     // 制作单据
-    makeAdocument(row, index, num, name) {
+    makeAdocument(row, index, num, Offset) {
       let type = 0
       if(num==3){
         type = 2
@@ -1171,31 +1192,32 @@ export default {
       }
       this.BillMakingMsg.ReFinanceId = row.OrderId;
       this.BillMakingMsg.ReFinanceId2 = num;
-      if (name == "Hand") {
-        this.BillMakingMsg.OtherType = 62;
-      } else {
-        this.BillMakingMsg.OtherType = 66;
-      }
-      let text = "";
-      let query = {};
-      if (num == 1) {
-        text = "收款";
-      } else if (num == 2) {
-        text = "付款";
-      } else if (num == 3) {
-        text = "成本";
+      this.BillMakingMsg.OtherType = 66;
+      
+        let text = "";
+        let query = {};
+        if (num == 1) {
+          text = "收款";
+        } else if (num == 2) {
+          text = "付款";
+        } else if (num == 3) {
+          text = "成本";
+        }
+      
+        query = {
+          blank: "y",
+          tab: `新增${text}单据`,
+          Type: type,
+          tradeObj: JSON.stringify(this.BillMakingMsg)
+        };
+      this.queryObj = query
+      if(!Offset){
+        this.$store.commit("ChoiceAddFinancialDocuments");
+        this.$router.push({
+          path: "/ChoiceAddFinancialDocuments",
+          query
+        });
       }
-      query = {
-        blank: "y",
-        tab: `新增${text}单据`,
-        Type: type,
-        tradeObj: JSON.stringify(this.BillMakingMsg)
-      };
-      this.$store.commit("ChoiceAddFinancialDocuments");
-      this.$router.push({
-        path: "/ChoiceAddFinancialDocuments",
-        query
-      });
     },
     // 订单明细
     goRoomDetails(obj, title) {

src/router/config.js

@@ -4416,6 +4416,22 @@ export default {
                 title: '修改签证订单列表'
               },
             },
+            { // 操作   修改签证订单列表
+              path: '/VisaProductEditOrderOP',
+              name: 'VisaProductEditOrderOP',
+              component: resolve => require(['@/components/SalesVisa/VisaProductEditOrderOP'], resolve),
+              meta: {
+                title: '修改签证订单列表'
+              },
+            },
+            { // 签证   修改签证订单列表
+              path: '/VisaProductEditOrderQZ',
+              name: 'VisaProductEditOrderQZ',
+              component: resolve => require(['@/components/SalesVisa/VisaProductEditOrderQZ'], resolve),
+              meta: {
+                title: '修改签证订单列表'
+              },
+            },
             { // 销售   签证产品下单
               path: '/VisaProductAddOrder',
               name: 'VisaProductAddOrder',