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

src/components/SalesVisa/VisaProductEditOrder.vue

@@ -171,7 +171,7 @@
 			               <el-button v-show='item.visaManagementId>0' type="primary"  style='background:#00a1f1; border-color:#00a1f1' @click='goUrlT(item)'  icon="iconfont icon-bumen"></el-button>
 			             </el-tooltip>
 									 <el-tooltip effect="dark" :content="$t('salesModule.ApplyInvoice')" placement="top-start">
-			               <el-button v-show='item.visaManagementId>0' type="primary"  style='background:#607D8B; border-color:#607D8B' @click='goUrlAdd("invoicesManagerAdd", item.id, item.visaId, item.CustomerId, 2)' icon="iconfont icon-rizhi1"></el-button>
+			               <el-button type="primary"  style='background:#607D8B; border-color:#607D8B' @click='goUrlAdd("invoicesManagerAdd", item.id, item.visaId, item.CustomerId, 2)' icon="iconfont icon-rizhi1"></el-button>
 			             </el-tooltip>
 						  <el-tooltip v-if="item.income<=0&&(item.visaOrderStatus==1||item.visaOrderStatus==3)"  class="item" effect="dark" :content="$t('pub.cancelBtn')" placement="top-start">
 			              <el-button type="primary" style='background:#E95252; border-color:#E95252;' icon="iconfont icon-xingzhuangkaobei" @click='cancelOrder(item)'></el-button>

src/components/SalesVisa/VisaProductOrder.vue

@@ -401,9 +401,11 @@ export default {
                 }else{
                     this.dataList = res.data.data.pageData;
                     this.total = res.data.data.count;
-                    this.loading = false;
+					this.loading = false;
 					this.dataList.forEach(x=>{
-						this.PreferPrice+=x.TotalPrice;
+						if(x.VisaOrderStatus!=2){
+							this.PreferPrice+=x.TotalPrice;
+						}
 						this.IncomePrice+=(x.Income+x.PlatformTax-x.RefundMoney);
 					})
                 }

src/components/clientConfirm.vue

@@ -276,7 +276,7 @@
 <template>
     <div class="dic_content" :class="dialogVisible?'CisHideen':''">
         <!-- 签字 -->
-        <div v-show="signShow&&dataList.companySignature!=''" class="signSpan">
+        <div class="signSpan">
             <div @click="goUrl" class="sign">
                 <!-- <span><span class="sp1"></span></p> -->
                 <p><span style="font-size:3rem" class="iconfont icon-qianming"></span></p>

src/components/commonPage/commonHotelLog.vue

@@ -72,7 +72,7 @@
             <div class="operateName" style="color:#005CAA;font-size:12px;">{{item.CreateByName}} {{item.CreateTimeStr}}
             </div>
           </div>
-          <div class="fz12 color333">{{item.Remarks}}</div>
+          <div class="fz12 color333"><template v-if="item.TCID && item.TCID>0">【团号:{{item.TCID}}】</template>{{item.Remarks}}</div>
         </div>
         <div v-if='HotelLogsList.length==0'>暂无数据</div>
       </div>