From f209b5b6aded569d6f6d6cb631fc35118c89818e Mon Sep 17 00:00:00 2001
From: caoxinyu <caoxinyu@meswork.com>
Date: Tue, 7 May 2019 15:38:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=90=8D=E7=A7=B0=E5=8A=A0?=
 =?UTF-8?q?=E5=88=B0=E9=A1=B9=E7=9B=AE=E7=BC=96=E5=8F=B7=E5=90=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ManufacturingCenter/ProcessPlanning.js         |  2 +-
 .../ContractInformationManagement/index.vue            | 10 +++++-----
 src/views/MarketingCenter/InvoiceRecord/index.vue      |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/api/ManufacturingCenter/ProcessPlanning.js b/src/api/ManufacturingCenter/ProcessPlanning.js
index de2aa8ef..7cf21080 100644
--- a/src/api/ManufacturingCenter/ProcessPlanning.js
+++ b/src/api/ManufacturingCenter/ProcessPlanning.js
@@ -353,7 +353,7 @@ export function saveApprove(num0, num1, request0, spec, num2, outhelp, num3, num
     method: 'post',
     data: {
       type: '2',
-      name: ' ',
+      name: '车间生产管理工艺_零件工序_增加数据_同时修改工艺计划',
       param: '工艺计划流水号=' + num0 + '&工艺编号=' + num1 + '&工艺要求=' + request0 + '&原材料规格=' + spec + '&工序顺序=' + num2 + '&工序间是否外协=' + outhelp + '&工序流水号=' + num3 + '&材料流水号=' + num4 + '&重量=' + weight + '&面积=' + area + '&工艺人员编号=' + num5 + '&工艺难度等级=' + level
     }
   })
diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue
index 9bc5964f..b3f4492f 100644
--- a/src/views/MarketingCenter/ContractInformationManagement/index.vue
+++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue
@@ -104,6 +104,11 @@
             </template>
           </template>
         </el-table-column>
+        <el-table-column align="center" label="客户名称" width="260">
+          <template slot-scope="scope">
+            {{ scope.row.客户名称 }}
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="项目名称" width="200">
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
@@ -144,11 +149,6 @@
             {{ scope.row.营销经理 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="客户名称" width="260">
-          <template slot-scope="scope">
-            {{ scope.row.客户名称 }}
-          </template>
-        </el-table-column>
         <el-table-column align="center" label="联系人" width="80">
           <template slot-scope="scope">
             {{ scope.row.联系人 }}
diff --git a/src/views/MarketingCenter/InvoiceRecord/index.vue b/src/views/MarketingCenter/InvoiceRecord/index.vue
index 5407ade1..83014f1a 100644
--- a/src/views/MarketingCenter/InvoiceRecord/index.vue
+++ b/src/views/MarketingCenter/InvoiceRecord/index.vue
@@ -484,10 +484,10 @@ export default {
           sums[index] = this.taxRate * 100 + '% (税率)'
           return
         } else if (index === 9) {
-          sums[index] = (parseInt(sums[7]) * 100 * this.taxRate) / 100 + ' 元(税额)'
+          sums[index] = (parseInt(sums[7]) * 100 * this.taxRate) / 100 + ' 万元(税额)'
           return
         } else if (index === 10) {
-          sums[index] = parseFloat(sums[7]) - parseFloat(sums[9]) + ' 元(未税)'
+          sums[index] = parseFloat(sums[7]) - parseFloat(sums[9]) + ' 万元(未税)'
           return
         }
       })