From dd34f0ab1c3bb3ae92e93227b26bdcb2711ff3e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=A4=AB=E7=90=B3?= <5356169+zhaofulin@user.noreply.gitee.com> Date: Wed, 3 Apr 2024 10:17:50 +0800 Subject: [PATCH 1/3] 1 --- .env.production | 2 +- .env.test | 3 ++- src/views/company/claim/index.vue | 12 +++++------- 3 files changed, 8 insertions(+), 9 deletions(-) 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) }) From 1dbf764bbff59546f800d01176430662fb269d9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=A4=AB=E7=90=B3?= <5356169+zhaofulin@user.noreply.gitee.com> Date: Wed, 3 Apr 2024 11:02:40 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=8C=E8=A1=8C?= =?UTF-8?q?=E4=BA=BA=E6=97=A0=E6=B3=95=E5=85=B3=E8=81=94=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/FollowPeoPle/index.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/FollowPeoPle/index.vue b/src/components/FollowPeoPle/index.vue index 0d8c5e2..4f143d8 100644 --- a/src/components/FollowPeoPle/index.vue +++ b/src/components/FollowPeoPle/index.vue @@ -11,7 +11,7 @@
姓名： {{item.nickname}}
电话： {{item.mobile}}
-
+
@@ -157,9 +157,9 @@ export default { arr.push(z) }) }) - if (this.tripPartners.length) { - arr = arr.concat(this.tripPartners) - } + // if (this.tripPartners.length) { + // arr = arr.concat(this.tripPartners) + // } let newArr = arr.concat(this.allTripPartners) let repeatId = this.getisRepeat(newArr) if (repeatId) { From ddc29a046d2a75b488b3a12221ac94938f1a1c1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=A4=AB=E7=90=B3?= <5356169+zhaofulin@user.noreply.gitee.com> Date: Wed, 3 Apr 2024 11:45:01 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E7=94=B3=E8=AF=B7=E5=8D=95?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=9B=9E=E6=98=BE=E5=BE=97bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/company/claim/index.vue | 59 +++++++++++++++++-------------- 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/src/views/company/claim/index.vue b/src/views/company/claim/index.vue index fc086ee..7304842 100644 --- a/src/views/company/claim/index.vue +++ b/src/views/company/claim/index.vue @@ -154,7 +154,6 @@ -
申请单关联
@@ -280,7 +279,7 @@ export default { } ] }, - times:null + times: null }; }, // 计算属性 @@ -676,6 +675,8 @@ export default { this.$nextTick(() => { this.$refs.BottomBtn.handleFilterBtnList() }) + // this.handleInitForm(this.form.expenseApplyIds || []) + this.handleGetInvoiceList(this.form.expenseApplyIds || []) }).finally(() => { this.$loading(false, 'loadingSb') }) @@ -753,27 +754,8 @@ export default { ] }) }, - handleInitList() { - console.log('......'); - this.$loading(true) - return new Promise((resolve) => { - listData({ - pageNo: 1, - pageSize: this.$store.getters.requestPageSize, - dictType: 'bs_trip_type', - }).then((res) => { - // 出差类型 - this.tripTypeList = res.data.list || [] - console.log('tripTypeList..', this.tripTypeList); - }) - listData({ - pageNo: 1, - pageSize: this.$store.getters.requestPageSize, - dictType: 'bs_fee_type', - }).then((res) => { - // 出差类型 - this.feeTypeList = res.data.list || [] - }) + handleGetInvoiceList(ids = []) { + return new Promise(resolve => { getInvoicePage({ pageNo: 1, pageSize: this.$store.getters.requestPageSize, @@ -784,7 +766,7 @@ export default { pageSize: 1000, billType: this.$route.query.billType === 'RCBX' ? 'RCSQ' : 'CLSQ', expenseFlag: 0, - ids: [], + ids: ids.length ? ids.join(',') : null, sortingFieldStr: encodeURIComponent(JSON.stringify([{ field: 'id', order: "desc" }])) }).then((res) => { @@ -824,13 +806,36 @@ export default { disabled: item.status != 2 ? true : false } }) - console.log(this.expenseApplyList) - console.log('dkldsjlkdsjl') + console.log('this.expenseApplyList', this.expenseApplyList.filter(item => item.id == 179)) resolve() this.$loading(false) }) }) - + }) + }, + handleInitList() { + this.$loading(true) + return new Promise((resolve) => { + listData({ + pageNo: 1, + pageSize: this.$store.getters.requestPageSize, + dictType: 'bs_trip_type', + }).then((res) => { + // 出差类型 + this.tripTypeList = res.data.list || [] + console.log('tripTypeList..', this.tripTypeList); + }) + listData({ + pageNo: 1, + pageSize: this.$store.getters.requestPageSize, + dictType: 'bs_fee_type', + }).then((res) => { + // 出差类型 + this.feeTypeList = res.data.list || [] + }) + this.handleGetInvoiceList([]).then(() => { + resolve() + }) }) },