Merge branch 'master' of http://gitlab.oytour.com/huaguohao/crm

src/components/guestManagement/Agreement.vue

@@ -118,14 +118,15 @@
             label="退款"
             show-overflow-tooltip>
             <template slot-scope="scope">
-              {{scope.row.BackMoney}}<i v-if="scope.row.OrderStatus!=1" @click="makeAdocument(scope.row,2)" class="iconfont iconjia- numIcon"></i>
+              <!-- v-if="scope.row.OrderStatus!=1" -->
+              {{scope.row.BackMoney}}<i @click="makeAdocument(scope.row,2)" class="iconfont iconjia- numIcon"></i>
             </template>
         </el-table-column>
         <el-table-column
             label="成本"
             show-overflow-tooltip>
             <template slot-scope="scope">
-              {{scope.row.PayMoney}}<i v-if="scope.row.OrderStatus!=1" @click="makeAdocument(scope.row,3)" class="iconfont iconjia- numIcon"></i>
+              {{scope.row.PayMoney}}<i @click="makeAdocument(scope.row,3)" class="iconfont iconjia- numIcon"></i>
             </template>
         </el-table-column>
         <el-table-column
@@ -262,19 +263,17 @@ export default {
   },
   methods: {
     // 制作单据
-    makeAdocument(row,type){
-      if(type!=1){
-        type = 2
-      }
+    makeAdocument(row,num){
+      let type
+      type = num==1? 1:2
       let href
       let url
       if(this.isOnline()){
         url = 'http://yx.oytour.com/#/'
-        href = url +'automaticLogin?token=' + this.getLocalStorage().token +'&type=' +type
       }else{
         url = 'http://www.test.com:8081/#/'
-        href = url+'automaticLogin?token=' + this.getLocalStorage().token +'&type=' +type
       }
+      href = url+'automaticLogin?token='+this.getLocalStorage().token+'&type='+type+'&OtherType=55'+'&ReFinanceId='+row.OrderId+'&ReFinanceId2='+num+'&GuestId=' +row.GuestId
       window.open(href);
     },
     // 操作日志