Skip to content

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

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

parents 50380cf7 44d9eb99
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 46 deletions
src/assets/common/lang/zh.js
View file @ 77616421
......@@ -1948,6 +1948,20 @@ export const salesModule={
MapDetails:'地图详情',
Registered:'注册',
AutoRelease:'自动释放',
Recipient:'接收人',
MassTransfer:'批量转交',
VisitCount:'拜访次数',
TransactionMon:'交易金额',
Visital:'拜访',
laxin:'拉新',
ShouKe:'收客',
MakeInquiry:'询价',
Complaints:'投诉',
AfterSales:'售后',
InputPhone:'请输入门店名称或电话',
JYETJ:'交易额总计',
SuoSales:'所属销售',
CustomerStatus:'客户状态',
}
import invoicesManager from './H/h-invoicesManager'
......
src/components/SalesModule/publicCustomer.vue
View file @ 77616421
......@@ -2,23 +2,23 @@
<div>
<div class="query-box" style="border: none;">
<ul>
<li><span><em>姓名</em></span>
<li><span><em>{{$t('system.query_name')}}</em></span>
<el-input v-model='msg.CustomerName'></el-input>
</li>
<li><span><em>电话</em></span>
<li><span><em>{{$t('hotel.table_tel')}}</em></span>
<el-input v-model='msg.ContactNumber'></el-input>
</li>
<li><span><em>来源</em></span>
<li><span><em>{{$t('salesModule.Laiyuan')}}</em></span>
<el-select v-model='msg.MarkOverType'>
<el-option label='不限' value='-1' key='-1'></el-option>
<el-option label='离职' value='1' key='1'></el-option>
<el-option label='注册' value='2' key='2'></el-option>
<el-option label='自动释放' value='3' key='3'></el-option>
<el-option :label="$t('pub.unlimitedSel')" value='-1' key='-1'></el-option>
<el-option :label="$t('pub.noJobSel')" value='1' key='1'></el-option>
<el-option :label="$t('salesModule.Registered')" value='2' key='2'></el-option>
<el-option :label="$t('salesModule.AutoRelease')" value='3' key='3'></el-option>
</el-select>
</li>
<li><span><em>创建人</em></span>
<el-select filterable v-model='msg.CreateByInfo' placeholder="请选择">
<el-option label='不限' value='0' key='0'></el-option>
<li><span><em>{{$t('active.cl_addPp')}}</em></span>
<el-select filterable v-model='msg.CreateByInfo' :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('system.ph_buxian')" value='0' key='0'></el-option>
<el-option v-for='item in CreateByInfoList'
:label='item.emName'
:value='item.employeeId'
......@@ -26,13 +26,13 @@
</el-option>
</el-select>
</li>
<li><input type="button" class="hollowFixedBtn" value="查询" @click="resetPageIndex(),getList()" />
<li><input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()" />
<el-popover width='280' v-model='layerShow' popper-class='pd20' trigger="click">
<div>
<p class="fz12 fbold mt10 color333">转交</p>
<p class="fz12 fbold mt10 color333">{{$t('fnc.zhuanjiao')}}</p>
<p class="fz12 mt30 color666">
<span>接收人</span>&nbsp;
<el-select filterable class='w180' v-model='RecipientMsg.NewCreateBy' placeholder="请选择">
<span>{{$t('salesModule.Recipient')}}</span>&nbsp;
<el-select filterable class='w180' v-model='RecipientMsg.NewCreateBy' :placeholder="$t('pub.pleaseSel')">
<el-option v-for='item in RecipientInfoList'
:label='item.emName'
:value='item.employeeId'
......@@ -41,10 +41,10 @@
</el-select>
</p>
<p>
<input type="button" @click="save()" class="normalBtn mt30" value="批量转交"/>
<input type="button" @click="save()" class="normalBtn mt30" :value="$t('salesModule.MassTransfer')"/>
</p>
</div>
<input slot="reference" type="button" class="normalBtn" value="批量转交" />
<input slot="reference" type="button" class="normalBtn" :value="$t('salesModule.MassTransfer')" />
</el-popover>
</li>
</ul>
......@@ -52,20 +52,20 @@
<table class="publicCustomerTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
<tr>
<th width="20%">
<label><input type="checkbox" v-model="isCkedAll" @click='checkedAll()' style="vertical-align: middle;"/>门店名称</label>
<label><input type="checkbox" v-model="isCkedAll" @click='checkedAll()' style="vertical-align: middle;"/>{{$t('salesModule.storeName')}}</label>
</th>
<th width="17%">联系电话</th>
<th width="20%">地址</th>
<th width="10%">所属联盟</th>
<th width="10%">来源</th>
<th width="8%">拜访次数</th>
<th width="10%">交易金额</th>
<th width="10%">创建人</th>
<th width="5%">操作</th>
<th width="17%">{{$t('restaurant.res_ContactNumber')}}</th>
<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('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>
<tr>
<td colspan="8" align="center" v-show='list.length==0'>
暂无数据
{{$t('system.content_noData')}}
</td>
</tr>
<tr v-for='(item,index) in list'>
......@@ -80,13 +80,13 @@
<td style="color: #FF9C00;">￥{{moneyFormat(item.TotalPrice)}}</td>
<td>{{item.AccountName}}</td>
<td>
<el-tooltip effect="dark" content="转交" placement="top-start">
<el-tooltip effect="dark" :content="$t('fnc.zhuanjiao')" placement="top-start">
<el-popover width='280' popper-class='pd20' trigger="click">
<div>
<p class="fz12 fbold mt10 color333">转交</p>
<p class="fz12 fbold mt10 color333">{{$t('fnc.zhuanjiao')}}</p>
<p class="fz12 mt30 color666">
<span>接收人</span>&nbsp;
<el-select filterable class='w180' v-model='RecipientMsg.NewCreateBy' placeholder="请选择">
<span>{{$t('salesModule.Recipient')}}</span>&nbsp;
<el-select filterable class='w180' v-model='RecipientMsg.NewCreateBy' :placeholder="$t('pub.pleaseSel')">
<el-option v-for='item in RecipientInfoList'
:label='item.emName'
:value='item.employeeId'
......@@ -95,7 +95,7 @@
</el-select>
</p>
<p>
<input type="button" class="normalBtn mt30" @click="save" value="转交"/>
<input type="button" class="normalBtn mt30" @click="save" :value="$t('fnc.zhuanjiao')"/>
</p>
</div>
<i slot="reference" @click="singeleCked(item)" style="color: #019CED; font-size: 27px; cursor: pointer;" class="iconfont icon-zhuanjiao"></i>
......
src/components/SalesModule/workTotal.vue
View file @ 77616421
......@@ -3,20 +3,20 @@
<div class="workTotalSearch">
<ul>
<li>
<span><em class="fl" style="margin-top: 10px!important;">部门选择</em>
<span><em class="fl" style="margin-top: 10px!important;">{{$t('fnc.bmxuanze')}}</em>
<treeselect class='w200 fl'
:options="departmentList"
v-model="RB_Department_Id"
placeholder="不限"
:placeholder="$t('pub.unlimitedSel')"
:normalizer="normalizer"
@select='linkageEmployeeMsg()'
/>
</span>
</li>
<li>
<span><em>人员选择</em></span>
<span><em>{{$t('fnc.ryxuanze')}}人员选择</em></span>
<el-select class='w200' v-model="msg.EmployeeId" filterable :placeholder="$t('pub.pleaseSel')" >
<el-option label='不限' value='-1'></el-option>
<el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
<el-option v-for='item in employeeList'
:label='item.name'
:value='item.empId'
......@@ -24,30 +24,30 @@
</el-option>
</el-select>
</li>
<li><span><em>报名日期</em><el-date-picker :picker-options="pickerOptions" v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
<li><span><em>{{$t('fnc.bmriqi')}}</em><el-date-picker :picker-options="pickerOptions" v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
-
<el-date-picker :picker-options="pickerOptions" v-model='msg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</span>
</li>
<li>
<input type="button" class="hollowFixedBtn" value="查询" @click="getList();resetPageIndex()" />
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList();resetPageIndex()" />
</li>
</ul>
</div>
<div style="clear: both; width: 100%;height: 20px;"></div>
<table class="workTotalSearchTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
<tr>
<th width="15%">人员</th>
<th width="15%">拜访</th>
<th width="15%">拉新</th>
<th width="15%">收客</th>
<th width="10%">收款</th>
<th width="10%">询价</th>
<th width="10%">投诉</th>
<th width="10%">售后</th>
<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('salesModule.ShouKe')}}</th>
<th width="10%">{{$t('fnc.shoukuan')}}</th>
<th width="10%">{{$t('salesModule.MakeInquiry')}}</th>
<th width="10%">{{$t('salesModule.Complaints')}}</th>
<th width="10%">{{$t('salesModule.AfterSales')}}</th>
</tr>
<tr>
<td v-show="list.length==0" colspan="11" align="center">暂无数据</td>
<td v-show="list.length==0" colspan="11" align="center">{{$t('system.content_noData')}}</td>
</tr>
<tr v-for="item in list">
<td>
......
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