Commit 980a6954 authored by zhengke's avatar zhengke

修改

parent def869ce
...@@ -23,7 +23,9 @@ ...@@ -23,7 +23,9 @@
</el-form-item> </el-form-item>
<el-form-item label="工作年限" prop="WorkYears" class="is-required" size="small"> <el-form-item label="工作年限" prop="WorkYears" class="is-required" size="small">
<el-input v-model="addMsg.WorkYears" placeholder="请输入工作年限" /> <el-input v-model="addMsg.WorkYears" @keyup.native="checkPrice(addMsg,'WorkYears')" placeholder="请输入工作年限">
<template slot="append"></template>
</el-input>
</el-form-item> </el-form-item>
<el-form-item label="站点" prop="SiteId" class="is-required"> <el-form-item label="站点" prop="SiteId" class="is-required">
<el-select class="w120" v-model="addMsg.SiteId" size="small" <el-select class="w120" v-model="addMsg.SiteId" size="small"
...@@ -181,7 +183,7 @@ ...@@ -181,7 +183,7 @@
this.defaultMsg = this.addMsg.Introduction; this.defaultMsg = this.addMsg.Introduction;
} }
}) })
}, }
}, },
mounted() { mounted() {
} }
......
...@@ -211,7 +211,7 @@ ...@@ -211,7 +211,7 @@
</el-form-item> </el-form-item>
<el-form-item label="关联城市或景点" v-if="EnumType==5"> <el-form-item label="关联城市或景点" v-if="EnumType==5">
<div flex="dir:left" style="flex-wrap: wrap;"> <div flex="dir:left" style="flex-wrap: wrap;">
<div class="attr-list" v-for="(item,index) in addMsg.LineDescriptionList" :key="index"> <div class="attr-list" v-for="(item,index) in LineCityScen" :key="index">
<el-input size="mini" v-model="item.Name" width="152px"></el-input> <el-input size="mini" v-model="item.Name" width="152px"></el-input>
<i @click="Deleteggz(index)" class="el-icon-error close"></i> <i @click="Deleteggz(index)" class="el-icon-error close"></i>
</div> </div>
...@@ -597,13 +597,15 @@ ...@@ -597,13 +597,15 @@
</el-form-item> </el-form-item>
<el-form-item v-if="addMsg.SeparateSetMember == 1 <el-form-item v-if="addMsg.SeparateSetMember == 1
" label="默认规格会员价设置"> " label="默认规格会员价设置">
<div v-for="(item, index) in addMsg.MemberPriceTreeList[0].GradePriceList" :key="index+'15'"> <template v-if="memberList1&&memberList1[0].GradePriceList.length>0">
<el-input style="width:700px" placeholder="请输入内容" v-model="item.MemberPrice" size="small" <div v-for="(item, index) in memberList1[0].GradePriceList" :key="index+'15'">
class="input-with-select"> <el-input style="width:700px" placeholder="请输入内容" v-model="item.MemberPrice" size="small"
<el-button slot="prepend">{{ item.MemberGrade }}级会员</el-button> class="input-with-select">
<el-button slot="append"></el-button> <el-button slot="prepend">{{ item.MemberGrade }}级会员</el-button>
</el-input> <el-button slot="append"></el-button>
</div> </el-input>
</div>
</template>
</el-form-item> </el-form-item>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
...@@ -713,7 +715,7 @@ ...@@ -713,7 +715,7 @@
</span> </span>
</el-dialog> </el-dialog>
<!--区域--> <!--区域-->
<el-dialog custom-class="regionDig" title="区域" :visible.sync="dialogFormVisible"> <el-dialog custom-class="regionDig" title="区域" :visible.sync="dialogFormVisible" width="950px">
<region_Choice @event1="change($event)" :List="AreaList" ref="child"></region_Choice> <region_Choice @event1="change($event)" :List="AreaList" ref="child"></region_Choice>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" size="small" @click="Addto">确 定</el-button> <el-button type="primary" size="small" @click="Addto">确 定</el-button>
...@@ -819,7 +821,7 @@ ...@@ -819,7 +821,7 @@
// FormsId: -1, // FormsId: -1,
// FormsName: "", // FormsName: "",
}, },
LineCityScen:[], //关联城市或景点
predefineColors: [ predefineColors: [
'#000000', '#000000',
'#FFFFFF', '#FFFFFF',
...@@ -1025,12 +1027,11 @@ ...@@ -1025,12 +1027,11 @@
if (this.$route.query.FxState) { if (this.$route.query.FxState) {
this.FxState = this.$route.query.FxState; this.FxState = this.$route.query.FxState;
} }
this.gethuiyList();
this.getTree(); this.getTree();
this.getRule(); this.getRule();
this.getSpeciList(); this.getSpeciList();
this.getDistributor(); this.getDistributor();
this.gethuiyList();
this.getSupplierList() this.getSupplierList()
this.getAllGuideCarSiteList() this.getAllGuideCarSiteList()
this.getGuideCarList() //获取车辆下拉 this.getGuideCarList() //获取车辆下拉
...@@ -1173,6 +1174,12 @@ ...@@ -1173,6 +1174,12 @@
} }
//预定日期设置 //预定日期设置
this.addMsg.TargetDateStrList = this.subDateList; this.addMsg.TargetDateStrList = this.subDateList;
this.addMsg.LineDescriptionList=[];
if(this.LineCityScen.length>0){
this.LineCityScen.forEach(x=>{
this.addMsg.LineDescriptionList.push(x.Name);
})
}
if (this.addMsg.SeparateDistributionType == 1) { if (this.addMsg.SeparateDistributionType == 1) {
this.disList1 = [{ this.disList1 = [{
...@@ -1185,10 +1192,6 @@ ...@@ -1185,10 +1192,6 @@
this.addMsg.MemberPriceList = this.memberList1; this.addMsg.MemberPriceList = this.memberList1;
this.addMsg.MemberPriceTreeList = this.memberList1; this.addMsg.MemberPriceTreeList = this.memberList1;
} }
if (this.addMsg.SeparateSetMember == 1) {
this.addMsg.MemberPriceList = this.memberList2;
this.addMsg.MemberPriceTreeList = this.memberList2;
}
let mall_userInfo = JSON.parse(localStorage.mall_userInfo) let mall_userInfo = JSON.parse(localStorage.mall_userInfo)
if (mall_userInfo.TenantId == 1 && mall_userInfo.MallBaseId == 1 && this.SupplierId == '') { if (mall_userInfo.TenantId == 1 && mall_userInfo.MallBaseId == 1 && this.SupplierId == '') {
this.Error("请选择供应商!"); this.Error("请选择供应商!");
...@@ -1427,7 +1430,15 @@ ...@@ -1427,7 +1430,15 @@
this.EnumType = this.addMsg.CarType; this.EnumType = this.addMsg.CarType;
if (this.addMsg.SupplierId != 0) { if (this.addMsg.SupplierId != 0) {
this.SupplierId = this.addMsg.SupplierId; this.SupplierId = this.addMsg.SupplierId;
}
if(this.addMsg.LineDescriptionList==null){
this.addMsg.LineDescriptionList=[];
}
this.LineCityScen=[]
if(this.addMsg.LineDescriptionList){
this.addMsg.LineDescriptionList.forEach(x=>{
this.LineCityScen.push({'Name':x})
})
} }
if (!this.$route.query.GoodsId) { if (!this.$route.query.GoodsId) {
this.addMsg.Id = 0 this.addMsg.Id = 0
...@@ -1449,7 +1460,9 @@ ...@@ -1449,7 +1460,9 @@
this.GradeCommissionList = this.addMsg.DistributionCommissionTreeList[0].GradeCommissionList; this.GradeCommissionList = this.addMsg.DistributionCommissionTreeList[0].GradeCommissionList;
} }
} }
this.memberList2 = this.addMsg.MemberPriceTreeList; if(this.addMsg.MemberPriceTreeList.length>0){
this.memberList1 = this.addMsg.MemberPriceTreeList;
}
this.thisType = 1; this.thisType = 1;
this.disList1 = []; this.disList1 = [];
let objNew = { let objNew = {
...@@ -1633,10 +1646,10 @@ ...@@ -1633,10 +1646,10 @@
let obj = { let obj = {
Name: '' Name: ''
} }
this.addMsg.LineDescriptionList.push(obj) this.LineCityScen.push(obj);
}, },
Deleteggz(index) { Deleteggz(index) {
this.addMsg.LineDescriptionList.splice(index, 1) this.LineCityScen.splice(index, 1)
}, },
changeSiteId(val) { changeSiteId(val) {
this.getGuideCarGuideList(val) //导游下拉 this.getGuideCarGuideList(val) //导游下拉
......
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