Commit 24e762ff authored by 黄奎's avatar 黄奎

销售开团样式修改

parent 01e76c09
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<span class="TDTextspan">{{$t('sm.jhcfchengshi')}}</span> <span class="TDTextspan">{{$t('sm.jhcfchengshi')}}</span>
<span> <span>
<el-form-item prop="StartCityId"> <el-form-item prop="StartCityId">
<el-select :disabled="isOpenGroup" class='w200' :placeholder="$t('pub.pleaseSel')" v-model="subConfig.StartCityId" <el-select :disabled="isOpenGroup" class='w120' :placeholder="$t('pub.pleaseSel')" v-model="subConfig.StartCityId"
filterable> filterable>
<el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
<el-option v-for="item in StartCity" :label='item.startCityName' :value='item.ID' :key='item.ID'> <el-option v-for="item in StartCity" :label='item.startCityName' :value='item.ID' :key='item.ID'>
...@@ -37,10 +37,10 @@ ...@@ -37,10 +37,10 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</span> </span>
<span class="TDTextspan">{{$t('sm.jhcfchengshi')}}返回抵达城市</span> <span class="TDTextspan">返回抵达城市</span>
<span> <span>
<el-form-item prop="ReturnArriveCityId"> <el-form-item prop="ReturnArriveCityId">
<el-select :disabled="isOpenGroup" class='w200' :placeholder="$t('pub.pleaseSel')" v-model="subConfig.ReturnArriveCityId" <el-select :disabled="isOpenGroup" class='w120' :placeholder="$t('pub.pleaseSel')" v-model="subConfig.ReturnArriveCityId"
filterable> filterable>
<el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
<el-option v-for="item in StartCity" :label='item.startCityName' :value='item.ID' :key='item.ID'> <el-option v-for="item in StartCity" :label='item.startCityName' :value='item.ID' :key='item.ID'>
......
...@@ -9,10 +9,12 @@ ...@@ -9,10 +9,12 @@
<el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')" placement="top-start"> <el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')" placement="top-start">
<i class="iconfont icon-chakan" @click="isShowEdit=!isShowEdit"></i> <i class="iconfont icon-chakan" @click="isShowEdit=!isShowEdit"></i>
</el-tooltip> </el-tooltip>
<el-tooltip v-if="!isOpenGroup" class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start"> <el-tooltip v-if="!isOpenGroup" class="item" effect="dark" :content="$t('system.table_delete')"
placement="top-start">
<i class="iconfont icon-xingzhuang" @click="removeDinnerTrip(subItemObj.childItem.DayNum,subIndex)"></i> <i class="iconfont icon-xingzhuang" @click="removeDinnerTrip(subItemObj.childItem.DayNum,subIndex)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('sm.shangyi')" placement="top-start" v-if="subIndex!=0&&!isOpenGroup"> <el-tooltip class="item" effect="dark" :content="$t('sm.shangyi')" placement="top-start"
v-if="subIndex!=0&&!isOpenGroup">
<i class="iconfont icon-shangyi" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,0)"></i> <i class="iconfont icon-shangyi" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,0)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start" <el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start"
...@@ -47,7 +49,8 @@ ...@@ -47,7 +49,8 @@
<el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.UseTimeHour" <el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.UseTimeHour"
@keyup.native="checkInteger(subItemObj.childItem,'UseTimeHour')"></el-input>&nbsp;&nbsp;{{$t('sm.hour')}} @keyup.native="checkInteger(subItemObj.childItem,'UseTimeHour')"></el-input>&nbsp;&nbsp;{{$t('sm.hour')}}
<el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.UseTimeMinutes" <el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.UseTimeMinutes"
@keyup.native="checkInteger(subItemObj.childItem,'UseTimeMinutes')"></el-input>&nbsp;&nbsp;{{$t('sm.Minute')}} @keyup.native="checkInteger(subItemObj.childItem,'UseTimeMinutes')"></el-input>
&nbsp;&nbsp;{{$t('sm.Minute')}}
</div> </div>
</div> </div>
</div> </div>
...@@ -92,10 +95,12 @@ ...@@ -92,10 +95,12 @@
<el-tooltip class="item" effect="dark" :content="$t('pub.edit')" placement="top-start"> <el-tooltip class="item" effect="dark" :content="$t('pub.edit')" placement="top-start">
<i class="iconfont icon-bianji" @click="isShowEdit=!isShowEdit"></i> <i class="iconfont icon-bianji" @click="isShowEdit=!isShowEdit"></i>
</el-tooltip> </el-tooltip>
<el-tooltip v-if="!isOpenGroup" class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start"> <el-tooltip v-if="!isOpenGroup" class="item" effect="dark" :content="$t('system.table_delete')"
placement="top-start">
<i class="iconfont icon-xingzhuang" @click="removeDinnerTrip(subItemObj.childItem.DayNum,subIndex)"></i> <i class="iconfont icon-xingzhuang" @click="removeDinnerTrip(subItemObj.childItem.DayNum,subIndex)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('sm.shangyi')" placement="top-start" v-if="subIndex!=0&&!isOpenGroup"> <el-tooltip class="item" effect="dark" :content="$t('sm.shangyi')" placement="top-start"
v-if="subIndex!=0&&!isOpenGroup">
<i class="iconfont icon-shangyi" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,0)"></i> <i class="iconfont icon-shangyi" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,0)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start" <el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start"
...@@ -178,8 +183,7 @@ ...@@ -178,8 +183,7 @@
}; };
return { return {
//其他餐食 //其他餐食
otherDinner: [ otherDinner: [{
{
Id: 1, Id: 1,
Name: this.$t('sm.jiudiannxyzc'), Name: this.$t('sm.jiudiannxyzc'),
City: 0, City: 0,
...@@ -216,7 +220,7 @@ ...@@ -216,7 +220,7 @@
}, },
{ {
ID: -2, ID: -2,
Name:this.$t('sm.jiudianxy'), Name: this.$t('sm.jiudianxy'),
City: 0, City: 0,
About: "", About: "",
PicPath: "" PicPath: ""
...@@ -335,6 +339,7 @@ ...@@ -335,6 +339,7 @@
this.subItemObj.childItem.ImaArray = []; this.subItemObj.childItem.ImaArray = [];
var dinnerImgList = obj.PicPath.split(","); var dinnerImgList = obj.PicPath.split(",");
for (var i = 0; i < dinnerImgList.length; i++) { for (var i = 0; i < dinnerImgList.length; i++) {
if (i <= 3) {
var fileObj = this.$commonUtils.FileObject(); var fileObj = this.$commonUtils.FileObject();
fileObj.Url = this.domainManager().ViittoFileUrl + dinnerImgList[i]; fileObj.Url = this.domainManager().ViittoFileUrl + dinnerImgList[i];
fileObj.Name = ""; fileObj.Name = "";
...@@ -342,6 +347,7 @@ ...@@ -342,6 +347,7 @@
} }
} }
} }
}
}, },
//获取餐厅套餐列表 //获取餐厅套餐列表
getDinnerMealList(event) { getDinnerMealList(event) {
......
...@@ -281,7 +281,19 @@ export default { ...@@ -281,7 +281,19 @@ export default {
that.Diner.UseDinnerArray = []; that.Diner.UseDinnerArray = [];
that.subItemObj.childItem.ImaArray = []; that.subItemObj.childItem.ImaArray = [];
that.subItemObj.childItem.Description = obj.Descriptions; that.subItemObj.childItem.Description = obj.Descriptions;
if(obj.imgList&&obj.imgList.length>4)
{
obj.imgList.forEach((sItem,sIndex)=>{
if(sIndex<=3)
{
that.subItemObj.childItem.ImaArray.push(sItem);
}
})
}
else{
that.subItemObj.childItem.ImaArray = obj.imgList; that.subItemObj.childItem.ImaArray = obj.imgList;
}
that.subItemObj.childItem.IsUseDinner = obj.IsUseDinner; that.subItemObj.childItem.IsUseDinner = obj.IsUseDinner;
that.subItemObj.childItem.HotelName = obj.Name; that.subItemObj.childItem.HotelName = obj.Name;
let useDinnerTypeStr = that.subItemObj.childItem.UseDinnerType; let useDinnerTypeStr = that.subItemObj.childItem.UseDinnerType;
......
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
</div> </div>
<span class="datePickContent" style="display:none;"> <span class="datePickContent" style="display:none;">
<el-form-item> <el-form-item>
<el-select :disabled="isOpenGroup" class="w160" :placeholder="$t('sm.qxztime')" v-model="subItemObj.childItem.TimeType"> <el-select :disabled="isOpenGroup" class="w160" :placeholder="$t('sm.qxztime')"
v-model="subItemObj.childItem.TimeType">
<el-option v-for="item in TimeTypeList" :label='item.Name' :value='item.Id' :key='item.Id'> <el-option v-for="item in TimeTypeList" :label='item.Name' :value='item.Id' :key='item.Id'>
</el-option> </el-option>
</el-select> </el-select>
...@@ -17,13 +18,16 @@ ...@@ -17,13 +18,16 @@
<el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')" placement="top-start"> <el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')" placement="top-start">
<i class="iconfont icon-chakan" @click="isShowEdit=!isShowEdit"></i> <i class="iconfont icon-chakan" @click="isShowEdit=!isShowEdit"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start" v-if="!isOpenGroup"> <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start"
v-if="!isOpenGroup">
<i class="iconfont icon-xingzhuang" @click="removeScienTrip(subItemObj.childItem.DayNum,subIndex)"></i> <i class="iconfont icon-xingzhuang" @click="removeScienTrip(subItemObj.childItem.DayNum,subIndex)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('sm.shangyi')" placement="top-start" v-if="subIndex!=0 && !isOpenGroup"> <el-tooltip class="item" effect="dark" :content="$t('sm.shangyi')" placement="top-start"
v-if="subIndex!=0 && !isOpenGroup">
<i class="iconfont icon-shangyi" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,0)"></i> <i class="iconfont icon-shangyi" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,0)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start" v-if="subIndex!=subTotalIndex-1 && !isOpenGroup"> <el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start"
v-if="subIndex!=subTotalIndex-1 && !isOpenGroup">
<i class="iconfont icon-xiayi1" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,1)"></i> <i class="iconfont icon-xiayi1" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,1)"></i>
</el-tooltip> </el-tooltip>
</div> </div>
...@@ -31,9 +35,11 @@ ...@@ -31,9 +35,11 @@
<div class="TDLeftPlan"> <div class="TDLeftPlan">
<span>{{$t('sm.scenChoosse')}}</span> <span>{{$t('sm.scenChoosse')}}</span>
<span> <span>
<el-form-item :prop="'DayList.'+index+'.dayArray.'+subIndex+'.childItem.CouponsId'" :rules="scienTripRules.CouponsId"> <el-form-item :prop="'DayList.'+index+'.dayArray.'+subIndex+'.childItem.CouponsId'"
<el-select :disabled="isOpenGroup" class='w160' :placeholder="$t('pub.pleaseSel')" filterable v-model="subItemObj.childItem.CouponsId" :rules="scienTripRules.CouponsId">
@visible-change="getQScenicList($event)" @change="changeQScenicList()"> <el-select :disabled="isOpenGroup" class='w160' :placeholder="$t('pub.pleaseSel')" filterable
v-model="subItemObj.childItem.CouponsId" @visible-change="getQScenicList($event)"
@change="changeQScenicList()">
<el-option :label="$t('pub.unlimitedSel')" :value='DefaultSelectValue'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='DefaultSelectValue'></el-option>
<el-option v-for="item in QScenicList" :label='getItemLabel(item)' :value='item.ID' :key='item.ID'> <el-option v-for="item in QScenicList" :label='getItemLabel(item)' :value='item.ID' :key='item.ID'>
</el-option> </el-option>
...@@ -55,13 +61,15 @@ ...@@ -55,13 +61,15 @@
<el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.PlayTimeHour" <el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.PlayTimeHour"
@keyup.native="checkInteger(subItemObj.childItem,'PlayTimeHour')" maxlength="2"></el-input>&nbsp;&nbsp;小时 @keyup.native="checkInteger(subItemObj.childItem,'PlayTimeHour')" maxlength="2"></el-input>&nbsp;&nbsp;小时
<el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.PlayTimeMinutes" <el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.PlayTimeMinutes"
@keyup.native="checkInteger(subItemObj.childItem,'PlayTimeMinutes')" maxlength="2"></el-input>&nbsp;&nbsp;分钟 @keyup.native="checkInteger(subItemObj.childItem,'PlayTimeMinutes')" maxlength="2"></el-input>
&nbsp;&nbsp;分钟
</div> </div>
</div> </div>
</div> </div>
<div class="TP_edit"> <div class="TP_edit">
<my-edit v-if="isShowEdit" v-on:edit-value="subItemObj.childItem.Description = arguments[0]" v-bind:editValue="subItemObj.childItem.Description" <my-edit v-if="isShowEdit" v-on:edit-value="subItemObj.childItem.Description = arguments[0]"
v-bind:toolbarShow="toolbar" v-bind:referenceList="DefaultList" v-bind:placeholder="placeholder"></my-edit> v-bind:editValue="subItemObj.childItem.Description" v-bind:toolbarShow="toolbar"
v-bind:referenceList="DefaultList" v-bind:placeholder="placeholder"></my-edit>
</div> </div>
<div class="SiencDiv clearfix"> <div class="SiencDiv clearfix">
<div class="ScLeftImg"> <div class="ScLeftImg">
...@@ -70,18 +78,20 @@ ...@@ -70,18 +78,20 @@
<img v-else :src="item.Url" /> <img v-else :src="item.Url" />
<div class="imgzhe" @click="getPic(subItemObj.childItem.ImaArray,index)"> <div class="imgzhe" @click="getPic(subItemObj.childItem.ImaArray,index)">
<div class="clearfix" style="text-align:center;"> <div class="clearfix" style="text-align:center;">
<div class="re-delte" @click.stop="delImg(index,subItemObj)"><i class="iconfont icon-xingzhuang"></i></div> <div class="re-delte" @click.stop="delImg(index,subItemObj)"><i class="iconfont icon-xingzhuang"></i>
<div class="re-delte" @click.stop="toExchangeImg(subItemObj.childItem.DayNum,subIndex,index,0)" v-if="index!=0"><i </div>
class="iconfont icon-zuoyi"></i></div> <div class="re-delte" @click.stop="toExchangeImg(subItemObj.childItem.DayNum,subIndex,index,0)"
<div class="re-delte" @click.stop="toExchangeImg(subItemObj.childItem.DayNum,subIndex,index,1)" v-if="index!=subItemObj.childItem.ImaArray.length-1"><i v-if="index!=0"><i class="iconfont icon-zuoyi"></i></div>
class="iconfont icon-youyi"></i></div> <div class="re-delte" @click.stop="toExchangeImg(subItemObj.childItem.DayNum,subIndex,index,1)"
v-if="index!=subItemObj.childItem.ImaArray.length-1"><i class="iconfont icon-youyi"></i></div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="rightAddImg"> <div class="rightAddImg">
<el-upload :file-list="subItemObj.childItem.ImaArray" :http-request="uploadScenImg" :data="subItemObj.childItem" <el-upload :file-list="subItemObj.childItem.ImaArray" :http-request="uploadScenImg"
:multiple="true" accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action=""> :data="subItemObj.childItem" :multiple="true" accept="image/jpeg,image/gif,image/png,image/bmp"
:show-file-list="false" action="">
<i class="iconfont icon-img_haha"></i> <i class="iconfont icon-img_haha"></i>
</el-upload> </el-upload>
</div> </div>
...@@ -97,13 +107,16 @@ ...@@ -97,13 +107,16 @@
<el-tooltip class="item" effect="dark" :content="$t('pub.edit')" placement="top-start" v-if="!isShowEdit"> <el-tooltip class="item" effect="dark" :content="$t('pub.edit')" placement="top-start" v-if="!isShowEdit">
<i class="iconfont icon-bianji" @click="isShowEdit=!isShowEdit"></i> <i class="iconfont icon-bianji" @click="isShowEdit=!isShowEdit"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start" v-if="!isOpenGroup"> <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start"
v-if="!isOpenGroup">
<i class="iconfont icon-xingzhuang" @click="removeScienTrip(subItemObj.childItem.DayNum,subIndex)"></i> <i class="iconfont icon-xingzhuang" @click="removeScienTrip(subItemObj.childItem.DayNum,subIndex)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('sm.shangyi')" placement="top-start" v-if="subIndex!=0 && !isOpenGroup"> <el-tooltip class="item" effect="dark" :content="$t('sm.shangyi')" placement="top-start"
v-if="subIndex!=0 && !isOpenGroup">
<i class="iconfont icon-shangyi" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,0)"></i> <i class="iconfont icon-shangyi" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,0)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start" v-if="subIndex!=subTotalIndex-1 && !isOpenGroup"> <el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start"
v-if="subIndex!=subTotalIndex-1 && !isOpenGroup">
<i class="iconfont icon-xiayi1" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,1)"></i> <i class="iconfont icon-xiayi1" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,1)"></i>
</el-tooltip> </el-tooltip>
</div> </div>
...@@ -248,6 +261,7 @@ ...@@ -248,6 +261,7 @@
if (obj.PicPath != undefined && obj.PicPath != "") { if (obj.PicPath != undefined && obj.PicPath != "") {
var scenImgList = obj.PicPath.split(","); var scenImgList = obj.PicPath.split(",");
for (var i = 0; i < scenImgList.length; i++) { for (var i = 0; i < scenImgList.length; i++) {
if (i <= 3) {
var fileObj = that.$commonUtils.FileObject(); var fileObj = that.$commonUtils.FileObject();
if (scenImgList[i] != "") { if (scenImgList[i] != "") {
fileObj.Url = that.domainManager().ViittoFileUrl + scenImgList[i]; fileObj.Url = that.domainManager().ViittoFileUrl + scenImgList[i];
...@@ -255,6 +269,8 @@ ...@@ -255,6 +269,8 @@
that.subItemObj.childItem.ImaArray.push(fileObj); that.subItemObj.childItem.ImaArray.push(fileObj);
} }
} }
}
} }
} }
} }
...@@ -326,10 +342,10 @@ ...@@ -326,10 +342,10 @@
this.dspNone = true; this.dspNone = true;
this.initialIndex = index; this.initialIndex = index;
}, },
getItemLabel(item){ getItemLabel(item) {
let returnName = item.Name; let returnName = item.Name;
if(item.Inventory>=0){ if (item.Inventory >= 0) {
returnName = returnName+ " " +item.Inventory; returnName = returnName + " " + item.Inventory;
} }
return returnName; return returnName;
} }
......
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