From 8e87fc4a9cd9e05d5ea2090febd7e2806952f43d Mon Sep 17 00:00:00 2001
From: caoxinyu <caoxinyu@meswork.com>
Date: Sat, 15 Dec 2018 20:15:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DeliveryManagement/index.vue              |  5 ++---
 .../MarketingCenter/InvoiceRecord/index.vue   |  8 ++++---
 .../MarketingCenter/PerformanceBond/index.vue | 22 ++++++++++++++++---
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/views/MarketingCenter/DeliveryManagement/index.vue b/src/views/MarketingCenter/DeliveryManagement/index.vue
index 683105d1..755ff14d 100644
--- a/src/views/MarketingCenter/DeliveryManagement/index.vue
+++ b/src/views/MarketingCenter/DeliveryManagement/index.vue
@@ -104,14 +104,13 @@
               :file-list="fileList"
               :before-upload="beforeUpload"
               :on-success="onSuccess"
-              :action="'http://192.168.1.122:8410/submit/upload2.ashx?InvoiceNum='+ invoiceNum"
+              :action="'http://localhost:8411/submit/upload2.ashx?InvoiceNum='+ invoiceNum"
               list-type="picture-card">
               <i class="el-icon-plus"/>
             </el-upload>
             <el-dialog :visible.sync="dialogVisible">
               <img :src="dialogImageUrl" width="100%" alt="">
             </el-dialog>
-
           </div>
         </div></el-col>
       </el-row>
@@ -1093,7 +1092,7 @@ export default {
         return {
           _id: item.附件号,
           name: item.文件标识,
-          url: 'http://192.168.1.122:8410/webpage/img/' + item.文件标识
+          url: 'http://localhost:8411/webpage/img/' + item.文件标识
         }
       })
     },
diff --git a/src/views/MarketingCenter/InvoiceRecord/index.vue b/src/views/MarketingCenter/InvoiceRecord/index.vue
index f0b6a296..c3d4b0eb 100644
--- a/src/views/MarketingCenter/InvoiceRecord/index.vue
+++ b/src/views/MarketingCenter/InvoiceRecord/index.vue
@@ -94,7 +94,7 @@
               size="mini"
               type="primary"
               icon="el-icon-circle-plus-outline"
-              @click.stop="openAddInvoiceRecordingDialog(); flag = 1">增加记录</el-button>
+              @click.stop="openAddInvoiceRecordingDialog(scope.row); flag = 1">增加记录</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -391,6 +391,7 @@ export default {
   },
   created() {
     this.init()
+    this.fetchTableData1()
   },
   methods: {
     // 初始化条件
@@ -466,7 +467,7 @@ export default {
           sums[index] = this.taxRate * 100 + '% (税率)'
           return
         } else if (index === 9) {
-          sums[index] = parseFloat(sums[7]) * this.taxRate + ' 元(税额)'
+          sums[index] = (parseInt(sums[7]) * 100 * this.taxRate) / 100 + ' 元(税额)'
           return
         } else if (index === 10) {
           sums[index] = parseFloat(sums[7]) - parseFloat(sums[9]) + ' 元(未税)'
@@ -522,7 +523,8 @@ export default {
       this.peopleid = ''
     },
     // 打开增加开票记录对话框
-    openAddInvoiceRecordingDialog() {
+    openAddInvoiceRecordingDialog(row) {
+      this.projectid = row.项目流水号
       this.addForm('form')
       this.title = '增加'
       this.dialogFormVisible1 = true
diff --git a/src/views/MarketingCenter/PerformanceBond/index.vue b/src/views/MarketingCenter/PerformanceBond/index.vue
index c751dfe1..78019360 100644
--- a/src/views/MarketingCenter/PerformanceBond/index.vue
+++ b/src/views/MarketingCenter/PerformanceBond/index.vue
@@ -90,7 +90,7 @@
               size="mini"
               type="primary"
               icon="el-icon-circle-plus-outline"
-              @click.stop="openPerformanceBondDialog(); flag = 1">履约保证金</el-button>
+              @click.stop="openPerformanceBondDialog(scope.row); flag = 1">履约保证金</el-button>
             <el-button
               :disabled="scope.row.是否禁用增加履约保函"
               size="mini"
@@ -198,7 +198,21 @@
             </el-table>
           </el-tab-pane>
           <el-tab-pane label="履约保函" name="second">
-            履约保函
+            <div>
+              <!--<el-upload-->
+              <!--:on-preview="handlePictureCardPreview"-->
+              <!--:on-remove="handleRemove"-->
+              <!--:file-list="fileList"-->
+              <!--:before-upload="beforeUpload"-->
+              <!--:on-success="onSuccess"-->
+              <!--:action="'http://localhost:8411/submit/upload3.ashx?ProjectId='+ ProjectId"-->
+              <!--list-type="picture-card">-->
+              <!--<i class="el-icon-plus"/>-->
+              <!--</el-upload>-->
+              <!--<el-dialog :visible.sync="dialogVisible">-->
+              <!--<img :src="dialogImageUrl" width="100%" alt="">-->
+              <!--</el-dialog>-->
+            </div>
           </el-tab-pane>
         </el-tabs>
       </template>
@@ -329,6 +343,7 @@ export default {
   },
   created() {
     this.init()
+    this.fetchTableData1()
   },
   methods: {
     // 初始化条件
@@ -444,10 +459,11 @@ export default {
         }
       })
     },
-    openPerformanceBondDialog() {
+    openPerformanceBondDialog(row) {
       this.addForm('form2')
       this.title1 = '增加履约保证金'
       this.dialogFormVisible1 = true
+      this.projectId = row.项目流水号
       this.tableData2 = []
     },
     callOffPerformanceBondDialog() {