优化发票相关页面bug

wuxw
1 parent 911b5549
Showing 6 changed files with 45 additions and 25 deletions
src/api/user/menuApi.js
src/components/fee/invoiceApplyDetailFee.vue
src/components/owner/AddOwnerCommittee.vue
src/views/fee/feeDetail.vue
src/views/fee/invoiceApplyList.vue
src/views/owner/addOwnerCommitteeList.vue
@@ -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
@@ -9,8 +9,8 @@
       <el-table-column :label="$t('invoiceApplyDetailFee.paymentId')" align="center">
         <template slot-scope="scope">
           {{ scope.row.itemObjId }}
-          （<a href="javascript:void(0)" v-if="scope.row.itemType === '2002'" @click="viewFeeDetail(scope.row)">{{ $t('common.view') }}</a>
-          <a href="javascript:void(0)" v-else @click="viewAcctDetail(scope.row)">{{ $t('common.view') }}</a>）
+          <!-- （<a href="javascript:void(0)" v-if="scope.row.itemType === '2002'" @click="viewFeeDetail(scope.row)">{{ $t('common.view') }}</a>
+          <a href="javascript:void(0)" v-else @click="viewAcctDetail(scope.row)">{{ $t('common.view') }}</a>） -->
         </template>
       </el-table-column>
     </el-table>
@@ -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' }})
@@ -21,6 +21,7 @@
               v-model="formData.sex"
               :placeholder="$t('addOwnerCommittee.required') + $t('addOwnerCommittee.sex')"
               style="width:100%"
+              clearable
             >
               <el-option :label="$t('addOwnerCommittee.male')" value="B" />
               <el-option :label="$t('addOwnerCommittee.female')" value="G" />
@@ -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) {
@@ -137,6 +137,8 @@ import DeleteInvoiceApply from &#39;@/components/fee/deleteInvoiceApply&#39;
 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)
@@ -23,8 +23,8 @@
                   <el-select v-model="addOwnerCommitteeInfo.sex" :placeholder="$t('addOwnerCommittee.requiredSex')"
                     style="width:100%">
                     <el-option disabled value="">{{ $t('addOwnerCommittee.requiredSex') }}</el-option>
-                    <el-option value="B">{{ $t('addOwnerCommittee.male') }}</el-option>
-                    <el-option value="G">{{ $t('addOwnerCommittee.female') }}</el-option>
+                    <el-option :label="$t('addOwnerCommittee.male')" value="B">{{ $t('addOwnerCommittee.male') }}</el-option>
+                    <el-option :label="$t('addOwnerCommittee.female')" value="G">{{ $t('addOwnerCommittee.female') }}</el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -94,8 +94,8 @@
                   <el-select v-model="addOwnerCommitteeInfo.state" :placeholder="$t('addOwnerCommittee.requiredState')"
                     style="width:100%">
                     <el-option disabled value="">{{ $t('addOwnerCommittee.requiredState') }}</el-option>
-                    <el-option value="1000">{{ $t('addOwnerCommittee.onJob') }}</el-option>
-                    <el-option value="2000">{{ $t('addOwnerCommittee.leaveJob') }}</el-option>
+                    <el-option :label="$t('addOwnerCommittee.onJob')" value="1000">{{ $t('addOwnerCommittee.onJob') }}</el-option>
+                    <el-option :label="$t('addOwnerCommittee.leaveJob')" value="2000">{{ $t('addOwnerCommittee.leaveJob') }}</el-option>
                   </el-select>
                 </el-form-item>
               </el-col>