Commit 80eb1639 authored by zhengke's avatar zhengke
parents 649bc3da b74f936d
......@@ -108,7 +108,7 @@ export default {
}
</script>
<style>
@import "//at.alicdn.com/t/font_635492_p33f7rq158p.css";
@import "//at.alicdn.com/t/font_635492_zhaw2pckn4j.css";
@import "./assets/css/Semibold.css";
@import "./assets/css/global/config.css";
@import "./assets/css/fileIcon.css";
......
......@@ -1346,8 +1346,11 @@ export default {
this.msg.startDate=this.$route.query.StartTime!=undefined?this.$route.query.StartTime:'';
this.msg.endDate=this.$route.query.EndTime!=undefined?this.$route.query.EndTime:'';
this.msg.LineId=this.$route.query.LineId!=undefined?Number(this.$route.query.LineId):'';
this.productionDate[0]=this.msg.startDate;
this.productionDate[1]=this.msg.endDate;
if(this.msg.endDate!=""){
this.productionDate[0]=this.msg.startDate;
this.productionDate[1]=this.msg.endDate;
}
if(this.msg.LineId>0){
this.msg.DataType="1";
}
......
......@@ -157,7 +157,7 @@
<el-tooltip v-else class="item" effect="dark" content="修改备注" placement="top-start">
<el-button type="primary" style='background:#409EFF; border-color:#409EFF' icon="iconfont icon-img_bianji_small" @click='getDetail(item,true)'></el-button>
</el-tooltip>
<el-tooltip v-if="item.visaOrderStatus==1&&item.visaStatus==1" effect="dark" content="结算" placement="top-start">
<el-tooltip v-if="item.visaOrderStatus==1" effect="dark" content="结算" placement="top-start">
<el-button type="primary" style='background:#5EBB64; border-color:#5EBB64' @click='goUrl(item)' icon="iconfont icon-qian"></el-button>
</el-tooltip>
<el-tooltip v-if="item.visaOrderStatus==1&&item.visaStatus==1" effect="dark" content="旅客名单" placement="top-start">
......
......@@ -135,7 +135,7 @@
<th>{{$t('admin.admin_company')}}</th>
<th>{{$t('active.ld_cjcs')}}</th>
<th>{{$t('hotel.hotel_StartDate')}}</th>
<th>{{$t('hotel.hotel_StartDate')}}</th>
<th>{{$t('hotel.hotel_EndDate')}}</th>
<th>{{$t('active.ld_status')}}</th>
<th width="400">{{$t('hotel.hotel_remark')}}</th>
<th>{{$t('hotel.table_operat')}}</th>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment