meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
chenjianan
2019-04-19 11:35:11 +08:00
parent d1c8408275
commit 55f53eedda
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/views/PurchasingCenter/CreatePurchaseContract/index.vue
View File

@@ -159,6 +159,7 @@ import Tinymce from '@/components/Tinymce'
import { searchInquirySheet, searchSheetContract, doneContract, searchBaseInfo } from '@/api/PurchasingCenter/CreatePurchaseContract' import { searchInquirySheet, searchSheetContract, doneContract, searchBaseInfo } from '@/api/PurchasingCenter/CreatePurchaseContract'
import { convertCurrency } from '@/vendor/int2Chinese' import { convertCurrency } from '@/vendor/int2Chinese'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import { sleep } from '@/utils/tool'
import $ from 'jquery' import $ from 'jquery'
export default { export default {
@@ -240,15 +241,13 @@ export default {
supplierValue: response.data[i].供应商流水号, supplierValue: response.data[i].供应商流水号,
supplierAddress: response.data[i].地址, supplierAddress: response.data[i].地址,
legalPerson: response.data[i].企业性质, // 法人 legalPerson: response.data[i].企业性质, // 法人
supplierPhone: response.data[i].电话号码, trustee: response.data[i].注册资本 || '', // 受托人
supplierFax: response.data[i].传真, bank1: response.data[i].开户行 || '', // 开户行
trustee: response.data[i].注册资本, // 受托人 account1: response.data[i].帐号 || '', // 帐号
bank1: response.data[i].开户行, // 开户行 taxCode1: response.data[i].税号 || '', // 税号
account1: response.data[i].帐号, // 帐号 phone1: response.data[i].电话号码 || '', // 电话
taxCode1: response.data[i].税号, // 税号 fax1: response.data[i].传真 || '', // 传真
phone1: response.data[i].电话号码, // 电话 postCode1: response.data[i].货期 || '' // 邮编
fax1: response.data[i].传真, // 传真
postCode1: response.data[i].货期 // 邮编
}) })
} }
}) })
@@ -268,8 +267,6 @@ export default {
this.supplierValue = this.contractNums[i].supplierValue this.supplierValue = this.contractNums[i].supplierValue
this.supplierAddress = this.contractNums[i].supplierAddress this.supplierAddress = this.contractNums[i].supplierAddress
this.legalPerson = this.contractNums[i].legalPerson 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.contractNum = this.contractNums[i].label
this.trustee = this.contractNums[i].trustee this.trustee = this.contractNums[i].trustee
this.bank1 = this.contractNums[i].bank1 this.bank1 = this.contractNums[i].bank1
@@ -467,6 +464,8 @@ export default {
` `
}, },
async editContract() { // 选择一个询价单，整成合同明细 async editContract() { // 选择一个询价单，整成合同明细
this.demoChange()
await sleep(0)
if (this.contractNumValue) { if (this.contractNumValue) {
if (this.demoRadio) { if (this.demoRadio) {
this.$refs.tinymce.destroyTinymce() this.$refs.tinymce.destroyTinymce()

1
src/views/PurchasingCenter/SupplierManagement/index.vue
View File

@@ -452,7 +452,6 @@ export default {
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
if (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 => { 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) { if (Number(response.data.output[0].output1) === 0) {
this.$message.warning('该供应商已存在') this.$message.warning('该供应商已存在')
} else if (response.data.result[0].result === '1') { } else if (response.data.result[0].result === '1') {