From 27b299f456cf3d72ae41effebe8022cf385fcc73 Mon Sep 17 00:00:00 2001
From: caoxinyu <caoxinyu@meswork.com>
Date: Sun, 2 Jun 2019 14:51:42 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js                              | 2 +-
 src/views/MarketingCenter/InvoiceRecord/index.vue | 6 +++---
 src/views/TechnologyCenter/ImportParts/index.vue  | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 750f3023..c609d18e 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -20,7 +20,7 @@ export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` //
 export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFileMachine.ashx` // 机床总图   发布时改成0.231
 
 const service = axios.create({
-  baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 
diff --git a/src/views/MarketingCenter/InvoiceRecord/index.vue b/src/views/MarketingCenter/InvoiceRecord/index.vue
index 83014f1a..c2c4da9f 100644
--- a/src/views/MarketingCenter/InvoiceRecord/index.vue
+++ b/src/views/MarketingCenter/InvoiceRecord/index.vue
@@ -476,7 +476,7 @@ export default {
                 return Number(prev)
               }
             }, 0)
-            sums[index] += ' 元(含税)'
+            sums[index] += ' 万元(含税)'
           } else {
             sums[index] = 'N/A'
           }
@@ -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] = (parseFloat(sums[7]) - (parseFloat(sums[7]) / (1 + parseFloat(sums[8]) / 100)).toFixed(2)).toFixed(2) + ' 万元(税额)'
           return
         } else if (index === 10) {
-          sums[index] = parseFloat(sums[7]) - parseFloat(sums[9]) + ' 万元(未税)'
+          sums[index] = (parseFloat(sums[7]) / (1 + parseFloat(sums[8]) / 100)).toFixed(2) + ' 万元(未税)'
           return
         }
       })
diff --git a/src/views/TechnologyCenter/ImportParts/index.vue b/src/views/TechnologyCenter/ImportParts/index.vue
index cc88ac11..3c4df5d3 100644
--- a/src/views/TechnologyCenter/ImportParts/index.vue
+++ b/src/views/TechnologyCenter/ImportParts/index.vue
@@ -45,13 +45,11 @@
     <!--<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>-->
     <!--<div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>-->
     <!--</el-upload>-->
-
-
     <el-dialog
       :visible.sync="dialogVisibleMachine"
       width="30%">
       <el-card>
-        <el-select clearable filterable  v-model="machineDrawValue" filterable size="small" placeholder="机床名称" @change="changeMachine">
+        <el-select v-model="machineDrawValue" clearable filterable size="small" placeholder="机床名称" @change="changeMachine">
           <el-option
             v-for="item in machineDraw"
             :key="item.value"
@@ -60,6 +58,7 @@
         </el-select>
         <div style="float: right;">
           <el-upload
+            :disabled="disabledMachine"
             :action="action"
             :on-success="uploadSuccess"
             :on-error="uploadFailure"
@@ -67,7 +66,7 @@
             :file-list="fileList"
             class="upload-demo"
             multiple>
-            <el-button size="small" type="primary" :disabled="disabledMachine">点击上传</el-button>
+            <el-button size="small" type="primary">点击上传</el-button>
           </el-upload>
         </div>
       </el-card>
@@ -169,6 +168,7 @@ export default {
       this.dialogVisibleMachine = true
       this.machineDrawValue === '' ? this.disabledMachine = true : this.disabledMachine = false
       this.getSelect(machineSelect, ['机床图号', '机床流水号'], 'machineDraw', this.projectValue)
+      this.$notify.error(`请选择机床`)
     },
     changeMachine() {
       this.machineDrawValue === '' ? this.disabledMachine = true : this.disabledMachine = false