Browse Source

查看报表跳转修改

duy 1 year ago
parent
commit
c47072f927
2 changed files with 19 additions and 6 deletions
  1. 9 2
      src/views/debit-pay/admin/certificate.vue
  2. 10 4
      src/views/debit-pay/admin/middlepay.vue

+ 9 - 2
src/views/debit-pay/admin/certificate.vue

@@ -34,15 +34,17 @@
 
 <script setup>
 import { getArrValue } from 'js-fast-way'
-import { onActivated, ref } from 'vue'
+import { onActivated, ref, watch } from 'vue'
 import { useAppStore } from '~src/store'
 import { delMessage } from '~uti/tools'
 import HcAddModal from './components/certificate/addModal.vue'
 import HcEditModal from './components/certificate/editModal.vue'
 import mainApi from '~api/debit-pay/admin/certificate'
 import { toPdfPage } from '~uti/btn-auth'
+import { useRoute } from 'vue-router'
 
 const useAppState = useAppStore()
+const useRoutes = useRoute()
 const projectId = ref(useAppState.getProjectId || '')
 const contractId = ref(useAppState.getContractId || '')
 
@@ -54,8 +56,13 @@ defineOptions({
 onActivated(() => {
     getTableData()
 })
-
 const isReportDrawer = ref(false)
+watch(() => useRoutes, (val) => {
+if (val) {
+    isReportDrawer.value = false
+}
+}, { immediate: true, deep: true })
+
 
 //搜索表单
 const searchForm = ref({ current: 1, size: 20, total: 0 })

+ 10 - 4
src/views/debit-pay/admin/middlepay.vue

@@ -60,8 +60,9 @@
 </template>
 
 <script setup>
-import { nextTick, onActivated, onMounted, ref } from 'vue'
+import { nextTick, onActivated, onMounted, ref, watch } from 'vue'
 import { useAppStore } from '~src/store'
+import { useRoute } from 'vue-router'
 import { getArrValue, getObjValue, getRandom } from 'js-fast-way'
 import { getStoreValue, setStoreValue } from '~src/utils/storage'
 import { delMessage } from '~uti/tools'
@@ -71,7 +72,7 @@ import HcDetailsModal from './components/middlepay/detailsModal.vue'
 
 import unitApi from '~api/project/debit/contract/unit'
 import mainApi from '~api/debit-pay/admin/middlepay'
-
+const useRoutes = useRoute()
 const useAppState = useAppStore()
 const projectId = ref(useAppState.getProjectId || '')
 const contractId = ref(useAppState.getContractId || '')
@@ -92,7 +93,12 @@ onActivated(async () => {
     await getKey1Data()
     getCurrentMeterMoney().then()
 })
-
+const isReportDrawer = ref(false)
+watch(() => useRoutes, (val) => {
+if (val) {
+    isReportDrawer.value = false
+}
+}, { immediate: true, deep: true })
 //初始化设置拖动分割线
 const setSplitRef = () => {
     //配置参考: https://split.js.org/#/?direction=vertical&snapOffset=0
@@ -315,5 +321,5 @@ const reportFinish = () => {
     window.location.reload()
 }
 
-const isReportDrawer = ref(false)
+// const isReportDrawer = ref(false)
 </script>