Commit 7ddf539e authored by 吴春's avatar 吴春

没有什么提交的

parents e3b56bcc 207bb545
...@@ -108,7 +108,7 @@ export default { ...@@ -108,7 +108,7 @@ export default {
} }
</script> </script>
<style> <style>
@import "//at.alicdn.com/t/font_635492_tjcw5hoim2.css"; @import "//at.alicdn.com/t/font_635492_t6jc0sd8qcj.css";
@import "./assets/css/Semibold.css"; @import "./assets/css/Semibold.css";
@import "./assets/css/global/config.css"; @import "./assets/css/global/config.css";
@import "./assets/css/fileIcon.css"; @import "./assets/css/fileIcon.css";
......
...@@ -1983,3 +1983,12 @@ div{ ...@@ -1983,3 +1983,12 @@ div{
.__flower_J{ .__flower_J{
left: -135px; left: -135px;
} }
.template_bg_1{
background-color: #f6dc61 !important
}
.template_bg_2{
background-color: #ffc2ca !important
}
.template_bg_3{
background-color: #9cdaff !important
}
\ No newline at end of file
...@@ -239,6 +239,7 @@ ...@@ -239,6 +239,7 @@
} }
._zhuan_msg{ ._zhuan_msg{
font-size: 12px; font-size: 12px;
margin-top:10px;
padding-bottom: 10px; padding-bottom: 10px;
} }
._zhuan_msg span{ ._zhuan_msg span{
...@@ -468,12 +469,6 @@ ...@@ -468,12 +469,6 @@
</div> </div>
</div> </div>
<div class="_right_content" v-for="(son,sindex) in item.AuditRecordList" v-if="son.AuditStatus!=2"> <div class="_right_content" v-for="(son,sindex) in item.AuditRecordList" v-if="son.AuditStatus!=2">
<template v-if="son.CareOfRemarks">
<div class="_zhuan_msg" v-for="(z,zIndex) in JSON.parse(son.CareOfRemarks)">
<p><span></span>{{z.BeFrom}}<span><i class="_color_green">转交</i></span>{{z.Target}}</p>
<p class="_pp_info">转交备注:{{z.Remarks?z.Remarks:'无'}}</p>
</div>
</template>
<span class="_sm" > <span class="_sm" >
<p class="_name"> <p class="_name">
<span class="_n">{{son.AuditName}}</span> <span class="_n">{{son.AuditName}}</span>
...@@ -481,6 +476,12 @@ ...@@ -481,6 +476,12 @@
<span class="_sn" v-if="son.AuditStatus==2">通过</span> <span class="_sn" v-if="son.AuditStatus==2">通过</span>
<span class="_m" v-if="son.AuditStatus==4">驳回</span> <span class="_m" v-if="son.AuditStatus==4">驳回</span>
</p> </p>
<template v-if="son.CareOfRemarks">
<div class="_zhuan_msg" v-for="(z,zIndex) in JSON.parse(son.CareOfRemarks)">
<p><span></span>{{z.BeFrom}}<span><i class="_color_green">转交</i></span>{{z.Target}}</p>
<p class="_pp_info">转交备注:{{z.Remarks?z.Remarks:'无'}}</p>
</div>
</template>
</span> </span>
</div> </div>
<textarea v-if="item.SpecialNode!=2||AuditOrRefundMsg.Status=='3'" class="_textarea" v-model="AuditOrRefundMsg.Description" placeholder="请输入..."></textarea> <textarea v-if="item.SpecialNode!=2||AuditOrRefundMsg.Status=='3'" class="_textarea" v-model="AuditOrRefundMsg.Description" placeholder="请输入..."></textarea>
...@@ -681,6 +682,12 @@ ...@@ -681,6 +682,12 @@
<p class="_name _mgt_15" v-for="(son,sindex) in item.AuditRecordList"> <p class="_name _mgt_15" v-for="(son,sindex) in item.AuditRecordList">
<span class="_n">{{son.AuditName}}</span> <span class="_n">{{son.AuditName}}</span>
<span class="_sm" v-if="item.Status==1">待审</span> <span class="_sm" v-if="item.Status==1">待审</span>
<template v-if="son.CareOfRemarks">
<div class="_zhuan_msg" v-for="(z,zIndex) in JSON.parse(son.CareOfRemarks)">
<p><span></span>{{z.BeFrom}}<span><i class="_color_green">转交</i></span>{{z.Target}}</p>
<p class="_pp_info">转交备注:{{z.Remarks?z.Remarks:'无'}}</p>
</div>
</template>
</p> </p>
<textarea v-if="item.SpecialNode!=2||AuditOrRefundMsg.Status=='3'" class="_textarea" v-model="AuditOrRefundMsg.Description" placeholder="请输入..."></textarea> <textarea v-if="item.SpecialNode!=2||AuditOrRefundMsg.Status=='3'" class="_textarea" v-model="AuditOrRefundMsg.Description" placeholder="请输入..."></textarea>
<!-- <textarea v-if="AuditOrRefundMsg.Status=='3'&&item.SpecialNode!=0" class="_textarea" v-model="AuditOrRefundMsg.Description" placeholder="请输入..."></textarea> --> <!-- <textarea v-if="AuditOrRefundMsg.Status=='3'&&item.SpecialNode!=0" class="_textarea" v-model="AuditOrRefundMsg.Description" placeholder="请输入..."></textarea> -->
...@@ -905,16 +912,16 @@ ...@@ -905,16 +912,16 @@
</div> </div>
<div class="_right_content" v-else> <div class="_right_content" v-else>
<div class="_more" v-for="(son,sindex) in item.AuditRecordList"> <div class="_more" v-for="(son,sindex) in item.AuditRecordList">
<p class="_name" v-if="son.AuditStatus==2">{{son.AuditName}}
<span class="_sm">{{item.AuditDescription}}</span>
<span class="_time _time_n">{{son.AduitDate}}</span>
</p>
<template v-if="son.CareOfRemarks"> <template v-if="son.CareOfRemarks">
<div class="_zhuan_msg" v-for="(z,zIndex) in JSON.parse(son.CareOfRemarks)"> <div class="_zhuan_msg" v-for="(z,zIndex) in JSON.parse(son.CareOfRemarks)">
<p><span></span>{{z.BeFrom}}<span><i class="_color_green">转交</i></span>{{z.Target}}</p> <p><span></span>{{z.BeFrom}}<span><i class="_color_green">转交</i></span>{{z.Target}}</p>
<p class="_pp_info">转交备注:{{z.Remarks?z.Remarks:'无'}}</p> <p class="_pp_info">转交备注:{{z.Remarks?z.Remarks:'无'}}</p>
</div> </div>
</template> </template>
<p class="_name" v-if="son.AuditStatus==2">{{son.AuditName}}
<span class="_sm">{{item.AuditDescription}}</span>
<span class="_time _time_n">{{son.AduitDate}}</span>
</p>
<div class="_right_content" v-if="son.AuditStatus==2"> <div class="_right_content" v-if="son.AuditStatus==2">
<div class="_pp_info"> <div class="_pp_info">
<p>{{son.Remark?son.Remark:'无'}}</p> <p>{{son.Remark?son.Remark:'无'}}</p>
......
...@@ -96,6 +96,7 @@ ...@@ -96,6 +96,7 @@
.w216{ .w216{
width: 216px; width: 216px;
} }
._icon_btn i.icon-tiaozheng{background-color: #1296db;font-size: 16px;}
</style> </style>
<template > <template >
...@@ -506,6 +507,9 @@ ...@@ -506,6 +507,9 @@
<el-tooltip class="item" effect="dark" content="作废" placement="top"> <el-tooltip class="item" effect="dark" content="作废" placement="top">
<i v-if="((msg.Conditon==1 ||msg.Conditon==7) && (item.InOrNotProcess==1 || item.Status==3 || item.Status==0))" class="iconfont icon-quxiao1" @click="financeRemove(item.FrID)"></i> <i v-if="((msg.Conditon==1 ||msg.Conditon==7) && (item.InOrNotProcess==1 || item.Status==3 || item.Status==0))" class="iconfont icon-quxiao1" @click="financeRemove(item.FrID)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip v-if="ActionMenuCode.indexOf('F_Update_TradeDate')!=-1" class="item" content="调整交易日期" placement="top">
<i v-if="msg.Conditon==2 && item.TradeDate" class="iconfont icon-tiaozheng" @click="dialogFormVisible=true,updateMsg.FrID=item.FrID,updateMsg.OTradeDate=item.TradeDate" ></i>
</el-tooltip>
</td> </td>
</tr> </tr>
</table> </table>
...@@ -554,6 +558,32 @@ ...@@ -554,6 +558,32 @@
<button class="hollowFixedBtn" @click="zhuanBox=false">{{$t('pub.cancelBtn')}}</button> <button class="hollowFixedBtn" @click="zhuanBox=false">{{$t('pub.cancelBtn')}}</button>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :title="'单号:' + updateMsg.FrID + ' 调整交易日期'" width="400px" :visible.sync="dialogFormVisible" center :before-close="closeChangeMachie" >
<el-form label-width="110px">
<el-form-item label="原交易日期">
<el-date-picker
v-model="updateMsg.OTradeDate"
type="date"
:disabled='true'>
</el-date-picker>
</el-form-item>
<el-form-item label="交易日期">
<el-date-picker
v-model="updateMsg.TradeDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item label="说明">
<el-input type="textarea" v-model="updateMsg.Description" class="w216"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button class="hollowFixedBtn" @click="dialogFormVisible=false">取 消</el-button>
<el-button class="normalBtn" type="primary" @click="UpdateTradeDate()">确 定</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
...@@ -620,6 +650,12 @@ export default { ...@@ -620,6 +650,12 @@ export default {
WorkFlowId:0, WorkFlowId:0,
Description:'' Description:''
}, },
updateMsg:{
FrID:0,
OTradeDate:'',
TradeDate:'',
Description:''
},
DataList:[], DataList:[],
GetFinancLogList:[], GetFinancLogList:[],
StatusList:[], StatusList:[],
...@@ -659,8 +695,11 @@ export default { ...@@ -659,8 +695,11 @@ export default {
DepartIDs:'', DepartIDs:'',
zhuanBox:false, zhuanBox:false,
loading2:false, loading2:false,
dialogFormVisible:false,
searchList:[], searchList:[],
minHeight:400, minHeight:400,
//当前登录用户功能权限
ActionMenuCode:''
} }
}, },
created(){ created(){
...@@ -693,6 +732,7 @@ export default { ...@@ -693,6 +732,7 @@ export default {
},mounted(){ },mounted(){
let userInfo=this.getLocalStorage(); let userInfo=this.getLocalStorage();
this.getCompanyMsg.RB_Group_Id= this.employeeMsg.GroupId = this.getDepartmentMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID this.getCompanyMsg.RB_Group_Id= this.employeeMsg.GroupId = this.getDepartmentMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID
this.ActionMenuCode=userInfo.ActionMenuCode;
this.DepartIDs = userInfo.RB_Department_Id; this.DepartIDs = userInfo.RB_Department_Id;
this.userId = userInfo.EmployeeId; this.userId = userInfo.EmployeeId;
this.financeinfo_post_GetList(); this.financeinfo_post_GetList();
...@@ -713,6 +753,7 @@ export default { ...@@ -713,6 +753,7 @@ export default {
}, },
zhuanBtn(){ zhuanBtn(){
if(!this.zhuanMsg.AuditEmId) return this.$message.error('请选择转交人'); if(!this.zhuanMsg.AuditEmId) return this.$message.error('请选择转交人');
if(!this.zhuanMsg.Description)return this.$message.error('请填写转交备注');
let msg = []; let msg = [];
msg.push(this.zhuanMsg); msg.push(this.zhuanMsg);
this.apipost("Financial_post_Transfer",msg,res => { this.apipost("Financial_post_Transfer",msg,res => {
...@@ -726,6 +767,23 @@ export default { ...@@ -726,6 +767,23 @@ export default {
} }
},err => {}); },err => {});
}, },
goUrl(){
this.dialogFormVisible = true;
},
UpdateTradeDate(){
if(!this.updateMsg.TradeDate) return this.$message.error('请选择调整后的交易日期');
if(!this.updateMsg.Description) return this.$message.error('请填写说明');
this.apipost("Financial_get_SetTradeDate",this.updateMsg,res => {
if(res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.dialogFormVisible = false;
this.msg.Conditon=2;
this.getPageList();
}else{
this.$message.error(res.data.message);
}
},err => {});
},
remoteMethod(query) { // 转交人模糊查询 remoteMethod(query) { // 转交人模糊查询
if (query !== ''||this.addShow) { if (query !== ''||this.addShow) {
this.loading2 = true; this.loading2 = true;
......
...@@ -232,6 +232,7 @@ ...@@ -232,6 +232,7 @@
} }
._zhuan_msg{ ._zhuan_msg{
font-size: 12px; font-size: 12px;
margin-top:10px;
padding-bottom: 10px; padding-bottom: 10px;
} }
._zhuan_msg span{ ._zhuan_msg span{
...@@ -568,17 +569,17 @@ ...@@ -568,17 +569,17 @@
</p> </p>
<div class="_more _mgt_15" v-for="(son,sindex) in item.AuditRecordList" v-if="son.AuditStatus==2"> <div class="_more _mgt_15" v-for="(son,sindex) in item.AuditRecordList" v-if="son.AuditStatus==2">
<div class="_right_content"> <div class="_right_content">
<p class="_name">
<span class="_n PingFangSC">{{son.AuditName}}</span>
<span class="_sn" v-if="son.AuditStatus==2">通过</span>
<span class="_time _time_n">{{son.AduitDate}}</span>
</p>
<template v-if="son.CareOfRemarks"> <template v-if="son.CareOfRemarks">
<div class="_zhuan_msg" v-for="(z,zIndex) in JSON.parse(son.CareOfRemarks)"> <div class="_zhuan_msg" v-for="(z,zIndex) in JSON.parse(son.CareOfRemarks)">
<p><span></span>{{z.BeFrom}}<span><i class="_color_green">转交</i></span>{{z.Target}}</p> <p><span></span>{{z.BeFrom}}<span><i class="_color_green">转交</i></span>{{z.Target}}</p>
<p class="_pp_info">转交备注:{{z.Remarks?z.Remarks:'无'}}</p> <p class="_pp_info">转交备注:{{z.Remarks?z.Remarks:'无'}}</p>
</div> </div>
</template> </template>
<p class="_name">
<span class="_n PingFangSC">{{son.AuditName}}</span>
<span class="_sn" v-if="son.AuditStatus==2">通过</span>
<span class="_time _time_n">{{son.AduitDate}}</span>
</p>
<div class="_pp_info" v-if="son.AuditStatus!=1"> <div class="_pp_info" v-if="son.AuditStatus!=1">
<p>{{son.Remark!=''?son.Remark:'无'}}</p> <p>{{son.Remark!=''?son.Remark:'无'}}</p>
<div class="_info_img" v-if="son.Image!=null&&son.AuditStatus==2" > <div class="_info_img" v-if="son.Image!=null&&son.AuditStatus==2" >
...@@ -597,12 +598,6 @@ ...@@ -597,12 +598,6 @@
</div> </div>
<div class="_more _mgt_15" v-for="(son,sindex) in item.AuditRecordList" v-if="son.AuditStatus!=2"> <div class="_more _mgt_15" v-for="(son,sindex) in item.AuditRecordList" v-if="son.AuditStatus!=2">
<div class="_right_content" v-if="item.AuditWay==2&&son.AuditStatus!=2"> <div class="_right_content" v-if="item.AuditWay==2&&son.AuditStatus!=2">
<template v-if="son.CareOfRemarks">
<div class="_zhuan_msg" v-for="(z,zIndex) in JSON.parse(son.CareOfRemarks)">
<p><span></span>{{z.BeFrom}}<span><i class="_color_green">转交</i></span>{{z.Target}}</p>
<p class="_pp_info">转交备注:{{z.Remarks?z.Remarks:'无'}}</p>
</div>
</template>
<p class="_name"> <p class="_name">
<span class="_n PingFangSC">{{son.AuditName}}</span> <span class="_n PingFangSC">{{son.AuditName}}</span>
<span class="_sn" v-if="son.AuditStatus==2">通过</span> <span class="_sn" v-if="son.AuditStatus==2">通过</span>
...@@ -610,6 +605,12 @@ ...@@ -610,6 +605,12 @@
<span class="_sm" v-else-if="son.AuditStatus==1">待审</span> <span class="_sm" v-else-if="son.AuditStatus==1">待审</span>
<span class="_time _time_n" v-if="item.Status!=1">{{son.AduitDate}}</span> <span class="_time _time_n" v-if="item.Status!=1">{{son.AduitDate}}</span>
</p> </p>
<template v-if="son.CareOfRemarks">
<div class="_zhuan_msg" v-for="(z,zIndex) in JSON.parse(son.CareOfRemarks)">
<p><span></span>{{z.BeFrom}}<span><i class="_color_green">转交</i></span>{{z.Target}}</p>
<p class="_pp_info">转交备注:{{z.Remarks?z.Remarks:'无'}}</p>
</div>
</template>
<div class="_pp_info" v-if="item.Status!=1"> <div class="_pp_info" v-if="item.Status!=1">
<p>{{son.Remark!=''?son.Remark:'无'}}</p> <p>{{son.Remark!=''?son.Remark:'无'}}</p>
<div class="_info_img" v-if="son.Image!=null&&item.Status!=1" > <div class="_info_img" v-if="son.Image!=null&&item.Status!=1" >
...@@ -626,12 +627,6 @@ ...@@ -626,12 +627,6 @@
</div> </div>
</div> </div>
<div class="_right_content" v-else-if="item.AuditWay==3 && son.AuditStatus==1"> <div class="_right_content" v-else-if="item.AuditWay==3 && son.AuditStatus==1">
<template v-if="son.CareOfRemarks">
<div class="_zhuan_msg" v-for="(z,zIndex) in JSON.parse(son.CareOfRemarks)">
<p><span></span>{{z.BeFrom}}<span><i class="_color_green">转交</i></span>{{z.Target}}</p>
<p class="_pp_info">转交备注:{{z.Remarks?z.Remarks:'无'}}</p>
</div>
</template>
<p class="_name"> <p class="_name">
<span class="_n PingFangSC">{{son.AuditName}}</span> <span class="_n PingFangSC">{{son.AuditName}}</span>
<span class="_sm" v-if="item.Status==2 && item.Sort!=0">通过</span> <span class="_sm" v-if="item.Status==2 && item.Sort!=0">通过</span>
...@@ -639,6 +634,12 @@ ...@@ -639,6 +634,12 @@
<span class="_sm _left_radius_sus" v-else-if="son.AuditStatus==1">待审</span> <span class="_sm _left_radius_sus" v-else-if="son.AuditStatus==1">待审</span>
<span class="_time _time_n" v-if="item.Status!=1">{{son.AduitDate}}</span> <span class="_time _time_n" v-if="item.Status!=1">{{son.AduitDate}}</span>
</p> </p>
<template v-if="son.CareOfRemarks">
<div class="_zhuan_msg" v-for="(z,zIndex) in JSON.parse(son.CareOfRemarks)">
<p><span></span>{{z.BeFrom}}<span><i class="_color_green">转交</i></span>{{z.Target}}</p>
<p class="_pp_info">转交备注:{{z.Remarks?z.Remarks:'无'}}</p>
</div>
</template>
<div class="_pp_info" v-if="item.Status!=1"> <div class="_pp_info" v-if="item.Status!=1">
<p>{{son.Remark!=''?son.Remark:'无'}}</p> <p>{{son.Remark!=''?son.Remark:'无'}}</p>
<div class="_info_img" v-if="son.Image!=null&&item.Status!=1" > <div class="_info_img" v-if="son.Image!=null&&item.Status!=1" >
...@@ -655,12 +656,6 @@ ...@@ -655,12 +656,6 @@
</div> </div>
</div> </div>
<div class="_right_content" v-else-if="item.AuditWay==3 && son.AuditStatus==4"> <div class="_right_content" v-else-if="item.AuditWay==3 && son.AuditStatus==4">
<template v-if="son.CareOfRemarks">
<div class="_zhuan_msg" v-for="(z,zIndex) in JSON.parse(son.CareOfRemarks)">
<p><span></span>{{z.BeFrom}}<span><i class="_color_green">转交</i></span>{{z.Target}}</p>
<p class="_pp_info">转交备注:{{z.Remarks?z.Remarks:'无'}}</p>
</div>
</template>
<p class="_name"> <p class="_name">
<span class="_n PingFangSC">{{son.AuditName}}</span> <span class="_n PingFangSC">{{son.AuditName}}</span>
<span class="_sm" v-if="item.Status==2 && item.Sort!=0">通过</span> <span class="_sm" v-if="item.Status==2 && item.Sort!=0">通过</span>
...@@ -668,6 +663,12 @@ ...@@ -668,6 +663,12 @@
<span class="_sm _left_radius_sus" v-else-if="son.AuditStatus==1">待审</span> <span class="_sm _left_radius_sus" v-else-if="son.AuditStatus==1">待审</span>
<span class="_time _time_n" v-if="item.Status!=1">{{son.AduitDate}}</span> <span class="_time _time_n" v-if="item.Status!=1">{{son.AduitDate}}</span>
</p> </p>
<template v-if="son.CareOfRemarks">
<div class="_zhuan_msg" v-for="(z,zIndex) in JSON.parse(son.CareOfRemarks)">
<p><span></span>{{z.BeFrom}}<span><i class="_color_green">转交</i></span>{{z.Target}}</p>
<p class="_pp_info">转交备注:{{z.Remarks?z.Remarks:'无'}}</p>
</div>
</template>
<div class="_pp_info" v-if="item.Status!=1"> <div class="_pp_info" v-if="item.Status!=1">
<p>{{son.Remark!=''?son.Remark:'无'}}</p> <p>{{son.Remark!=''?son.Remark:'无'}}</p>
<div class="_info_img" v-if="son.Image!=null&&item.Status!=1" > <div class="_info_img" v-if="son.Image!=null&&item.Status!=1" >
......
...@@ -142,9 +142,9 @@ ...@@ -142,9 +142,9 @@
</script> </script>
<style> <style>
._bank_type{background-color: #2AAEF2} .workTotalSearch ._bank_type{background-color: #2AAEF2}
._bank_type2{background-color: #FF9C01} ._bank_type2{background-color: #FF9C01}
._bank_name,._bank_type{display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;} .workTotalSearch ._bank_name,.workTotalSearch ._bank_type{display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;}
._fex_cen{display: flex;align-items: center} ._fex_cen{display: flex;align-items: center}
.workTotalSearch{width: 100%; min-height: auto; padding:0 0 20px 0;} .workTotalSearch{width: 100%; min-height: auto; padding:0 0 20px 0;}
.workTotalSearch li{float: left; font-size: 12px; color: #666; margin:20px 10px 0px 0;} .workTotalSearch li{float: left; font-size: 12px; color: #666; margin:20px 10px 0px 0;}
......
...@@ -214,7 +214,7 @@ ...@@ -214,7 +214,7 @@
<div class="zidingyi" v-if="showType==3&&loadNone==false&&vshowC"> <div class="zidingyi" v-if="showType==3&&loadNone==false&&vshowC">
<div v-html="feature.featureContent"></div> <div v-html="feature.featureContent"></div>
</div> </div>
<div class="template-box" v-if="(showType==4||showType==5)&&loadNone==false&&vshowC"> <div class="template-box" v-if="(showType>=4)&&loadNone==false&&vshowC">
<div v-if="vshowC" class="module-title"> <div v-if="vshowC" class="module-title">
<h2>行程特色</h2> <h2>行程特色</h2>
<div class="short-line"></div> <div class="short-line"></div>
...@@ -648,7 +648,7 @@ ...@@ -648,7 +648,7 @@
let tcid = this.$route.query.tcid; let tcid = this.$route.query.tcid;
let UploadUrl = this.domainManager().UploadUrl let UploadUrl = this.domainManager().UploadUrl
let _this = this let _this = this
if (this.showType===4 || this.showType===5) { // 判断是否为行程特色 if (this.showType>=4) { // 判断是否为行程特色
$.ajax({ //调用是否已经存在文件夹接口判断是否进行上传图片操作 $.ajax({ //调用是否已经存在文件夹接口判断是否进行上传图片操作
url: UploadUrl + '/Upload/GetImage?filePath=Feature/' + tcid, url: UploadUrl + '/Upload/GetImage?filePath=Feature/' + tcid,
type: "POST", type: "POST",
...@@ -658,7 +658,6 @@ ...@@ -658,7 +658,6 @@
if (msg.ResultCode) { // 已经存在文件 直接调用下载 if (msg.ResultCode) { // 已经存在文件 直接调用下载
_this.ToWord(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg.dayNum + '日游',isPc) _this.ToWord(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg.dayNum + '日游',isPc)
} else { // 不存在图片保存图片后下载 } else { // 不存在图片保存图片后下载
console.log(document.querySelector("#gernalCanvas").querySelectorAll('img').length)
if (document.querySelector("#gernalCanvas").querySelectorAll('img').length === 0) { if (document.querySelector("#gernalCanvas").querySelectorAll('img').length === 0) {
_this.ToWord(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg.dayNum + '日游',isPc) _this.ToWord(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg.dayNum + '日游',isPc)
return return
...@@ -674,7 +673,7 @@ ...@@ -674,7 +673,7 @@
let cName='' let cName=''
if(_this.showType==4){ if(_this.showType==4){
cName='.feature-box' cName='.feature-box'
}else if(_this.showType==5){ }else if(_this.showType>4){
cName='.travle_page' cName='.travle_page'
} }
if(cName!=''){ if(cName!=''){
...@@ -942,6 +941,8 @@ ...@@ -942,6 +941,8 @@
isShowVisa:this.vshowH?1:0, isShowVisa:this.vshowH?1:0,
//isPc是否PC下载 //isPc是否PC下载
isPc: isPc, isPc: isPc,
//模板参数
templateId: this.showType,
}; };
this.GetLocalFile("DownLoadTripWord", msg,title+ ".doc", res=>{ this.GetLocalFile("DownLoadTripWord", msg,title+ ".doc", res=>{
this.pdfLoading = false this.pdfLoading = false
......
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
</div> --> </div> -->
<new-feature ref='newFeature' :data='FeatureData'></new-feature> <new-feature ref='newFeature' :data='FeatureData'></new-feature>
</div> </div>
<div v-if="FeatureData.FeatureType===FeatureTypeState.travelSpecial2 && FeatureDataFlag"> <div v-if="(FeatureData.FeatureType===FeatureTypeState.travelSpecial2 || FeatureData.FeatureType===6 || FeatureData.FeatureType===7) && FeatureDataFlag">
<!--<newFeature2 ref='newFeature2' :data='FeatureData'></newFeature2>--> <!--<newFeature2 ref='newFeature2' :data='FeatureData'></newFeature2>-->
<newFeature2 ref='newFeature2' :FeatureData='FeatureData'></newFeature2> <newFeature2 ref='newFeature2' :FeatureData='FeatureData'></newFeature2>
</div> </div>
...@@ -222,7 +222,7 @@ ...@@ -222,7 +222,7 @@
nineGrid: 2, nineGrid: 2,
userDefined: 3, userDefined: 3,
travelSpecial: 4, travelSpecial: 4,
travelSpecial2: 5 travelSpecial2: 5,
}, },
TypeArray: [{ TypeArray: [{
ckTitle: "自定义", ckTitle: "自定义",
...@@ -249,27 +249,40 @@ ...@@ -249,27 +249,40 @@
TypeState: 4 TypeState: 4
}, },
{ {
ckTitle: "行程特色2", ckTitle: "行程特色-黄",
isShow: false, isShow: false,
imgUrl: Travelslider, imgUrl: Travelslider,
TypeState: 5 TypeState: 5
},
{
ckTitle: "行程特色-粉",
isShow: false,
imgUrl: Travelslider,
TypeState: 6
},
{
ckTitle: "行程特色-蓝",
isShow: false,
imgUrl: Travelslider,
TypeState: 7
} }
], //tab数组 ], //tab数组
templateColorArray:[ templateColorArray:[
{ {
id: 1, id: 1,
color: 'yellow', color: 'yellow',
text: '黄色' text: '土黄黄'
}, },
{ {
id: 2, id: 2,
color: 'pink', color: 'pink',
text: '粉色' text: '樱桃粉'
}, },
{ {
id: 3, id: 3,
color: 'blue', color: 'blue',
text: '蓝色' text: '水蓝蓝'
}, },
], ],
travelsList: [], travelsList: [],
...@@ -383,7 +396,6 @@ ...@@ -383,7 +396,6 @@
} }
setTimeout(() => { setTimeout(() => {
try { try {
FeatureData.FeatureHtml = document.getElementById("newFeatureBox").innerHTML; FeatureData.FeatureHtml = document.getElementById("newFeatureBox").innerHTML;
} catch (err) { } catch (err) {
} }
...@@ -473,7 +485,7 @@ ...@@ -473,7 +485,7 @@
//切换tab事件 //切换tab事件
clickFeature(item) { clickFeature(item) {
let state = this.FeatureData.FeatureType let state = this.FeatureData.FeatureType
if (state === 4 && item.TypeState === 5) { if ((state === 4 && item.TypeState === 5) || (state === 4 && item.TypeState === 6) || (state === 4 && item.TypeState === 7)) {
this.$confirm('尊敬的用户,行程特色“1”切换为行程特色“2”将会清空行程特色“1”里面的所有内容,您确定切换吗?', { this.$confirm('尊敬的用户,行程特色“1”切换为行程特色“2”将会清空行程特色“1”里面的所有内容,您确定切换吗?', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
......
...@@ -6,16 +6,16 @@ ...@@ -6,16 +6,16 @@
<!-- 酒店1 --> <!-- 酒店1 -->
<div class="travel_hotel_1" v-if="item === 0 && hotelObj.list!=null && hotelObj.list.length>0"> <div class="travel_hotel_1" v-if="item === 0 && hotelObj.list!=null && hotelObj.list.length>0">
<div class="hotel_1_header"> <div class="hotel_1_header">
<img class="hotel_1_header_bg" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/top-1.jpg"> <img class="hotel_1_header_bg" :src="`https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/BackgroundImg/featurebg/template_top_${templateType}.jpg`">
<img class="hotel_1_header_bg2" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/title-1.png"> <img class="hotel_1_header_bg2" :src="`https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/BackgroundImg/featurebg/template_title1_${templateType}.jpg`">
<div class="hotel_1_header_title"> <div class="hotel_1_header_title">
<div> <div>
<vEditDiv :canEdit='canEdit' v-model="hotelObj.title.first"></vEditDiv> <vEditDiv :canEdit='canEdit' v-model="hotelObj.title.first"></vEditDiv>
</div> </div>
<div> <div>
<img src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/icon-5.png"> <img :src="`https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/BackgroundImg/featurebg/template_icon_5.jpg`">
<vEditDiv :canEdit='canEdit' v-model="hotelObj.title.second"></vEditDiv> <vEditDiv :canEdit='canEdit' v-model="hotelObj.title.second"></vEditDiv>
<img src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/icon-4.png"> <img :src="`https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/BackgroundImg/featurebg/template_icon_4.jpg`">
</div> </div>
</div> </div>
</div> </div>
...@@ -93,13 +93,13 @@ ...@@ -93,13 +93,13 @@
</div> </div>
</div> </div>
<div class="hotel_1_info_1_info"> <div class="hotel_1_info_1_info">
<img class="__flower" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/bg1.png"> <img class="__flower" :src="`https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/BackgroundImg/featurebg/template_bg_${templateType}.jpg`">
<div class="hotel_1_info_1_info_left"> <div class="hotel_1_info_1_info_left">
<img src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/icon-1.png"> <img :src="`https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/BackgroundImg/featurebg/template_icon_1.jpg`">
<div></div> <div :class="`template_bg_${templateType}`"></div>
</div> </div>
<div class="hotel_1_info_1_info_right"> <div class="hotel_1_info_1_info_right">
<div><vEditDiv :canEdit='canEdit' v-model="hotelObj.list[item*2].name"></vEditDiv></div> <div :class="`template_bg_${templateType}`"><vEditDiv :canEdit='canEdit' v-model="hotelObj.list[item*2].name"></vEditDiv></div>
<div class="hotel_1_info_1_info_right_Ename"><vEditDiv :canEdit='canEdit' v-model="hotelObj.list[item*2].Ename"></vEditDiv></div> <div class="hotel_1_info_1_info_right_Ename"><vEditDiv :canEdit='canEdit' v-model="hotelObj.list[item*2].Ename"></vEditDiv></div>
<div><vEditDiv :canEdit='canEdit' v-model="hotelObj.list[item*2].description"></vEditDiv></div> <div><vEditDiv :canEdit='canEdit' v-model="hotelObj.list[item*2].description"></vEditDiv></div>
</div> </div>
...@@ -206,11 +206,11 @@ ...@@ -206,11 +206,11 @@
</div> </div>
</div> </div>
<div class="hotel_1_info_2_bottom_left"> <div class="hotel_1_info_2_bottom_left">
<img src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/icon-1.png"> <img :src="`https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/BackgroundImg/featurebg/template_icon_1.jpg`">
<div></div> <div :class="`template_bg_${templateType}`"></div>
</div> </div>
<div class="hotel_1_info_2_bottom_right"> <div class="hotel_1_info_2_bottom_right">
<div><vEditDiv :canEdit='canEdit' v-model="hotelObj.list[item*2+1].name"></vEditDiv></div> <div :class="`template_bg_${templateType}`"><vEditDiv :canEdit='canEdit' v-model="hotelObj.list[item*2+1].name"></vEditDiv></div>
<div class="hotel_1_info_1_info_right_Ename"><vEditDiv :canEdit='canEdit' v-model="hotelObj.list[item*2+1].Ename"></vEditDiv></div> <div class="hotel_1_info_1_info_right_Ename"><vEditDiv :canEdit='canEdit' v-model="hotelObj.list[item*2+1].Ename"></vEditDiv></div>
<div><vEditDiv :canEdit='canEdit' v-model="hotelObj.list[item*2+1].description"></vEditDiv></div> <div><vEditDiv :canEdit='canEdit' v-model="hotelObj.list[item*2+1].description"></vEditDiv></div>
</div> </div>
...@@ -238,7 +238,7 @@ ...@@ -238,7 +238,7 @@
@toDelete="bolckToDelete"> @toDelete="bolckToDelete">
</vToolBar> </vToolBar>
</div> </div>
<img class="hotel_2_info_1_bg" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/top-2.jpg"> <img class="hotel_2_info_1_bg" :src="`https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/BackgroundImg/featurebg/template_top2_${templateType}.jpg`">
<div class="hotel_2_info_1_content"> <div class="hotel_2_info_1_content">
<div><vEditDiv :canEdit='canEdit' v-model="hotelObj.list[item*2].name"></vEditDiv></div> <div><vEditDiv :canEdit='canEdit' v-model="hotelObj.list[item*2].name"></vEditDiv></div>
<div class="hotel_1_info_1_info_right_Ename"><vEditDiv :canEdit='canEdit' v-model="hotelObj.list[item*2].Ename"></vEditDiv></div> <div class="hotel_1_info_1_info_right_Ename"><vEditDiv :canEdit='canEdit' v-model="hotelObj.list[item*2].Ename"></vEditDiv></div>
...@@ -374,7 +374,7 @@ ...@@ -374,7 +374,7 @@
</div> </div>
</div> </div>
<div class="hotel_2_info_2_top_left"> <div class="hotel_2_info_2_top_left">
<img src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/icon-1.png"> <img :src="`https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/BackgroundImg/featurebg/template_icon_1.jpg`">
<div></div> <div></div>
</div> </div>
<div class="hotel_2_info_2_top_right"> <div class="hotel_2_info_2_top_right">
...@@ -445,8 +445,8 @@ ...@@ -445,8 +445,8 @@
<!-- 景点1 --> <!-- 景点1 -->
<div class="travel_viewSpot_1" v-if="item === 0"> <div class="travel_viewSpot_1" v-if="item === 0">
<div class="viewSpot_1_header"> <div class="viewSpot_1_header">
<img class="viewSpot_1_header_bg" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/top-1.jpg"> <img class="viewSpot_1_header_bg" :src="`https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/BackgroundImg/featurebg/template_top_${templateType}.jpg`">
<img class="viewSpot_1_header_bg2" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/title-3.jpg"> <img class="viewSpot_1_header_bg2" :src="`https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/BackgroundImg/featurebg/template_title2_${templateType}.jpg`">
<div class="viewSpot_1_header_title"> <div class="viewSpot_1_header_title">
<div> <div>
<div>看见</div> <div>看见</div>
...@@ -454,9 +454,9 @@ ...@@ -454,9 +454,9 @@
<div>之美</div> <div>之美</div>
</div> </div>
<div> <div>
<img src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/icon-5.png"> <img :src="`https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/BackgroundImg/featurebg/template_icon_5.jpg`">
<div>放慢旅途步伐·畅游自在假期</div> <div>放慢旅途步伐·畅游自在假期</div>
<img src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/icon-4.png"> <img :src="`https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/BackgroundImg/featurebg/template_icon_4.jpg`">
</div> </div>
</div> </div>
</div> </div>
...@@ -506,13 +506,13 @@ ...@@ -506,13 +506,13 @@
</div> </div>
</div> </div>
<div class="viewSpot_1_info_1_info"> <div class="viewSpot_1_info_1_info">
<img class="__flower __flower_J" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/bg1.png"> <img class="__flower __flower_J" :src="`https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/BackgroundImg/featurebg/template_bg_${templateType}.jpg`">
<div class="viewSpot_1_info_1_info_left"> <div class="viewSpot_1_info_1_info_left">
<img src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/icon-3.png"> <img :src="`https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/BackgroundImg/featurebg/template_icon_3.jpg`">
<div></div> <div :class="`template_bg_${templateType}`"></div>
</div> </div>
<div class="viewSpot_1_info_1_info_right"> <div class="viewSpot_1_info_1_info_right">
<div><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4].name"></vEditDiv></div> <div :class="`template_bg_${templateType}`"><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4].name"></vEditDiv></div>
<div><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4].description"></vEditDiv></div> <div><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4].description"></vEditDiv></div>
</div> </div>
</div> </div>
...@@ -597,11 +597,11 @@ ...@@ -597,11 +597,11 @@
</div> </div>
</div> </div>
<div class="viewSpot_1_info_2_bottom_left"> <div class="viewSpot_1_info_2_bottom_left">
<img src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/icon-3.png"> <img :src="`https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/BackgroundImg/featurebg/template_icon_3.jpg`">
<div></div> <div :class="`template_bg_${templateType}`"></div>
</div> </div>
<div class="viewSpot_1_info_2_bottom_right"> <div class="viewSpot_1_info_2_bottom_right">
<div><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4+1].name"></vEditDiv></div> <div :class="`template_bg_${templateType}`"><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4+1].name"></vEditDiv></div>
<div class="hotel_1_info_1_info_right_Ename"><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4+1].Ename"></vEditDiv></div> <div class="hotel_1_info_1_info_right_Ename"><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4+1].Ename"></vEditDiv></div>
<div><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4+1].description"></vEditDiv></div> <div><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4+1].description"></vEditDiv></div>
</div> </div>
...@@ -631,11 +631,11 @@ ...@@ -631,11 +631,11 @@
</div> </div>
<div class="viewSpot_2_info_1_info"> <div class="viewSpot_2_info_1_info">
<div class="viewSpot_2_info_1_info_left"> <div class="viewSpot_2_info_1_info_left">
<img src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/icon-3.png"> <img :src="`https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/BackgroundImg/featurebg/template_icon_3.jpg`">
<div></div> <div :class="`template_bg_${templateType}`"></div>
</div> </div>
<div class="viewSpot_2_info_1_info_right"> <div class="viewSpot_2_info_1_info_right">
<div><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4-2].name"></vEditDiv></div> <div :class="`template_bg_${templateType}`"><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4-2].name"></vEditDiv></div>
<div><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4-2].description"></vEditDiv></div> <div><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4-2].description"></vEditDiv></div>
</div> </div>
</div> </div>
...@@ -722,15 +722,15 @@ ...@@ -722,15 +722,15 @@
</div> </div>
<div class="viewSpot_2_info_2"> <div class="viewSpot_2_info_2">
<div class="viewSpot_2_info_2_info_1" v-if="viewSpotObj.list[item*4-1]"> <div class="viewSpot_2_info_2_info_1" v-if="viewSpotObj.list[item*4-1]">
<div><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4-1].name"></vEditDiv></div> <div :class="`template_bg_${templateType}`"><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4-1].name"></vEditDiv></div>
<div><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4-1].description"></vEditDiv></div> <div><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4-1].description"></vEditDiv></div>
</div> </div>
<div class="viewSpot_2_info_2_info_2" v-if="viewSpotObj.list[item*4]"> <div class="viewSpot_2_info_2_info_2" v-if="viewSpotObj.list[item*4]">
<div><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4].name"></vEditDiv></div> <div :class="`template_bg_${templateType}`"><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4].name"></vEditDiv></div>
<div><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4].description"></vEditDiv></div> <div><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4].description"></vEditDiv></div>
</div> </div>
<div class="viewSpot_2_info_2_info_3" v-if="viewSpotObj.list[item*4+1]"> <div class="viewSpot_2_info_2_info_3" v-if="viewSpotObj.list[item*4+1]">
<div><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4+1].name"></vEditDiv></div> <div :class="`template_bg_${templateType}`"><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4+1].name"></vEditDiv></div>
<div><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4+1].description"></vEditDiv></div> <div><vEditDiv :canEdit='canEdit' v-model="viewSpotObj.list[item*4+1].description"></vEditDiv></div>
</div> </div>
<div class="viewSpot_2_info_2_img" v-if="viewSpotObj.list[item*4-1]"> <div class="viewSpot_2_info_2_img" v-if="viewSpotObj.list[item*4-1]">
...@@ -883,8 +883,8 @@ ...@@ -883,8 +883,8 @@
<div class="travle_page" v-for="(item, index) in restaurantObj.pageList" :key="'restaurant'+index" v-if="restaurantObj.list.length>0"> <div class="travle_page" v-for="(item, index) in restaurantObj.pageList" :key="'restaurant'+index" v-if="restaurantObj.list.length>0">
<div class="travel_restaurant_1"> <div class="travel_restaurant_1">
<div class="restaurant_1_header" v-if="item === 0"> <div class="restaurant_1_header" v-if="item === 0">
<img class="restaurant_1_header_bg" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/top-1.jpg"> <img class="restaurant_1_header_bg" :src="`https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/BackgroundImg/featurebg/template_top_${templateType}.jpg`">
<img class="restaurant_1_header_bg2" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/title-3.jpg"> <img class="restaurant_1_header_bg2" :src="`https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/BackgroundImg/featurebg/template_title3_${templateType}.jpg`">
<div class="restaurant_1_header_title"> <div class="restaurant_1_header_title">
<div> <div>
<div>品尝</div> <div>品尝</div>
...@@ -892,9 +892,9 @@ ...@@ -892,9 +892,9 @@
<div>之味</div> <div>之味</div>
</div> </div>
<div> <div>
<img src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/icon-5.png"> <img :src="`https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/BackgroundImg/featurebg/template_icon_5.jpg`">
<div>特色美味,征服你的味蕾</div> <div>特色美味,征服你的味蕾</div>
<img src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/icon-4.png"> <img :src="`https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/BackgroundImg/featurebg/template_icon_4.jpg`">
</div> </div>
</div> </div>
</div> </div>
...@@ -944,13 +944,13 @@ ...@@ -944,13 +944,13 @@
</div> </div>
</div> </div>
<div class="restaurant_1_info_1_info"> <div class="restaurant_1_info_1_info">
<img class="__flower __flower_J" src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/bg1.png"> <img class="__flower __flower_J" :src="`https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/BackgroundImg/featurebg/template_bg_${templateType}.jpg`">
<div class="restaurant_1_info_1_info_left"> <div class="restaurant_1_info_1_info_left">
<img src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/icon-2.png"> <img :src="`https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/BackgroundImg/featurebg/template_icon_2.jpg`">
<div></div> <div :class="`template_bg_${templateType}`"></div>
</div> </div>
<div class="restaurant_1_info_1_info_right"> <div class="restaurant_1_info_1_info_right">
<div><vEditDiv :canEdit='canEdit' v-model="restaurantObj.list[item*2].name"></vEditDiv></div> <div :class="`template_bg_${templateType}`"><vEditDiv :canEdit='canEdit' v-model="restaurantObj.list[item*2].name"></vEditDiv></div>
<div><vEditDiv :canEdit='canEdit' v-model="restaurantObj.list[item*2].description"></vEditDiv></div> <div><vEditDiv :canEdit='canEdit' v-model="restaurantObj.list[item*2].description"></vEditDiv></div>
</div> </div>
</div> </div>
...@@ -1059,11 +1059,11 @@ ...@@ -1059,11 +1059,11 @@
</div> </div>
<div class="restaurant_1_info_2_right_bottom"> <div class="restaurant_1_info_2_right_bottom">
<div class="restaurant_1_info_2_right_bottom_left"> <div class="restaurant_1_info_2_right_bottom_left">
<img src="https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/PictureMaterial/Web/icon-2.png"> <img :src="`https://reborndev.oss-cn-hangzhou.aliyuncs.com/Upload/BackgroundImg/featurebg/template_icon_2.jpg`">
<div></div> <div :class="`template_bg_${templateType}`"></div>
</div> </div>
<div class="restaurant_1_info_2_right_bottom_right"> <div class="restaurant_1_info_2_right_bottom_right">
<div><vEditDiv :canEdit='canEdit' v-model="restaurantObj.list[item*2+1].name"></vEditDiv></div> <div :class="`template_bg_${templateType}`"><vEditDiv :canEdit='canEdit' v-model="restaurantObj.list[item*2+1].name"></vEditDiv></div>
<div class="hotel_1_info_1_info_right_Ename"><vEditDiv :canEdit='canEdit' v-model="restaurantObj.list[item*2+1].Ename"></vEditDiv></div> <div class="hotel_1_info_1_info_right_Ename"><vEditDiv :canEdit='canEdit' v-model="restaurantObj.list[item*2+1].Ename"></vEditDiv></div>
<div><vEditDiv :canEdit='canEdit' v-model="restaurantObj.list[item*2+1].description"></vEditDiv></div> <div><vEditDiv :canEdit='canEdit' v-model="restaurantObj.list[item*2+1].description"></vEditDiv></div>
</div> </div>
...@@ -1157,6 +1157,7 @@ ...@@ -1157,6 +1157,7 @@
ReadOnly: false, ReadOnly: false,
jsonTravelFeature2:null, jsonTravelFeature2:null,
theFirstTime: true, theFirstTime: true,
templateType: "1"
} }
}, },
methods: { methods: {
...@@ -1873,6 +1874,19 @@ ...@@ -1873,6 +1874,19 @@
canEditChange: function (val) { canEditChange: function (val) {
this.canEdit = val; this.canEdit = val;
this.$forceUpdate() this.$forceUpdate()
},
setTemplateType: function () {
switch (this.FeatureData.FeatureType) {
case 5:
this.templateType = "1";
break;
case 6:
this.templateType = "2";
break;
case 7:
this.templateType = "3";
break;
}
} }
}, },
computed: { computed: {
...@@ -1897,9 +1911,27 @@ ...@@ -1897,9 +1911,27 @@
} }
}, },
deep: true deep: true
},
"FeatureData.FeatureType":{
handler: function (val, oldVal) {
if (val !== oldVal)
this.setTemplateType()
},
deep: true
} }
}, },
mounted: function () { mounted: function () {
switch (this.FeatureData.FeatureType) {
case 5:
this.templateType = "1";
break;
case 6:
this.templateType = "2";
break;
case 7:
this.templateType = "3";
break;
}
this.MsgBus.$on('saveTravel', (val)=> { this.MsgBus.$on('saveTravel', (val)=> {
this.ReadOnly = val; this.ReadOnly = val;
this.theFirstTime = true; this.theFirstTime = true;
......
...@@ -11,7 +11,7 @@ export default { ...@@ -11,7 +11,7 @@ export default {
install(Vue, options) { install(Vue, options) {
Vue.prototype.MsgBus = MsgBus; Vue.prototype.MsgBus = MsgBus;
Vue.prototype.md5 = md5; Vue.prototype.md5 = md5;
Vue.prototype.orderBy = function(source, orders, type) { Vue.prototype.orderBy=function(source, orders, type) {
if ( if (
source instanceof Array && source instanceof Array &&
orders instanceof Array && orders instanceof Array &&
...@@ -77,27 +77,27 @@ export default { ...@@ -77,27 +77,27 @@ export default {
return source; return source;
} }
}, },
Vue.prototype.calcPageSize = function(itemHeight) { Vue.prototype.calcPageSize=function(itemHeight){
let yuHeight = itemHeight let yuHeight=itemHeight
try { try {
let obj = null let obj=null
document.querySelectorAll('.frame-box').forEach(x => { document.querySelectorAll('.frame-box').forEach(x=>{
if (x.style.display != 'none') { if(x.style.display!='none'){
obj = x obj=x
} }
}) })
let dom = obj.offsetHeight let dom=obj.offsetHeight
yuHeight = dom - (obj.querySelector('.v-table-header') ? obj.querySelector('.v-table-header').offsetHeight : 39) - 50 //减去面包屑,减去表格头部,减去分页,减去偏量 yuHeight=dom-(obj.querySelector('.v-table-header')?obj.querySelector('.v-table-header').offsetHeight:39)-50//减去面包屑,减去表格头部,减去分页,减去偏量
//减去其它同级元素 //减去其它同级元素
obj.childNodes[0].childNodes.forEach(x => { obj.childNodes[0].childNodes.forEach(x=>{
if (x.className && x.className.indexOf('v-table-views') == -1) { if(x.className && x.className.indexOf('v-table-views')==-1){
yuHeight -= x.offsetHeight ? x.offsetHeight : 0 yuHeight-=x.offsetHeight?x.offsetHeight:0
} }
}) })
} catch (error) { console.log(error) } } catch (error) {console.log(error)}
return Math.floor(yuHeight / itemHeight) return Math.floor(yuHeight/itemHeight)
} }
Vue.prototype.random_string = function(len) { Vue.prototype.random_string = function (len) {
len = len || 32; len = len || 32;
var chars = 'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678'; var chars = 'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678';
var maxPos = chars.length; var maxPos = chars.length;
...@@ -108,24 +108,24 @@ export default { ...@@ -108,24 +108,24 @@ export default {
return pwd; return pwd;
}, },
//是否是线上环境【发布时修改为true】 //是否是线上环境【发布时修改为true】
Vue.prototype.isOnline = function() { Vue.prototype.isOnline = function () {
return process.env.NODE_ENV !== 'development'; return process.env.NODE_ENV !== 'development';
}, },
//域名管理对象 //域名管理对象
Vue.prototype.domainManager = function() { Vue.prototype.domainManager = function () {
let domainUrl = ''; let domainUrl = '';
let locationName = window.location.hostname; let locationName = window.location.hostname;
// domainUrl = "http://127.0.0.1"; //214主域名 domainUrl = "http://127.0.0.1"; //214主域名
// 127.0.0.12 // 127.0.0.12
// domainUrl = "http://192.168.2.88"; //王悦主域名 // domainUrl = "http://192.168.2.88"; //王悦主域名
// domainUrl = "http://127.0.0.1"; //214主域名 // domainUrl = "http://127.0.0.1"; //214主域名
// domainUrl = "http://192.168.2.16:8083"; //王悦主域名 // domainUrl = "http://192.168.2.16:8083"; //王悦主域名
// domainUrl = "http://127.0.0.1"; //214主域名 // domainUrl = "http://127.0.0.1"; //214主域名
domainUrl = "http://192.168.2.65:8025"; //吴春主域名 // domainUrl = "http://192.168.2.65:8025"; //吴春主域名
// domainUrl = "http://192.168.2.106:8082"; //罗超主域名 // domainUrl = "http://192.168.2.106:8082"; //罗超主域名
if (locationName.indexOf('oytour') !== -1) { if (locationName.indexOf('oytour')!==-1) {
domainUrl = "https://reborn.oytour.com"; domainUrl = "https://reborn.oytour.com";
} else if (locationName.indexOf('viitto') !== -1) { }else if (locationName.indexOf('viitto')!==-1) {
domainUrl = "https://test.viitto.com"; domainUrl = "https://test.viitto.com";
} }
var obj = { var obj = {
...@@ -150,19 +150,21 @@ export default { ...@@ -150,19 +150,21 @@ export default {
//google地图图片地址 //google地图图片地址
GoogleMapImageUrl: "http://super.oytour.com", GoogleMapImageUrl: "http://super.oytour.com",
// "http://upload.oytour.com" // "http://upload.oytour.com"
UploadUrl: locationName.indexOf('oytour') !== -1 ? "http://upload.oytour.com" : "http://127.0.0.1:8120" UploadUrl: locationName.indexOf('oytour') !== -1 ? "http://upload.oytour.com" : "http://127.0.0.1:8120",
// 读取文件
ViittoFileUrl:'http://imgfile.oytour.com'
// UploadUrl: "http://upload.oytour.com" // UploadUrl: "http://upload.oytour.com"
}; };
return obj; return obj;
}, },
Vue.prototype.yinyanFn = function(url, successCall, faildCall) { Vue.prototype.yinyanFn = function (url, successCall, faildCall) {
this.$http.jsonp(url, ) this.$http.jsonp(url, )
.then(res => { .then(res => {
successCall(res) successCall(res)
}, faildCall) }, faildCall)
}, },
//消息成功提示 //消息成功提示
Vue.prototype.Success = function(msg) { Vue.prototype.Success = function (msg) {
this.$message({ this.$message({
message: msg, message: msg,
duration: 2000, duration: 2000,
...@@ -170,7 +172,7 @@ export default { ...@@ -170,7 +172,7 @@ export default {
}); });
}, },
//错误提示 //错误提示
Vue.prototype.Error = function(msg) { Vue.prototype.Error = function (msg) {
this.$message({ this.$message({
message: msg, message: msg,
duration: 2000, duration: 2000,
...@@ -179,7 +181,7 @@ export default { ...@@ -179,7 +181,7 @@ export default {
}, },
//一般提示 //一般提示
Vue.prototype.Info = function(msg) { Vue.prototype.Info = function (msg) {
this.$message({ this.$message({
message: msg, message: msg,
duration: 2000, duration: 2000,
...@@ -187,7 +189,7 @@ export default { ...@@ -187,7 +189,7 @@ export default {
}); });
}, },
//警告提示 //警告提示
Vue.prototype.Warning = function(msg) { Vue.prototype.Warning = function (msg) {
this.$message({ this.$message({
message: msg, message: msg,
duration: 2000, duration: 2000,
...@@ -195,7 +197,7 @@ export default { ...@@ -195,7 +197,7 @@ export default {
}); });
}, },
//Confirm //Confirm
Vue.prototype.Confirm = function(msg, callback) { Vue.prototype.Confirm = function (msg, callback) {
this.$confirm(msg, "提示", { this.$confirm(msg, "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
...@@ -212,22 +214,22 @@ export default { ...@@ -212,22 +214,22 @@ export default {
}, },
//打开新窗口连接 //打开新窗口连接
Vue.prototype.OpenNewUrl = function(URL) { Vue.prototype.OpenNewUrl = function (URL) {
if (URL != '') { if (URL != '') {
window.open('http://' + URL, '_blank'); window.open('http://' + URL, '_blank');
} }
} }
Vue.prototype.uploadImg = function(tcID, msg, successCall, faildCall) { Vue.prototype.uploadImg = function (tcID, msg, successCall, faildCall) {
var apiurl = this.domainManager().Upload + '/Upload/UploadBase64?fileType=1&fileLimit=5&&filePath=Freature/TCID' + tcID; var apiurl = this.domainManager().Upload + '/Upload/UploadBase64?fileType=1&fileLimit=5&&filePath=Freature/TCID' + tcID;
this.$http.post(apiurl, msg, { this.$http.post(apiurl, msg, {
datatype: "jsonP", datatype:"jsonP",
}).then(res => { }).then(res => {
successCall(res); successCall(res);
}, faildCall) }, faildCall)
} }
//HTTP提交数据 //HTTP提交数据
Vue.prototype.apipost = function(cmd, msg, successCall, faildCall) { Vue.prototype.apipost = function (cmd, msg, successCall, faildCall) {
if (msg == null || msg == "") { if (msg == null || msg == "") {
msg = {} msg = {}
} }
...@@ -280,7 +282,7 @@ export default { ...@@ -280,7 +282,7 @@ export default {
}, },
//下载文件 //下载文件
Vue.prototype.GetLocalFile = function(cmd, msg, fileName, successCall) { Vue.prototype.GetLocalFile = function (cmd, msg, fileName, successCall) {
var apiurl = this.domainManager().LocalFileStreamDownLoadUrl; var apiurl = this.domainManager().LocalFileStreamDownLoadUrl;
var timestamp = (new Date()).valueOf(); var timestamp = (new Date()).valueOf();
if (!localStorage.userInfo && localStorage.userInfo != "" && this.$route.path.toLowerCase() != "/login") { if (!localStorage.userInfo && localStorage.userInfo != "" && this.$route.path.toLowerCase() != "/login") {
...@@ -316,20 +318,20 @@ export default { ...@@ -316,20 +318,20 @@ export default {
document.body.appendChild(link); document.body.appendChild(link);
link.click(); link.click();
successCall(res); successCall(res);
}).catch(function(res) {}); }).catch(function (res) {});
}, },
Vue.prototype.getCookieItem = function() { Vue.prototype.getCookieItem = function () {
return JSON.parse(this.getCookie("userInfo")) return JSON.parse(this.getCookie("userInfo"))
}, },
Vue.prototype.getLocalStorage = function() { Vue.prototype.getLocalStorage = function () {
var localStorageData = window.localStorage["userInfo"]; var localStorageData = window.localStorage["userInfo"];
if (localStorageData !== undefined && localStorageData != 'undefined') { if (localStorageData !== undefined && localStorageData!='undefined') {
return JSON.parse(localStorageData); return JSON.parse(localStorageData);
} else { } else {
return null; return null;
} }
}, },
Vue.prototype.getCookie = function(cookieName) { Vue.prototype.getCookie = function (cookieName) {
var strCookie = document.cookie; var strCookie = document.cookie;
var arrCookie = strCookie.split("; "); var arrCookie = strCookie.split("; ");
for (var i = 0; i < arrCookie.length; i++) { for (var i = 0; i < arrCookie.length; i++) {
...@@ -340,19 +342,19 @@ export default { ...@@ -340,19 +342,19 @@ export default {
} }
return ""; return "";
}, },
Vue.prototype.getLoginUser = function() { Vue.prototype.getLoginUser = function () {
return this.loginUser return this.loginUser
}, },
Vue.prototype.setLoginUser = function(user) { Vue.prototype.setLoginUser = function (user) {
this.loginUser = user this.loginUser = user
} }
//PDF预览 //PDF预览
Vue.prototype.previewPDF = function(url) { Vue.prototype.previewPDF = function (url) {
window.open(this.domainManager().PDFViewUrl + url); window.open(this.domainManager().PDFViewUrl + url);
}, },
Vue.prototype.downloadFile = function(objectKey) { Vue.prototype.downloadFile = function (objectKey) {
var co = require('co'); var co = require('co');
var OSS = require('ali-oss'); var OSS = require('ali-oss');
var oss = new OSS({ var oss = new OSS({
...@@ -368,7 +370,7 @@ export default { ...@@ -368,7 +370,7 @@ export default {
link.click(); link.click();
}, },
Vue.prototype.downloadFileRename = function(objectKey, filename, fileurl) { Vue.prototype.downloadFileRename = function (objectKey, filename, fileurl) {
var co = require('co'); var co = require('co');
var OSS = require('ali-oss'); var OSS = require('ali-oss');
...@@ -380,7 +382,7 @@ export default { ...@@ -380,7 +382,7 @@ export default {
}) })
let url = ''; let url = '';
if (fileurl) if(fileurl)
url = fileurl url = fileurl
else else
url = oss.signatureUrl(objectKey); url = oss.signatureUrl(objectKey);
...@@ -412,7 +414,7 @@ export default { ...@@ -412,7 +414,7 @@ export default {
}); });
}, },
Vue.prototype.getFileBlob = function(objectKey, filename) { Vue.prototype.getFileBlob = function (objectKey, filename) {
var co = require('co'); var co = require('co');
var OSS = require('ali-oss'); var OSS = require('ali-oss');
var oss = new OSS({ var oss = new OSS({
...@@ -439,7 +441,7 @@ export default { ...@@ -439,7 +441,7 @@ export default {
//path 请按照"/模块名称/用户ID/自定义文件夹/" /谁搞错一次5块红包 //path 请按照"/模块名称/用户ID/自定义文件夹/" /谁搞错一次5块红包
//files 文件数组 //files 文件数组
//p 进度回调函数 //p 进度回调函数
Vue.prototype.uploadFile = function(path, files, successCall) { Vue.prototype.uploadFile = function (path, files, successCall) {
if (files && files.length > 0) { if (files && files.length > 0) {
let nameList = new Array() let nameList = new Array()
for (let index = 0; index < files.length; index++) { for (let index = 0; index < files.length; index++) {
...@@ -452,24 +454,24 @@ export default { ...@@ -452,24 +454,24 @@ export default {
bucket: 'reborndev' bucket: 'reborndev'
}) })
let that = this let that = this
co(function*() { co(function* () {
for (let index = 0; index < files.length; index++) { for (let index = 0; index < files.length; index++) {
let fileName = nameList[index] let fileName = nameList[index]
fileName = path + fileName + "." + files[index].name.split('.').pop() fileName = path + fileName + "." + files[index].name.split('.').pop()
var result = yield oss.multipartUpload(fileName, files[index], { var result = yield oss.multipartUpload(fileName, files[index], {
progress: function*(p) {}, progress: function* (p) {},
mime: 'application/octet-stream' mime: 'application/octet-stream'
}) })
successCall(result); successCall(result);
} }
}).catch(function(err) { }).catch(function (err) {
console.log(err); console.log(err);
}); });
} }
}, },
Vue.prototype.uploadBlob = function(path, files, successCall) { Vue.prototype.uploadBlob = function (path, files, successCall) {
if (files && files.length > 0) { if (files && files.length > 0) {
var oss = new OSS({ var oss = new OSS({
region: 'oss-cn-hangzhou', region: 'oss-cn-hangzhou',
...@@ -478,22 +480,22 @@ export default { ...@@ -478,22 +480,22 @@ export default {
bucket: 'reborndev' bucket: 'reborndev'
}) })
let that = this let that = this
co(function*() { co(function* () {
for (let index = 0; index < files.length; index++) { for (let index = 0; index < files.length; index++) {
var result = yield oss.multipartUpload(path, files[index], { var result = yield oss.multipartUpload(path, files[index], {
progress: function*(p) {}, progress: function* (p) {},
mime: 'application/octet-stream' mime: 'application/octet-stream'
}) })
successCall(result); successCall(result);
} }
}).catch(function(err) { }).catch(function (err) {
console.log(err); console.log(err);
}); });
} }
}, },
//验证只能输入2位小数【负数:isMinus传true】 //验证只能输入2位小数【负数:isMinus传true】
Vue.prototype.checkPrice = function(item, filed, isMinus) { Vue.prototype.checkPrice = function (item, filed, isMinus) {
var value = "" + item[filed]; //转字符串 var value = "" + item[filed]; //转字符串
var t = value.charAt(0); var t = value.charAt(0);
value = value.replace(/[^\d.]/g, ""); //清除“数字”和“.”以外的字符 value = value.replace(/[^\d.]/g, ""); //清除“数字”和“.”以外的字符
...@@ -511,7 +513,7 @@ export default { ...@@ -511,7 +513,7 @@ export default {
item[filed] = value; item[filed] = value;
} }
//验证输入6位小数汇率 //验证输入6位小数汇率
Vue.prototype.checkRate = function(item, filed) { Vue.prototype.checkRate = function (item, filed) {
var value = "" + item[filed]; //转字符串 var value = "" + item[filed]; //转字符串
var p1 = /[^\d\.]/g; // 过滤非数字及小数点 /g :所有范围中过滤 var p1 = /[^\d\.]/g; // 过滤非数字及小数点 /g :所有范围中过滤
var p2 = /(\.\d{6})\d*$/g; var p2 = /(\.\d{6})\d*$/g;
...@@ -526,7 +528,7 @@ export default { ...@@ -526,7 +528,7 @@ export default {
} }
//验证只能输入整数【负数:isMinus传true】 //验证只能输入整数【负数:isMinus传true】
Vue.prototype.checkInteger = function(item, filed, isMinus) { Vue.prototype.checkInteger = function (item, filed, isMinus) {
var value = "" + item[filed]; //转字符串 var value = "" + item[filed]; //转字符串
var t = value.charAt(0); var t = value.charAt(0);
value = value.replace(this.$commonUtils.Regex.isInteger, ""); value = value.replace(this.$commonUtils.Regex.isInteger, "");
...@@ -538,7 +540,7 @@ export default { ...@@ -538,7 +540,7 @@ export default {
} }
//价钱格式化,三位数逗号分隔,保留两位小数 duanjun //价钱格式化,三位数逗号分隔,保留两位小数 duanjun
Vue.prototype.moneyFormat = function(value) { Vue.prototype.moneyFormat = function (value) {
let nStr = Number(value).toFixed(2) let nStr = Number(value).toFixed(2)
nStr += ''; nStr += '';
let x = nStr.split('.'); let x = nStr.split('.');
...@@ -551,7 +553,7 @@ export default { ...@@ -551,7 +553,7 @@ export default {
return x1 + x2; return x1 + x2;
}, },
Vue.prototype.loadFileICON = function(suffix) { Vue.prototype.loadFileICON = function (suffix) {
let icons = [{ let icons = [{
"name": "\u7f51\u76d8BT\u79bb\u7ebf\u4e0b\u8f7d", "name": "\u7f51\u76d8BT\u79bb\u7ebf\u4e0b\u8f7d",
......
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