shawncai/ERP
1
1
Fork 0
mirror of https://github.com/shawncai/ERP.git synced 2024-12-28 19:11:00 +08:00
Code Issues Projects Releases Packages Wiki Activity

tag页问题

Browse source 
tag页问题
This commit is contained in:
shawn 2020-02-17 18:22:23 +08:00
parent 64f13b6ccb
commit cca2c29da5
6 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/lang/en.js
View file

@ -404,8 +404,8 @@ export default {
AccountManagement: 'account management',
AccountManagement2: 'account management',
expensesSummary: 'expenses form summary',
saleDetailCount: 'sale detail count',
profitCount: 'profit count'
SaleDetailCount: 'sale detail count',
ProfitCount: 'profit count'
},
installmentAnalyze: {
repositoryName: 'warehouse name',
@ -4185,6 +4185,7 @@ export default {
outMoney: 'outMoney',
retreatMoney: 'retreatMoney',
endMoney: 'endMoney',
repositoryName: 'repository'
repositoryName: 'repository',
discountMoney: 'discountMoney'
}
}

8
src/lang/zh.js
View file

@ -404,8 +404,8 @@ export default {
AccountManagement: '账户管理',
AccountManagement2: '账户管理',
expensesSummary: '支出单汇总',
saleDetailCount: '销售明细统计',
profitCount: '利润统计表'
SaleDetailCount: '销售明细统计',
ProfitCount: '利润统计表'
},
installmentAnalyze: {
repositoryName: '仓库名称',
@ -4185,8 +4185,8 @@ export default {
outMoney: '出库金额',
retreatMoney: '退货金额',
endMoney: '结余金额',
repositoryName: '门店'
repositoryName: '门店',
discountMoney: '折扣金额'
}
}

12
src/router/index.js
View file

@ -3042,10 +3042,10 @@ export const asyncRouterMap = [
meta: { title: 'saleBillList', noCache: false, roles: ['311-313-327-4'] }
},
{
path: 'saleDetailCount',
path: 'SaleDetailCount',
component: () => import('@/views/SaleReport/saleDetailCount'),
name: 'saleDetailCount',
meta: { title: 'saleDetailCount', noCache: false, roles: ['311-313-379-4'] }
name: 'SaleDetailCount',
meta: { title: 'SaleDetailCount', noCache: false, roles: ['311-313-379-4'] }
}
// ,
// {
@ -3148,10 +3148,10 @@ export const asyncRouterMap = [
meta: { title: 'expensesSummary', noCache: false, roles: ['311-314-375-4'] }
},
{
path: 'profitCount',
path: 'ProfitCount',
component: () => import('@/views/Financecount/profitCount'),
name: 'profitCount',
meta: { title: 'profitCount', noCache: false, roles: ['311-313-380-4'] }
name: 'ProfitCount',
meta: { title: 'ProfitCount', noCache: false, roles: ['311-313-380-4'] }
}
]
},

2
src/views/Financecount/profitCount.vue
View file

@ -174,7 +174,7 @@ import MySupplier from './components/MySupplier'
var _that
export default {
name: 'ExpensesSummary',
name: 'ProfitCount',
directives: { waves, permission, permission2 },
components: {
MyDialog,

13
src/views/SaleOrder/SaleOrderList.vue
View file

@ -16,9 +16,9 @@
<el-option value="1" label="经销商"/>
<el-option value="2" label="零售"/>
</el-select>
<el-input v-model="customerName" :placeholder="$t('SaleOrder.customerName')" style="width: 40%;float: right;margin-right: 20px;" clearable @clear="restFilter" @focus="chooseCustomer"/>
<my-customer :customercontrol.sync="customercontrol" @customerdata="customerdata"/>
<my-agent :agentcontrol.sync="agentcontrol" @agentdata="agentdata"/>
<el-input v-model="getemplist.customerName" :placeholder="$t('SaleOrder.customerName')" style="width: 40%;float: right;margin-right: 20px;" clearable/>
<!-- <my-customer :customercontrol.sync="customercontrol" @customerdata="customerdata"/>
<my-agent :agentcontrol.sync="agentcontrol" @agentdata="agentdata"/> -->
<el-select v-model="getemplist.receiptStat" :value="getemplist.receiptStat" :placeholder="$t('updates.djzt')" clearable style="width: 40%;float: left;margin-left: 20px;margin-top: 20px">
<el-option :label="$t('updates.zd')" value="1"/>
<el-option :label="$t('updates.zx')" value="2"/>
@ -39,7 +39,7 @@
end-placeholder="销售日期"
value-format="yyyy-MM-dd"
style="margin-top: 20px;margin-left: 20px"/>
<el-input v-model="getemplist.customerName" :placeholder="$t('updates2.customerName')" style="width: 40%;float: left;margin-left: 20px;margin-top: 20px" clearable @keyup.enter.native="handleFilter"/>
<!-- <el-input v-model="getemplist.customerName" :placeholder="$t('updates2.customerName')" style="width: 40%;float: left;margin-left: 20px;margin-top: 20px" clearable @keyup.enter.native="handleFilter"/> -->
<div class="seachbutton" style="width: 100%;float: right;margin-top: 20px">
<el-button v-waves class="filter-item" type="primary" style="float: right" round @click="handleFilter">{{ $t('public.search') }}</el-button>
</div>
@ -452,11 +452,6 @@ export default {
// 搜索
handleFilter() {
this.getemplist.pageNum = 1
if (this.getemplist.customerName !== null && this.getemplist.customerName !== undefined && this.getemplist.customerName !== '') {
this.getemplist.customerType = 2
} else {
this.getemplist.customerType = null
}
searchsaleOrder(this.getemplist).then(res => {
if (res.data.ret === 200) {
this.list = res.data.data.content.list

5
src/views/SaleReport/saleDetailCount.vue
View file

@ -173,6 +173,11 @@
prop="thisMoney"
width="200"
align="center"/>
<el-table-column
:label="$t('tongyo.discountMoney')"
prop="discountMoney"
width="200"
align="center"/>
<el-table-column
:label="$t('tongyo.fistMoney')"
prop="firstMoney"