diff --git a/.env.production b/.env.production index a17420f..3e49185 100644 --- a/.env.production +++ b/.env.production @@ -13,4 +13,4 @@ VUE_APP_API= '/' # 请求环境 # 方楠 -VUE_APP_BASE_API = 'https://2537287x0n.imdo.co' \ No newline at end of file +VUE_APP_BASE_API = 'http://60.204.223.58:8080' \ No newline at end of file diff --git a/.env.test b/.env.test index 39969ed..54c48a2 100644 --- a/.env.test +++ b/.env.test @@ -7,7 +7,8 @@ VUE_APP_TITLE = 链友融财务数字一体化信息系统 # 链友融财务数字一体化信息系统/开发环境 # VUE_APP_BASE_API = 'https://2537287x0n.imdo.co' # VUE_APP_BASE_API = 'https://351009q0x9.oicp.vip' -VUE_APP_BASE_API = 'https://60.204.223.58:8080' +# VUE_APP_BASE_API = 'https://60.204.223.58:8080' + VUE_APP_BASE_API = 'http://60.204.223.58:8080' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/src/views/company/claim/index.vue b/src/views/company/claim/index.vue index 0d80291..1815eb5 100644 --- a/src/views/company/claim/index.vue +++ b/src/views/company/claim/index.vue @@ -569,15 +569,15 @@ export default { // let nameArr = ((this.ieList.filter(item => arr.includes(item.id)) || []).map(item => item.invoiceCode)).join('、') this.$set(this.form.expenseClaimTrips[index].expenseClaimDetails[nIndex], 'invoiceIds', arr) this.$set(this.form.expenseClaimTrips[index].expenseClaimDetails[nIndex], 'show', false) - this.$set(this.form.expenseClaimTrips[index].expenseClaimDetails[nIndex], 'invoiceCount', this.totalCount(arr)==0?'':this.totalCount(arr)) - this.$set(this.form.expenseClaimTrips[index].expenseClaimDetails[nIndex], 'invoiceName', this.totalCount(arr)==0?'请关联':'已关联发票') + this.$set(this.form.expenseClaimTrips[index].expenseClaimDetails[nIndex], 'invoiceCount', this.totalCount(arr) == 0 ? '' : this.totalCount(arr)) + this.$set(this.form.expenseClaimTrips[index].expenseClaimDetails[nIndex], 'invoiceName', this.totalCount(arr) == 0 ? '请关联' : '已关联发票') }, handleConfirmIe1(arr, nIndex) { // let nameArr = ((this.ieList.filter(item => arr.includes(item.id)) || []).map(item => item.invoiceCode)).join('、') this.$set(this.form.expenseClaimDetails[nIndex], 'invoiceIds', arr) this.$set(this.form.expenseClaimDetails[nIndex], 'show', false) - this.$set(this.form.expenseClaimDetails[nIndex], 'invoiceCount', this.totalCount(arr)==0?'':this.totalCount(arr)) - this.$set(this.form.expenseClaimDetails[nIndex], 'invoiceName', this.totalCount(arr)==0?'请关联':'已关联发票') + this.$set(this.form.expenseClaimDetails[nIndex], 'invoiceCount', this.totalCount(arr) == 0 ? '' : this.totalCount(arr)) + this.$set(this.form.expenseClaimDetails[nIndex], 'invoiceName', this.totalCount(arr) == 0 ? '请关联' : '已关联发票') }, totalCount(obj) { @@ -704,15 +704,12 @@ export default { this.$set(this.form.expenseClaimTrips[index], 'isOpen', false) }, handlePoShow(index) { - // if (this.disabled) return if (this.form.expenseClaimTrips[index].tripPartners.length) { this.$set(this.form.expenseClaimTrips[index], 'type', 0) this.$set(this.form.expenseClaimTrips[index], 'isOpen', true) } else { - this.$fm('请先添加同行人!') } - }, handlePoCancel(index) { this.$set(this.form.expenseClaimTrips[index], 'isOpen', false) @@ -822,6 +819,7 @@ export default { disabled: item.status != 2 ? true : false } }) + console.log('...', this.expenseApplyList); resolve() this.$loading(false) })