From b8563c839b556529f1c67730d2e882ed25300bfa Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Mon, 9 Dec 2019 17:25:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/en/orderAuthor.js       |  4 +++-
 src/i18n/langs/zh/orderAuthor.js       |  4 +++-
 src/views/orderauthor/order/detail.vue |  4 ++--
 src/views/orderauthor/order/draft.vue  | 10 +++++-----
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/i18n/langs/en/orderAuthor.js b/src/i18n/langs/en/orderAuthor.js
index 13c021cd7..64bc9efa4 100644
--- a/src/i18n/langs/en/orderAuthor.js
+++ b/src/i18n/langs/en/orderAuthor.js
@@ -114,5 +114,7 @@ export default {
     back: 'back',
     next: 'next',
     transferAttribution: 'Transfer attribution',
-    distributionAttribution: 'Distribution attribution'
+    distributionAttribution: 'Distribution attribution',
+    goodsAmount:'Goods Amount',
+    operate:'operate'
 };
diff --git a/src/i18n/langs/zh/orderAuthor.js b/src/i18n/langs/zh/orderAuthor.js
index 88567b5b1..0313eea4b 100644
--- a/src/i18n/langs/zh/orderAuthor.js
+++ b/src/i18n/langs/zh/orderAuthor.js
@@ -113,5 +113,7 @@ export default {
     back: '返回',
     next: '下一步',
     transferAttribution: '转赠归属',
-    distributionAttribution: '分发归属'
+    distributionAttribution: '分发归属',
+    goodsAmount:'商品个数',
+    operate:'操作'
 };
diff --git a/src/views/orderauthor/order/detail.vue b/src/views/orderauthor/order/detail.vue
index 3d6b83434..0da07a4be 100644
--- a/src/views/orderauthor/order/detail.vue
+++ b/src/views/orderauthor/order/detail.vue
@@ -11,11 +11,11 @@
       <el-table-column :key="goodsName" :label="this.$t('orderAuthor.commodityName')" prop="goodsName" />
       <el-table-column :key="forever" :label="this.$t('orderAuthor.permanenceOrNot')" prop="forever">
         <template slot-scope="scope">
-          {{ scope.row.forever?'是':'否' }}
+          {{ $ConstSelect.translate(scope.row.forever, 'Whether') }}
         </template>
       </el-table-column>
 
-      <el-table-column :key="goodsName" label="商品个数" prop="goodsAmount" />
+      <el-table-column :key="goodsName" :label="this.$t('orderAuthor.goodsAmount')" prop="goodsAmount" />
       <el-table-column :key="goodsName" :label="this.$t('orderAuthor.itemPricing')" prop="price" />
       <el-table-column :key="goodsName" :label="this.$t('orderAuthor.startDate')" prop="startTime" />
       <el-table-column :key="goodsName" :label="this.$t('orderAuthor.purchaseMonths')" prop="monthAmount">
diff --git a/src/views/orderauthor/order/draft.vue b/src/views/orderauthor/order/draft.vue
index 76969a3d4..cf4b03ca8 100644
--- a/src/views/orderauthor/order/draft.vue
+++ b/src/views/orderauthor/order/draft.vue
@@ -162,8 +162,8 @@ export default {
                         buttonClick: this.buttonClick,
                         type:'table',
                         tableList:[
-                            {prop:'goodsName', label:'商品名称' },
-                            {prop:'goodsAmount', label:'商品数量', isEdit:true, min:0,
+                            {prop:'goodsName', label:this.$t('orderAuthor.commodityName') },
+                            {prop:'goodsAmount', label:this.$t('orderAuthor.goodsAmount'), isEdit:true, min:0,
                                 rules:{
                                     goodsAmount:[
                                         {
@@ -177,11 +177,11 @@ export default {
                                     ]
                                 }
                             },
-                            {prop:'goodsPrice', label:'商品单价'}
+                            {prop:'goodsPrice', label:this.$t('orderAuthor.itemPricing')}
                         ],
-                        operate:'操作',
+                        operate:this.$t('orderAuthor.operate'),
                         operateButton:[
-                            {name:'删除', clickFunc:this.removeGoods}
+                            {name:this.$t('global.delete'), clickFunc:this.removeGoods}
                         ]
                     },
                     // { prop: 'price', label: this.$t('orderAuthor.itemPricing'), type: 'number', required: false, disabled: true, min: 0, message: this.$t('orderAuthor.yuan') },