diff --git a/src/api/user/menuApi.js b/src/api/user/menuApi.js
index 64382d74a..5ea0ff16f 100644
--- a/src/api/user/menuApi.js
+++ b/src/api/user/menuApi.js
@@ -172,4 +172,30 @@ export function jumpToIot(url) {
reject(error)
})
})
+}
+
+export function jumpToPlugin(url) {
+
+ return new Promise((resolve, reject) => {
+ request({
+ url: '/plugin.getPluginToken',
+ method: 'get',
+ params: {
+ targetUrl: encodeURIComponent(url),
+ communityId: getCommunityId()
+ }
+ }).then(response => {
+ //发送get请求
+ const res = response.data
+ if (res.code != 0) {
+ this.$message.warning(res.msg);
+ return;
+ }
+ let _url = res.data.url;
+ window.open(_url);
+ resolve(res)
+ }).catch(error => {
+ reject(error)
+ })
+ })
}
\ No newline at end of file
diff --git a/src/components/fee/invoiceApplyDetailFee.vue b/src/components/fee/invoiceApplyDetailFee.vue
index 18e1f0047..1756e09cb 100644
--- a/src/components/fee/invoiceApplyDetailFee.vue
+++ b/src/components/fee/invoiceApplyDetailFee.vue
@@ -9,8 +9,8 @@
{{ scope.row.itemObjId }}
- ({{ $t('common.view') }}
- {{ $t('common.view') }})
+
@@ -91,7 +91,7 @@ export default {
this.loadData()
},
viewFeeDetail(fee) {
- this.$router.push({ path: '/fee/feeDetail', query: { detailId: fee.itemObjId }})
+ this.$router.push({ path: '/views/fee/feeDetail', query: { feeId: fee.feeId }})
},
viewAcctDetail(fee) {
this.$router.push({ path: '/views/owner/ownerDetail', query: { ownerId: fee.ownerId, currentTab: 'ownerDetailAccountReceipt' }})
diff --git a/src/components/owner/AddOwnerCommittee.vue b/src/components/owner/AddOwnerCommittee.vue
index 6120428e0..4bf9599d5 100644
--- a/src/components/owner/AddOwnerCommittee.vue
+++ b/src/components/owner/AddOwnerCommittee.vue
@@ -21,6 +21,7 @@
v-model="formData.sex"
:placeholder="$t('addOwnerCommittee.required') + $t('addOwnerCommittee.sex')"
style="width:100%"
+ clearable
>
diff --git a/src/views/fee/feeDetail.vue b/src/views/fee/feeDetail.vue
index fc391350e..38146acd6 100644
--- a/src/views/fee/feeDetail.vue
+++ b/src/views/fee/feeDetail.vue
@@ -264,14 +264,14 @@ export default {
changeTab(tab) {
this.feeDetailInfo._currentTab = tab
setTimeout(() => {
- this.$refs[tab].open({
- feeId: this.feeDetailInfo.feeId,
- payerObjId: this.feeDetailInfo.payerObjId,
- configId: this.feeDetailInfo.configId,
- state: this.feeDetailInfo.state,
- ownerId: this.ownerId
- })
- },500)
+ this.$refs[tab].open({
+ feeId: this.feeDetailInfo.feeId,
+ payerObjId: this.feeDetailInfo.payerObjId,
+ configId: this.feeDetailInfo.configId,
+ state: this.feeDetailInfo.state,
+ ownerId: this.ownerId
+ })
+ }, 500)
},
getDeadlineTime(fee) {
if (fee.amountOwed == 0 && fee.endTime == fee.deadlineTime) {
diff --git a/src/views/fee/invoiceApplyList.vue b/src/views/fee/invoiceApplyList.vue
index 40a5a67aa..90a3d6280 100644
--- a/src/views/fee/invoiceApplyList.vue
+++ b/src/views/fee/invoiceApplyList.vue
@@ -137,6 +137,8 @@ import DeleteInvoiceApply from '@/components/fee/deleteInvoiceApply'
import UploadInvoicePhoto from '@/components/fee/uploadInvoicePhoto'
import WirteInvoiceEvent from '@/components/fee/wirteInvoiceEvent'
import AuditDialog from '@/components/fee/audit'
+import { jumpToPlugin } from '@/api/user/menuApi'
+import {getUserName} from '@/api/user/userApi'
export default {
name: 'InvoiceApplyList',
@@ -241,16 +243,7 @@ export default {
this.$refs.writeEventDialog.open(row)
},
_toOpenInvoicePlugin(row) {
- const userInfo = this.$store.getters.userInfo
- this.$router.push({
- path: '/plugin',
- query: {
- pluginType: 'invoice',
- orderNo: row.applyId,
- staffName: userInfo.name,
- communityId: this.communityId
- }
- })
+ jumpToPlugin(`/#/pages/index/plugin?pluginType=invoice&orderNo=&orderNo=${row.applyId}&staffName=${getUserName()}&communityId=${this.communityId}`)
},
_openDeleteInvoiceApplyModel(row) {
this.$refs.deleteDialog.open(row)
diff --git a/src/views/owner/addOwnerCommitteeList.vue b/src/views/owner/addOwnerCommitteeList.vue
index b7d98818c..6711c7805 100644
--- a/src/views/owner/addOwnerCommitteeList.vue
+++ b/src/views/owner/addOwnerCommitteeList.vue
@@ -23,8 +23,8 @@
{{ $t('addOwnerCommittee.requiredSex') }}
- {{ $t('addOwnerCommittee.male') }}
- {{ $t('addOwnerCommittee.female') }}
+ {{ $t('addOwnerCommittee.male') }}
+ {{ $t('addOwnerCommittee.female') }}
@@ -94,8 +94,8 @@
{{ $t('addOwnerCommittee.requiredState') }}
- {{ $t('addOwnerCommittee.onJob') }}
- {{ $t('addOwnerCommittee.leaveJob') }}
+ {{ $t('addOwnerCommittee.onJob') }}
+ {{ $t('addOwnerCommittee.leaveJob') }}