From e97ea8d2731bb55927bd3ad015db7b68bbb857b3 Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Thu, 20 Jun 2019 09:18:21 +0800
Subject: [PATCH] fixed bug

---
 src/api/PurchasingCenter/CreatePurchaseContract.js          | 2 +-
 src/views/PurchasingCenter/CreatePurchaseContract/index.vue | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/api/PurchasingCenter/CreatePurchaseContract.js b/src/api/PurchasingCenter/CreatePurchaseContract.js
index b2f77cd0..06fb7d44 100644
--- a/src/api/PurchasingCenter/CreatePurchaseContract.js
+++ b/src/api/PurchasingCenter/CreatePurchaseContract.js
@@ -45,7 +45,7 @@ export function doneContract(...params) {
     data: {
       type: '2',
       name: '采购管理_采购合同_增加数据',
-      param: `采购合同编号=${params[0]}\\&采购合同名称=${params[1]}\\&交货日期=${params[2]}\\&支付日期=${params[3]}\\&支付方式=${params[4]}\\&开票信息=${params[5]}\\&其他说明=${params[6]}\\&合同总额=${params[7]}\\&采购员流水号=${params[8]}\\&供应商流水号=${params[9]}\\&单价是否含税=${params[10]}\\&组件零件流水号组=${params[11]}\\&组件零件基本件流水号组=${params[12]}\\&数量组=${params[13]}\\&单价组=${params[14]}\\&交货期组=${params[15]}\\&合同内容\\=${params[16]}\\&税率=${params[17]}\\&询价单明细流水号组=${params[18]}`
+      param: `采购合同编号=${params[0]}\\&采购合同名称=${params[1]}\\&交货日期=${params[2]}\\&支付日期=${params[3]}\\&支付方式=${params[4]}\\&开票信息=${params[5]}\\&其他说明=${params[6]}\\&合同总额=${params[7]}\\&采购员流水号=${params[8]}\\&供应商流水号=${params[9]}\\&单价是否含税=${params[10]}\\&组件零件流水号组=${params[11]}\\&组件零件基本件流水号组=${params[12]}\\&数量组=${params[13]}\\&单价组=${params[14]}\\&交货期组=${params[15]}\\&合同内容\\=${params[16]}\\&税率=${params[17]}\\&询价单明细流水号组=${params[18]}\\&备注组=${params[19]}`
     }
   })
 }
diff --git a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
index 5c3ac0a2..cfff54dd 100644
--- a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
+++ b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
@@ -252,6 +252,7 @@ export default {
       数量组: [],
       单价组: [],
       交货期组: [],
+      备注组: [],
       companyAddress: '',
       sendAddress: ''
     }
@@ -772,6 +773,7 @@ export default {
           this.数量组.push(v.数量)
           this.hasTax === '含税' ? this.单价组.push(v.含税单价) : this.单价组.push(v.未税单价)
           this.交货期组.push(v.交货期)
+          this.备注组.push(v.备注)
         } else { // 获取未询到价格的物料的询价单明细流水号们
           inquiryDetailNum_old.push(v.询价单明细流水号)
         }
@@ -782,7 +784,7 @@ export default {
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          doneContract(this.contractNum, this.contractName, this.deliveryDate, this.payDate, this.payMethod, this.invoiceInfo, this.otherInfo, this.actualTotal, this.id, this.supplierValue, this.单价是否含税, this.组件零件流水号组, this.组件零件基本件流水号组, this.数量组, this.单价组, this.交货期组, this.content, this.taxRate * 100, inquiryDetailNum_old).then(response => {
+          doneContract(this.contractNum, this.contractName, this.deliveryDate, this.payDate, this.payMethod, this.invoiceInfo, this.otherInfo, this.actualTotal, this.id, this.supplierValue, this.单价是否含税, this.组件零件流水号组, this.组件零件基本件流水号组, this.数量组, this.单价组, this.交货期组, this.content, this.taxRate * 100, inquiryDetailNum_old, this.备注组).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('合同生成成功')
               this.reload()