Skip to content

E
ElectricitySheep
Commit af5da747 authored by zhengke's avatar zhengke
Browse files
Options

修改

parent 76bf58c3
Hide whitespace changes
Inline Side-by-side
Showing with 406 additions and 192 deletions
src/components/director/directorGoodsEdit.vue
View file @ af5da747
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
addMsg.CategoryList && addMsg.CategoryList.length > 0 addMsg.CategoryList && addMsg.CategoryList.length > 0
"> ">
<el-tag type="warning" style="margin-right:10px;" @close="exitCheck(item, index)" <el-tag type="warning" style="margin-right:10px;" @close="exitCheck(item, index)"
v-for="(item, index) in addMsg.CategoryList" :key="index+'1'" closable>{{ item.CategoryName }} v-for="(item, index) in addMsg.CategoryList" :key="index+'1'" closable>{{ item.CategoryName }}
</el-tag> </el-tag>
</template> </template>
<el-button type="primary" @click=" <el-button type="primary" @click="
...@@ -38,11 +38,11 @@ ...@@ -38,11 +38,11 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="商城商品编码"> <el-form-item label="商城商品编码">
<el-tooltip class="item" effect="dark" content="只能从商城中获取商品信息，且基本信息与商城商品保持一致" placement="top" <el-tooltip class="item" effect="dark" content="只能从商城中获取商品信息，且基本信息与商城商品保持一致" placement="top"
style="position: absolute;left: -22px;top:12px"> style="position: absolute;left: -22px;top:12px">
<i class="el-tooltip el-icon-info"></i> <i class="el-tooltip el-icon-info"></i>
</el-tooltip> </el-tooltip>
<el-input v-model="addMsg.Id" type="number" min="1" size="small" placeholder="请输入内容" <el-input v-model="addMsg.Id" type="number" min="1" size="small" placeholder="请输入内容"
class="input-with-select"> class="input-with-select">
<el-button slot="append" @click="getcode()">获取</el-button> <el-button slot="append" @click="getcode()">获取</el-button>
</el-input> </el-input>
</el-form-item> </el-form-item>
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
</el-form-item> </el-form-item>
<el-form-item label="供应商" prop="SupplierId"> <el-form-item label="供应商" prop="SupplierId">
<el-select class="w150" style="margin-right: 10px;" v-model="SupplierId" size="small" <el-select class="w150" style="margin-right: 10px;" v-model="SupplierId" size="small"
placeholder="请选择" @change='changeSupplier'> placeholder="请选择" @change='changeSupplier'>
<el-option v-for="item in options" :key="item.ID" :label="item.Name" :value="item.ID"> <el-option v-for="item in options" :key="item.ID" :label="item.Name" :value="item.ID">
</el-option> </el-option>
</el-select> </el-select>
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
<el-form-item label="商品轮播图(多张)"> <el-form-item label="商品轮播图(多张)">
<el-tooltip class="item" effect="dark" content="第一张图片为封面图" placement="top" <el-tooltip class="item" effect="dark" content="第一张图片为封面图" placement="top"
style="position: absolute;left: -22px;top:12px"> style="position: absolute;left: -22px;top:12px">
<i class="el-tooltip el-icon-info"></i> <i class="el-tooltip el-icon-info"></i>
</el-tooltip> </el-tooltip>
<p style="color:#c9c9c9;margin-bottom: 12px;"> <p style="color:#c9c9c9;margin-bottom: 12px;">
...@@ -74,43 +74,43 @@ ...@@ -74,43 +74,43 @@
<div class="nav_IconContent"> <div class="nav_IconContent">
<draggable v-model="addMsg.CarouselImageList"> <draggable v-model="addMsg.CarouselImageList">
<div v-for="(item, index) in addMsg.CarouselImageList" :key="index+'2'" <div v-for="(item, index) in addMsg.CarouselImageList" :key="index+'2'"
style="margin-right: 20px; position: relative; "> style="margin-right: 20px; position: relative; ">
<div class="colapp-image" :style="{ <div class="colapp-image" :style="{
backgroundImage: 'url(' + item.Path + ')' backgroundImage: 'url(' + item.Path + ')'
}"></div> }"></div>
<el-button @click="ClearCarouse(index)" class="delBtn" type="danger" icon="el-icon-close" <el-button @click="ClearCarouse(index)" class="delBtn" type="danger" icon="el-icon-close"
circle></el-button> circle></el-button>
</div> </div>
</draggable> </draggable>
</div> </div>
<div @click="openChangeDig(1)" v-if="addMsg.CarouselImageList.length<9" <div @click="openChangeDig(1)" v-if="addMsg.CarouselImageList.length<9"
class="add-image-btn 2222"> class="add-image-btn 2222">
+ 添加图片 + 添加图片
</div> </div>
</div> </div>
</el-form-item> </el-form-item>
<!-- <el-form-item label="商品视频">--> <el-form-item label="商品视频">
<!-- <el-input v-model="addMsg.VideoAddress" size="small" placeholder="请输入内容">--> <el-input v-model="addMsg.VideoAddress" size="small" placeholder="请输入内容">
<!-- <el-button @click="changeState1 = true" slot="append">添加视频</el-button>--> <el-button @click="changeState1 = true" slot="append">添加视频</el-button>
<!-- </el-input>--> </el-input>
<!-- <a v-if="addMsg.VideoAddress != ''" class="blue noline" :href="addMsg.VideoAddress"--> <a v-if="addMsg.VideoAddress != ''" class="blue noline" :href="addMsg.VideoAddress"
<!-- target="_blank">视频链接</a>--> target="_blank">视频链接</a>
<!-- </el-form-item>--> </el-form-item>
<el-form-item label="自定义分享标题"> <el-form-item label="自定义分享标题">
<el-tooltip class="item" effect="dark" content="分享给好友时，作为商品名称" placement="top" <el-tooltip class="item" effect="dark" content="分享给好友时，作为商品名称" placement="top"
style="position: absolute;left: -22px;top:12px"> style="position: absolute;left: -22px;top:12px">
<i class="el-tooltip el-icon-info"></i> <i class="el-tooltip el-icon-info"></i>
</el-tooltip> </el-tooltip>
<el-input v-model="addMsg.CustomShareTitles" size="small" placeholder="请输入内容" <el-input v-model="addMsg.CustomShareTitles" size="small" placeholder="请输入内容"
class="input-with-select"></el-input> class="input-with-select"></el-input>
<p class="blue point" @click="imgDig = true">查看图例</p> <p class="blue point" @click="imgDig = true">查看图例</p>
</el-form-item> </el-form-item>
<el-form-item class="commonLabel discount" label="自定义分享图片"> <el-form-item class="commonLabel discount" label="自定义分享图片">
<el-tooltip class="item" effect="dark" content="分享给好友时，作为分享图片" placement="top-start" <el-tooltip class="item" effect="dark" content="分享给好友时，作为分享图片" placement="top-start"
style="position: absolute;left: -22px;top:12px"> style="position: absolute;left: -22px;top:12px">
<i class="elzk el-tooltip el-icon-info"></i> <i class="elzk el-tooltip el-icon-info"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="建议尺寸420*336" placement="top"> <el-tooltip class="item" effect="dark" content="建议尺寸420*336" placement="top">
...@@ -121,11 +121,12 @@ ...@@ -121,11 +121,12 @@
!addMsg.CustomShareImage || !addMsg.CustomShareImage ||
addMsg.CustomShareImage == '' addMsg.CustomShareImage == ''
" src="../../assets/img/default.png" style="width:80px;height:80px" alt="" /> " src="../../assets/img/default.png" style="width:80px;height:80px" alt="" />
<el-button @click="clearCustom" style="position: absolute;right: 6px;top: -10px;" v-if=" <el-button @click="clearCustom" style="position: absolute;right: 6px;top: -10px;" v-if="
addMsg.CustomShareImage && addMsg.CustomShareImage &&
addMsg.CustomShareImage != '' addMsg.CustomShareImage != ''
" size="mini" type="danger" icon="el-icon-close" circle></el-button> " size="mini" type="danger" icon="el-icon-close" circle></el-button>
<img v-if="addMsg.CustomShareImage ||addMsg.CustomShareImage !=''" style="width:80px;height:80px" :src="addMsg.CustomShareImage" alt="" /> <img v-if="addMsg.CustomShareImage ||addMsg.CustomShareImage !=''" style="width:80px;height:80px"
:src="addMsg.CustomShareImage" alt="" />
</div> </div>
<p style="margin-top:-15px" class="blue f12"> <p style="margin-top:-15px" class="blue f12">
<span class="point" @click="imgDig = true">查看图例</span> <span class="point" @click="imgDig = true">查看图例</span>
...@@ -133,12 +134,12 @@ ...@@ -133,12 +134,12 @@
</el-form-item> </el-form-item>
<el-form-item label="直播商品"> <el-form-item label="直播商品">
<el-switch v-model="addMsg.IsLiveGoods" active-color="#409EFF" :active-value="1" <el-switch v-model="addMsg.IsLiveGoods" active-color="#409EFF" :active-value="1"
:inactive-value="2"> :inactive-value="2">
</el-switch> </el-switch>
</el-form-item> </el-form-item>
<el-form-item label="上架状态"> <el-form-item label="上架状态">
<el-switch v-model="addMsg.GoodsStatus" active-color="#409EFF" :active-value="1" <el-switch v-model="addMsg.GoodsStatus" active-color="#409EFF" :active-value="1"
:inactive-value="2"> :inactive-value="2">
</el-switch> </el-switch>
</el-form-item> </el-form-item>
...@@ -153,54 +154,57 @@ ...@@ -153,54 +154,57 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="站点" prop="SiteId"> <el-form-item label="站点" prop="SiteId">
<el-select class="w150" style="margin-right: 10px;" v-model="addMsg.SiteId" size="small" <el-select class="w150" style="margin-right: 10px;" v-model="addMsg.SiteId" size="small"
placeholder="请选择" @change='changeSiteId'> placeholder="请选择" @change='changeSiteId'>
<el-option v-for="item in SiteList" :key="item.ID" :label="item.SiteName" :value="item.ID"> <el-option v-for="item in SiteList" :key="item.ID" :label="item.SiteName" :value="item.ID">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="关联导游" prop="GuideId" v-if="addMsg.SiteId!=''"> <el-form-item label="关联导游" prop="GuideId" v-if="addMsg.SiteId!=''">
<el-select class="w150" style="margin-right: 10px;" v-model="addMsg.GuideId" size="small" <el-select class="w150" style="margin-right: 10px;" v-model="addMsg.GuideId" size="small"
placeholder="请选择" @change='changeSupplier'> placeholder="请选择">
<el-option v-for="item in GuideList" :key="item.ID" :label="item.Name" :value="item.ID"> <el-option v-for="item in GuideList" :key="item.ID" :label="item.Name" :value="item.ID">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="关联车辆" prop="CarId" > <el-form-item label="关联车辆" prop="CarId">
<el-select class="w150" style="margin-right: 10px;" v-model="addMsg.CarId" size="small" <el-select class="w150" style="margin-right: 10px;" v-model="addMsg.CarId" size="small"
placeholder="请选择" @change='changeCarId'> placeholder="请选择" @change='changeCarId'>
<el-option v-for="item in CarList" :key="item.ID" :label="item.Name" :value="item.ID"> <el-option v-for="item in CarList" :key="item.ID" :label="item.Name" :value="item.ID">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="车辆颜色" prop="CarColorId" v-if="addMsg.CarId!=''"> <el-form-item label="车辆颜色" prop="CarColorId" v-if="addMsg.CarId!=''">
<el-select class="w150" style="margin-right: 10px;" v-model="addMsg.CarColorId" size="small" <el-select class="w150" style="margin-right: 10px;" v-model="addMsg.CarColorId" size="small"
placeholder="请选择" @change='changeCarColorList'> placeholder="请选择" @change='changeCarColorList'>
<el-option v-for="item in CarColorList" :key="item.ID" :label="item.ColorName" :value="item.ID"> <el-option v-for="item in CarColorList" :key="item.ID" :label="item.ColorName" :value="item.ID">
</el-option> </el-option>
</el-select> </el-select>
<!-- <img v-for="(item,index) in CarColorList" :key="item.ID" src="" alt="">--> <!-- <img v-for="(item,index) in CarColorList" :key="item.ID" src="" alt="">-->
</el-form-item> </el-form-item>
<el-form-item label="车牌号" prop="CarNumber"> <el-form-item label="车牌号" prop="CarNumber">
<el-input v-model="addMsg.CarNumber" size="small" placeholder="请输入车牌号" class="input-with-select"></el-input> <el-input v-model="addMsg.CarNumber" size="small" placeholder="请输入车牌号" class="input-with-select">
</el-input>
</el-form-item> </el-form-item>
<el-form-item label="车购买年份"> <el-form-item label="车购买年份">
<el-input v-model="addMsg.CarBuyYear" size="small" placeholder="请输入车购买年份" class="input-with-select"></el-input> <el-input v-model="addMsg.CarBuyYear" size="small" placeholder="请输入车购买年份" class="input-with-select">
</el-input>
</el-form-item> </el-form-item>
<el-form-item label="服务类型" prop="CarType" > <el-form-item label="服务类型" prop="CarType">
<el-select class="w150" style="margin-right: 10px;" v-model="addMsg.CarType" size="small" <el-select class="w150" style="margin-right: 10px;" v-model="addMsg.CarType" size="small"
placeholder="请选择" @change='changeEnumList'> placeholder="请选择" @change='changeEnumList'>
<el-option v-for="item in EnumList" :key="item.Id" :label="item.Name" :value="item.Id"> <el-option v-for="item in EnumList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="线路名称" v-if="EnumType==5"> <el-form-item label="线路名称" v-if="EnumType==5">
<el-input v-model="addMsg.LineName" size="small" placeholder="请输入内容" class="input-with-select"></el-input> <el-input v-model="addMsg.LineName" size="small" placeholder="请输入内容" class="input-with-select">
</el-input>
</el-form-item> </el-form-item>
<el-form-item label="使用天数" v-if="EnumType==3||EnumType==4||EnumType==5"> <el-form-item label="使用天数" v-if="EnumType==3||EnumType==4||EnumType==5">
<el-select class="w150" style="margin-right: 10px;" v-model="addMsg.UserDay" size="small" <el-select class="w150" style="margin-right: 10px;" v-model="addMsg.UserDay" size="small"
placeholder="请选择" @change='changeSupplier'> placeholder="请选择" @change='changeSupplier'>
<el-option v-for="item in DayList" :key="item.ID" :label="item.Name" :value="item.ID"> <el-option v-for="item in DayList" :key="item.ID" :label="item.Name" :value="item.ID">
</el-option> </el-option>
</el-select> </el-select>
...@@ -221,7 +225,7 @@ ...@@ -221,7 +225,7 @@
<el-button slot="append">人</el-button> <el-button slot="append">人</el-button>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="是否拼车" > <el-form-item label="是否拼车">
<el-radio v-model="addMsg.IsSpell" label="1">是</el-radio> <el-radio v-model="addMsg.IsSpell" label="1">是</el-radio>
<el-radio v-model="addMsg.IsSpell" label="2">否</el-radio> <el-radio v-model="addMsg.IsSpell" label="2">否</el-radio>
</el-form-item> </el-form-item>
...@@ -241,28 +245,28 @@ ...@@ -241,28 +245,28 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="排序"> <el-form-item label="排序">
<el-tooltip class="item" effect="dark" content="排序值越小排序越靠前" placement="top-start" <el-tooltip class="item" effect="dark" content="排序值越小排序越靠前" placement="top-start"
style="position: absolute;left: -22px;top:12px"> style="position: absolute;left: -22px;top:12px">
<i class="elzk el-tooltip el-icon-info"></i> <i class="elzk el-tooltip el-icon-info"></i>
</el-tooltip> </el-tooltip>
<el-input v-model="addMsg.Sort" type="number" min="1" size="small" placeholder="请输入内容" <el-input v-model="addMsg.Sort" type="number" min="1" size="small" placeholder="请输入内容"
class="input-with-select"></el-input> class="input-with-select"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="售价" prop="SellingPrice"> <el-form-item label="售价" prop="SellingPrice">
<el-input v-model="addMsg.SellingPrice" type="number" min="1" size="small" placeholder="请输入内容" <el-input v-model="addMsg.SellingPrice" type="number" min="1" size="small" placeholder="请输入内容"
class="input-with-select"> class="input-with-select">
<el-button slot="append">元</el-button> <el-button slot="append">元</el-button>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="原价" prop="OriginalPrice"> <el-form-item label="原价" prop="OriginalPrice">
<el-input v-model="addMsg.OriginalPrice" type="number" min="1" size="small" placeholder="请输入内容" <el-input v-model="addMsg.OriginalPrice" type="number" min="1" size="small" placeholder="请输入内容"
class="input-with-select"> class="input-with-select">
<el-button slot="append">元</el-button> <el-button slot="append">元</el-button>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="成本价"> <el-form-item label="成本价">
<el-input @change="getSuggestPrice" v-model="addMsg.CostPrice" type="number" min="1" size="small" <el-input @change="getSuggestPrice" v-model="addMsg.CostPrice" type="number" min="1" size="small"
placeholder="请输入内容" class="input-with-select"> placeholder="请输入内容" class="input-with-select">
<el-button slot="append">元</el-button> <el-button slot="append">元</el-button>
</el-input> </el-input>
<span v-if=" <span v-if="
...@@ -274,15 +278,70 @@ ...@@ -274,15 +278,70 @@
<!-- 判断是开启了粉象返佣 --> <!-- 判断是开启了粉象返佣 -->
<el-form-item label="返佣总金额" prop="Commission" v-if="FxState==1"> <el-form-item label="返佣总金额" prop="Commission" v-if="FxState==1">
<el-input v-model="addMsg.Commission" @keyup.native="checkPrice(addMsg,'Commission')" size="small" <el-input v-model="addMsg.Commission" @keyup.native="checkPrice(addMsg,'Commission')" size="small"
placeholder="请输入内容" class="input-with-select"> placeholder="请输入内容" class="input-with-select">
<el-button slot="append">元</el-button> <el-button slot="append">元</el-button>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="预订日期" class="is-required"> <el-form-item label="预订日期" class="is-required">
<el-select class="w150" style="margin-right: 10px;" v-model="reserveType" size="small" <el-select class="w120" style="margin-right: 10px;" v-model="dateMsg.DayType" size="small"
placeholder="请选择" @change='changeSupplier'> placeholder="请选择" @change='changeSupplier'>
<el-option v-for="item in reserveList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option> <el-option v-for="item in reserveList" :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select> </el-select>
<template v-if="dateMsg.DayType==1">
<div style="margin-left:30px;display:inline-block;">
日期：
<el-date-picker class="w130" size="small" v-model="dateMsg.StartDate" type="date"
value-format="yyyy-MM-dd" :picker-options="pickerBeginDateBefore" placeholder="选择日期"></el-date-picker>
-
<el-date-picker class="w130" size="small" v-model="dateMsg.EndDate" value-format="yyyy-MM-dd"
type="date" :picker-options="pickerBeginDateAfter" placeholder="选择日期"></el-date-picker>
</div>
</template>
<template v-if="dateMsg.DayType==2">
<div style="margin-left:20px;display:inline-block;">
月：
<el-date-picker v-model="dateMsg.Month" size="small" value-format="yyyy-MM" type="month" placeholder="选择月">
</el-date-picker>
</div>
</template>
<template v-if="dateMsg.DayType==3">
<div style="display:inline-block;">
年：
<el-date-picker class="w90" size="small" v-model="dateMsg.Year" value-format="yyyy" type="year" placeholder="选择年">
</el-date-picker>
月：
<el-select size="small" class="w90" v-model="dateMsg.Month">
<el-option label="一月" value="01"></el-option>
<el-option label="二月" value="02"></el-option>
<el-option label="三月" value="03"></el-option>
<el-option label="四月" value="04"></el-option>
<el-option label="五月" value="05"></el-option>
<el-option label="六月" value="06"></el-option>
<el-option label="七月" value="07"></el-option>
<el-option label="八月" value="08"></el-option>
<el-option label="九月" value="09"></el-option>
<el-option label="十月" value="10"></el-option>
<el-option label="十一月" value="11"></el-option>
<el-option label="十二月" value="12"></el-option>
</el-select>
周：
<el-select size="small" class="w100" v-model="dateMsg.Week">
<el-option label="星期天" value="0"></el-option>
<el-option label="星期一" value="1"></el-option>
<el-option label="星期二" value="2"></el-option>
<el-option label="星期三" value="3"></el-option>
<el-option label="星期四" value="4"></el-option>
<el-option label="星期五" value="5"></el-option>
<el-option label="星期六" value="6"></el-option>
</el-select>
</div>
</template>
<el-button size="small" type="primary" @click="SaveDate()">追加</el-button>
</el-form-item>
<el-form-item>
<el-tag type="info" style="margin-right:20px;" closable @close="handleClose(index)"
v-for="(SubItem,index) in subDateList" :key="index" size="small">{{SubItem}}</el-tag>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -294,20 +353,20 @@ ...@@ -294,20 +353,20 @@
</div> </div>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="自定义表单"> <!-- <el-form-item label="自定义表单">
<el-tooltip class="item" effect="dark" content="选择第一项（默认表单）将会根据表单列表的（默认表单）变化而变化" <el-tooltip class="item" effect="dark" content="选择第一项（默认表单）将会根据表单列表的（默认表单）变化而变化"
placement="top-start" style="position: absolute;left: -22px;top:12px"> placement="top-start" style="position: absolute;left: -22px;top:12px">
<i class="elzk el-tooltip el-icon-info"></i> <i class="elzk el-tooltip el-icon-info"></i>
</el-tooltip> </el-tooltip>
<template v-if="addMsg.FormsName && addMsg.FormsName != ''"> <template v-if="addMsg.FormsName && addMsg.FormsName != ''">
<el-tag style="margin-right:10px;" @close="(addMsg.FormsName = ''), (addMsg.FormsId = -1)" <el-tag style="margin-right:10px;" @close="(addMsg.FormsName = ''), (addMsg.FormsId = -1)"
closable> closable>
{{ addMsg.FormsName }}</el-tag> {{ addMsg.FormsName }}</el-tag>
</template> </template>
<el-button @click=" <el-button @click="
(choosebdDig = true), (keepFormsId = addMsg.FormsId) (choosebdDig = true), (keepFormsId = addMsg.FormsId)
" size="mini">选择表单</el-button> " size="mini">选择表单</el-button>
</el-form-item> </el-form-item> -->
<el-form-item label="区域购买"> <el-form-item label="区域购买">
<el-switch v-model="addMsg.IsAreaBuy" active-color="#409EFF" :active-value="1" :inactive-value="0"> <el-switch v-model="addMsg.IsAreaBuy" active-color="#409EFF" :active-value="1" :inactive-value="0">
</el-switch> </el-switch>
...@@ -315,7 +374,7 @@ ...@@ -315,7 +374,7 @@
<el-form-item v-if="addMsg.IsAreaBuy == 1" label="允许购买区域"> <el-form-item v-if="addMsg.IsAreaBuy == 1" label="允许购买区域">
<span v-if="addMsg.AreaList.length == 0" @click="addOf" class="blue point">+添加地区</span> <span v-if="addMsg.AreaList.length == 0" @click="addOf" class="blue point">+添加地区</span>
<div v-if="addMsg.AreaList.length > 0" style="border: 1px solid #EBEEF5;padding:20px" <div v-if="addMsg.AreaList.length > 0" style="border: 1px solid #EBEEF5;padding:20px"
flex="dir:left box:last"> flex="dir:left box:last">
<div> <div>
<div flex="dir:left" style="flex-wrap: wrap; width: 90%;"> <div flex="dir:left" style="flex-wrap: wrap; width: 90%;">
<span>区域：</span> <span>区域：</span>
...@@ -326,7 +385,7 @@ ...@@ -326,7 +385,7 @@
<div> <div>
<img @click="editQy" src="../../assets/img/userman/edit.png" alt="" /> <img @click="editQy" src="../../assets/img/userman/edit.png" alt="" />
<img @click="(addMsg.AreaList = []), (AreaList = [])" style="margin-left:15px" <img @click="(addMsg.AreaList = []), (AreaList = [])" style="margin-left:15px"
src="../../assets/img/userman/del.png" alt="" /> src="../../assets/img/userman/del.png" alt="" />
</div> </div>
</div> </div>
</el-form-item> </el-form-item>
...@@ -341,7 +400,7 @@ ...@@ -341,7 +400,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="积分赠送"> <el-form-item label="积分赠送">
<el-tooltip class="item" effect="dark" placement="top" <el-tooltip class="item" effect="dark" placement="top"
style="position: absolute;left: -10px;top:12px"> style="position: absolute;left: -10px;top:12px">
<div slot="content"> <div slot="content">
用户购物赠送的积分, 用户购物赠送的积分,
如果不填写或填写0，则默认为不赠送积分<br /> 如果不填写或填写0，则默认为不赠送积分<br />
...@@ -354,7 +413,7 @@ ...@@ -354,7 +413,7 @@
<i class="el-tooltip el-icon-info"></i> <i class="el-tooltip el-icon-info"></i>
</el-tooltip> </el-tooltip>
<el-input v-model="addMsg.IntegralPresent" style="width:100%;margin-left:15px" type="number" min="1" <el-input v-model="addMsg.IntegralPresent" style="width:100%;margin-left:15px" type="number" min="1"
size="small" placeholder="请输入内容" class="input-with-select"> size="small" placeholder="请输入内容" class="input-with-select">
<el-button slot="append"> <el-button slot="append">
分 分
<el-radio v-model="addMsg.IntegralPresentType" :label="2">固定值</el-radio> <el-radio v-model="addMsg.IntegralPresentType" :label="2">固定值</el-radio>
...@@ -364,11 +423,11 @@ ...@@ -364,11 +423,11 @@
</el-form-item> </el-form-item>
<el-form-item label="积分抵扣"> <el-form-item label="积分抵扣">
<el-tooltip class="item" effect="dark" content="如果设置0，则不支持积分抵扣 如果带%则为按成交价格的比例计算抵扣多少元" <el-tooltip class="item" effect="dark" content="如果设置0，则不支持积分抵扣 如果带%则为按成交价格的比例计算抵扣多少元"
placement="top" style="position: absolute;left: -10px;top:12px"> placement="top" style="position: absolute;left: -10px;top:12px">
<i class="el-tooltip el-icon-info"></i> <i class="el-tooltip el-icon-info"></i>
</el-tooltip> </el-tooltip>
<el-input v-model="addMsg.PointsDeduction" style="width:100%;margin-left:15px" type="number" min="1" <el-input v-model="addMsg.PointsDeduction" style="width:100%;margin-left:15px" type="number" min="1"
size="small" placeholder="请输入内容" class="input-with-select"> size="small" placeholder="请输入内容" class="input-with-select">
<template slot="prepend">最多抵扣</template> <template slot="prepend">最多抵扣</template>
<el-button slot="append"> <el-button slot="append">
元 元
...@@ -383,14 +442,14 @@ ...@@ -383,14 +442,14 @@
</el-form-item> </el-form-item>
<el-form-item label="商品赠送VIP" v-if="FxState==1"> <el-form-item label="商品赠送VIP" v-if="FxState==1">
<el-select class="w150" style="margin-left:15px" v-model="addMsg.PresentFXGrade" size="small" <el-select class="w150" style="margin-left:15px" v-model="addMsg.PresentFXGrade" size="small"
clearable placeholder="请选择" @change='changeVIP'> clearable placeholder="请选择" @change='changeVIP'>
<el-option v-for="item in FXlevelList" :key="item.Id" :label="item.GradeName" :value="item.Id"> <el-option v-for="item in FXlevelList" :key="item.Id" :label="item.GradeName" :value="item.Id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="赠送日期" v-if="FxState==1 && giveDate==true"> <el-form-item label="赠送日期" v-if="FxState==1 && giveDate==true">
<el-input v-model="addMsg.PresentFXMonth" style="width:100%;margin-left:15px" type="number" min="1" <el-input v-model="addMsg.PresentFXMonth" style="width:100%;margin-left:15px" type="number" min="1"
size="small" placeholder="请输入内容" class="input-with-select"> size="small" placeholder="请输入内容" class="input-with-select">
<el-button slot="append"> <el-button slot="append">
月 月
...@@ -400,7 +459,7 @@ ...@@ -400,7 +459,7 @@
<el-form-item label="广告词"> <el-form-item label="广告词">
<el-input v-model="addMsg.Advertising" style="width:100%;margin-left:15px" type="textarea" :rows="3" <el-input v-model="addMsg.Advertising" style="width:100%;margin-left:15px" type="textarea" :rows="3"
size="small" placeholder="请输入内容" class="input-with-select"></el-input> size="small" placeholder="请输入内容" class="input-with-select"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标签类型"> <el-form-item label="标签类型">
<el-radio v-model="addMsg.MarketingLogo.iswords" :label="1">文字模式</el-radio> <el-radio v-model="addMsg.MarketingLogo.iswords" :label="1">文字模式</el-radio>
...@@ -409,16 +468,16 @@ ...@@ -409,16 +468,16 @@
</el-form-item> </el-form-item>
<el-form-item label="标签文字" v-if="addMsg.MarketingLogo.iswords==1"> <el-form-item label="标签文字" v-if="addMsg.MarketingLogo.iswords==1">
<el-input v-model="addMsg.MarketingLogo.words" style="width:100%;margin-left:15px" size="small" <el-input v-model="addMsg.MarketingLogo.words" style="width:100%;margin-left:15px" size="small"
placeholder="请输入内容" class="input-with-select" maxlength='10' show-word-limit></el-input> placeholder="请输入内容" class="input-with-select" maxlength='10' show-word-limit></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标签字体颜色" v-if="addMsg.MarketingLogo.iswords==1"> <el-form-item label="标签字体颜色" v-if="addMsg.MarketingLogo.iswords==1">
<el-color-picker style="width:100%;margin-left:15px" v-model="addMsg.MarketingLogo.wordsColor" <el-color-picker style="width:100%;margin-left:15px" v-model="addMsg.MarketingLogo.wordsColor"
show-alpha :predefine="predefineColors"> show-alpha :predefine="predefineColors">
</el-color-picker> </el-color-picker>
</el-form-item> </el-form-item>
<el-form-item label="标签背景颜色" v-if="addMsg.MarketingLogo.iswords==1"> <el-form-item label="标签背景颜色" v-if="addMsg.MarketingLogo.iswords==1">
<el-color-picker style="width:100%;margin-left:15px" v-model="addMsg.MarketingLogo.wordsBack" <el-color-picker style="width:100%;margin-left:15px" v-model="addMsg.MarketingLogo.wordsBack"
show-alpha :predefine="predefineColors"> show-alpha :predefine="predefineColors">
</el-color-picker> </el-color-picker>
</el-form-item> </el-form-item>
<el-form-item class="commonLabel discount" label="标签图片" v-if="addMsg.MarketingLogo.iswords==2"> <el-form-item class="commonLabel discount" label="标签图片" v-if="addMsg.MarketingLogo.iswords==2">
...@@ -431,7 +490,7 @@ ...@@ -431,7 +490,7 @@
addMsg.MarketingLogo.ico == '' addMsg.MarketingLogo.ico == ''
" src="../../assets/img/default.png" style="width:80px;height:80px" alt="" /> " src="../../assets/img/default.png" style="width:80px;height:80px" alt="" />
<el-button @click="addMsg.MarketingLogo.ico = ''" <el-button @click="addMsg.MarketingLogo.ico = ''"
style="position: absolute;right: 6px;top: -10px;" v-if=" style="position: absolute;right: 6px;top: -10px;" v-if="
addMsg.MarketingLogo.ico && addMsg.MarketingLogo.ico &&
addMsg.MarketingLogo.ico != '' addMsg.MarketingLogo.ico != ''
" size="mini" type="danger" icon="el-icon-close" circle></el-button> " size="mini" type="danger" icon="el-icon-close" circle></el-button>
...@@ -457,7 +516,7 @@ ...@@ -457,7 +516,7 @@
<el-tab-pane label="分销价设置" name="second"> <el-tab-pane label="分销价设置" name="second">
<el-form-item label="是否开启单独分销"> <el-form-item label="是否开启单独分销">
<el-switch @change="HpChange" v-model="addMsg.SeparateDistribution" active-color="#409EFF" <el-switch @change="HpChange" v-model="addMsg.SeparateDistribution" active-color="#409EFF"
:active-value="1" :inactive-value="0"> :active-value="1" :inactive-value="0">
</el-switch> </el-switch>
</el-form-item> </el-form-item>
<template v-if="addMsg.SeparateDistribution == 1"> <template v-if="addMsg.SeparateDistribution == 1">
...@@ -471,10 +530,10 @@ ...@@ -471,10 +530,10 @@
<el-form-item label-width="90px" style="display:inline-block" label="批量设置"> <el-form-item label-width="90px" style="display:inline-block" label="批量设置">
<el-select style="width:130px" v-model="pusetVal" size="small"> <el-select style="width:130px" v-model="pusetVal" size="small">
<el-option v-for="(item, index) in butorInt" :label="`${index + 1}级分销`" :value="index + 1" <el-option v-for="(item, index) in butorInt" :label="`${index + 1}级分销`" :value="index + 1"
:key="index+'8'"></el-option> :key="index+'8'"></el-option>
</el-select> </el-select>
<el-input style="width:150px;position:relative;top:5px" size="small" v-model="ptinput" <el-input style="width:150px;position:relative;top:5px" size="small" v-model="ptinput"
placeholder="请输入内容"> placeholder="请输入内容">
<el-button slot="append"> <el-button slot="append">
<span v-if="addMsg.SeparateDistributionMoneyType == 2">元</span> <span v-if="addMsg.SeparateDistributionMoneyType == 2">元</span>
<span v-if="addMsg.SeparateDistributionMoneyType == 1">%</span> <span v-if="addMsg.SeparateDistributionMoneyType == 1">%</span>
...@@ -484,7 +543,7 @@ ...@@ -484,7 +543,7 @@
</el-form-item> </el-form-item>
</div> </div>
<el-table ref="table" :data="GradeCommissionList" border style="width: 100%" <el-table ref="table" :data="GradeCommissionList" border style="width: 100%"
@selection-change="TbaleSelectionChange2"> @selection-change="TbaleSelectionChange2">
<el-table-column type="selection" width="55"> <el-table-column type="selection" width="55">
</el-table-column> </el-table-column>
<el-table-column width="100" label="等级名称"> <el-table-column width="100" label="等级名称">
...@@ -539,18 +598,18 @@ ...@@ -539,18 +598,18 @@
<template v-if="hpState==1"> <template v-if="hpState==1">
<table class="fen-table"> <table class="fen-table">
<thead> <thead>
<tr> <tr>
<th>结算对象</th> <th>结算对象</th>
<th>结算成本(毛利)</th> <th>结算成本(毛利)</th>
<th>预计返佣金额</th> <th>预计返佣金额</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr v-for="(x, i) in shareSettings" :key="i"> <tr v-for="(x, i) in shareSettings" :key="i">
<td>{{x.GradeName}}</td> <td>{{x.GradeName}}</td>
<td>{{x.cb}}（{{x.CommissionRatio}}%）</td> <td>{{x.cb}}（{{x.CommissionRatio}}%）</td>
<td>{{x.commission}}</td> <td>{{x.commission}}</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<div class="fen-sumg"> <div class="fen-sumg">
...@@ -567,7 +626,7 @@ ...@@ -567,7 +626,7 @@
</el-form-item> </el-form-item>
<el-form-item label="是否单独设置会员价"> <el-form-item label="是否单独设置会员价">
<el-switch v-model="addMsg.SeparateSetMember" active-color="#409EFF" :active-value="1" <el-switch v-model="addMsg.SeparateSetMember" active-color="#409EFF" :active-value="1"
:inactive-value="0"> :inactive-value="0">
</el-switch> </el-switch>
</el-form-item> </el-form-item>
<el-form-item v-if="addMsg.SeparateSetMember == 1 && huiyList.length == 0" label="会员价设置"> <el-form-item v-if="addMsg.SeparateSetMember == 1 && huiyList.length == 0" label="会员价设置">
...@@ -579,11 +638,53 @@ ...@@ -579,11 +638,53 @@
" label="默认规格会员价设置"> " label="默认规格会员价设置">
<div v-for="(item, index) in memberList1[0].GradePriceList" :key="index+'15'"> <div v-for="(item, index) in memberList1[0].GradePriceList" :key="index+'15'">
<el-input style="width:700px" placeholder="请输入内容" v-model="item.MemberPrice" size="small" <el-input style="width:700px" placeholder="请输入内容" v-model="item.MemberPrice" size="small"
class="input-with-select"> class="input-with-select">
<el-button slot="prepend">{{ item.Name }}</el-button> <el-button slot="prepend">{{ item.Name }}</el-button>
<el-button slot="append">元</el-button> <el-button slot="append">元</el-button>
</el-input> </el-input>
</div> </div>
<el-tag type="danger">如需设置多规格会员价,请先添加商品规格</el-tag>
</el-form-item>
<el-form-item v-if="
addMsg.SeparateSetMember == 1 &&
SpecificationPriceList.length > 0
" label="会员价设置">
<div class="app-attr">
<div class="box">
<el-form-item style="display:inline-block">
<el-input style="width:500px;position:relative;top:5px" size="small" v-model="memberinput"
placeholder="请输入内容">
<el-select slot="prepend" style="width:130px" v-model="memberVal" size="small">
<el-option v-for="(item, index) in huiyList" :label="item.Name" :value="item.Grade"
:key="index">
</el-option>
</el-select>
<el-button @click="HySet" slot="append">确定</el-button>
</el-input>
</el-form-item>
</div>
<el-table ref="table" :data="memberList2" border style="width: 100%"
@selection-change="TbaleSelectionChange4">
<el-table-column type="selection" width="55">
</el-table-column>
<template v-for="(item, index) in SpecificationList">
<el-table-column :key="index+'16'" :label="item.Name" width="100">
<template slot-scope="scope">
<span v-if="index == index2" v-for="(item2, index2) in scope.row.AttrList" :key="index2+'17'">
{{ scope.row.AttrList[index2].SVName }}
</span>
</template>
</el-table-column>
</template>
<template v-for="(item, index) in huiyList">
<el-table-column :key="index+'18'" :label="item.Name">
<template slot-scope="scope">
<el-input v-model="scope.row.GradePriceList[index].MemberPrice" size="small"></el-input>
</template>
</el-table-column>
</template>
</el-table>
</div>
</el-form-item> </el-form-item>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
...@@ -607,7 +708,7 @@ ...@@ -607,7 +708,7 @@
<div flex="box:last cross:center"> <div flex="box:last cross:center">
<span>{{ item.Name }}</span> <span>{{ item.Name }}</span>
<i v-if="item.ChildList.length > 0" @click="getChild2(item.ChildList)" <i v-if="item.ChildList.length > 0" @click="getChild2(item.ChildList)"
class="el-icon-arrow-right"></i> class="el-icon-arrow-right"></i>
</div> </div>
</div> </div>
</el-checkbox-group> </el-checkbox-group>
...@@ -624,7 +725,7 @@ ...@@ -624,7 +725,7 @@
<div flex="box:last cross:center"> <div flex="box:last cross:center">
<span>{{ item.Name }}</span> <span>{{ item.Name }}</span>
<i v-if="item.ChildList.length > 0" @click="getChild3(item.ChildList)" <i v-if="item.ChildList.length > 0" @click="getChild3(item.ChildList)"
class="el-icon-arrow-right"></i> class="el-icon-arrow-right"></i>
</div> </div>
</div> </div>
</el-checkbox-group> </el-checkbox-group>
...@@ -649,7 +750,7 @@ ...@@ -649,7 +750,7 @@
</el-row> </el-row>
<div class="tag-box"> <div class="tag-box">
<el-tag @close="exitCheck(item)" v-for="(item, index) in addMsg.CategoryList" :key="index+'22'" type="warning" <el-tag @close="exitCheck(item)" v-for="(item, index) in addMsg.CategoryList" :key="index+'22'" type="warning"
closable style="margin-right:5px">{{ item.Name }}</el-tag> closable style="margin-right:5px">{{ item.Name }}</el-tag>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button size="small" @click=" <el-button size="small" @click="
...@@ -727,7 +828,7 @@ ...@@ -727,7 +828,7 @@
newSpecificationValueList: [], newSpecificationValueList: [],
SpecificationValueList: [], SpecificationValueList: [],
speciList: [], speciList: [],
choosebdDig:false, choosebdDig: false,
val2: "", val2: "",
defaultMsg: "", defaultMsg: "",
config: { config: {
...@@ -742,69 +843,67 @@ ...@@ -742,69 +843,67 @@
flDig: false, flDig: false,
addMsg: { addMsg: {
Id: 0, Id: 0,
CategoryList: [], CategoryList: [], //分类列表
Name: "", Name: "", //商品名称
CarouselImageList: [], CarouselImageList: [], //轮播图
VideoAddress: "", VideoAddress: "", //视频地址
CustomShareTitles: "", CustomShareTitles: "", // 分享标题
CustomShareImage: "", CustomShareImage: "", //分享图片
CustomShareImagePath: "", GoodsStatus: 0, //商品状态 1销售中 2下架
IsLiveGoods: 2, //直播商品 IsLiveGoods: 2, //是否直播商品 1是 2否
GoodsStatus: 0, Sort: 0, //排序
SpecificationList: [], SellingPrice: 0, //销售价格
SpecificationPriceList: [], OriginalPrice: 0, //原价
SellingPrice: 0, CostPrice: 0, //成本价格
CostPrice: 0, IsAreaBuy: 2, //是否区域购买 1是 2否
IsCustomSpecification: 2, IntegralPresent: 0, //积分赠送
IsDefaultService: 1, IntegralPresentType: 2, //积分赠送类型
FreightId: -1, PointsDeduction: 0, //积分抵扣
FormsId: -1, PointsDeductionType: 2, //积分抵扣类型
FormsName: "", IsMultipleDeduction: 2, //是否可以多件累计抵扣 1是 2否
IsAreaBuy: 2, GoodsDetails: "", //商品描述
AreaList: [], SeparateDistribution: 2, //分销
IntegralPresent: 0,
IntegralPresentType: 2,
PointsDeduction: 0,
PointsDeductionType: 2,
IsMultipleDeduction: 2,
GoodsDetails: "",
SeparateDistribution: 2,
SeparateDistributionType: 1, SeparateDistributionType: 1,
SeparateDistributionMoneyType: 2, //默认显示固定金额 SeparateDistributionMoneyType: 2, //默认显示固定金额
EnjoyMember: 1, EnjoyMember: 1, //会员价
SeparateSetMember: 2, SeparateSetMember: 2,
IsQuickBuy: 1, SupplierId: '', //供应商id
SupplierId: '', Commission: 0, // 返佣总金额 （粉象模式开启 才显示）
Sort: 0, AreaList: [], //区域列表
Commission: 0, DistributionCommissionList:[], //分销佣金
PresentFXGrade: '', DistributionCommissionTreeList:[],
PresentFXMonth: 0, MemberPriceList:[], //会员价格
Advertising: '', Advertising: '', //广告词
SubName: '', SubName: '', //副标题
MarketingLogo: { MarketingLogo: { //图标
iswords: 0, iswords: 0,
words: "", words: "",
wordsColor: "", wordsColor: "",
wordsBack: "", wordsBack: "",
ico: "" ico: ""
}, },
OriginalPrice:0, SiteId: '', //站点id
SiteId:'', GuideId: '', //导游id
GuideId:'', CarId: '', //车辆id
CarId:'', CarColorId: 2, //车辆颜色id
CarColorId:2, CarNumber: '', //车牌号
CarNumber:'',//车牌号 CarBuyYear: '', //车购买年份
CarBuyYear:'',//车购买年份 CarType: '', //服务类型 枚举
CarType:'', UserDay: 1, //使用天数
UserDay:1, LineName: '', //线路名称
LineName:'',//线路名称 LineDescriptionList: [], //关联城市或景点
LineDescriptionList:[],//关联城市或景点 RideNum: 0, //乘坐人数
RideNum:0, IsSpell: 2, //是否拼车 1是 2否
IsSpell:'2',//是否拼车 1是 2否 AdvanceDay: 0, // 提前预定天数
AdvanceDay:0, TargetDateStrList:[],
TargetDateList:[
{Date:'2020-05-23'} SpecificationList: [],
], SpecificationPriceList: [],
// FormsId: -1,
// FormsName: "",
// PresentFXGrade: '',
// PresentFXMonth: 0,
}, },
predefineColors: [ predefineColors: [
...@@ -813,7 +912,7 @@ ...@@ -813,7 +912,7 @@
'#888888', '#888888',
'#FF4544', '#FF4544',
], ],
EnumType:0, EnumType: 0,
SupplierId: '', SupplierId: '',
fenleiData: [], fenleiData: [],
checkList: [], checkList: [],
...@@ -869,27 +968,58 @@ ...@@ -869,27 +968,58 @@
trigger: "blur" trigger: "blur"
}] }]
}, },
SiteList:[],//站点列表 SiteList: [], //站点列表
GuideList:[],//导游列表 GuideList: [], //导游列表
CarList:[],//导游列表 CarList: [], //导游列表
CarColorList:[],//车辆颜色 CarColorList: [], //车辆颜色
EnumList:[],//服务列表 EnumList: [], //服务列表
DayList:[ DayList: [{
{'ID':0.5,'Name':'半日'}, 'ID': 0.5,
{'ID':1,'Name':'一日'}, 'Name': '半日'
{'ID':2,'Name':'二日'}, },
{'ID':3,'Name':'三日'}, {
{'ID':4,'Name':'四日'}, 'ID': 1,
{'ID':5,'Name':'五日'}, 'Name': '一日'
{'ID':6,'Name':'六日'}, },
{'ID':7,'Name':'七日'}, {
'ID': 2,
'Name': '二日'
},
{
'ID': 3,
'Name': '三日'
},
{
'ID': 4,
'Name': '四日'
},
{
'ID': 5,
'Name': '五日'
},
{
'ID': 6,
'Name': '六日'
},
{
'ID': 7,
'Name': '七日'
},
], ],
reserveList:[ reserveList: [{
{'ID':1,'Name':'指定区间'}, 'ID': 1,
{'ID':2,'Name':'按每周'}, 'Name': '指定区间'
{'ID':3,'Name':'按每月'}, },
{
'ID': 2,
'Name': '按每月'
},
{
'ID': 3,
'Name': '按每周'
},
], ],
reserveType:1, reserveType: 1,
imgType: 1, imgType: 1,
checkService: [], checkService: [],
keepServiceList: [], keepServiceList: [],
...@@ -941,6 +1071,33 @@ ...@@ -941,6 +1071,33 @@
options: [], options: [],
FXlevelList: [], FXlevelList: [],
giveDate: false, giveDate: false,
//请求日期参数
dateMsg: {
DayType: 1, //类型
StartDate: '', //开始时间
EndDate: '', //结束时间
Year: '', //年
Month: '', //月
Week: '' //周
},
pickerBeginDateBefore: {
disabledDate: time => {
if (this.dateMsg.EndDate == null) {
return false;
} else {
let endTime = new Date(this.dateMsg.EndDate);
return endTime.getTime() < time.getTime();
}
}
},
pickerBeginDateAfter: {
disabledDate: time => {
let startTime = new Date(this.dateMsg.StartDate);
return startTime.getTime() >= time.getTime();
}
},
subDateList: [] //日期数组
}; };
}, },
created() { created() {
...@@ -959,7 +1116,7 @@ ...@@ -959,7 +1116,7 @@
this.getSupplierList() this.getSupplierList()
this.getFXDGradeList() this.getFXDGradeList()
this.getAllGuideCarSiteList() this.getAllGuideCarSiteList()
this.getGuideCarList()//获取车辆下拉 this.getGuideCarList() //获取车辆下拉
this.getOrderListExportEnumList() this.getOrderListExportEnumList()
}, },
...@@ -1104,11 +1261,14 @@ ...@@ -1104,11 +1261,14 @@
this.addMsg.IsCustomSpecification = 2; this.addMsg.IsCustomSpecification = 2;
} }
//预定日期设置
this.addMsg.TargetDateStrList=this.subDateList;
if (this.addMsg.SeparateDistributionType == 1) { if (this.addMsg.SeparateDistributionType == 1) {
this.disList1 = [{ this.disList1 = [{
SpecificationSort: "", SpecificationSort: "",
GradeCommissionList: this.GradeCommissionList GradeCommissionList: this.GradeCommissionList
}], }],
this.addMsg.DistributionCommissionList = this.disList1; this.addMsg.DistributionCommissionList = this.disList1;
} }
if (this.addMsg.SeparateSetMember == 1 && this.SpecificationList.length == 0) { if (this.addMsg.SeparateSetMember == 1 && this.SpecificationList.length == 0) {
...@@ -1225,7 +1385,6 @@ ...@@ -1225,7 +1385,6 @@
clearCustom() { clearCustom() {
this.addMsg.CustomShareImage = ""; this.addMsg.CustomShareImage = "";
this.addMsg.CustomShareImagePath = "";
}, },
Selectvideo(val) { Selectvideo(val) {
this.addMsg.VideoAddress = val.Path; this.addMsg.VideoAddress = val.Path;
...@@ -1266,7 +1425,7 @@ ...@@ -1266,7 +1425,7 @@
let imgListIndex2 = this.imgListIndex2; let imgListIndex2 = this.imgListIndex2;
this.SpecificationList[imgListIndex1].SpecificationValueList[ this.SpecificationList[imgListIndex1].SpecificationValueList[
imgListIndex2 imgListIndex2
].Image = that.getIconLink(msg[0].url); ].Image = that.getIconLink(msg[0].url);
} }
if (this.imgType == 4) { if (this.imgType == 4) {
that.addMsg.MarketingLogo.ico = that.getIconLink(msg[0].url) that.addMsg.MarketingLogo.ico = that.getIconLink(msg[0].url)
...@@ -1364,15 +1523,21 @@ ...@@ -1364,15 +1523,21 @@
if (!this.$route.query.GoodsId) { if (!this.$route.query.GoodsId) {
this.addMsg.Id = 0 this.addMsg.Id = 0
} }
if(this.addMsg.TargetDateList.length>0){
this.addMsg.TargetDateList.forEach(x=>{
this.subDateList.push(x.Date.split('T')[0])
})
}
this.getGuideCarGuideList(this.addMsg.SiteId) //导游下拉
this.initShareSettings(); this.initShareSettings();
this.SpecificationPriceList = this.addMsg.SpecificationPriceList; if(this.addMsg.SpecificationPriceList){
this.ComTreeList = this.addMsg.DistributionCommissionTreeList; this.SpecificationPriceList = this.addMsg.SpecificationPriceList;
this.SpecificationList = this.addMsg.SpecificationList;
if (this.SpecificationList.length > 0) { //根据编码来的详情 重新调用这个方法 否则分销详情设置没有数据
this.getDistributor()
} }
this.SpecificationList = this.addMsg.SpecificationList;
this.ComTreeList = this.addMsg.DistributionCommissionTreeList;
if (this.addMsg.SeparateDistributionType == 1) { if (this.addMsg.SeparateDistributionType == 1) {
this.disList1 = this.addMsg.DistributionCommissionTreeList; this.disList1 = this.addMsg.DistributionCommissionTreeList;
if (this.addMsg.DistributionCommissionTreeList.length > 0) { if (this.addMsg.DistributionCommissionTreeList.length > 0) {
...@@ -1401,7 +1566,7 @@ ...@@ -1401,7 +1566,7 @@
if (this.addMsg.PresentFXGrade == 0) { if (this.addMsg.PresentFXGrade == 0) {
this.addMsg.PresentFXGrade = '' this.addMsg.PresentFXGrade = ''
} }
if (!this.addMsg.MarketingLogo||this.addMsg.MarketingLogo == null) { if (!this.addMsg.MarketingLogo || this.addMsg.MarketingLogo == null) {
this.addMsg.MarketingLogo = { this.addMsg.MarketingLogo = {
iswords: 0, iswords: 0,
...@@ -1412,16 +1577,29 @@ ...@@ -1412,16 +1577,29 @@
} }
} else { } else {
let MarketingLogo = JSON.parse(this.addMsg.MarketingLogo) let MarketingLogo = JSON.parse(this.addMsg.MarketingLogo)
let obj=MarketingLogo let obj = MarketingLogo
this.addMsg.MarketingLogo = obj this.addMsg.MarketingLogo = obj
} }
this.getSuggestPrice(); this.getSuggestPrice();
this.getFXDGradeList2(); this.getFXDGradeList2();
this.apipost("/api/GuideCar/GetGuideCarList", {}, res => {
if (res.data.resultCode == 1) {
var MyData = res.data.data;
MyData.forEach(x=>{
if (x.ID == this.addMsg.CarId) {
this.CarColorList = x.ColorList
}
})
}
});
}else{
this.Error(res.data.message);
} }
} }
); );
}, },
getSuggestPrice() {//获取和平分销商品建议价格 getSuggestPrice() { //获取和平分销商品建议价格
if (this.hpState == 1 && Number(this.addMsg.CostPrice) > 0) { if (this.hpState == 1 && Number(this.addMsg.CostPrice) > 0) {
let arr = []; let arr = [];
this.addMsg.CategoryList.forEach(item => { this.addMsg.CategoryList.forEach(item => {
...@@ -1546,28 +1724,31 @@ ...@@ -1546,28 +1724,31 @@
changeSupplier(val) { changeSupplier(val) {
}, },
addGgz(){ addGgz() {
let obj= {Name:''} let obj = {
Name: ''
}
this.addMsg.LineDescriptionList.push(obj) this.addMsg.LineDescriptionList.push(obj)
}, },
Deleteggz(index){ Deleteggz(index) {
this.addMsg.LineDescriptionList.splice(index,1) this.addMsg.LineDescriptionList.splice(index, 1)
}, },
changeSiteId(val){ changeSiteId(val) {
this.getGuideCarGuideList(val)//导游下拉 this.getGuideCarGuideList(val) //导游下拉
this.addMsg.GuideId='' this.addMsg.GuideId = ''
}, },
changeCarId(val){ changeCarId(val) {
this.CarList.forEach(x=>{ this.addMsg.CarColorId='';
if(x.ID == val){ this.CarList.forEach(x => {
this.CarColorList=x.ColorList if (x.ID == val) {
this.CarColorList = x.ColorList
} }
}) })
}, },
changeCarColorList(val){ changeCarColorList(val) {
console.log(val) console.log(val)
}, },
changeEnumList(val){ changeEnumList(val) {
this.EnumType = val this.EnumType = val
}, },
getSupplierList() { getSupplierList() {
...@@ -1600,21 +1781,22 @@ ...@@ -1600,21 +1781,22 @@
} }
}); });
}, },
getAllGuideCarSiteList(){//获取站点下拉 getAllGuideCarSiteList() { //获取站点下拉
this.apipost("/api/GuideCar/GetAllGuideCarSiteList", {}, res => { this.apipost("/api/GuideCar/GetAllGuideCarSiteList", {}, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.SiteList = res.data.data this.SiteList = res.data.data
} }
}); });
}, },
getGuideCarList(){ getGuideCarList() {
this.apipost("/api/GuideCar/GetGuideCarList", {}, res => { this.apipost("/api/GuideCar/GetGuideCarList", {}, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.CarList = res.data.data this.CarList = res.data.data;
console.log(this.CarList,'carllist');
} }
}); });
}, },
getOrderListExportEnumList(){//获取服务类型枚举列表 getOrderListExportEnumList() { //获取服务类型枚举列表
this.apipost("/api/GuideCar/GetOrderListExportEnumList", {}, res => { this.apipost("/api/GuideCar/GetOrderListExportEnumList", {}, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.EnumList = res.data.data this.EnumList = res.data.data
...@@ -1623,14 +1805,16 @@ ...@@ -1623,14 +1805,16 @@
}); });
}, },
getGuideCarGuideList(ID){ getGuideCarGuideList(ID) {
this.apipost("/api/GuideCar/GetGuideCarGuideList", {SiteId:ID}, res => { this.apipost("/api/GuideCar/GetGuideCarGuideList", {
SiteId: ID
}, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.GuideList = res.data.data this.GuideList = res.data.data
} }
}); });
}, },
getFXDGradeList2() {//获取粉象等级下拉列表 getFXDGradeList2() { //获取粉象等级下拉列表
this.apipost("/api/user/GetFXDistributorGradeList", { this.apipost("/api/user/GetFXDistributorGradeList", {
GradeName: '' GradeName: ''
...@@ -1660,6 +1844,30 @@ ...@@ -1660,6 +1844,30 @@
} else { } else {
this.giveDate = true; this.giveDate = true;
} }
},
//追加日期
SaveDate() {
console.log(this.dateMsg, 'this.dateMsg');
this.apipost("/api/GuideCar/GetGoodsTargetDateList", this.dateMsg, res => {
if (res.data.resultCode == 1) {
console.log(res, 'ress');
var myArr = res.data.data;
//遍历当前数组
for (var i = 0; i < myArr.length; i++) {
//如果当前数组的第i已经保存进了临时数组，那么跳过，
//否则把当前项push到临时数组里面
if (this.subDateList.indexOf(myArr[i]) == -1) {
this.subDateList.push(myArr[i]);
}
}
}else{
this.Error(res.data.message);
}
});
},
//删除标签
handleClose(index) {
this.subDateList.splice(index, 1);
} }
} }
}; };
...@@ -1744,7 +1952,7 @@ ...@@ -1744,7 +1952,7 @@
border: 1px solid #ebeef5; border: 1px solid #ebeef5;
} }
.directorGoodsEdit .close { .directorGoodsEdit .close {
position: absolute; position: absolute;
top: -4px; top: -4px;
right: -4px; right: -4px;
...@@ -1752,7 +1960,7 @@ ...@@ -1752,7 +1960,7 @@
cursor: pointer; cursor: pointer;
} }
.directorGoodsEdit .attr-list { .directorGoodsEdit .attr-list {
display: inline-block; display: inline-block;
margin-right: 10px; margin-right: 10px;
margin-bottom: 10px; margin-bottom: 10px;
...@@ -1941,4 +2149,10 @@ ...@@ -1941,4 +2149,10 @@
display: inline-block; display: inline-block;
} }
.directorGoodsEdit .w90 {
width: 90px !important;
}
.directorGoodsEdit .w130{
width: 130px !important;
}
</style> </style>
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