From cca2c29da52db3844eabb57c362d95a35210860b Mon Sep 17 00:00:00 2001
From: shawn <z784836221@outlook.com>
Date: Mon, 17 Feb 2020 18:22:23 +0800
Subject: [PATCH] =?UTF-8?q?tag=E9=A1=B5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

tag页问题
---
 src/lang/en.js                           |  7 ++++---
 src/lang/zh.js                           |  8 ++++----
 src/router/index.js                      | 12 ++++++------
 src/views/Financecount/profitCount.vue   |  2 +-
 src/views/SaleOrder/SaleOrderList.vue    | 13 ++++---------
 src/views/SaleReport/saleDetailCount.vue |  5 +++++
 6 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/lang/en.js b/src/lang/en.js
index fbb1427e..97f71358 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -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'
   }
 }
diff --git a/src/lang/zh.js b/src/lang/zh.js
index 48bdea10..e8c1a1c0 100644
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -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: '折扣金额'
   }
 
 }
diff --git a/src/router/index.js b/src/router/index.js
index f2153d32..a8901612 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -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'] }
       }
     ]
   },
diff --git a/src/views/Financecount/profitCount.vue b/src/views/Financecount/profitCount.vue
index 051f408a..17f4d02d 100644
--- a/src/views/Financecount/profitCount.vue
+++ b/src/views/Financecount/profitCount.vue
@@ -174,7 +174,7 @@ import MySupplier from './components/MySupplier'
 
 var _that
 export default {
-  name: 'ExpensesSummary',
+  name: 'ProfitCount',
   directives: { waves, permission, permission2 },
   components: {
     MyDialog,
diff --git a/src/views/SaleOrder/SaleOrderList.vue b/src/views/SaleOrder/SaleOrderList.vue
index fb34b02c..b14e2142 100644
--- a/src/views/SaleOrder/SaleOrderList.vue
+++ b/src/views/SaleOrder/SaleOrderList.vue
@@ -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
diff --git a/src/views/SaleReport/saleDetailCount.vue b/src/views/SaleReport/saleDetailCount.vue
index e6cc924f..23a21549 100644
--- a/src/views/SaleReport/saleDetailCount.vue
+++ b/src/views/SaleReport/saleDetailCount.vue
@@ -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"