Skip to content

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

1

parent 5d816cd0
Hide whitespace changes
Inline Side-by-side
Showing with 112 additions and 76 deletions
src/assets/common/lang/zhCN/Ground.js
View file @ de1fb55f
......@@ -636,6 +636,30 @@ export const obj = {
lduiwubi:'领队务必当场确认护照、签证和机票行程单，请仔细核对上面信息，若有错误，请及时将OP票务联系。',
ruyoukeren:'如有客人出发当天没到机场（NO SHOW）一定要当日马上回去线控/OP',
lduichutuan:'领队出团带出的领队旗和手配旗，结束后需带回，押金50元。',
chahewuwu:'查核无误后，请在以下栏位签名及压日期',
chahewuwu: '查核无误后，请在以下栏位签名及压日期',
guanggaolianjie: '广告链接',
shifoushancgg: '是否删除此广告',
shangpinfl: '商品分类',
xiaoshoujia: '销售价',
lingduifyje: '领队返佣金额',
gongsifyje: '公司返佣金额',
tonghangfyje: '同行返佣金额',
weitufyje: '微途返佣金额',
shangpintp: '商品图片',
zuiduoscwz: '最多上传5张图片',
shangpinms: '商品描述',
shangpinsm: '商品说明',
shangpinxq: '商品详情',
qingsrspmc: '请输入商品名称',
qingsrjg: '请输入价格',
qingsrscjg: '请输入市场价格',
qingxzsplx: '请选择商品类型',
qingxzspfl: '请选择商品分类',
fenleimc: '分类名称',
leixingmc: '类型名称',
lingduifany: '领队返佣',
gongsifany: '公司返佣',
tonghangfy: '同行返佣',
weitufany: '微途返佣'
}
export default obj;
\ No newline at end of file
src/assets/common/lang/zhTW/Ground.js
View file @ de1fb55f
......@@ -636,6 +636,30 @@ LDHUIGUO:'領隊回國請務必提供所有消費明細憑據報帳。',
lduiwubi:'領隊務必當場確認護照、簽證和機票行程單，請仔細核對上面資訊，若有錯誤，請及時將OP票務聯系。',
ruyoukeren:'如有客人出發當天沒到機場（NO SHOW）一定要當日馬上回去線控/OP',
lduichutuan:'領隊出團帶出的領隊旗和手配旗，結束後需帶回，押金50元。',
chahewuwu:'查核無誤後，請在以下欄比特簽名及壓日期',
chahewuwu: '查核無誤後，請在以下欄比特簽名及壓日期',
guanggaolianjie: '廣告連結',
shifoushancgg: '是否删除此廣告',
shangpinfl: '商品分類',
xiaoshoujia: '銷售價',
lingduifyje: '領隊返傭金額',
gongsifyje: '公司返傭金額',
tonghangfyje: '同行返傭金額',
weitufyje: '微途返傭金額',
shangpintp: '商品圖片',
zuiduoscwz: '最多上傳5張圖片',
shangpinms: '商品描述',
shangpinsm: '商品說明',
shangpinxq: '商品詳情',
qingsrspmc: '請輸入商品名稱',
qingsrjg: '請輸入價格',
qingsrscjg: '請輸入市場價格',
qingxzsplx: '請選擇商品類型',
qingxzspfl: '請選擇商品分類',
fenleimc: '分類名稱',
leixingmc: '類型名稱',
lingduifany: '領隊返傭',
gongsifany: '公司返傭',
tonghangfy: '同行返傭',
weitufany: '微途返傭'
}
export default obj;
\ No newline at end of file
src/components/Buying/AdManageList.vue
View file @ de1fb55f
......@@ -70,16 +70,16 @@
<div class="query-box">
<ul>
<li>
<input type="button" class="normalBtn" value="新增" @click="IsShowBtm=true" />
<input type="button" class="normalBtn" :value="$t('pub.addBtn')" @click="IsShowBtm=true" />
</li>
</ul>
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th>编号</th>
<th>广告图</th>
<th>广告链接</th>
<th>状态</th>
<th>{{$t('hotel.hotel_SerialNumber')}}</th>
<th>{{$t('salesModule.AdvPic')}}</th>
<th>{{$t('ground.guanggaolianjie')}}</th>
<th>{{$t('admin.admin_status')}}</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="item in dataList">
......@@ -92,12 +92,12 @@
<td>{{item.StatusStr}}</td>
<td>
<el-button-group>
<el-tooltip class="item" effect="dark" :content="$t('active.ld_editInfo')" placement="top">
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top">
<el-button type="primary" size="mini" icon="el-icon-edit" @click="getAdManage(item.Id)">
</el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<el-button type="danger" size="mini" class="iconfont icon-quxiao1" @click="removeAdManage(item.Id)">
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top">
<el-button type="danger" style="font-size: 14px;" size="mini" class="iconfont icon-quxiao1" @click="removeAdManage(item.Id)">
</el-button>
</el-tooltip>
</el-button-group>
......@@ -112,17 +112,17 @@
<div class="combottomDiv" v-if="IsShowBtm" style="left:0;">
<el-row>
<el-col :span="20">
<p class="combottomTitle">广告图</p>
<p class="combottomTitle">{{$t('salesModule.AdvPic')}}</p>
</el-col>
<el-col :span="4">
<input type="button" class="normalBtn" @click="SetAdmanage()" value="保存" />
<input type="button" class="hollowFixedBtn" @click="clearAdManage(),IsShowBtm=false" value="取消" />
<input type="button" class="normalBtn" @click="SetAdmanage()" :value="$t('pub.saveBtn')" />
<input type="button" class="hollowFixedBtn" @click="clearAdManage(),IsShowBtm=false" :value="$t('pub.cancelBtn')"/>
</el-col>
</el-row>
<el-form label-width="80px">
<ul class="changeMsg">
<li>
<el-form-item label="图片">
<el-form-item :label="$t('system.label_img')">
<div class="TFimgList">
<img v-if="!ShowImgUrl" src="../../assets/img/bg_c3@3x.png">
<img v-else :src='ShowImgUrl'>
......@@ -138,7 +138,7 @@
</el-form-item>
</li>
<li>
<el-form-item label="广告链接">
<el-form-item :label="$t('ground.guanggaolianjie')">
<el-input v-model="addMsg.AdLink" class="w210"></el-input>
</el-form-item>
</li>
......@@ -222,7 +222,7 @@
//根据编号删除广告详情
removeAdManage(Id) {
var that = this;
this.Confirm("是否删除此广告?", function () {
this.Confirm(this.$t('ground.shifoushancgg'), function () {
that.apipost("ShopAd_post_RemoveAdManageService", {
Id: Id
}, res => {
......
src/components/Buying/BuyingAdd.vue
View file @ de1fb55f
......@@ -205,11 +205,11 @@
<el-row class="addIntegralMall">
<el-col :span="9">
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="130px">
<span class="resource-lititle">基本信息</span>
<el-form-item label="商品名称" prop="Name">
<span class="resource-lititle">{{$t('salesModule.BaseInfo')}}</span>
<el-form-item :label="$t('MarketingActi.commName')" prop="Name">
<el-input v-model="addMsg.Name" class="w217"/>
</el-form-item>
<el-form-item label="商品类型" prop="SellType">
<el-form-item :label="$t('MarketingActi.commType')" prop="SellType">
<el-select filterable v-model="addMsg.SellType">
<el-option
v-for="item in CommodityTypeList"
......@@ -217,7 +217,7 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="商品分类" >
<el-form-item :label="$t('ground.shangpinfl')" >
<el-select filterable v-model="addMsg.ParentCategoryId" @change="getGoodsTypeManager(2)">
<el-option
v-for="item in GoodsTypeList"
......@@ -231,28 +231,28 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="成本价" prop="CostPrice">
<el-form-item :label="$t('ground.cbenjia')" prop="CostPrice">
<el-input v-model="addMsg.CostPrice" class="w217"/>
</el-form-item>
<el-form-item label="销售价" prop="SellPrice">
<el-form-item :label="$t('ground.xiaoshoujia')" prop="SellPrice">
<el-input v-model="addMsg.SellPrice" class="w217"/>
</el-form-item>
<el-form-item label="领队返佣金额" prop="LeaderRebate">
<el-form-item :label="$t('ground.lingduifyje')" prop="LeaderRebate">
<el-input v-model="addMsg.LeaderRebate" class="w217"/>
</el-form-item>
<el-form-item label="公司返佣金额" prop="CompanyRebate">
<el-form-item :label="$t('ground.gongsifyje')" prop="CompanyRebate">
<el-input v-model="addMsg.CompanyRebate" class="w217"/>
</el-form-item>
<el-form-item label="同行返佣金额" prop="ClientRebate">
<el-form-item :label="$t('ground.tonghangfyje')" prop="ClientRebate">
<el-input v-model="addMsg.ClientRebate" class="w217"/>
</el-form-item>
<el-form-item label="微途返佣金额" prop="WeiTuRebate">
<el-form-item :label="$t('ground.weitufyje')" prop="WeiTuRebate">
<el-input v-model="addMsg.WeiTuRebate" class="w217"/>
</el-form-item>
</el-form>
</el-col>
<el-col :span="9">
<span class="resource-lititle">商品图片</span>
<span class="resource-lititle">{{$t('ground.shangpintp')}}</span>
<div class="resource-list">
<div class="resource-imglist clearfix">
<div class="re-img" v-for="(item,index) in DiningImageArray" :key="index">
......@@ -301,11 +301,11 @@
</div>
</div>
</div>
<p class="tips tips2">最多上传5张图片</p>
<span class="resource-lititle resource-lititle2">商品描述</span>
<p class="tips tips2">{{$t('ground.zuiduoscwz')}}</p>
<span class="resource-lititle resource-lititle2">{{$t('ground.shangpinms')}}</span>
<el-input type="textarea" :rows="2" v-model="addMsg.Description" class="w217"/>
<span class="resource-lititle resource-lititle2">商品说明</span>
<el-select v-model="addMsg.ExplainList" multiple placeholder="请选择" class="heightauto">
<span class="resource-lititle resource-lititle2">{{$t('ground.shangpinsm')}}</span>
<el-select v-model="addMsg.ExplainList" multiple :placeholder="$t('pub.pleaseSel')" class="heightauto">
<el-option
v-for="item in CommodityExplainList"
:key="item.Id"
......@@ -313,9 +313,9 @@
:value="item.Id">
</el-option>
</el-select>
<span class="resource-lititle resource-lititle2">商品详情</span>
<span class="resource-lititle resource-lititle2">{{$t('ground.shangpinxq')}}</span>
<my-edit v-on:edit-value="addMsg.Content = arguments[0]" v-bind:editValue="addMsg.Content"
v-bind:toolbarShow="toolbar" v-bind:placeholder="placeholder"></my-edit>
v-bind:toolbarShow="toolbar" v-bind:placeholder="$t('pub.pleaseSel')"></my-edit>
</div>
<div class="bottom_sub">
......@@ -349,7 +349,6 @@ export default {
fontColor: true, //字体颜色
fontBackgroundColor: true, //背景颜色
},
placeholder: "请输入内容",
editorOption: {
modules: {
toolbar: [
......@@ -378,32 +377,21 @@ export default {
LeaderRebate: 1,
CompanyRebate: 0,
ClientRebate: 0,
WeiTuRebate: '',
WeiTuRebate: 0,
ParentCategoryId: ""
},
MenberList: [],
GoodsTypeList: [],
CommodityTypeList: [],
rules: {
memberLevel: [
{ required: true, message: "请输入会员等级", trigger: "blur" }
],
name: [{ required: true, message: "请输入商品名称", trigger: "blur" }],
price: [{ required: true, message: "请输入价格", trigger: "blur" }],
Name: [{ required: true, message: this.$t('ground.qingsrspmc'), trigger: "blur" }],
CostPrice: [{ required: true, message: this.$t('ground.qingsrjg'), trigger: "blur" }],
marketPrice: [
{ required: true, message: "请输入市场价格", trigger: "blur" }
{ required: true, message: this.$t('ground.qingsrscjg'), trigger: "blur" }
],
state: [
{ required: true, message: "请选择商品类型", trigger: "change" }
],
tradeMoneyReq: [
{ required: true, message: "交易金额要求", trigger: "blur" }
],
tradePeopleReq: [
{ required: true, message: "交易人头数要求", trigger: "blur" }
{ required: true, message: this.$t('ground.qingxzsplx'), trigger: "change" }
],
remark: [{ required: true, message: "请输入备注", trigger: "blur" }],
storeNum:[{ required: true, message: "请输入商品数量", trigger: "blur" }]
},
//上传的文件数组
DiningImageArray: [],
......@@ -478,7 +466,7 @@ export default {
this.UploadSelfFileT(path, newArr, x => {
//统一图片处理
if (this.DiningImageArray.length === 5) {
return this.$message.error('最多上传5张图片')
return this.$message.error(this.$t('ground.zuiduoscwz'))
}
var obj = {}
var str = x.data.FilePath;
......@@ -541,7 +529,7 @@ export default {
});
},
addIntegralMall: function() {
if (this.addMsg.CategoryId == '') return this.$message.error('请选择商品分类')
if (this.addMsg.CategoryId == '') return this.$message.error(this.$t('ground.qingxzspfl'))
this.addMsg.FlowImgList = this.DiningImageArray
this.apipost("Shop_post_SetCommodityInfo", this.addMsg,
res => {
......
src/components/Buying/BuyingList.vue
View file @ de1fb55f
......@@ -22,7 +22,7 @@
</li>
<li>
<span>
<em>商品类型</em>
<em>{{$t('MarketingActi.commType')}}</em>
<el-select filterable v-model="msg.SellType">
<el-option :label="$t('pub.unlimitedSel')" :value="0" key="0"></el-option>
<el-option v-for="item in CommodityTypeList" :label="item.Name" :value="item.Id" :key="item.Id"></el-option>
......@@ -31,7 +31,7 @@
</li>
<li>
<span>
<em>商品分类</em>
<em>{{$t('ground.shangpinfl')}}</em>
<el-select filterable v-model="msg.CategoryId">
<el-option :label="$t('pub.unlimitedSel')" :value="-1"></el-option>
<el-option v-for="item in GoodsTypeList" :label="item.Name" :value="item.Id" :key="item.Id"></el-option>
......@@ -43,10 +43,10 @@
<em>{{$t('admin.admin_status')}}</em>
<el-select filterable v-model="msg.Status">
<el-option :label="$t('pub.unlimitedSel')" :value="-1"></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="$t('visa.v_dwanshan')" :value="1"></el-option>
<el-option :label="$t('Operation.Op_shangjia')" :value="2"></el-option>
<el-option :label="$t('Operation.Op_xiajia')" :value="3"></el-option>
<el-option :label="$t('pub.cancelBtn')" :value="4"></el-option>
</el-select>
</span>
</li>
......@@ -62,17 +62,17 @@
<tr>
<th width='80'>{{$t('MarketingActi.commNum')}}</th>
<th>{{$t('MarketingActi.commName')}}</th>
<th>分类名称</th>
<th>类型名称</th>
<th>成本价</th>
<th>销售价</th>
<th>领队返佣</th>
<th>公司返佣</th>
<th>同行返佣</th>
<th>微途返佣</th>
<th>状态</th>
<th>操作人</th>
<th>操作时间</th>
<th>{{$t('ground.fenleimc')}}</th>
<th>{{$t('ground.leixingmc')}}</th>
<th>{{$t('ground.cbenjia')}}</th>
<th>{{$t('ground.xiaoshoujia')}}</th>
<th>{{$t('ground.lingduifany')}}</th>
<th>{{$t('ground.gongsifany')}}</th>
<th>{{$t('ground.tonghangfy')}}</th>
<th>{{$t('ground.weitufany')}}</th>
<th>{{$t('admin.admin_status')}}</th>
<th>{{$t('admin.admin_czPerson')}}</th>
<th>{{$t('hotel.table_operattime')}}</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="item in dataList">
......@@ -91,19 +91,19 @@
<td>{{item.UpdateDate}}</td>
<td class="BuyingList">
<el-button-group size="mini">
<el-tooltip class="item" effect="dark" content="修改" placement="top">
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top">
<el-button type="primary" size="mini" class="iconfont icon-xiugai" @click="addIntegralMall('BuyingAdd', item.Id, '修改商品')"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="上架" placement="top">
<el-tooltip class="item" effect="dark" :content="$t('Operation.Op_shangjia')" placement="top">
<el-button type="success" size="mini" class="iconfont icon-shangjia1" @click="setProS(3, item.Id)" v-if="item.Status === 2 || item.Status === 1"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="下架" placement="top">
<el-tooltip class="item" effect="dark" :content="$t('Operation.Op_shangjia')" placement="top">
<el-button type="warning" size="mini" class="iconfont icon-xiajia1" @click="setProS(2, item.Id)" v-if="item.Status === 3"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="价格" placement="top">
<el-tooltip class="item" effect="dark" :content="$t('Operation.Op_price')" placement="top">
<el-button type="warning" size="mini" class="iconfont icon-jiage" @click="setPrice(item.Id)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="取消" placement="top">
<el-tooltip class="item" effect="dark" :content="$t('pub.cancelBtn')" placement="top">
<el-button type="danger" size="mini" class="iconfont icon-quxiao1" @click="setProS(4, item.Id)"></el-button>
</el-tooltip>
</el-button-group>
......
src/components/Buying/BuyingPrice.vue
View file @ de1fb55f
......@@ -31,8 +31,8 @@
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th>{{$t('MarketingActi.commName')}}</th>
<th>成本价</th>
<th>销售价</th>
<th>{{$t('ground.cbenjia')}}</th>
<th>{{$t('ground.xiaoshoujia')}}</th>
<th>开始时间</th>
<th>结束时间</th>
<th>描述</th>
......
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