Skip to content

S
SuperMan
Commit ba0e0a4c authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents 003d5c58 dba87fa2
Hide whitespace changes
Inline Side-by-side
Showing with 2015 additions and 1328 deletions
src/components/DomesticTravelcontract.vue
View file @ ba0e0a4c
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/Hotel/roomReservationsDetails.vue
View file @ ba0e0a4c
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
{{lItem.UseTimeStr}} {{lItem.UseTimeStr}}
</td> </td>
<td style="width:280px;"> <td style="width:280px;">
<el-checkbox :checked="subItem.IsChecked" @change="MoreUpdate(subItem)">{{subItem.NewHotelName}}</el-checkbox> <el-checkbox v-model="subItem.IsChecked" @change="MoreUpdate(subItem)">{{subItem.NewHotelName}}</el-checkbox>
</td> </td>
</tr> </tr>
</template> </template>
...@@ -605,7 +605,6 @@ ...@@ -605,7 +605,6 @@
methods: { methods: {
MoreUpdate(subItem) MoreUpdate(subItem)
{ {
subItem.IsChecked=!subItem.IsChecked;
this.IsMoreUpdate=1; this.IsMoreUpdate=1;
}, },
//付款方式切换 //付款方式切换
...@@ -764,6 +763,7 @@ ...@@ -764,6 +763,7 @@
subItem.ContractUrl=fileUrl; subItem.ContractUrl=fileUrl;
} }
subItem.IsChecked=false; subItem.IsChecked=false;
this.$forceUpdate();
}); });
}); });
this.isShowPiliangPop=false; this.isShowPiliangPop=false;
...@@ -772,6 +772,11 @@ ...@@ -772,6 +772,11 @@
{ {
this.list[this.checkedIndex].HotelOrderList[this.checkedsubIndex].ContractUrl = fileUrl; this.list[this.checkedIndex].HotelOrderList[this.checkedsubIndex].ContractUrl = fileUrl;
} }
// this.list.forEach((sItem,sIndex)=>{
// sItem.HotelOrderList.forEach((subItem,subIndex)=>{
// subItem.IsChecked=false;
// });
// });
this.IsMoreUpdate=0; this.IsMoreUpdate=0;
this.$forceUpdate() this.$forceUpdate()
}) })
......
src/components/SalesModule/planeTicketInquiry.vue
View file @ ba0e0a4c
...@@ -1414,7 +1414,7 @@ ...@@ -1414,7 +1414,7 @@
<li> <li>
<span> <span>
<em>{{$t('hotel.hotel_SerialNumber')}}</em> <em>{{$t('hotel.hotel_SerialNumber')}}</em>
<el-input v-model="msg.ID" :placeholder="$t('fnc.jpbianhao')"></el-input> <el-input v-model="msg.ID" :placeholder="$t('fnc.jpbianhao')" @keyup.native="checkInteger(msg,'ID')" maxlength="8" ></el-input>
</span> </span>
</li> </li>
<li> <li>
...@@ -2251,11 +2251,18 @@ ...@@ -2251,11 +2251,18 @@
}, },
getList() { getList() {
this.loading = true; this.loading = true;
if(this.msg.ID=="")
{
this.msg.ID=0;
}
this.apipost( this.apipost(
"AirTicket_get_GetERPAirTicketPageList", "AirTicket_get_GetERPAirTicketPageList",
this.msg, this.msg,
res => { res => {
this.loading = false; this.loading = false;
if(this.msg.ID==0) {
this.msg.ID="";
}
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.total = res.data.data.count; this.total = res.data.data.count;
this.dataList = res.data.data.pageData; this.dataList = res.data.data.pageData;
......
src/components/ShoppingStore/ShoppingReimbursementDetails.vue
View file @ ba0e0a4c
...@@ -57,11 +57,11 @@ ...@@ -57,11 +57,11 @@
<!--EnterTime 进店时间--> <!--EnterTime 进店时间-->
</td> </td>
<td class="more_td"> <td class="more_td">
<el-input type="number" v-model="subItem.EnterNum" maxlength="3"></el-input> <el-input type="number" v-model="subItem.EnterNum" maxlength="3" @keyup.native="checkInteger(subItem,'EnterNum')" ></el-input>
<!--EnterNum 进店人数--> <!--EnterNum 进店人数-->
</td> </td>
<td class="more_td _height_45"> <td class="more_td _height_45">
<el-input type="number" v-model="subItem.TotalMoney"></el-input> <el-input type="number" v-model="subItem.TotalMoney" @keyup.native="checkPrice(subItem,'TotalMoney')"></el-input>
<!--TotalMoney 总金额【公司】--> <!--TotalMoney 总金额【公司】-->
</td> </td>
<td class="more_td" v-if="subIndex==0" :rowspan="item.ShopDetailsList.length"> <td class="more_td" v-if="subIndex==0" :rowspan="item.ShopDetailsList.length">
......
src/components/administrative/ContractManage.vue
View file @ ba0e0a4c
...@@ -79,19 +79,19 @@ ...@@ -79,19 +79,19 @@
<li> <li>
<input <input
type="button" type="button"
@click="goContract('onedayTripContract')" @click="goContract('onedayTripContract',0,'一日游合同')"
class="normalBtn" class="normalBtn"
value="一日游合同" value="一日游合同"
/> />
<input <input
type="button" type="button"
@click="goContract('DomesticTravelcontract')" @click="goContract('DomesticTravelcontract',0,'境内旅游合同')"
class="normalBtn" class="normalBtn"
value="境内旅游合同" value="境内旅游合同"
/> />
<input <input
type="button" type="button"
@click="goContract('SingleContract')" @click="goContract('SingleContract',0,'单项委托合同')"
class="normalBtn" class="normalBtn"
value="单项委托合同" value="单项委托合同"
/> />
...@@ -108,6 +108,7 @@ ...@@ -108,6 +108,7 @@
<tr> <tr>
<th width="80">编号</th> <th width="80">编号</th>
<th width="120">合同编号</th> <th width="120">合同编号</th>
<th width="120">合同类型</th>
<th width="150">客户名称</th> <th width="150">客户名称</th>
<th width="150">客户联系电话</th> <th width="150">客户联系电话</th>
<th width="150">客户地址</th> <th width="150">客户地址</th>
...@@ -119,6 +120,14 @@ ...@@ -119,6 +120,14 @@
<tr v-for="(item, index) in dataList" :key="index"> <tr v-for="(item, index) in dataList" :key="index">
<td>{{ item.ID }}</td> <td>{{ item.ID }}</td>
<td>{{ item.T_ContractNum }}</td> <td>{{ item.T_ContractNum }}</td>
<td>
<template v-if="item.CType == 2">
境内旅游合同
</template>
<template v-else-if="item.CType == 3">
一日游合同
</template>
</td>
<td>{{ item.Tourists_Name }}</td> <td>{{ item.Tourists_Name }}</td>
<td>{{ item.Tourists_Tel }}</td> <td>{{ item.Tourists_Tel }}</td>
<td>{{ item.Tourists_Addres }}</td> <td>{{ item.Tourists_Addres }}</td>
...@@ -132,12 +141,22 @@ ...@@ -132,12 +141,22 @@
content="修改" content="修改"
placement="top-start" placement="top-start"
> >
<el-button <template v-if="item.CType == 3">
type="primary" <el-button
icon="el-icon-edit" type="primary"
circle icon="el-icon-edit"
@click="goContract('onedayTripContract', item.ID)" circle
></el-button> @click="goContract('onedayTripContract', item.ID,'一日游合同')"
></el-button>
</template>
<template v-else-if="item.CType == 2">
<el-button
type="primary"
icon="el-icon-edit"
circle
@click="goContract('DomesticTravelcontract', item.ID,'境内旅游合同')"
></el-button>
</template>
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip
class="item" class="item"
...@@ -257,7 +276,7 @@ export default { ...@@ -257,7 +276,7 @@ export default {
this.msg.pageIndex = val; this.msg.pageIndex = val;
this.getList(); this.getList();
}, },
goContract(path, Id) { goContract(path, Id,title) {
var nId = 0; var nId = 0;
if (Id && Id > 0) { if (Id && Id > 0) {
nId = Id; nId = Id;
...@@ -267,7 +286,7 @@ export default { ...@@ -267,7 +286,7 @@ export default {
query: { query: {
id: nId, id: nId,
blank: "y", blank: "y",
tab: "一日游合同" tab: title
} }
}); });
} }
......
src/components/newTravelmanager/TravelGroupControl/TravelTemp/VToolBar.vue
View file @ ba0e0a4c
...@@ -12,6 +12,9 @@ ...@@ -12,6 +12,9 @@
<div v-if="isXuan === true"> <div v-if="isXuan === true">
<i :class="'iconfont ' + icon.xuan" @click="toXuan"></i> <i :class="'iconfont ' + icon.xuan" @click="toXuan"></i>
</div> </div>
<div v-if="isAdd === true" style="display:none;">
<i :class="'' + icon.add" @click="toAdd"></i>
</div>
<div v-if="isDelete === true"> <div v-if="isDelete === true">
<i :class="'iconfont ' + icon.delete" @click="toDelete"></i> <i :class="'iconfont ' + icon.delete" @click="toDelete"></i>
</div> </div>
...@@ -75,6 +78,11 @@ ...@@ -75,6 +78,11 @@
type: Boolean, type: Boolean,
default: true default: true
}, },
//是否显示添加
isAdd: {
type: Boolean,
default: true
},
// 是否显示删除 // 是否显示删除
isDelete: { isDelete: {
type: Boolean, type: Boolean,
...@@ -100,7 +108,8 @@ ...@@ -100,7 +108,8 @@
rightZ: 'icon-right', rightZ: 'icon-right',
bottomY: 'icon-arrowdown', bottomY: 'icon-arrowdown',
bottomZ: 'icon-zhidi', bottomZ: 'icon-zhidi',
reset: 'icon-zhongzhi' reset: 'icon-zhongzhi',
add: 'el-icon-plus'
} }
} }
}, },
...@@ -158,6 +167,11 @@ ...@@ -158,6 +167,11 @@
}, },
toReset: function () { toReset: function () {
this.$emit('toReset', this.name, this.index1, this.index2) this.$emit('toReset', this.name, this.index1, this.index2)
},
//添加
toAdd:function()
{
this.$emit('toAdd', this.name, this.index1, this.index2)
} }
} }
} }
......
src/components/newTravelmanager/TravelGroupControl/TravelTemp/travelFeature3.vue
View file @ ba0e0a4c
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<vToolBar :isHorizontal="false" :isHuan="false" :isXuan="false" name="hotel" :type="1" :index1="item*2" <vToolBar :isHorizontal="false" :isHuan="false" :isXuan="false" name="hotel" :type="1" :index1="item*2"
:index2="0" :length1="hotelObj.list.length" :length2="hotelObj.list[item*2].images.length" :index2="0" :length1="hotelObj.list.length" :length2="hotelObj.list[item*2].images.length"
@toPreY="bolckToPreY" @toNextY="bolckToNextY" @toPreZ="bolckToPreZ" @toNextZ="bolckToNextZ" @toPreY="bolckToPreY" @toNextY="bolckToNextY" @toPreZ="bolckToPreZ" @toNextZ="bolckToNextZ"
@toDelete="bolckToDelete"> @toDelete="bolckToDelete" @toAdd="blockToAdd">
</vToolBar> </vToolBar>
</div> </div>
<div class="hotel_1_info_1_img"> <div class="hotel_1_info_1_img">
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<vToolBar :isHorizontal="true" name="hotel" :type="2" :index1="item*2" :index2="0" <vToolBar :isHorizontal="true" name="hotel" :type="2" :index1="item*2" :index2="0"
:length1="hotelObj.list.length" :length2="hotelObj.list[item*2].images.length" @toPreY="imgToPreY" :length1="hotelObj.list.length" :length2="hotelObj.list[item*2].images.length" @toPreY="imgToPreY"
@toNextY="imgToNextY" @toPreZ="imgToPreZ" @toNextZ="imgToNextZ" @toHuan="imgToHuan" @toNextY="imgToNextY" @toPreZ="imgToPreZ" @toNextZ="imgToNextZ" @toHuan="imgToHuan"
@toXuan="imgToXuan" @toDelete="imgToDelete" @toReset="resetXY" :isReset='true'> @toXuan="imgToXuan" @toDelete="imgToDelete" @toReset="resetXY" :isReset='true' :isAdd="false">
</vToolBar> </vToolBar>
<input type="file" style="display:none" :id='"hotelfile_"+(item*2)+"_0"' @change="uploadpic"> <input type="file" style="display:none" :id='"hotelfile_"+(item*2)+"_0"' @change="uploadpic">
</div> </div>
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<vToolBar :isHorizontal="true" name="hotel" :type="2" :index1="item*2" :index2="1" <vToolBar :isHorizontal="true" name="hotel" :type="2" :index1="item*2" :index2="1"
:length1="hotelObj.list.length" :length2="hotelObj.list[item*2].images.length" @toPreY="imgToPreY" :length1="hotelObj.list.length" :length2="hotelObj.list[item*2].images.length" @toPreY="imgToPreY"
@toNextY="imgToNextY" @toPreZ="imgToPreZ" @toNextZ="imgToNextZ" @toHuan="imgToHuan" @toNextY="imgToNextY" @toPreZ="imgToPreZ" @toNextZ="imgToNextZ" @toHuan="imgToHuan"
@toXuan="imgToXuan" @toDelete="imgToDelete"> @toXuan="imgToXuan" @toDelete="imgToDelete" >
</vToolBar> </vToolBar>
<input type="file" style="display:none" :id='"hotelfile_"+(item*2)+"_1"' @change="uploadpic"> <input type="file" style="display:none" :id='"hotelfile_"+(item*2)+"_1"' @change="uploadpic">
</div> </div>
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
<vToolBar :isHorizontal="false" :isHuan="false" :isXuan="false" name="hotel" :type="1" :index1="item*2+1" <vToolBar :isHorizontal="false" :isHuan="false" :isXuan="false" name="hotel" :type="1" :index1="item*2+1"
:index2="0" :length1="hotelObj.list.length" :length2="hotelObj.list[item*2+1].images.length" :index2="0" :length1="hotelObj.list.length" :length2="hotelObj.list[item*2+1].images.length"
@toPreY="bolckToPreY" @toNextY="bolckToNextY" @toPreZ="bolckToPreZ" @toNextZ="bolckToNextZ" @toPreY="bolckToPreY" @toNextY="bolckToNextY" @toPreZ="bolckToPreZ" @toNextZ="bolckToNextZ"
@toDelete="bolckToDelete"> @toDelete="bolckToDelete" @toAdd="blockToAdd">
</vToolBar> </vToolBar>
</div> </div>
<div class="hotel_1_info_2_top"> <div class="hotel_1_info_2_top">
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
<vToolBar :isHorizontal="false" :isHuan="false" :isXuan="false" name="hotel" :type="1" :index1="item*2" <vToolBar :isHorizontal="false" :isHuan="false" :isXuan="false" name="hotel" :type="1" :index1="item*2"
:index2="0" :length1="hotelObj.list.length" :length2="hotelObj.list[item*2].images.length" :index2="0" :length1="hotelObj.list.length" :length2="hotelObj.list[item*2].images.length"
@toPreY="bolckToPreY" @toNextY="bolckToNextY" @toPreZ="bolckToPreZ" @toNextZ="bolckToNextZ" @toPreY="bolckToPreY" @toNextY="bolckToNextY" @toPreZ="bolckToPreZ" @toNextZ="bolckToNextZ"
@toDelete="bolckToDelete"> @toDelete="bolckToDelete" @toAdd="blockToAdd">
</vToolBar> </vToolBar>
</div> </div>
<img class="hotel_2_info_1_bg" <img class="hotel_2_info_1_bg"
...@@ -238,7 +238,7 @@ ...@@ -238,7 +238,7 @@
<vToolBar :isHorizontal="false" :isHuan="false" :isXuan="false" name="hotel" :type="1" :index1="item*2+1" <vToolBar :isHorizontal="false" :isHuan="false" :isXuan="false" name="hotel" :type="1" :index1="item*2+1"
:index2="0" :length1="hotelObj.list.length" :length2="hotelObj.list[item*2+1].images.length" :index2="0" :length1="hotelObj.list.length" :length2="hotelObj.list[item*2+1].images.length"
@toPreY="bolckToPreY" @toNextY="bolckToNextY" @toPreZ="bolckToPreZ" @toNextZ="bolckToNextZ" @toPreY="bolckToPreY" @toNextY="bolckToNextY" @toPreZ="bolckToPreZ" @toNextZ="bolckToNextZ"
@toDelete="bolckToDelete"> @toDelete="bolckToDelete" @toAdd="blockToAdd">
</vToolBar> </vToolBar>
</div> </div>
<div class="hotel_2_info_2_top"> <div class="hotel_2_info_2_top">
...@@ -365,7 +365,7 @@ ...@@ -365,7 +365,7 @@
<vToolBar :isHorizontal="false" :isHuan="false" :isXuan="false" name="viewSpot" :type="1" :index1="item*4" <vToolBar :isHorizontal="false" :isHuan="false" :isXuan="false" name="viewSpot" :type="1" :index1="item*4"
:index2="0" :length1="viewSpotObj.list.length" :length2="viewSpotObj.list[item*4].images.length" :index2="0" :length1="viewSpotObj.list.length" :length2="viewSpotObj.list[item*4].images.length"
@toPreY="bolckToPreY" @toNextY="bolckToNextY" @toPreZ="bolckToPreZ" @toNextZ="bolckToNextZ" @toPreY="bolckToPreY" @toNextY="bolckToNextY" @toPreZ="bolckToPreZ" @toNextZ="bolckToNextZ"
@toDelete="bolckToDelete"> @toDelete="bolckToDelete" @toAdd="blockToAdd">
</vToolBar> </vToolBar>
</div> </div>
<div class="viewSpot_1_info_1_img1"> <div class="viewSpot_1_info_1_img1">
...@@ -373,7 +373,7 @@ ...@@ -373,7 +373,7 @@
<vToolBar :isHorizontal="true" name="viewSpot" :type="2" :index1="item*4" :index2="0" <vToolBar :isHorizontal="true" name="viewSpot" :type="2" :index1="item*4" :index2="0"
:length1="viewSpotObj.list.length" :length2="viewSpotObj.list[item*4].images.length" @toPreY="imgToPreY" :length1="viewSpotObj.list.length" :length2="viewSpotObj.list[item*4].images.length" @toPreY="imgToPreY"
@toNextY="imgToNextY" @toPreZ="imgToPreZ" @toNextZ="imgToNextZ" @toHuan="imgToHuan" @toXuan="imgToXuan" @toNextY="imgToNextY" @toPreZ="imgToPreZ" @toNextZ="imgToNextZ" @toHuan="imgToHuan" @toXuan="imgToXuan"
@toDelete="imgToDelete" @toReset="resetXY" :isReset='true'> @toDelete="imgToDelete" @toReset="resetXY" :isReset='true' :isAdd="false">
</vToolBar> </vToolBar>
<input type="file" style="display:none" :id='"viewSpotfile_"+(item*4)+"_0"' @change="uploadpic"> <input type="file" style="display:none" :id='"viewSpotfile_"+(item*4)+"_0"' @change="uploadpic">
</div> </div>
...@@ -408,7 +408,7 @@ ...@@ -408,7 +408,7 @@
<vToolBar :isHorizontal="false" :isHuan="false" :isXuan="false" name="viewSpot" :type="1" :index1="item*4+1" <vToolBar :isHorizontal="false" :isHuan="false" :isXuan="false" name="viewSpot" :type="1" :index1="item*4+1"
:index2="0" :length1="viewSpotObj.list.length" :length2="viewSpotObj.list[item*4+1].images.length" :index2="0" :length1="viewSpotObj.list.length" :length2="viewSpotObj.list[item*4+1].images.length"
@toPreY="bolckToPreY" @toNextY="bolckToNextY" @toPreZ="bolckToPreZ" @toNextZ="bolckToNextZ" @toPreY="bolckToPreY" @toNextY="bolckToNextY" @toPreZ="bolckToPreZ" @toNextZ="bolckToNextZ"
@toDelete="bolckToDelete"> @toDelete="bolckToDelete" @toAdd="blockToAdd">
</vToolBar> </vToolBar>
</div> </div>
<div class="viewSpot_1_info_2_bottom"> <div class="viewSpot_1_info_2_bottom">
...@@ -444,7 +444,6 @@ ...@@ -444,7 +444,6 @@
</div> </div>
<div class="travel_noImg dragDiv" :id='"viewSpotBox_"+(item*4+1)+"_1"'> <div class="travel_noImg dragDiv" :id='"viewSpotBox_"+(item*4+1)+"_1"'>
<div class="triangle_border_rb_c"></div> <div class="triangle_border_rb_c"></div>
<!-- viewSpotObj.list[item*4+1].images[1].y -->
<VueDraggableResizable v-if="viewSpotObj.list[item*4+1].images[1]" <VueDraggableResizable v-if="viewSpotObj.list[item*4+1].images[1]"
:ref='"viewSpotVds_"+(item*4+1)+"_1"' tabindex="0" :resizable='false' :active="false" :ref='"viewSpotVds_"+(item*4+1)+"_1"' tabindex="0" :resizable='false' :active="false"
:parent="false" axis='x' @activated="onActivated(item*4+1,1)" :parent="false" axis='x' @activated="onActivated(item*4+1,1)"
...@@ -480,7 +479,7 @@ ...@@ -480,7 +479,7 @@
<vToolBar :isHorizontal="false" :isHuan="false" :isXuan="false" name="viewSpot" :type="1" :index1="item*4-2" <vToolBar :isHorizontal="false" :isHuan="false" :isXuan="false" name="viewSpot" :type="1" :index1="item*4-2"
:index2="0" :length1="viewSpotObj.list.length" :length2="viewSpotObj.list[item*4-2].images.length" :index2="0" :length1="viewSpotObj.list.length" :length2="viewSpotObj.list[item*4-2].images.length"
@toPreY="bolckToPreY" @toNextY="bolckToNextY" @toPreZ="bolckToPreZ" @toNextZ="bolckToNextZ" @toPreY="bolckToPreY" @toNextY="bolckToNextY" @toPreZ="bolckToPreZ" @toNextZ="bolckToNextZ"
@toDelete="bolckToDelete"> @toDelete="bolckToDelete" @toAdd="blockToAdd">
</vToolBar> </vToolBar>
</div> </div>
<div class="viewSpot_2_info_1_info"> <div class="viewSpot_2_info_1_info">
...@@ -503,7 +502,7 @@ ...@@ -503,7 +502,7 @@
<vToolBar :isHorizontal="true" name="viewSpot" :type="2" :index1="item*4-2" :index2="0" <vToolBar :isHorizontal="true" name="viewSpot" :type="2" :index1="item*4-2" :index2="0"
:length1="viewSpotObj.list.length" :length2="viewSpotObj.list[item*4-2].images.length" :length1="viewSpotObj.list.length" :length2="viewSpotObj.list[item*4-2].images.length"
@toPreY="imgToPreY" @toNextY="imgToNextY" @toPreZ="imgToPreZ" @toNextZ="imgToNextZ" @toPreY="imgToPreY" @toNextY="imgToNextY" @toPreZ="imgToPreZ" @toNextZ="imgToNextZ"
@toHuan="imgToHuan" @toXuan="imgToXuan" @toDelete="imgToDelete" @toReset="resetXY" :isReset='true'> @toHuan="imgToHuan" @toXuan="imgToXuan" @toDelete="imgToDelete" @toReset="resetXY" :isReset='true' :isAdd="false">
</vToolBar> </vToolBar>
<input type="file" style="display:none" :id='"viewSpotfile_"+(item*4-2)+"_0"' @change="uploadpic"> <input type="file" style="display:none" :id='"viewSpotfile_"+(item*4-2)+"_0"' @change="uploadpic">
</div> </div>
...@@ -585,7 +584,7 @@ ...@@ -585,7 +584,7 @@
<vToolBar :isHorizontal="false" :isHuan="false" :isXuan="false" name="viewSpot" :type="1" <vToolBar :isHorizontal="false" :isHuan="false" :isXuan="false" name="viewSpot" :type="1"
:index1="item*4-1" :index2="0" :length1="viewSpotObj.list.length" :index1="item*4-1" :index2="0" :length1="viewSpotObj.list.length"
:length2="viewSpotObj.list[item*4-1].images.length" @toPreY="bolckToPreY" @toNextY="bolckToNextY" :length2="viewSpotObj.list[item*4-1].images.length" @toPreY="bolckToPreY" @toNextY="bolckToNextY"
@toPreZ="bolckToPreZ" @toNextZ="bolckToNextZ" @toDelete="bolckToDelete"> @toPreZ="bolckToPreZ" @toNextZ="bolckToNextZ" @toDelete="bolckToDelete" @toAdd="blockToAdd">
</vToolBar> </vToolBar>
</div> </div>
<div class="travel_toolbar" v-if="canEdit===true"> <div class="travel_toolbar" v-if="canEdit===true">
...@@ -612,7 +611,7 @@ ...@@ -612,7 +611,7 @@
<vToolBar :isHorizontal="false" :isHuan="false" :isXuan="false" name="viewSpot" :type="1" <vToolBar :isHorizontal="false" :isHuan="false" :isXuan="false" name="viewSpot" :type="1"
:index1="item*4" :index2="0" :length1="viewSpotObj.list.length" :index1="item*4" :index2="0" :length1="viewSpotObj.list.length"
:length2="viewSpotObj.list[item*4].images.length" @toPreY="bolckToPreY" @toNextY="bolckToNextY" :length2="viewSpotObj.list[item*4].images.length" @toPreY="bolckToPreY" @toNextY="bolckToNextY"
@toPreZ="bolckToPreZ" @toNextZ="bolckToNextZ" @toDelete="bolckToDelete"> @toPreZ="bolckToPreZ" @toNextZ="bolckToNextZ" @toDelete="bolckToDelete" @toAdd="blockToAdd">
</vToolBar> </vToolBar>
</div> </div>
<div class="travel_toolbar" v-if="canEdit===true"> <div class="travel_toolbar" v-if="canEdit===true">
...@@ -639,7 +638,7 @@ ...@@ -639,7 +638,7 @@
<vToolBar :isHorizontal="false" :isHuan="false" :isXuan="false" name="viewSpot" :type="1" <vToolBar :isHorizontal="false" :isHuan="false" :isXuan="false" name="viewSpot" :type="1"
:index1="item*4+1" :index2="0" :length1="viewSpotObj.list.length" :index1="item*4+1" :index2="0" :length1="viewSpotObj.list.length"
:length2="viewSpotObj.list[item*4+1].images.length" @toPreY="bolckToPreY" @toNextY="bolckToNextY" :length2="viewSpotObj.list[item*4+1].images.length" @toPreY="bolckToPreY" @toNextY="bolckToNextY"
@toPreZ="bolckToPreZ" @toNextZ="bolckToNextZ" @toDelete="bolckToDelete"> @toPreZ="bolckToPreZ" @toNextZ="bolckToNextZ" @toDelete="bolckToDelete" @toAdd="blockToAdd">
</vToolBar> </vToolBar>
</div> </div>
<div class="travel_toolbar" v-if="canEdit===true"> <div class="travel_toolbar" v-if="canEdit===true">
...@@ -698,7 +697,7 @@ ...@@ -698,7 +697,7 @@
<vToolBar :isHorizontal="false" :isHuan="false" :isXuan="false" name="restaurant" :type="1" :index1="item*2" <vToolBar :isHorizontal="false" :isHuan="false" :isXuan="false" name="restaurant" :type="1" :index1="item*2"
:index2="0" :length1="restaurantObj.list.length" :length2="restaurantObj.list[item*2].images.length" :index2="0" :length1="restaurantObj.list.length" :length2="restaurantObj.list[item*2].images.length"
@toPreY="bolckToPreY" @toNextY="bolckToNextY" @toPreZ="bolckToPreZ" @toNextZ="bolckToNextZ" @toPreY="bolckToPreY" @toNextY="bolckToNextY" @toPreZ="bolckToPreZ" @toNextZ="bolckToNextZ"
@toDelete="bolckToDelete"> @toDelete="bolckToDelete" @toAdd="blockToAdd">
</vToolBar> </vToolBar>
</div> </div>
<div class="restaurant_1_info_1_img1"> <div class="restaurant_1_info_1_img1">
...@@ -706,7 +705,7 @@ ...@@ -706,7 +705,7 @@
<vToolBar :isHorizontal="true" name="restaurant" :type="2" :index1="item*2" :index2="0" <vToolBar :isHorizontal="true" name="restaurant" :type="2" :index1="item*2" :index2="0"
:length1="restaurantObj.list.length" :length2="restaurantObj.list[item*2].images.length" :length1="restaurantObj.list.length" :length2="restaurantObj.list[item*2].images.length"
@toPreY="imgToPreY" @toNextY="imgToNextY" @toPreZ="imgToPreZ" @toNextZ="imgToNextZ" @toHuan="imgToHuan" @toPreY="imgToPreY" @toNextY="imgToNextY" @toPreZ="imgToPreZ" @toNextZ="imgToNextZ" @toHuan="imgToHuan"
@toXuan="imgToXuan" @toDelete="imgToDelete" @toReset="resetXY" :isReset='true'> @toXuan="imgToXuan" @toDelete="imgToDelete" @toReset="resetXY" :isReset='true' :isAdd="false">
</vToolBar> </vToolBar>
<input type="file" style="display:none" :id='"restaurantfile_"+(item*2)+"_0"' @change="uploadpic"> <input type="file" style="display:none" :id='"restaurantfile_"+(item*2)+"_0"' @change="uploadpic">
</div> </div>
...@@ -741,7 +740,7 @@ ...@@ -741,7 +740,7 @@
<vToolBar :isHorizontal="false" :isHuan="false" :isXuan="false" name="restaurant" :type="1" <vToolBar :isHorizontal="false" :isHuan="false" :isXuan="false" name="restaurant" :type="1"
:index1="item*2+1" :index2="0" :length1="restaurantObj.list.length" :index1="item*2+1" :index2="0" :length1="restaurantObj.list.length"
:length2="restaurantObj.list[item*2+1].images.length" @toPreY="bolckToPreY" @toNextY="bolckToNextY" :length2="restaurantObj.list[item*2+1].images.length" @toPreY="bolckToPreY" @toNextY="bolckToNextY"
@toPreZ="bolckToPreZ" @toNextZ="bolckToNextZ" @toDelete="bolckToDelete"> @toPreZ="bolckToPreZ" @toNextZ="bolckToNextZ" @toDelete="bolckToDelete" @toAdd="blockToAdd">
</vToolBar> </vToolBar>
</div> </div>
<div class="restaurant_1_info_2_left"> <div class="restaurant_1_info_2_left">
...@@ -1635,6 +1634,38 @@ ...@@ -1635,6 +1634,38 @@
blockList.splice(index1, 1); blockList.splice(index1, 1);
this.pageCount(name) this.pageCount(name)
}, },
//添加酒店、门票、餐厅
blockToAdd:function(name, index1, index2)
{
var addObj={
Ename:"",
MD5Sign:"",
description:"酒店描述信息",
images:[],
name:"酒店名称",
type:"Hotel"
};
if (name === 'hotel') {
if(this.hotelObj&&this.hotelObj.list){
this.hotelObj.list.push(addObj);
}
} else if (name === 'viewSpot') {
addObj.description="景点描述";
addObj.name="景点名称";
addObj.type="Scenic";
if(this.viewSpotObj&&this.viewSpotObj.list){
this.viewSpotObj.list.push(addObj);
}
} else if (name === 'restaurant') {
addObj.description="餐厅描述";
addObj.name="餐厅名称";
addObj.type="Dinner";
if(this.restaurantObj&&this.restaurantObj.list){
this.restaurantObj.list.push(addObj);
}
}
this.pageCount(name)
},
//判断是否切换 //判断是否切换
getIsRefresh() getIsRefresh()
{ {
......
src/components/onedayTripContract.vue
View file @ ba0e0a4c
...@@ -1628,7 +1628,6 @@ export default { ...@@ -1628,7 +1628,6 @@ export default {
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
var tempObj = res.data.data; var tempObj = res.data.data;
console.log(tempObj,'tempobj');
this.CtObj.ID = tempObj.ID; this.CtObj.ID = tempObj.ID;
this.CtObj.CType = tempObj.CType; this.CtObj.CType = tempObj.CType;
this.CtObj.T_ContractNum = tempObj.T_ContractNum; this.CtObj.T_ContractNum = tempObj.T_ContractNum;
...@@ -1766,7 +1765,6 @@ export default { ...@@ -1766,7 +1765,6 @@ export default {
gItem.IsShow = 0; gItem.IsShow = 0;
}); });
} }
console.log(this.CtObj.ContractGuestList,'this.CtObj.ContractGuestList');
if ( if (
tempObj.ContractTripList && tempObj.ContractTripList &&
tempObj.ContractTripList != null && tempObj.ContractTripList != null &&
......
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