Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/SalesVisa/components/visaOrderList.vue

@@ -762,6 +762,20 @@
                             </el-tooltip>
                           </div>
                         </div>
+                        <div class="row-c justify-sb px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 200px;max-width: 400px;">
+                          <div class="row-c">
+                          <div class="fz12 flex-s">发票单据</div>
+                          <div class="row wrap orderNo fz12 ml">
+                            <span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;"
+                            :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 scope.row.invoiceApplyList"
+                              @click="openDetails(x)">{{ x.frID }} {{ x.name?x.name:'' }}</span>
+                            <span v-if="scope.row.invoiceApplyList&&scope.row.invoiceApplyList.length == 0" class="c9e fz12 mr">
+                              暂无
+                            </span>
+                          </div>
+                        </div>
+                        </div>
                         <div
                           class="row wrap px15 bgE8F5E9 radius5 ml fz12 orderop" style="min-width: 150px;">
                           <div class="row-c cursor-pointer radius5 change py5" @click="goUrlVisaList(scope.row)"

src/components/commonPage/payURL.vue

@@ -148,7 +148,8 @@
 								"companyID":obj.outBranchId,//公司id
 								"path": "",
 								'blank':'y',
-								'orderObj':JSON.stringify(orderObj)
+								'orderObj':JSON.stringify(orderObj),
+								'searchTitle':'溢收团费退款'
 							}
 						});
 					}else{
@@ -207,11 +208,11 @@
 							name: 'ChoiceAddFinancialDocuments',
 							query:{
 								"Type":2,
-                'searchTitle': '月结',
 								"companyID":obj.outBranchId,//公司id
 								"path": "",
 								'blank':'y',
-								'orderObj':JSON.stringify(orderObj)
+								'orderObj':JSON.stringify(orderObj),
+								'searchTitle': '团队成本月结'
 							}
 						});
 				}

src/components/public/offset.vue

@@ -122,8 +122,7 @@
         }
     },
     mounted() {
-        // this.czgetList()
-        // this.getCostTypeList()
+
     },
     methods: {
         close(){
@@ -150,12 +149,20 @@
             }
             // 签证订单
             if(this.queryObj.orderObj){
+                // if(this.queryObj.czmsg){
+                //   this.queryObj.orderObj.CostType = 0 //费用类型
+                // }
                 this.queryObj.orderObj = JSON.stringify(this.tradeObj)
             }
+            if(this.queryObj.czmsg){
+              this.queryObj.czmsg.ReFinanceId = this.checkList[0].FrID
+              // this.tradeObj.czmsg.Rate = this.checkList[0].Rate;
+              this.queryObj.czmsg.TCNUM = this.$route.query.id
+              this.queryObj.czmsg = JSON.stringify(this.queryObj.czmsg)
+            }
             let query = this.queryObj
             this.$emit('success')
             this.close()
-            // this.$store.commit("ChoiceAddFinancialDocuments");
             this.$router.push({
                 path: "/ChoiceAddFinancialDocuments",
                 query