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 01/10] =?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() {

From f4500e046d6b9429aece8e4d7670e1e4da31b81c Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Mon, 17 Dec 2018 08:44:02 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E5=88=9D=E6=AC=A1=E6=8A=95=E4=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ManufacturingCenter/InitialProduction/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue
index d0fa55ee..c8c94e65 100644
--- a/src/views/ManufacturingCenter/InitialProduction/index.vue
+++ b/src/views/ManufacturingCenter/InitialProduction/index.vue
@@ -86,7 +86,7 @@
             </el-col>
             <el-col :span="1" class="line">～</el-col>
             <el-col :span="11">
-              <el-date-picker v-model="time_machiningFinish" size="small" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" style="margin-bottom:20px;width:200px"/>
+              <el-date-picker :default-time="['12:00:00']" v-model="time_machiningFinish" size="small" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" style="margin-bottom:20px;width:200px"/>
             </el-col>
           </el-form-item>
         </el-form>

From 64f4350ba67cf8383d3ed876b694853574e2f1a1 Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Mon, 17 Dec 2018 10:33:38 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E9=87=87=E8=B4=AD=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=88=86=E9=85=8D=E7=94=9F=E4=BA=A7=E5=88=86=E9=85=8D=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=EF=BC=8C=E6=89=93=E5=9B=9E=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PurchasingCenter/PurchaseTaskAllocate/index.vue   | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
index 1b01d4ad..f560d976 100644
--- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
+++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
@@ -142,6 +142,11 @@
                 {{ scope.row.物料计划到货时间.split(' ')[0] }}
               </template>
             </el-table-column>
+            <el-table-column align="center" label="生产分配时间" min-width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.操作日期.split(' ')[0] }}
+              </template>
+            </el-table-column>
             <el-table-column :filters="person" :filter-method="filterHandler" align="center" label="采购员" min-width="80px" prop="buyer">
               <template slot-scope="scope">
                 {{ scope.row.姓名 ? scope.row.姓名 : '—' }}
@@ -266,6 +271,11 @@
                 {{ scope.row.物料计划到货时间.split(' ')[0] }}
               </template>
             </el-table-column>
+            <el-table-column align="center" label="生产分配时间" min-width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.操作日期.split(' ')[0] }}
+              </template>
+            </el-table-column>
             <el-table-column :filters="person" :filter-method="filterHandler" align="center" label="采购员" min-width="80px" prop="buyer">
               <template slot-scope="scope">
                 {{ scope.row.姓名 ? scope.row.姓名 : '—' }}
@@ -398,6 +408,7 @@ export default {
       this.materialName ? this.check4 = 1 : this.check4 = 0
       searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, this.check4, this.materialName, this.materialStatusValue[this.materialStatusValue.length - 1]).then(response => {
         this.tableData1 = response.data.rows
+        console.log(response.data.rows)
         this.total1 = response.data.total
       })
     },

From bc6320789949efecdd7f4f4c2e78a86c2bfa212a Mon Sep 17 00:00:00 2001
From: caoxinyu <caoxinyu@meswork.com>
Date: Mon, 17 Dec 2018 11:13:22 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E5=B1=A5=E7=BA=A6=E4=BF=9D=E8=AF=81?=
 =?UTF-8?q?=E9=87=91=E5=B1=A5=E7=BA=A6=E4=BF=9D=E5=87=BD=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/MarketingCenter/PerformanceBond.js    |  22 ++
 .../DeliveryManagement/index.vue              |   6 +-
 .../MarketingCenter/PerformanceBond/index.vue | 271 ++++++++++++++++--
 3 files changed, 270 insertions(+), 29 deletions(-)

diff --git a/src/api/MarketingCenter/PerformanceBond.js b/src/api/MarketingCenter/PerformanceBond.js
index c91f91ad..aa498530 100644
--- a/src/api/MarketingCenter/PerformanceBond.js
+++ b/src/api/MarketingCenter/PerformanceBond.js
@@ -108,3 +108,25 @@ export function delPerformanceBond() {
     }
   })
 }
+export function addPerformanceGuarantee() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '合同信息管理_履约保证金_履约保函新增',
+      param: '项目流水号=' + arguments[0]
+    }
+  })
+}
+export function delPerformanceGuarantee() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '合同信息管理_履约保证金_履约保函_删除',
+      param: '项目流水号=' + arguments[0]
+    }
+  })
+}
diff --git a/src/views/MarketingCenter/DeliveryManagement/index.vue b/src/views/MarketingCenter/DeliveryManagement/index.vue
index 755ff14d..92e810fa 100644
--- a/src/views/MarketingCenter/DeliveryManagement/index.vue
+++ b/src/views/MarketingCenter/DeliveryManagement/index.vue
@@ -817,7 +817,7 @@ export default {
           if (response.data[0].result === '1') {
             this.$message.success('删除成功')
             this.getTable(addressSearch, [this.pageCurrent1, this.pageSize1], ['addressData', 'total1'])
-          } else { this.$message.error('数据占用') }
+          } else { this.$message.error('删除失败') }
         })
       }).catch(() => {
         this.$message({
@@ -1106,7 +1106,7 @@ export default {
         }
       })
       if (data[0].result === '0') {
-        this.$message.error('数据占用')
+        this.$message.error('删除失败')
       }
     },
     handlePictureCardPreview(file) {
@@ -1126,7 +1126,7 @@ export default {
         this.$message.error('只能上传图片。。')
       }
       if (!isLt4M) {
-        this.$message.error('上传头像图片大小不能超过 4MB!')
+        this.$message.error('上传图片大小不能超过 4MB!')
       }
 
       return isJPG && isLt4M && isInvoiceNum
diff --git a/src/views/MarketingCenter/PerformanceBond/index.vue b/src/views/MarketingCenter/PerformanceBond/index.vue
index 78019360..612402b8 100644
--- a/src/views/MarketingCenter/PerformanceBond/index.vue
+++ b/src/views/MarketingCenter/PerformanceBond/index.vue
@@ -32,11 +32,11 @@
       <el-table
         v-loading="listLoading1"
         :data="tableData1"
-        highlight-current-row
         style="width: 100%"
         height="400"
         border
         size="mini"
+        highlight-current-row
         @row-click="fetchTableData2">
         <el-table-column align="center" label="合同编号" width="200">
           <template slot-scope="scope">
@@ -96,7 +96,7 @@
               size="mini"
               type="primary"
               icon="el-icon-circle-plus-outline"
-              @click.stop="openAddInvoiceRecordingDialog(); flag = 3">履约保函</el-button>
+              @click.stop="addPerformanceGuarantee(scope.row)">履约保函</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -114,7 +114,7 @@
     <el-card>
       <template>
         <el-tabs v-model="activeName" type="card">
-          <el-tab-pane label="履约保证金" name="first">
+          <el-tab-pane :disabled="performanceBondDisabled" label="履约保证金" name="first">
             <el-table
               v-loading="listLoading2"
               :data="tableData2"
@@ -197,21 +197,22 @@
               </el-table-column>
             </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>-->
+          <el-tab-pane :disabled="performanceGuaranteeDisabled" label="履约保函" name="second">
+            <el-button type="danger" icon="el-icon-delete" size="small" style="float: right" @click="delPerformanceGuarantee">删除</el-button>
+            <div v-show="performanceGuaranteeShow" style="width: 150px; height: 150px; margin: auto;left: 50%;right: 50%">
+              <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>
@@ -284,8 +285,9 @@
 </template>
 
 <script>
+import request from '@/utils/request'
 import elInput from 'element-ui/packages/input'
-import { initProject, searchTableData1, typeOfPerformanceBond, searchTableData2, takeBack, executionProgressID, initType, addPerformanceBond, editPerformanceBond, delPerformanceBond } from '@/api/MarketingCenter/PerformanceBond'
+import { initProject, searchTableData1, typeOfPerformanceBond, searchTableData2, takeBack, executionProgressID, initType, addPerformanceBond, editPerformanceBond, delPerformanceBond, addPerformanceGuarantee, delPerformanceGuarantee } from '@/api/MarketingCenter/PerformanceBond'
 export default {
   components: {
     elInput
@@ -319,6 +321,12 @@ export default {
       dialogFormVisible1: false, // 履约保证金对话框
       plannedTime: [],
       performanceBondType: [],
+      performanceBondDisabled: true, // 履约保证金标签页是否禁用
+      performanceGuaranteeDisabled: true, // 履约保函是否禁用
+      dialogVisible: false, // 履约保函复印件
+      dialogImageUrl: '',
+      fileList: [],
+      performanceGuaranteeShow: true,
       form: {
         实际收回日期: ''
       },
@@ -354,9 +362,21 @@ export default {
     },
     // 查询合同(项目)信息
     fetchTableData1() {
-      if (this.entryNameValue === '' || this.entryNameValue === null) { this.entryNameValue_check = 0 } else { this.entryNameValue_check = 1 }
-      if (this.startTime === '' || this.startTime === null) { this.startTime_check = 0 } else { this.startTime_check = 1 }
-      if (this.endTime === '' || this.endTime === null) { this.endTime_check = 0 } else { this.endTime_check = 1 }
+      if (this.entryNameValue === '' || this.entryNameValue === null) {
+        this.entryNameValue_check = 0
+      } else {
+        this.entryNameValue_check = 1
+      }
+      if (this.startTime === '' || this.startTime === null) {
+        this.startTime_check = 0
+      } else {
+        this.startTime_check = 1
+      }
+      if (this.endTime === '' || this.endTime === null) {
+        this.endTime_check = 0
+      } else {
+        this.endTime_check = 1
+      }
       this.listLoading1 = true
       searchTableData1(this.PageCurrent, this.PageSize, this.entryNameValue, this.entryNameValue_check, this.startTime_check, this.endTime_check, this.startTime, this.endTime).then(response => {
         this.tableData2 = []
@@ -394,6 +414,8 @@ export default {
         if (data === 1) {
           this.activeName = 'first'
           this.listLoading2 = true
+          this.performanceBondDisabled = false
+          this.performanceGuaranteeDisabled = true
           searchTableData2(this.projectId).then(response => {
             this.listLoading2 = false
             const data = response.data
@@ -405,11 +427,18 @@ export default {
             }
             this.tableData2 = data
           })
-        } else if (data === 1) {
+        } else if (data === 2) {
           this.activeName = 'second'
+          this.performanceBondDisabled = true
+          this.performanceGuaranteeDisabled = false
+          this.performanceGuaranteeShow = true
+          this.getFileList()
         } else {
           this.$message.warning('未缴纳履约保证金')
           this.tableData2 = []
+          this.performanceGuaranteeShow = false
+          this.performanceBondDisabled = true
+          this.performanceGuaranteeDisabled = true
         }
       })
     },
@@ -435,6 +464,8 @@ export default {
                 if (data === 1) {
                   this.activeName = 'first'
                   this.listLoading2 = true
+                  this.performanceBondDisabled = false
+                  this.performanceGuaranteeDisabled = true
                   searchTableData2(this.projectId).then(response => {
                     this.listLoading2 = false
                     const data = response.data
@@ -446,10 +477,18 @@ export default {
                     }
                     this.tableData2 = data
                   })
-                } else if (data === 1) {
+                } else if (data === 2) {
                   this.activeName = 'second'
+                  this.performanceBondDisabled = true
+                  this.performanceGuaranteeDisabled = false
+                  this.performanceGuaranteeShow = true
+                  this.getFileList()
                 } else {
                   this.$message.warning('未缴纳履约保证金')
+                  this.performanceBondDisabled = true
+                  this.performanceGuaranteeDisabled = true
+                  this.tableData2 = []
+                  this.performanceGuaranteeShow = false
                 }
               })
             } else {
@@ -485,6 +524,8 @@ export default {
                   if (data === 1) {
                     this.activeName = 'first'
                     this.listLoading2 = true
+                    this.performanceBondDisabled = false
+                    this.performanceGuaranteeDisabled = true
                     searchTableData2(this.projectId).then(response => {
                       this.listLoading2 = false
                       const data = response.data
@@ -496,10 +537,18 @@ export default {
                       }
                       this.tableData2 = data
                     })
-                  } else if (data === 1) {
+                  } else if (data === 2) {
                     this.activeName = 'second'
+                    this.performanceBondDisabled = true
+                    this.performanceGuaranteeDisabled = false
+                    this.performanceGuaranteeShow = true
+                    this.getFileList()
                   } else {
                     this.$message.warning('未缴纳履约保证金')
+                    this.performanceBondDisabled = true
+                    this.performanceGuaranteeDisabled = true
+                    this.tableData2 = []
+                    this.performanceGuaranteeShow = false
                   }
                 })
               } else {
@@ -518,6 +567,8 @@ export default {
                   if (data === 1) {
                     this.activeName = 'first'
                     this.listLoading2 = true
+                    this.performanceBondDisabled = false
+                    this.performanceGuaranteeDisabled = true
                     searchTableData2(this.projectId).then(response => {
                       this.listLoading2 = false
                       const data = response.data
@@ -529,10 +580,18 @@ export default {
                       }
                       this.tableData2 = data
                     })
-                  } else if (data === 1) {
+                  } else if (data === 2) {
                     this.activeName = 'second'
+                    this.performanceBondDisabled = true
+                    this.performanceGuaranteeDisabled = false
+                    this.performanceGuaranteeShow = true
+                    this.getFileList()
                   } else {
                     this.$message.warning('未缴纳履约保证金')
+                    this.performanceBondDisabled = true
+                    this.performanceGuaranteeDisabled = true
+                    this.tableData2 = []
+                    this.performanceGuaranteeShow = false
                   }
                 })
               } else {
@@ -578,6 +637,166 @@ export default {
           }
         })
       })
+    },
+    addPerformanceGuarantee(row) {
+      this.projectId = row.项目流水号
+      this.$confirm('是否新增履约保函', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        addPerformanceGuarantee(this.projectId).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('添加成功')
+            this.activeName = 'second'
+            this.performanceBondDisabled = true
+            this.performanceGuaranteeDisabled = false
+            this.fetchTableData1()
+            typeOfPerformanceBond(this.projectId).then(response => {
+              const data = response.data[0].履约保证金类型
+              return data
+            }).then(data => {
+              if (data === 1) {
+                this.activeName = 'first'
+                this.listLoading2 = true
+                this.performanceBondDisabled = false
+                this.performanceGuaranteeDisabled = true
+                searchTableData2(this.projectId).then(response => {
+                  this.listLoading2 = false
+                  const data = response.data
+                  for (let i = 0; i < data.length; i++) {
+                    data[i].实际收回日期 !== '' && data[i].实际收回日期 !== null ? data[i].实际收回日期 = data[i].实际收回日期.substring(0, data[i].实际收回日期.length - 8) : data[i].实际收回日期
+                    data[i].节点日期 !== '' && data[i].节点日期 !== null ? data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8) : data[i].节点日期
+                    data[i].计划收款日期 !== '' && data[i].计划收款日期 !== null ? data[i].计划收款日期 = data[i].计划收款日期.substring(0, data[i].计划收款日期.length - 8) : data[i].计划收款日期
+                    data[i].计划收款日期 === '' || data[i].计划收款日期 === null || parseInt(data[i].是否收回) === 1 ? data[i].是否禁用收回 = true : data[i].是否禁用收回 = false
+                  }
+                  this.tableData2 = data
+                })
+              } else if (data === 2) {
+                this.activeName = 'second'
+                this.performanceBondDisabled = true
+                this.performanceGuaranteeDisabled = false
+                this.performanceGuaranteeShow = true
+                this.getFileList()
+              } else {
+                this.$message.warning('未缴纳履约保证金')
+                this.tableData2 = []
+                this.performanceGuaranteeShow = false
+                this.performanceBondDisabled = true
+                this.performanceGuaranteeDisabled = true
+              }
+            })
+          } else {
+            this.$message.error('添加失败')
+          }
+        })
+      })
+    },
+    async getFileList() {
+      const { data } = await request({
+        url: '',
+        method: 'post',
+        data: {
+          type: '3',
+          name: `select * from 合同信息管理_履约保证金_履约保函 where 是否启用 = 1 and 项目流水号 = ${this.projectId}`
+        }
+      })
+      this.fileList = data.map(item => {
+        return {
+          _id: item.履约保函流水号,
+          name: item.文件标识,
+          url: 'http://localhost:8411/webpage/img/' + item.文件标识
+        }
+      })
+    },
+    async handleRemove(file, fileList) {
+      const { data } = await request({
+        url: '',
+        method: 'post',
+        data: {
+          type: '4',
+          name: `update 合同信息管理_履约保证金_履约保函 set 是否启用 = 0 where 履约保函流水号 = ${file._id}`
+        }
+      })
+      if (data[0].result === '0') {
+        this.$message.error('上传失败')
+      }
+    },
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url
+      this.dialogVisible = true
+    },
+    beforeUpload(file) {
+      const isJPG = /^image\/.*/.test(file.type)
+      const isLt4M = file.size / 1024 / 1024 < 4
+      const isInvoiceNum = !!this.projectId
+
+      if (!isJPG) {
+        this.$message.error('只能上传图片。。')
+      }
+      if (!isLt4M) {
+        this.$message.error('上传图片大小不能超过 4MB!')
+      }
+
+      return isJPG && isLt4M && isInvoiceNum
+    },
+    onSuccess(res, file, fileList) {
+      fileList = []
+      if (res[0].result === '1') {
+        this.getFileList()
+      } else {
+        this.$message.error('上传失败')
+      }
+    },
+    delPerformanceGuarantee() {
+      this.$confirm('是否删除履约保函', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        delPerformanceGuarantee(this.projectId).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('删除成功')
+            this.fetchTableData1()
+            typeOfPerformanceBond(this.projectId).then(response => {
+              const data = response.data[0].履约保证金类型
+              return data
+            }).then(data => {
+              if (data === 1) {
+                this.activeName = 'first'
+                this.listLoading2 = true
+                this.performanceBondDisabled = false
+                this.performanceGuaranteeDisabled = true
+                searchTableData2(this.projectId).then(response => {
+                  this.listLoading2 = false
+                  const data = response.data
+                  for (let i = 0; i < data.length; i++) {
+                    data[i].实际收回日期 !== '' && data[i].实际收回日期 !== null ? data[i].实际收回日期 = data[i].实际收回日期.substring(0, data[i].实际收回日期.length - 8) : data[i].实际收回日期
+                    data[i].节点日期 !== '' && data[i].节点日期 !== null ? data[i].节点日期 = data[i].节点日期.substring(0, data[i].节点日期.length - 8) : data[i].节点日期
+                    data[i].计划收款日期 !== '' && data[i].计划收款日期 !== null ? data[i].计划收款日期 = data[i].计划收款日期.substring(0, data[i].计划收款日期.length - 8) : data[i].计划收款日期
+                    data[i].计划收款日期 === '' || data[i].计划收款日期 === null || parseInt(data[i].是否收回) === 1 ? data[i].是否禁用收回 = true : data[i].是否禁用收回 = false
+                  }
+                  this.tableData2 = data
+                })
+              } else if (data === 2) {
+                this.activeName = 'second'
+                this.performanceBondDisabled = true
+                this.performanceGuaranteeDisabled = false
+                this.performanceGuaranteeShow = true
+                this.getFileList()
+              } else {
+                this.$message.warning('未缴纳履约保证金')
+                this.tableData2 = []
+                this.performanceGuaranteeShow = false
+                this.performanceBondDisabled = true
+                this.performanceGuaranteeDisabled = true
+              }
+            })
+          } else {
+            this.$message.error('删除失败')
+          }
+        })
+      })
     }
   }
 }

From 70b780356fad9a65bc97ca6ba793be35634a318c Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Mon, 17 Dec 2018 14:34:01 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E9=9B=B6=E4=BB=B6?=
 =?UTF-8?q?=E5=88=B0=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OutsourcingPaymentPlanManagement/index.vue     | 14 +++++++-------
 .../Outsourcing/OutsourcingTaskQuery/index.vue     | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
index 7c85ec31..37bde6f0 100644
--- a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
+++ b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
@@ -68,6 +68,12 @@
             <el-tag v-else type="info" size="small">未付款</el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="到货状态" width="100" align="center">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.单据状态==='3'" type="success" size="small">已到货</el-tag>
+            <el-tag v-else type="info" size="small">未到货</el-tag>
+          </template>
+        </el-table-column>
         <el-table-column label="表单号" align="center" width="280px">
           <template slot-scope="scope">
             {{ scope.row.表单号 }}
@@ -143,9 +149,6 @@
           </template>
         </el-table-column>
         <el-table-column label="付款日期" align="center" width="240px">
-          <!--<template slot-scope="scope">-->
-          <!--{{scope.row.实际付款时间}}-->
-          <!--</template>-->
           <el-table-column label="入库" align="center" width="140px">
             <template slot-scope="scope">
               {{ scope.row.入库时间 }}
@@ -176,7 +179,7 @@
               class="el-icon-edit"
               @click="Withdrawing(scope.$index, scope.row, 'form')">扣款</el-button>
             <el-button
-              :disabled="scope.row.实际付款时间!==''"
+              :disabled="scope.row.实际付款时间!==''||scope.row.单据状态!=='3'"
               size="mini"
               type="success"
               class="el-icon-check"
@@ -376,8 +379,6 @@ export default {
           day = '0' + day
         }
         this.实际付款时间 = time.getFullYear() + '/' + month + '/' + day
-        // payment(row.外协加工任务单流水号).then(response => {
-        // }).then(() => {
         payTime(row.外协加工任务单流水号, this.实际付款时间).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('付款成功')
@@ -386,7 +387,6 @@ export default {
             this.$message.error('付款失败')
           }
         })
-        // })
       }).catch(() => {
         this.$message({
           type: 'info',
diff --git a/src/views/Outsourcing/OutsourcingTaskQuery/index.vue b/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
index 5f34c824..5f2568c1 100644
--- a/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
@@ -20,18 +20,18 @@
 
     <el-card>
       <el-table v-loading="loading2" :data="List" highlight-current-row height="350" border @row-click="searchProcess" >
-        <el-table-column label="付款状态" width="100" align="center">
-          <template slot-scope="scope">
-            <el-tag v-if="scope.row.实际付款时间!==''" type="success" size="small" style="margin: 0px">已付款</el-tag>
-            <el-tag v-else type="info" size="small" style="margin: 0px">未付款</el-tag>
-          </template>
-        </el-table-column>
         <el-table-column label="收货状态" width="100" align="center">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.单据状态==='作废'" type="success" size="small" style="margin: 0px">已收货</el-tag>
             <el-tag v-else type="info" size="small" style="margin: 0px">未收货</el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="付款状态" width="100" align="center">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.实际付款时间!==''" type="success" size="small" style="margin: 0px">已付款</el-tag>
+            <el-tag v-else type="info" size="small" style="margin: 0px">未付款</el-tag>
+          </template>
+        </el-table-column>
         <el-table-column label="表单号" align="center" min-width="200px">
           <template slot-scope="scope">
             {{ scope.row.表单号 }}

From aa35831de7e7d65b6b034ef41441fe76b69db378 Mon Sep 17 00:00:00 2001
From: caoxinyu <caoxinyu@meswork.com>
Date: Mon, 17 Dec 2018 16:52:52 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E8=90=A5=E9=94=80=E7=B3=BB=E7=BB=9F=E7=9A=84=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/MarketingCenter/PerformanceBond/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/MarketingCenter/PerformanceBond/index.vue b/src/views/MarketingCenter/PerformanceBond/index.vue
index 612402b8..7735b5c0 100644
--- a/src/views/MarketingCenter/PerformanceBond/index.vue
+++ b/src/views/MarketingCenter/PerformanceBond/index.vue
@@ -70,7 +70,7 @@
         </el-table-column>
         <el-table-column align="center" label="联系人" width="80">
           <template slot-scope="scope">
-            {{ scope.row.姓名 }}
+            {{ scope.row.联系人 }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="联系电话" width="100">
@@ -608,6 +608,7 @@ export default {
       this.form2.保证金金额 = row.履约保证金金额
       this.form2.保证金类型 = row.保金类型
       this.form2.收回条件 = parseInt(row.执行进度流水号)
+      this.title1 = '编辑履约保证金'
     },
     delPerformanceBond(row) {
       this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {

From 55d326313c5649dcb05c7030def758db26b37383 Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Mon, 17 Dec 2018 18:21:31 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E6=80=BB=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PurchasingCenter/ProjectTotalSearch.js    |  2 +-
 .../ProjectTotalSearch/index.vue              | 21 ++++++++++++-------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/api/PurchasingCenter/ProjectTotalSearch.js b/src/api/PurchasingCenter/ProjectTotalSearch.js
index 1e46e7a1..8e4a7c1e 100644
--- a/src/api/PurchasingCenter/ProjectTotalSearch.js
+++ b/src/api/PurchasingCenter/ProjectTotalSearch.js
@@ -18,7 +18,7 @@ export function searchProjectTotal(num) {
     method: 'post',
     data: {
       type: '1',
-      name: '采购管理_项目总价_明细_查询数据',
+      name: '采购管理_项目采购总价_查询数据',
       param: `项目流水号=${num}`
     }
   })
diff --git a/src/views/PurchasingCenter/ProjectTotalSearch/index.vue b/src/views/PurchasingCenter/ProjectTotalSearch/index.vue
index cf7b6e17..369e8a07 100644
--- a/src/views/PurchasingCenter/ProjectTotalSearch/index.vue
+++ b/src/views/PurchasingCenter/ProjectTotalSearch/index.vue
@@ -25,19 +25,19 @@
             {{ scope.row.项目名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="物料名称" align="center" min-width="100">
+        <el-table-column label="图号" align="center" min-width="100">
           <template slot-scope="scope">
-            {{ scope.row.物料名称 }}
+            {{ scope.row.图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="物料型号" align="center" min-width="100">
+        <el-table-column label="名称" align="center" min-width="100">
           <template slot-scope="scope">
-            {{ scope.row.物料型号 }}
+            {{ scope.row.名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="物料规格" align="center" min-width="100">
+        <el-table-column label="规格" align="center" min-width="100">
           <template slot-scope="scope">
-            {{ scope.row.物料规格 }}
+            {{ scope.row.规格 }}
           </template>
         </el-table-column>
         <el-table-column label="数量" align="center" min-width="100">
@@ -50,9 +50,14 @@
             {{ scope.row.单价 }}
           </template>
         </el-table-column>
-        <el-table-column label="小计(元)" align="center" min-width="100" prop="金额">
+        <el-table-column label="优惠后单价" align="center" min-width="100">
           <template slot-scope="scope">
-            {{ scope.row.金额 }}
+            {{ scope.row.优惠后单价 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="优惠后小计(元)" align="center" min-width="100" prop="金额">
+          <template slot-scope="scope">
+            {{ scope.row.金额 = Number(scope.row.优惠后单价) * Number(scope.row.数量) }}
           </template>
         </el-table-column>
       </el-table>

From bccc982ab69f6ac7be7a485b52d3a9d10f21a0c5 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Mon, 17 Dec 2018 19:46:52 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E5=88=9D=E6=AC=A1=E6=8A=95=E4=BA=A7?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ManufacturingCenter/InitialProduction/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue
index c8c94e65..3d29e001 100644
--- a/src/views/ManufacturingCenter/InitialProduction/index.vue
+++ b/src/views/ManufacturingCenter/InitialProduction/index.vue
@@ -86,7 +86,7 @@
             </el-col>
             <el-col :span="1" class="line">～</el-col>
             <el-col :span="11">
-              <el-date-picker :default-time="['12:00:00']" v-model="time_machiningFinish" size="small" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" style="margin-bottom:20px;width:200px"/>
+              <el-date-picker v-model="time_machiningFinish" default-time="23:59:59" size="small" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" style="margin-bottom:20px;width:200px"/>
             </el-col>
           </el-form-item>
         </el-form>

From 3363e1bbc3f9f8fb4c814a53a5adcc09704c2588 Mon Sep 17 00:00:00 2001
From: caoxinyu <caoxinyu@meswork.com>
Date: Mon, 17 Dec 2018 20:16:56 +0800
Subject: [PATCH 09/10] =?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

---
 .../DeliveryManagement/index.vue              |  3 +-
 .../MarketingCenter/PerformanceBond/index.vue | 33 ++++++++++---------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/views/MarketingCenter/DeliveryManagement/index.vue b/src/views/MarketingCenter/DeliveryManagement/index.vue
index 92e810fa..67b0a632 100644
--- a/src/views/MarketingCenter/DeliveryManagement/index.vue
+++ b/src/views/MarketingCenter/DeliveryManagement/index.vue
@@ -105,7 +105,8 @@
               :before-upload="beforeUpload"
               :on-success="onSuccess"
               :action="'http://localhost:8411/submit/upload2.ashx?InvoiceNum='+ invoiceNum"
-              list-type="picture-card">
+              list-type="picture-card"
+              limit="4">
               <i class="el-icon-plus"/>
             </el-upload>
             <el-dialog :visible.sync="dialogVisible">
diff --git a/src/views/MarketingCenter/PerformanceBond/index.vue b/src/views/MarketingCenter/PerformanceBond/index.vue
index 7735b5c0..50299734 100644
--- a/src/views/MarketingCenter/PerformanceBond/index.vue
+++ b/src/views/MarketingCenter/PerformanceBond/index.vue
@@ -198,21 +198,24 @@
             </el-table>
           </el-tab-pane>
           <el-tab-pane :disabled="performanceGuaranteeDisabled" label="履约保函" name="second">
-            <el-button type="danger" icon="el-icon-delete" size="small" style="float: right" @click="delPerformanceGuarantee">删除</el-button>
-            <div v-show="performanceGuaranteeShow" style="width: 150px; height: 150px; margin: auto;left: 50%;right: 50%">
-              <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 v-show="performanceGuaranteeShow">
+              <el-button type="danger" icon="el-icon-delete" size="small" style="float: right;display: inline-block" @click="delPerformanceGuarantee">删除</el-button>
+              <div style="width: 150px; height: 150px; margin: auto;left: 50%;right: 50%">
+                <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"
+                  limit="1">
+                  <i class="el-icon-plus"/>
+                </el-upload>
+                <el-dialog :visible.sync="dialogVisible">
+                  <img :src="dialogImageUrl" width="100%" alt="">
+                </el-dialog>
+              </div>
             </div>
           </el-tab-pane>
         </el-tabs>

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

---
 src/views/MarketingCenter/DeliveryManagement/index.vue | 3 +--
 src/views/MarketingCenter/PerformanceBond/index.vue    | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/views/MarketingCenter/DeliveryManagement/index.vue b/src/views/MarketingCenter/DeliveryManagement/index.vue
index 67b0a632..92e810fa 100644
--- a/src/views/MarketingCenter/DeliveryManagement/index.vue
+++ b/src/views/MarketingCenter/DeliveryManagement/index.vue
@@ -105,8 +105,7 @@
               :before-upload="beforeUpload"
               :on-success="onSuccess"
               :action="'http://localhost:8411/submit/upload2.ashx?InvoiceNum='+ invoiceNum"
-              list-type="picture-card"
-              limit="4">
+              list-type="picture-card">
               <i class="el-icon-plus"/>
             </el-upload>
             <el-dialog :visible.sync="dialogVisible">
diff --git a/src/views/MarketingCenter/PerformanceBond/index.vue b/src/views/MarketingCenter/PerformanceBond/index.vue
index 50299734..5c3eddfc 100644
--- a/src/views/MarketingCenter/PerformanceBond/index.vue
+++ b/src/views/MarketingCenter/PerformanceBond/index.vue
@@ -208,8 +208,7 @@
                   :before-upload="beforeUpload"
                   :on-success="onSuccess"
                   :action="'http://localhost:8411/submit/upload3.ashx?ProjectId='+ projectId"
-                  list-type="picture-card"
-                  limit="1">
+                  list-type="picture-card">
                   <i class="el-icon-plus"/>
                 </el-upload>
                 <el-dialog :visible.sync="dialogVisible">