Skip to content

S
SuperMan
Commit cafc1152 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

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

parents 51f9080a 32db721a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 847 additions and 538 deletions
src/assets/common/lang/jp.js
View file @ cafc1152
This diff is collapsed.
src/assets/common/lang/zh-tw.js
View file @ cafc1152
......@@ -1536,6 +1536,31 @@ export const rule = {
qsrzjine: '請輸入總金額',
qxzrzshijian: '請選擇入職時間！',
qsrzqdqq: '請輸入正確的qq！',
EnterContratPerson:'請輸入連絡人',
EnterCustomer:'請輸入客戶名',
EnterPNum:'請輸入聯繫電話',
EnterRightNum:'請輸入正確的電話',
ChoiceBrand:'請選擇所屬品牌',
ChoiceJob:'請選擇職務',
ChoiceJYCS:'請選擇經營場所',
ChoiceCusFrom:'請選擇經客戶來源',
EnterCusName:'請輸入客戶名',
EnterBrandName:'請輸入品牌名稱',
ChoiceVDate:'請選擇拜訪日期',
ChoiceVTime:'請選擇拜訪時間',
ChoiceLC:'請選擇所屬流程',
EnterCusName:'請輸入客戶名稱',
EnterCusAds:'請輸入客戶地址',
EnterTaskName:'請輸入任務名稱',
ChoiceTaskType:'請選擇任務類型',
EnterNum:'請輸入數量',
OnlyInter:'只能輸入正整數',
ChoiceRQFW:'請選擇時間範圍',
EnterMark:'請輸入備註',
OnlyNumber:'只能輸入數位',
EnterPnum:'請輸入人數',
EnterRJRQ:'請輸入入境日期',
EnterCJRQ:'請輸入出境日期',
}
export const adm={
......
src/assets/common/lang/zh.js
View file @ cafc1152
......@@ -820,7 +820,7 @@ export const fnc = {
khuren: '开户人：',
ptAcc: '平台账户：',
suoshugs: '所属公司：',
ptsyongfei: '平台使用费：',
ptsffangshi: '平台使用费：',
ptsffangshi: '平台收费方式：',
abfenbi: '按百分比',
anrentou: '按人头',
......@@ -1258,7 +1258,7 @@ export const tips = {
tips: '提示',
shifoudui: '是否对',
zhshanchu: '账户进行销户操作？销户后不可恢复！',
cancleDelete: '已取消删除',
cancleDelete: '已取消删除！',
saveYes: '保存成功！',
sxhuilv: '以下汇率系统将每隔30分钟实时更新一次',
yssdliucheng: '注：以上费用类型将会被执行你设定的流程',
......@@ -1546,7 +1546,31 @@ export const rule = {
qxzrzshijian: '请选择入职时间!',
qsrzqdqq: '请输入正确的qq!',
EnterContratPerson:'请输入联系人',
EnterCustomer:'请输入客户名',
EnterPNum:'请输入联系电话',
EnterRightNum:'请输入正确的电话',
ChoiceBrand:'请选择所属品牌',
ChoiceJob:'请选择职务',
ChoiceJYCS:'请选择经营场所',
ChoiceCusFrom:'请选择经客户来源',
EnterCusName:'请输入客户名',
EnterBrandName:'请输入品牌名称',
ChoiceVDate:'请选择拜访日期',
ChoiceVTime:'请选择拜访时间',
ChoiceLC:'请选择所属流程',
EnterCusName:'请输入客户名称',
EnterCusAds:'请输入客户地址',
EnterTaskName:'请输入任务名称',
ChoiceTaskType:'请选择任务类型',
EnterNum:'请输入数量',
OnlyInter:'只能输入正整数',
ChoiceRQFW:'请选择时间范围',
EnterMark:'请输入备注',
OnlyNumber:'只能输入数字',
EnterPnum:'请输入人数',
EnterRJRQ:'请输入入境日期',
EnterCJRQ:'请输入出境日期',
}
export const adm={
......@@ -1779,6 +1803,7 @@ export const MarketingActi={
commTypename:'商品类型名称',
typeNum:'类型编号',
notShow:'不显示',
commName:'商品名称',
commType:'商品类型',
commActivity:'商品活动',
......@@ -2262,11 +2287,8 @@ export const sm={
songji:"送机",
bantian:"半天",
buyongche:"不用车",
qingxuanzchufacity:"请选择出发城市",
qingxuanzjiaotongType:"请选择交通类型",
qingxuanzchufacity:"请选择出发城市",
qingxuanzchufacity:"请选择出发城市",
qingxuanzchufacity:"请选择出发城市",
qsrjiaotonginfo:"请输入交通信息",
qxztime:"请选择时间",
scenChoosse:"景点选择",
......
src/components/Buying/AdManageList.vue 0 → 100644
View file @ cafc1152
<style>
.height_auto.el-select .el-input {
height: auto
}
</style>
<template>
<div class="flexOne">
<div class="clearfix"></div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th>编号</th>
<th>广告图</th>
<th>广告链接</th>
<th>状态</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="item in dataList">
<td>{{item.Id}}</td>
<td>{{item.AdImage}}</td>
<td>{{item.AdLink}}</td>
<td>{{item.Status}}</td>
<td>
<el-button-group>
<el-tooltip class="item" effect="dark" :content="$t('active.ld_editInfo')" 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-button>
</el-tooltip>
</el-button-group>
</td>
</tr>
</table>
<div class="noDataNotice" v-if="dataList.length<1">
<i class="iconfont icon-kong"></i>
<p>{{$t("active.ld_noData")}}</p>
</div>
</div>
</template>
<script>
import {
get
} from 'http';
export default {
data() {
return {
//查询参数
msg: {},
addMsg: {
Id: 0, //编号
AdImage: "", //广告图片
AdLink: "", //广告链接
},
loading: false,
dataList: [],
};
},
mounted() {
this.getList();
},
filters: {},
methods: {
//获取数据
getList() {
this.loading = true;
this.apipost("ShopAd_get_GetAdManageListService", this.msg, res => {
this.loading = false;
if (res.data.resultCode === 1) {
this.dataList = res.data.data;
} else {
this.Error(res.data.message)
}
}, null);
},
//添加修改广告
SetAdmanage() {
this.apipost("ShopAd_post_SetAdManageService", this.addMsg, res => {
if (res.data.resultCode === 1) {
this.getList();
} else {
this.Error(res.data.message)
}
}, null);
},
//根据编号获取广告详情
getAdManage(Id) {
this.apipost("ShopAd_get_GetAdManageService", {
Id: Id
}, res => {
if (res.data.resultCode === 1) {
this.addMsg = res.data.data;
} else {
this.Error(res.data.message)
}
}, null);
},
//根据编号删除广告详情
removeAdManage(Id) {
this.apipost("ShopAd_post_RemoveAdManageService", {
Id: Id
}, res => {
if (res.data.resultCode === 1) {
this.getList();
} else {
this.Error(res.data.message)
}
}, null);
},
}
};
</script>
src/components/Buying/BuyingList.vue 0 → 100644
View file @ cafc1152
<style>
.height_auto.el-select .el-input{
height: auto
}
.BuyingList .el-button-group .el-button{
padding: 6px !important;
}
.BuyingList .el-button-group .el-button.iconfont{
font-size: 12px !important;
}
</style>
<template>
<div class="flexOne BuyingList">
<div class="query-box">
<ul class="user_time_picker">
<li>
<span>
<em>{{$t('MarketingActi.commName')}}</em>
<el-input v-model="msg.name" @keyup.enter.native="getList"></el-input>
</span>
</li>
<li>
<span>
<em>商品类型</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>
</el-select>
</span>
</li>
<li>
<span>
<em>商品分类</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>
</el-select>
</span>
</li>
<li>
<span>
<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-select>
</span>
</li>
<li>
<input type="button" @click="getList" class="hollowFixedBtn" :value="$t('pub.searchBtn')">
<input type="button" @click="addIntegralMall('BuyingAdd')" class="normalBtn" :value="$t('pub.addBtn')">
</li>
</ul>
</div>
<div class="clearfix"></div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<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('system.table_operation')}}</th>
</tr>
<tr v-for="item in dataList">
<td>{{item.Id}}</td>
<td>{{item.Name}}</td>
<td>{{item.CategoryName}}</td>
<td>{{item.SellTypeName}}</td>
<td>{{item.CostPrice}}</td>
<td>{{item.SellPrice}}</td>
<td>{{item.LeaderRebate}}</td>
<td>{{item.CompanyRebate}}</td>
<td>{{item.ClientRebate}}</td>
<td>{{item.WeiTuRebate}}</td>
<td>{{item.StatusName}}</td>
<td>{{item.UpdateBy}}</td>
<td>{{item.UpdateDate}}</td>
<td class="BuyingList">
<el-button-group size="mini">
<el-tooltip class="item" effect="dark" content="修改" 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-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-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-button type="danger" size="mini" class="iconfont icon-quxiao1" @click="setProS(4, item.Id)"></el-button>
</el-tooltip>
</el-button-group>
</td>
</tr>
</table>
<el-pagination background @current-change="handleCurrentChange" layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
</el-pagination>
<div class="noDataNotice" v-if="dataList.length<1">
<i class="iconfont icon-kong"></i>
<p>{{$t("active.ld_noData")}}</p>
</div>
</div>
</template>
<script>
export default {
data() {
return {
//请求
msg: {
pageSize: 15,
pageIndex: 1,
SellType: 0,
Name: '',
CategoryId: -1,
Status: -1
},
loading:false,
dataList:[],
GoodsTypeList: [],
total:0,
CommodityTypeList: [],
};
},
mounted() {
this.getList();
this.getCommodityTypeList();
this.getGoodsTypeManager();
},
filters: {
},
methods: {
setProS(t, id){
this.apipost("Shop_post_SetCommodityStatus",{CommodityId: id, Status: t},res => {
if (res.data.resultCode === 1) {
this.$message.success(res.data.message);
this.getList()
} else {
this.Error(res.data.message);
}
},
null
);
},
handleCurrentChange(val){
this.msg.pageIndex=val;
this.getList();
},
addIntegralMall: function( path, proId, tab){
this.$router.push({ name: path,query:{blank: 'y', proId: proId, tab: tab} })
},
getGoodsTypeManager() {
this.apipost("Shop_post_GetCommodityCategoryList",{Name: "", ParentId: -1},res => {
if (res.data.resultCode === 1) {
this.GoodsTypeList = res.data.data;
} else {
this.Error(res.data.message);
}
},
null
);
},
getCommodityTypeList() {
this.apipost(
"Shop_post_GetCommodityTypeList",
{},
res => {
if (res.data.resultCode === 1) {
this.CommodityTypeList = res.data.data;
} else {
this.Error(res.data.message);
}
},
null
);
},
//获取数据
getList() {
this.loading = true;
this.apipost("Shop_post_GetPageList", this.msg, res => {
this.loading = false;
if (res.data.resultCode === 1) {
this.dataList = res.data.data.pageData;
this.total= res.data.data.count;
} else {
this.Error(res.data.message)
}
}, null);
},
}
};
</script>
\ No newline at end of file
src/components/activity/BuyingType.vue → src/components/Buying/BuyingType.vue
View file @ cafc1152
......@@ -119,7 +119,7 @@
<el-tooltip
class="item"
effect="dark"
:content="$t('active.ld_editInfo')"
content="修改"
placement="top"
>
<el-button
......@@ -129,6 +129,9 @@
@click="outerVisible=true,dialogTitle='修改商品类型',updateData(item)"
></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<el-button @click="Delete(item)" type="danger" class='zidingyiFz' icon="el-icon-delete" circle ></el-button>
</el-tooltip>
</td>
</tr>
</table>
......@@ -194,12 +197,6 @@
</div>
</div>
</el-form-item>
<el-form-item label="是否展示" prop="state">
<el-select filterable v-model="addMsg.Status">
<el-option label="展示" :value="0"></el-option>
<el-option label="不展示" :value="1"></el-option>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<button
......@@ -269,27 +266,18 @@ export default {
},
// 删除
Delete(item) {
this.$confirm("是否删除"+ item.name+"? 删除后不可恢复", "提示", {
this.$confirm("是否删除"+ item.Name+"? 删除后不可恢复", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
this.apiJavaPost(
"/api/IntegralManager/goodsTypeManager",
{ reqType: 'delete', id: item.id },
res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.getList();
} else {
this.Error(res.data.message);
}
},
err => {}
);
this.updateData(item, 2)
this.addAward()
})
.catch(() => {});
.catch(() => {
this.resetInfo()
});
},
//上传图片
uploadTypeImgBtn(file){
......@@ -386,15 +374,17 @@ export default {
);
},
//修改信息
updateData(item) {
this.outerVisible = true;
updateData(item, t) {
if (!t) {
this.outerVisible = true;
}
this.addMsg.IsShowIndex = item.IsShowIndex;
this.addMsg.Name = item.Name;
this.addMsg.ParentId = item.ParentId;
this.addMsg.Sort = item.Sort;
this.addMsg.Image = item.Image;
this.addMsg.Id = item.Id;
this.addMsg.Status = item.Status
this.addMsg.Status = t ? 1 : item.Status
},
//重置信息
resetInfo() {
......
src/components/activity/BuyingList.vue → src/components/Buying/GuestAccountList.vue
View file @ cafc1152
......@@ -37,14 +37,16 @@
<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="0"></el-option>
<el-option label="不展示" :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-select>
</span>
</li>
<li>
<input type="button" @click="getList" class="hollowFixedBtn" :value="$t('pub.searchBtn')">
<input type="button" @click="addIntegralMall('addIntegralMall', '', $t('MarketingActi.addComm'))" class="normalBtn" :value="$t('pub.addBtn')">
<input type="button" @click="addIntegralMall('BuyingAdd')" class="normalBtn" :value="$t('pub.addBtn')">
</li>
</ul>
</div>
......@@ -69,21 +71,27 @@
<td>{{item.Name}}</td>
<td>{{item.CategoryName}}</td>
<td>{{item.SellTypeName}}</td>
<td>{{item.price}}{{item.priceUnit === 1 ? '人民币' : '积分'}}</td>
<td>{{item.marketPrice}}</td>
<td>{{item.quota === 0 ? '不限购' : `限购${item.quota}次`}}</td>
<td>{{item.logistic}}</td>
<td>{{getHotName(item.ishot)}}</td>
<td>{{item.state === 1 ? '上架' : item.state === 0 ? '下架' : '删除'}}</td>
<td>{{item.CostPrice}}</td>
<td>{{item.SellPrice}}</td>
<td>{{item.LeaderRebate}}</td>
<td>{{item.CompanyRebate}}</td>
<td>{{item.ClientRebate}}</td>
<td>{{item.WeiTuRebate}}</td>
<td>
<el-button-group>
<el-tooltip class="item" effect="dark" :content="$t('active.ld_editInfo')" placement="top">
<el-button
type="primary"
icon="el-icon-edit"
circle
@click="addIntegralMall('addIntegralMall', item, '修改商品')"
></el-button>
<el-button type="primary" size="mini" icon="el-icon-edit" @click="addIntegralMall('BuyingAdd', item.Id, '修改商品')"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="上架" placement="top">
<el-button type="success" size="mini" class="iconfont icon-shangjia1"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="下架" placement="top">
<el-button type="warning" size="mini" class="iconfont icon-xiajia1"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="取消" placement="top">
<el-button type="danger" size="mini" class="iconfont icon-quxiao1"></el-button>
</el-tooltip>
</el-button-group>
</td>
</tr>
</table>
......@@ -111,7 +119,6 @@ export default {
loading:false,
dataList:[],
GoodsTypeList: [],
GoodsSeriesList: [],
total:0,
CommodityTypeList: [],
};
......@@ -119,7 +126,6 @@ export default {
mounted() {
this.getList();
this.getGoodsSeries();
this.getCommodityTypeList();
this.getGoodsTypeManager();
},
......@@ -131,33 +137,8 @@ export default {
this.msg.pageIndex=val;
this.getList();
},
getHotName: function (id) {
for(let i = 0; i < this.GoodsSeriesList.length; i++ ) {
if (this.GoodsSeriesList[i].id === id) {
return this.GoodsSeriesList[i].name
}
}
return '无'
},
getGoodsSeries() {
this.loading = true;
this.apiJavaPost(
"/api/IntegralManager/getGoodsSeries",
{},
res => {
this.loading = false;
if (res.data.resultCode === 1) {
this.GoodsSeriesList = res.data.data;
} else {
this.Error(res.data.message);
}
},
null
);
},
addIntegralMall: function( path, obj, tab){
localStorage.editIntegralMall = JSON.stringify(obj);
this.$router.push({ name: path,query:{blank: 'y', tab: tab} })
addIntegralMall: function( path, proId, tab){
this.$router.push({ name: path,query:{blank: 'y', proId: proId, tab: tab} })
},
getGoodsTypeManager() {
this.apipost("Shop_post_GetCommodityCategoryList",{Name: "", ParentId: 0},res => {
......
src/components/PersonalInfoSet.vue
View file @ cafc1152
......@@ -728,39 +728,39 @@
<div class="Shouji_Conteng">
<el-form :model="passWordMsg" ref="passWordMsg" label-position="right" :rules="rules2" label-width="100px">
<el-form-item v-if="sureOldPwd" label="旧密码" prop="OldPwd" style="margin-bottom:30px;">
<el-input type="password" class="w400" v-model="passWordMsg.OldPwd">
<el-input type="password" class="w400" v-model="passWordMsg.OldPwd" maxlength="15">
<i slot="suffix" title="显示密码" @click="changePassOld('show')" style="cursor:pointer;"
class="el-input__icon iconfont icon-yincang"></i>
</el-input>
</el-form-item>
<el-form-item v-else label="旧密码" prop="OldPwd" style="margin-bottom:30px;">
<el-input type="text" class="w400" v-model="passWordMsg.OldPwd">
<el-input type="text" class="w400" v-model="passWordMsg.OldPwd" maxlength="15">
<i slot="suffix" title="隐藏密码" @click="changePassOld('hide')" style="cursor:pointer;"
class="el-input__icon iconfont icon-xianshi"></i>
</el-input>
</el-form-item>
<el-form-item v-if="visible" label="新密码" style="margin-bottom:30px;" prop="Pwd">
<el-input type="password" class="w400" v-model="passWordMsg.Pwd" maxlength="6" placeholder="请输入新密码">
<el-input type="password" class="w400" v-model="passWordMsg.Pwd" maxlength="15" placeholder="请输入新密码">
<i slot="suffix" title="显示密码" @click="changePass('show')" style="cursor:pointer;"
class="el-input__icon iconfont icon-yincang"></i>
</el-input>
</el-form-item>
<el-form-item v-else label="新密码" style="margin-bottom:30px;" prop="Pwd">
<el-input type="text" class="w400" v-model="passWordMsg.Pwd" maxlength="6" placeholder="请输入新密码">
<el-input type="text" class="w400" v-model="passWordMsg.Pwd" maxlength="15" placeholder="请输入新密码">
<i slot="suffix" title="隐藏密码" @click="changePass('hide')" style="cursor:pointer;"
class="el-input__icon iconfont icon-xianshi"></i>
</el-input>
</el-form-item>
<el-form-item v-if="SureVisible" label="确认密码" style="margin-bottom:30px;" prop="surePassword">
<el-input type="password" class="w400" v-model="passWordMsg.surePassword" maxlength="6" placeholder="请输入新密码">
<el-input type="password" class="w400" v-model="passWordMsg.surePassword" maxlength="15" placeholder="请输入新密码">
<i slot="suffix" title="显示密码" @click="changePass2('show')" style="cursor:pointer;"
class="el-input__icon iconfont icon-yincang"></i>
</el-input>
</el-form-item>
<el-form-item v-else label="确认密码" style="margin-bottom:30px;" prop="surePassword">
<el-input type="text" class="w400" v-model="passWordMsg.surePassword" maxlength="6" placeholder="请输入新密码">
<el-input type="text" class="w400" v-model="passWordMsg.surePassword" maxlength="15" placeholder="请输入新密码">
<i slot="suffix" title="隐藏密码" @click="changePass2('hide')" style="cursor:pointer;"
class="el-input__icon iconfont icon-xianshi"></i>
</el-input>
......
src/components/SalesModule/CustomerCertification.vue
View file @ cafc1152
......@@ -146,7 +146,7 @@
<th width="10%">{{$t('salesModule.storeName')}}</th>
<th width="10%">{{$t('hotel.suplier_contact')}}</th>
<th width="10%">{{$t('hotel.table_tel')}}</th>
<th width="10%">{{$t('MarketingActi.TransactionMon')}}</th>
<th width="10%">{{$t('salesModule.TransactionMon')}}</th>
<th width="10%">{{$t('admin.admin_address')}}</th>
<th width="10%">{{$t('salesModule.belongUnion')}}</th>
<th width="10%">{{$t('salesModule.ApplyTime')}}</th>
......
src/components/SalesModule/MyCustomer.vue
View file @ cafc1152
......@@ -388,19 +388,19 @@ export default {
}
},
rules:{
contact:[{required: true, message: "请输入联系人", trigger: "blur"}],
customerName:[{required: true, message: "请输入客户名", trigger: "blur"}],
contact:[{required: true, message:this.$t('rule.EnterContratPerson'), trigger: "blur"}],
customerName:[{required: true, message:this.$t('rule.EnterCustomer'), trigger: "blur"}],
contactNumber:[
{required: true, message: "请输入联系电话", trigger: "blur"},
{ pattern: /^1[123457890]\d{9}$/, message: "请输入正确的电话" }
{required: true, message:this.$t('rule.EnterPNum'), trigger: "blur"},
{ pattern: /^1[123457890]\d{9}$/, message:this.$t('rule.EnterRightNum') }
],
brandIds:[{required: true, message: "请选择所属品牌", trigger: "change"}],
Duty:[{required: true, message: "请选择职务", trigger: "change"}],
remark:[{required: false, message: "请选择职务", trigger: "change"}],
Premises:[{required: true, message: "请选择经营场所", trigger: "change"}],
CustomerSourceType:[{required: true, message: "请选择经客户来源", trigger: "change"}],
customerName:[{required: true, message: "请输入客户名", trigger: "blur"}],
address:[{required: true, message: "请输入地址", trigger: "blur"}],
brandIds:[{required: true, message:this.$t('rule.ChoiceBrand'), trigger: "change"}],
Duty:[{required: true, message:this.$t('rule.ChoiceJob'), trigger: "change"}],
remark:[{required: false, message: this.$t('rule.ChoiceJob'), trigger: "change"}],
Premises:[{required: true, message:this.$t('rule.ChoiceJYCS'), trigger: "change"}],
CustomerSourceType:[{required: true, message:this.$t('rule.ChoiceCusFrom'), trigger: "change"}],
customerName:[{required: true, message:this.$t('rule.EnterCusName'), trigger: "blur"}],
address:[{required: true, message:this.$t('visaT.qsradder'), trigger: "blur"}],
},
dataList:[],
CustomerBrandList:[],
......@@ -421,19 +421,19 @@ export default {
}
},methods:{
deleteCustomer(obj){
this.$confirm('是否删除?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
this.$confirm(this.$t('tips.shifoushanchu'), this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.apipost('app_customer_Remove',{ID:obj.customerId},res=>{
if(res.data.resultCode==1){
this.$message.success('删除成功！');
this.Success(res.data.message);
this.getList()
}
},err=>{})
}).catch(() => {
this.$message.info('已取消删除！');
this.Error('已取消删除！');
});
},
uploadImg(file) {
......
src/components/SalesModule/SalesAssessment.vue
View file @ cafc1152
......@@ -67,12 +67,12 @@
},
rules:{
RequireScore:[
{ required: true, message: '请输入', trigger: 'blur' },
{pattern: /^\d*$/, message: '只能输入数字' }
{ required: true, message:this.$t('pub.pleaseImport'), trigger: 'blur' },
{pattern: /^\d*$/, message:this.$t('rule.OnlyNumber')}
],
Ratio:[
{ required: true, message: '请输入', trigger: 'blur' },
{pattern: /^\d*$/, message: '只能输入数字' }
{ required: true, message:this.$t('pub.pleaseImport'), trigger: 'blur' },
{pattern: /^\d*$/, message:this.$t('rule.OnlyNumber')}
]
},
dataList:[]
......
src/components/SalesModule/VisitPlan.vue
View file @ cafc1152
......@@ -675,19 +675,19 @@ export default {
}
},
rules:{
customerInfoId:[{required: true, message: "请选择客户", trigger: "change"}],
newVisitDay:[{required: true, message: "请选择拜访日期", trigger: "change"}],
newVisitTime:[{required: true, message: "请选择拜访时间", trigger: "change"}],
SalesProcess:[{required: true, message: "请选择所属流程", trigger: "change"}],
customerName:[{required: true, message: "请输入客户名称", trigger: "blur"}],
contact:[{required: true, message: "请输入联系人", trigger: "blur"}],
contactNumber:[{required: true, message: "请输入联系电话", trigger: "blur"}],
address:[{required: true, message: "请输入客户地址", trigger: "blur"}],
brandIds:[{required: true, message: "请选择所属品牌", trigger: "change"}],
Duty:[{required: true, message: "请选择职务", trigger: "change"}],
remark:[{required: false, message: "请选择职务", trigger: "change"}],
Premises:[{required: true, message: "请选择经营场所", trigger: "change"}],
CustomerSourceType:[{required: true, message: "请选择经客户来源", trigger: "change"}],
customerInfoId:[{required: true, message:this.$t('rule.qxzkhmingcheng'), trigger: "change"}],
newVisitDay:[{required: true, message:this.$t('rule.ChoiceVDate'), trigger: "change"}],
newVisitTime:[{required: true, message:this.$t('rule.ChoiceVTime'), trigger: "change"}],
SalesProcess:[{required: true, message:this.$t('rule.ChoiceLC'), trigger: "change"}],
customerName:[{required: true, message:this.$t('rule.EnterCusName'), trigger: "blur"}],
contact:[{required: true, message:this.$t('rule.EnterContratPerson'), trigger: "blur"}],
contactNumber:[{required: true, message:this.$t('rule.EnterPNum'), trigger: "blur"}],
address:[{required: true, message:this.$t('rule.EnterCusAds'), trigger: "blur"}],
brandIds:[{required: true, message:this.$t('rule.ChoiceBrand'), trigger: "change"}],
Duty:[{required: true, message:this.$t('rule.ChoiceJob'), trigger: "change"}],
remark:[{required: false, message:this.$t('rule.ChoiceJob'), trigger: "change"}],
Premises:[{required: true, message:this.$t('rule.ChoiceJYCS'), trigger: "change"}],
CustomerSourceType:[{required: true, message:this.$t('rule.ChoiceCusFrom'), trigger: "change"}],
},
pickerOptions0: {
disabledDate(time) {
......@@ -949,9 +949,9 @@ export default {
},err=>{})
},
deleteItem(obj,date){
this.$confirm('是否删除', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
this.$confirm(this.$t('tips.shifoushanchu'), this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.apipost('app_today_visit_RemoveCustomerVisit', {
......@@ -966,7 +966,7 @@ export default {
}
}, err => {})
}).catch(() => {
this.$message.info('取消删除');
this.$message.info(this.$t('tips.cancleDelete'));
});
},
goUrl(path,time) {
......
src/components/SalesModule/branding.vue
View file @ cafc1152
......@@ -90,7 +90,7 @@ export default {
},
editOk: function() {
if (this.editData.Name === "") {
this.$message.error("请输入品牌名称");
this.$message.error(this.$t('rule.EnterBrandName'));
} else {
this.apipost(
"customer_post_Set",
......@@ -109,9 +109,9 @@ export default {
}
},
delBtn: function(key) {
this.$confirm("是否改品牌删除?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
this.$confirm(this.$t('tips.shifoushanchu'), this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: "warning"
}).then(() => {
this.apipost(
......@@ -129,7 +129,7 @@ export default {
);
})
.catch(() => {
this.$message.info("已取消删除！");
this.$message.info(this.$t('tips.cancleDelete'));
});
},
getList: function() {
......
src/components/SalesModule/publicCustomer.vue
View file @ cafc1152
......@@ -58,8 +58,8 @@
<th width="20%">{{$t('admin.admin_address')}}</th>
<th width="10%">{{$t('salesModule.belongUnion')}}</th>
<th width="10%">{{$t('salesModule.Laiyuan')}}</th>
<th width="8%">{{$t('MarketingActi.VisitCount')}}</th>
<th width="10%">{{$t('MarketingActi.TransactionMon')}}</th>
<th width="8%">{{$t('salesModule.VisitCount')}}</th>
<th width="10%">{{$t('salesModule.TransactionMon')}}</th>
<th width="10%">{{$t('active.cl_addPp')}}</th>
<th width="5%">{{$t('hotel.table_operat')}}</th>
</tr>
......
src/components/SalesModule/saleTaskManagement.vue
View file @ cafc1152
......@@ -12,7 +12,7 @@
<el-input type="text" :disabled='isAllocatingTask' v-model='addTaskMsg.TaskName' :placeholder="$t('visaT.Pleasefillin')"></el-input>
</el-form-item>
<el-form-item class='w300' :label="$t('salesModule.TaskType')" prop="TaskType">
<el-select placeholder="请选项" :disabled='isDisabled||isAllocatingTask' v-model='addTaskMsg.TaskType'>
<el-select :placeholder="$t('pub.pleaseSel')" :disabled='isDisabled||isAllocatingTask' v-model='addTaskMsg.TaskType'>
<el-option v-for='item in taskTypeList'
:label='item.Name'
:value='item.Id'
......@@ -128,7 +128,7 @@
</div>
</div>
<p style="text-align: right; width: 100%; clear: both;">
<input type="button" class="hollowFixedBtn" value="取消" @click="clearMsg"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="clearMsg"/>
<input v-if='!isAllocatingTask' type="button" class="normalBtn" :value="$t('pub.saveBtn')" @click="submitForm('addTaskMsg')"/>
<input v-if='isAllocatingTask' type="button" class="normalBtn" :value="$t('pub.saveBtn')" @click="saveAllocatingTask"/>
</p>
......@@ -355,20 +355,20 @@
},
rules:{
TaskName:[
{ required: true, message: '请输入任务名称', trigger: 'blur' }
{ required: true, message:this.$t('rule.EnterTaskName'), trigger: 'blur' }
],
TaskType:[
{ required: true, message: '请选择任务类型', trigger: 'change' }
{ required: true, message:this.$t('rule.ChoiceTaskType'), trigger: 'change' }
],
TaskNum:[
{ required: true, message: '请输入数量', trigger: 'blur' },
{ pattern: /^[1-9]\d*$/, message: "只能输入正整数" }
{ required: true, message:this.$t('rule.EnterNum'), trigger: 'blur' },
{ pattern: /^[1-9]\d*$/, message:this.$t('rule.OnlyInter') }
],
taskTime:[
{ required: true, message: '请选择时间范围', trigger: 'change' }
{ required: true, message:this.$t('rule.ChoiceRQFW'), trigger: 'change' }
],
Remarks:[
{ required: false, message: '请输入备注', trigger: 'blur' }
{ required: false, message:this.$t('rule.EnterMark'), trigger: 'blur' }
],
},
......
src/components/SalesModule/workTotal.vue
View file @ cafc1152
......@@ -40,7 +40,7 @@
<th width="15%">{{$t('salesModule.Personnel')}}</th>
<th width="15%">{{$t('salesModule.Visital')}}</th>
<th width="15%">{{$t('salesModule.laxin')}}</th>
<th width="15%">{{$t('MarketingActi.ShouKe')}}</th>
<th width="15%">{{$t('salesModule.ShouKe')}}</th>
<th width="10%">{{$t('fnc.shoukuan')}}</th>
<th width="10%">{{$t('salesModule.MakeInquiry')}}</th>
<th width="10%">{{$t('salesModule.Complaints')}}</th>
......
src/components/SalesVisa/VisaProductAddOrder.vue
View file @ cafc1152
......@@ -299,10 +299,10 @@ export default {
ClientType: '1'
},
rules:{
PeopleNum:[{required: true, message: "请输入人数", trigger: "blur"}],
PeopleNum:[{required: true, message:this.$t('rule.EnterPnum'), trigger: "blur"}],
// DepartDate:[{required: true, message: "请输入出发日期", trigger: "blur"}],
EnterCountryTime:[{required: true, message: "请输入入境日期", trigger: "blur"}],
LeaveCountryTime:[{required: true, message: "请输入出境日期", trigger: "blur"}]
EnterCountryTime:[{required: true, message:this.$t('rule.EnterRJRQ'), trigger: "blur"}],
LeaveCountryTime:[{required: true, message:this.$t('rule.EnterCJRQ'), trigger: "blur"}]
},
VisaApplyForTypeEnum:[],
JapanAirportList:[],
......@@ -423,9 +423,9 @@ export default {
}
},
deleteCustomer(obj){
this.$confirm('是否删除?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
this.$confirm(this.$t('tips.shifoushanchu'), this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.apipost('app_customer_Remove',{ID:obj.customerId},res=>{
......@@ -435,7 +435,7 @@ export default {
}
},err=>{})
}).catch(() => {
this.$message.info('已取消删除！');
this.$message.info(this.$t('tips.cancleDelete'));
});
},
getList(){ // 获取列表数据
......
src/components/index.vue
View file @ cafc1152
......@@ -230,7 +230,7 @@
<el-dropdown-menu class="changelanguage" slot="dropdown">
<el-dropdown-item @click.native="ChangeLan('Japanese')">日语 <i v-if="language=='Japanese'" class="iconfont icon-duigou"></i></el-dropdown-item>
<el-dropdown-item @click.native="ChangeLan('zh-CN')">简体中文 <i v-if="language=='zh-CN'" class="iconfont icon-duigou"></i></el-dropdown-item>
<el-dropdown-item @click.native="ChangeLan('zh-TW')">繁体中文 <i v-if="language=='zh-TW'" class="iconfont"></i></el-dropdown-item>
<el-dropdown-item @click.native="ChangeLan('zh-TW')">繁体中文 <i v-if="language=='zh-TW'" class="iconfont icon-duigou"></i></el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</li>
......
src/plug/index.js
View file @ cafc1152
......@@ -112,7 +112,7 @@ export default {
Vue.prototype.domainManager = function () {
let domainUrl = '';
domainUrl = "http://192.168.2.214:8082";
// domainUrl = "http://192.168.2.65:8025"; // 吴春
domainUrl = "http://192.168.2.16:8083"; // 吴春
let locationName = window.location.hostname;
let javaUrldo="";
......
src/router/config.js
View file @ cafc1152
......@@ -3953,15 +3953,23 @@ export default {
{
path: '/BuyingType',
name: 'BuyingType',
component: resolve => require(['@/components/activity/BuyingType'], resolve),
component: resolve => require(['@/components/Buying/BuyingType'], resolve),
meta: {
title: '代购商品类型'
}
},
{
path: '/BuyingAdd',
name: 'BuyingAdd',
component: resolve => require(['@/components/Buying/BuyingAdd'], resolve),
meta: {
title: '新增代购商品'
}
},
{
path: '/BuyingList',
name: 'BuyingList',
component: resolve => require(['@/components/activity/BuyingList'], resolve),
component: resolve => require(['@/components/Buying/BuyingList'], resolve),
meta: {
title: '代购商品列表'
}
......
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