From 55f53eedda457c2bd6c4d68f7e38c04acf1a2d19 Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Fri, 19 Apr 2019 11:35:11 +0800
Subject: [PATCH] fix bug

---
 .../CreatePurchaseContract/index.vue          | 21 +++++++++----------
 .../SupplierManagement/index.vue              |  1 -
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
index db00a0d6..072e1134 100644
--- a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
+++ b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
@@ -159,6 +159,7 @@ import Tinymce from '@/components/Tinymce'
 import { searchInquirySheet, searchSheetContract, doneContract, searchBaseInfo } from '@/api/PurchasingCenter/CreatePurchaseContract'
 import { convertCurrency } from '@/vendor/int2Chinese'
 import { mapGetters } from 'vuex'
+import { sleep } from '@/utils/tool'
 import $ from 'jquery'
 
 export default {
@@ -240,15 +241,13 @@ export default {
             supplierValue: response.data[i].供应商流水号,
             supplierAddress: response.data[i].地址,
             legalPerson: response.data[i].企业性质, // 法人
-            supplierPhone: response.data[i].电话号码,
-            supplierFax: response.data[i].传真,
-            trustee: response.data[i].注册资本, // 受托人
-            bank1: response.data[i].开户行, // 开户行
-            account1: response.data[i].帐号, // 帐号
-            taxCode1: response.data[i].税号, // 税号
-            phone1: response.data[i].电话号码, // 电话
-            fax1: response.data[i].传真, // 传真
-            postCode1: response.data[i].货期 // 邮编
+            trustee: response.data[i].注册资本 || '', // 受托人
+            bank1: response.data[i].开户行 || '', // 开户行
+            account1: response.data[i].帐号 || '', // 帐号
+            taxCode1: response.data[i].税号 || '', // 税号
+            phone1: response.data[i].电话号码 || '', // 电话
+            fax1: response.data[i].传真 || '', // 传真
+            postCode1: response.data[i].货期 || '' // 邮编
           })
         }
       })
@@ -268,8 +267,6 @@ export default {
           this.supplierValue = this.contractNums[i].supplierValue
           this.supplierAddress = this.contractNums[i].supplierAddress
           this.legalPerson = this.contractNums[i].legalPerson
-          this.supplierPhone = this.contractNums[i].supplierPhone
-          this.supplierFax = this.contractNums[i].supplierFax
           this.contractNum = this.contractNums[i].label
           this.trustee = this.contractNums[i].trustee
           this.bank1 = this.contractNums[i].bank1
@@ -467,6 +464,8 @@ export default {
 `
     },
     async editContract() { // 选择一个询价单，整成合同明细
+      this.demoChange()
+      await sleep(0)
       if (this.contractNumValue) {
         if (this.demoRadio) {
           this.$refs.tinymce.destroyTinymce()
diff --git a/src/views/PurchasingCenter/SupplierManagement/index.vue b/src/views/PurchasingCenter/SupplierManagement/index.vue
index 3ce0ae40..7a11c065 100644
--- a/src/views/PurchasingCenter/SupplierManagement/index.vue
+++ b/src/views/PurchasingCenter/SupplierManagement/index.vue
@@ -452,7 +452,6 @@ export default {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           addTable(this.form.供应商名称, this.form.企业性质, this.form.创立日期, this.form.注册资本, this.form.税号, this.form.开户行, this.form.帐号, this.form.电子信箱, this.form.地址, this.form.电话号码, this.form.传真, this.form.货期).then(response => {
-            console.log(response.data)
             if (Number(response.data.output[0].output1) === 0) {
               this.$message.warning('该供应商已存在')
             } else if (response.data.result[0].result === '1') {