ZaiZai 1 year ago
parent
commit
2c8138ce6a
34 changed files with 127 additions and 117 deletions
  1. 1 1
      package.json
  2. 1 1
      public/version.json
  3. 5 1
      src/views/alter/admin/order.vue
  4. 2 2
      src/views/alter/ledgers/count.vue
  5. 2 2
      src/views/alter/ledgers/cover.vue
  6. 2 2
      src/views/alter/ledgers/ledger.vue
  7. 2 2
      src/views/alter/ledgers/pre-ledger.vue
  8. 2 2
      src/views/alter/ledgers/table.vue
  9. 2 2
      src/views/alter/ledgers/table2.vue
  10. 2 2
      src/views/debit-pay/admin/certificate.vue
  11. 5 1
      src/views/debit-pay/admin/middlepay.vue
  12. 4 4
      src/views/debit-pay/admin/periods.vue
  13. 2 2
      src/views/debit-pay/ledgers/collect.vue
  14. 2 2
      src/views/debit-pay/ledgers/debit.vue
  15. 2 2
      src/views/debit-pay/ledgers/detail.vue
  16. 2 2
      src/views/debit-pay/ledgers/payment.vue
  17. 7 7
      src/views/debit-pay/material/book.vue
  18. 8 8
      src/views/debit-pay/material/contract.vue
  19. 2 5
      src/views/debit-pay/material/order.vue
  20. 5 6
      src/views/debit-pay/material/periods.vue
  21. 2 2
      src/views/debit-pay/project/certificate.vue
  22. 6 6
      src/views/debit-pay/start-work/book.vue
  23. 2 2
      src/views/debit-pay/start-work/order.vue
  24. 4 5
      src/views/debit-pay/start-work/period.vue
  25. 29 28
      src/views/project/debit/contract/check-list.vue
  26. 4 1
      src/views/project/debit/contract/pay.vue
  27. 2 2
      src/views/project/debit/project/affix.vue
  28. 4 1
      src/views/project/debit/project/pay.vue
  29. 2 2
      src/views/project/periods/project/affix.vue
  30. 2 2
      src/views/tasks/flow.vue
  31. 2 2
      src/views/tasks/hc-data.vue
  32. 2 2
      src/views/tasks/message.vue
  33. 2 2
      src/views/user/index.vue
  34. 4 4
      yarn.lock

+ 1 - 1
package.json

@@ -21,7 +21,7 @@
         "dayjs": "^1.11.10",
         "echarts": "^5.4.3",
         "element-plus": "2.4.4",
-        "hc-vue3-ui": "^2.7.7",
+        "hc-vue3-ui": "^2.7.8",
         "js-base64": "^3.7.5",
         "js-fast-way": "^0.3.8",
         "js-md5": "^0.8.3",

+ 1 - 1
public/version.json

@@ -1,3 +1,3 @@
 {
-  "value": "20240105102321"
+  "value": "20240105102348"
 }

+ 5 - 1
src/views/alter/admin/order.vue

@@ -130,7 +130,7 @@
 </template>
 
 <script setup>
-import { nextTick, onMounted, ref } from 'vue'
+import { nextTick, onActivated, onMounted, ref } from 'vue'
 import { useAppStore } from '~src/store'
 import { actionConfirm, delMessage } from '~uti/tools'
 import addModal from './components/order/addModal.vue'
@@ -149,6 +149,10 @@ const contractId = ref(useAppState.getContractId || '')
 //渲染完成
 onMounted(() => {
     setSplitRef()
+})
+
+//激活
+onActivated(() => {
     getTableData()
 })
 

+ 2 - 2
src/views/alter/ledgers/count.vue

@@ -33,14 +33,14 @@
 </template>
 
 <script setup>
-import { onMounted, ref } from 'vue'
+import { onActivated, onMounted, ref } from 'vue'
 
 defineOptions({
     name: 'AlterLedgersCount',
 })
 
 //渲染完成
-onMounted(() => {
+onActivated(() => {
 
 })
 

+ 2 - 2
src/views/alter/ledgers/cover.vue

@@ -21,14 +21,14 @@
 </template>
 
 <script setup>
-import { onMounted, ref } from 'vue'
+import { onActivated, onMounted, ref } from 'vue'
 
 defineOptions({
     name: 'AlterLedgersCover',
 })
 
 //渲染完成
-onMounted(() => {
+onActivated(() => {
 
 })
 

+ 2 - 2
src/views/alter/ledgers/ledger.vue

@@ -42,14 +42,14 @@
 </template>
 
 <script setup>
-import { onMounted, ref } from 'vue'
+import { onActivated, onMounted, ref } from 'vue'
 
 defineOptions({
     name: 'AlterLedgersLedger',
 })
 
 //渲染完成
-onMounted(() => {
+onActivated(() => {
 
 })
 

+ 2 - 2
src/views/alter/ledgers/pre-ledger.vue

@@ -21,14 +21,14 @@
 </template>
 
 <script setup>
-import { onMounted, ref } from 'vue'
+import { onActivated, onMounted, ref } from 'vue'
 
 defineOptions({
     name: 'AlterLedgersPreLedger',
 })
 
 //渲染完成
-onMounted(() => {
+onActivated(() => {
 
 })
 

+ 2 - 2
src/views/alter/ledgers/table.vue

@@ -46,14 +46,14 @@
 </template>
 
 <script setup>
-import { onMounted, ref } from 'vue'
+import { onActivated, onMounted, ref } from 'vue'
 
 defineOptions({
     name: 'AlterLedgersTable',
 })
 
 //渲染完成
-onMounted(() => {
+onActivated(() => {
 
 })
 

+ 2 - 2
src/views/alter/ledgers/table2.vue

@@ -58,14 +58,14 @@
 </template>
 
 <script setup>
-import { onMounted, ref } from 'vue'
+import { onActivated, onMounted, ref } from 'vue'
 
 defineOptions({
     name: 'AlterLedgersTable2',
 })
 
 //渲染完成
-onMounted(() => {
+onActivated(() => {
 
 })
 

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

@@ -34,7 +34,7 @@
 
 <script setup>
 import { getArrValue } from 'js-fast-way'
-import { onMounted, ref } from 'vue'
+import { onActivated, ref } from 'vue'
 import { useAppStore } from '~src/store'
 import { delMessage } from '~uti/tools'
 import HcAddModal from './components/certificate/addModal.vue'
@@ -50,7 +50,7 @@ defineOptions({
 })
 
 //渲染完成
-onMounted(() => {
+onActivated(() => {
     getTableData()
 })
 

+ 5 - 1
src/views/debit-pay/admin/middlepay.vue

@@ -59,7 +59,7 @@
 </template>
 
 <script setup>
-import { nextTick, onMounted, ref } from 'vue'
+import { nextTick, onActivated, onMounted, ref } from 'vue'
 import { useAppStore } from '~src/store'
 import { getArrValue, getObjValue, getRandom } from 'js-fast-way'
 import { getStoreValue, setStoreValue } from '~src/utils/storage'
@@ -84,6 +84,10 @@ const uuid = getRandom(4)
 //渲染完成
 onMounted(async () => {
     setSplitRef()
+})
+
+//激活
+onActivated(async () => {
     await getKey1Data()
     getCurrentMeterMoney().then()
 })

+ 4 - 4
src/views/debit-pay/admin/periods.vue

@@ -74,7 +74,7 @@
 </template>
 
 <script setup>
-import { onMounted, ref } from 'vue'
+import { onActivated, ref } from 'vue'
 import dayjs from 'dayjs'
 import { getArrValue, getMonthList, getYearList } from 'js-fast-way'
 import mainApi from '~api/debit-pay/admin/periods.js'
@@ -93,7 +93,7 @@ const yearData = getYearList(year, 2010)
 const monthData = getMonthList()
 
 //渲染完成
-onMounted(() => {
+onActivated(() => {
     getTableData()
 })
 
@@ -227,7 +227,7 @@ const editModalSave = async () => {
         contractId:contractId.value,
         projectId:projectId.value,
         type:1,
-       
+
         })
         //判断状态
         saveLoading.value = false
@@ -236,7 +236,7 @@ const editModalSave = async () => {
             getTableData()
             editModalClose()
         }
-      
+
 }
 const editModalClose = () => {
     editModalShow.value = false

+ 2 - 2
src/views/debit-pay/ledgers/collect.vue

@@ -28,13 +28,13 @@
 </template>
 
 <script setup>
-import { onMounted, ref } from 'vue'
+import { onActivated, onMounted, ref } from 'vue'
 defineOptions({
     name: 'DebitPayLedgersCollect',
 })
 
 //渲染完成
-onMounted(() => {
+onActivated(() => {
 
 })
 

+ 2 - 2
src/views/debit-pay/ledgers/debit.vue

@@ -76,7 +76,7 @@
 </template>
 
 <script setup>
-import { onMounted, ref } from 'vue'
+import { onActivated, onMounted, ref } from 'vue'
 import HcPeriodModal from './components/debit/periodModal.vue'
 import HcExportModal from './components/debit/exportModal.vue'
 
@@ -85,7 +85,7 @@ defineOptions({
 })
 
 //渲染完成
-onMounted(() => {
+onActivated(() => {
 
 })
 

+ 2 - 2
src/views/debit-pay/ledgers/detail.vue

@@ -33,12 +33,12 @@
 </template>
 
 <script setup>
-import { onMounted, ref } from 'vue'
+import { onActivated, onMounted, ref } from 'vue'
 defineOptions({
     name: 'DebitPayLedgersDetail',
 })
 //渲染完成
-onMounted(() => {
+onActivated(() => {
 
 })
 

+ 2 - 2
src/views/debit-pay/ledgers/payment.vue

@@ -33,13 +33,13 @@
 </template>
 
 <script setup>
-import { onMounted, ref } from 'vue'
+import { onActivated, onMounted, ref } from 'vue'
 defineOptions({
     name: 'DebitPayLedgersPayment',
 })
 
 //渲染完成
-onMounted(() => {
+onActivated(() => {
 
 })
 

+ 7 - 7
src/views/debit-pay/material/book.vue

@@ -46,7 +46,7 @@
 </template>
 
 <script setup>
-import { onMounted, ref } from 'vue'
+import { onActivated, onMounted, ref } from 'vue'
 import bookApi from '~api/debit-pay/material/book.js'
 import periodApi from '~api/debit-pay/material/periods.js'
 import { useAppStore } from '~src/store'
@@ -60,7 +60,7 @@ defineOptions({
 })
 
 //渲染完成
-onMounted(() => {
+onActivated(() => {
     getTableData()
     getPeriodData()
     getKey1Data()
@@ -175,12 +175,12 @@ const delCilck = (row)=>{
 }
 const removeProPay = async (id) => {
     const { error, code } = await bookApi.remove({
-        ids: id, 
+        ids: id,
     })
     if (!error && code === 200) {
         window?.$message?.success('删除成功')
        getTableData()
-     
+
     }
 }
 //表单
@@ -198,7 +198,7 @@ const formRules = {
         message: '请输入报表名称',
     },
 }
- 
+
 
 
 const saveLoading = ref(false)
@@ -217,8 +217,8 @@ const formModalSave = async () => {
         saveLoading.value = false
         if (!error && code === 200) {
             window?.$message?.success(msg)
-            
-         
+
+
         }
     formModalClose()
 }

+ 8 - 8
src/views/debit-pay/material/contract.vue

@@ -72,7 +72,7 @@
 </template>
 
 <script setup>
-import { onMounted, ref } from 'vue'
+import { onActivated, onMounted, ref } from 'vue'
 import mainApi from '~api/debit-pay/material/contract.js'
 import { useAppStore } from '~src/store'
 import { deepClone, formValidate, getArrValue } from 'js-fast-way'
@@ -86,7 +86,7 @@ defineOptions({
 })
 
 //渲染完成
-onMounted(() => {
+onActivated(() => {
     getTableData()
 })
 
@@ -130,12 +130,12 @@ const getTableData = async () => {
             infoData.value = tableData.value[0]
             // getDetail(tableData.value[0].id)
         }
-       
-      
+
+
     } else {
         tableData.value = []
         searchForm.value.total = 0
-  
+
     }
 }
 const viewRow = ({ row })=>{
@@ -178,7 +178,7 @@ const modalSave = async () => {
         ...formModel.value,
         projectId:projectId.value,
         contractId:contractId.value,
-       
+
         })
         //判断状态
         saveLoaing.value = false
@@ -188,7 +188,7 @@ const modalSave = async () => {
             getTableData()
              modalClose()
     }
- 
+
 }
 const delRowClick = async (row)=>{
     delMessageV2(async (action, instance, done) => {
@@ -204,7 +204,7 @@ const delRowClick = async (row)=>{
 }
 const removeCon = async (id) => {
     const { error, code } = await mainApi.remove({
-        ids: id, 
+        ids: id,
     })
     if (!error && code === 200) {
         window?.$message?.success('删除成功')

+ 2 - 5
src/views/debit-pay/material/order.vue

@@ -120,12 +120,9 @@ defineOptions({
 })
 
 //渲染完成
-onActivated(() => {
-    getKey1Data()
-})
-onMounted(async () => {
+onActivated(async () => {
     await getKey1Data()
-    getTableData()
+    getTableData().then()
 })
 
 //搜索表单

+ 5 - 6
src/views/debit-pay/material/periods.vue

@@ -72,7 +72,7 @@
 </template>
 
 <script setup>
-import { onMounted, ref } from 'vue'
+import { onActivated, onMounted, ref } from 'vue'
 import dayjs from 'dayjs'
 import { getArrValue, getMonthList, getYearList } from 'js-fast-way'
 import mainApi from '~api/debit-pay/material/periods.js'
@@ -91,8 +91,7 @@ const yearData = getYearList(year, 2018)
 const monthData = getMonthList()
 
 //渲染完成
-//渲染完成
-onMounted(() => {
+onActivated(() => {
     getTableData()
 })
 
@@ -214,7 +213,7 @@ const editModalSave = async () => {
         contractId:contractId.value,
         projectId:projectId.value,
         type:1,
-       
+
         })
         //判断状态
         saveLoading.value = false
@@ -223,8 +222,8 @@ const editModalSave = async () => {
             getTableData()
             editModalClose()
         }
-     
-   
+
+
 }
 const editModalClose = () => {
     editModalShow.value = false

+ 2 - 2
src/views/debit-pay/project/certificate.vue

@@ -28,7 +28,7 @@
 </template>
 
 <script setup>
-import { onMounted, ref } from 'vue'
+import { onActivated, onMounted, ref } from 'vue'
 import HcAddModal from './components/certificate/addModal.vue'
 import HcEditModal from './components/certificate/editModal.vue'
 
@@ -37,7 +37,7 @@ defineOptions({
 })
 
 //渲染完成
-onMounted(() => {
+onActivated(() => {
 
 })
 

+ 6 - 6
src/views/debit-pay/start-work/book.vue

@@ -46,7 +46,7 @@
 </template>
 
 <script setup>
-import { onMounted, ref } from 'vue'
+import { onActivated, onMounted, ref } from 'vue'
 import bookApi from '~api/debit-pay/material/book.js'
 import periodApi from '~api/debit-pay/material/periods.js'
 import { useAppStore } from '~src/store'
@@ -60,7 +60,7 @@ defineOptions({
 })
 
 //渲染完成
-onMounted(() => {
+onActivated(() => {
     getTableData()
     getPeriodData()
     getKey1Data()
@@ -175,12 +175,12 @@ const delCilck = (row)=>{
 }
 const removeProPay = async (id) => {
     const { error, code } = await bookApi.remove({
-        ids: id, 
+        ids: id,
     })
     if (!error && code === 200) {
         window?.$message?.success('删除成功')
        getTableData()
-     
+
     }
 }
 //表单
@@ -214,8 +214,8 @@ const formModalSave = async () => {
         saveLoading.value = false
         if (!error && code === 200) {
             window?.$message?.success(msg)
-            
-         
+
+
         }
     formModalClose()
 }

+ 2 - 2
src/views/debit-pay/start-work/order.vue

@@ -90,9 +90,9 @@ defineOptions({
 })
 
 //渲染完成
-onMounted(async () => {
+onActivated(async () => {
     await getKey1Data()
-    getTableData()
+    getTableData().then()
 })
 
 onActivated(() => {

+ 4 - 5
src/views/debit-pay/start-work/period.vue

@@ -72,7 +72,7 @@
 </template>
 
 <script setup>
-import { onMounted, ref } from 'vue'
+import { onActivated, onMounted, ref } from 'vue'
 import dayjs from 'dayjs'
 import { getArrValue, getMonthList, getYearList } from 'js-fast-way'
 import mainApi from '~api/debit-pay/material/periods.js'
@@ -91,8 +91,7 @@ const yearData = getYearList(year, 2010)
 const monthData = getMonthList()
 
 //渲染完成
-//渲染完成
-onMounted(() => {
+onActivated(() => {
     getTableData()
 })
 
@@ -216,7 +215,7 @@ const editModalSave = async () => {
         contractId:contractId.value,
         projectId:projectId.value,
         type:2,
-       
+
         })
         //判断状态
         saveLoading.value = false
@@ -225,7 +224,7 @@ const editModalSave = async () => {
             getTableData()
             editModalClose()
         }
-   
+
 }
 const editModalClose = () => {
     editModalShow.value = false

+ 29 - 28
src/views/project/debit/contract/check-list.vue

@@ -2,15 +2,15 @@
     <div class="relative h-full flex">
         <div :id="`hc_tree_card_${uuid}`">
             <hc-new-card v-loading="treeLoaing" scrollbar>
-                <hc-lazy-tree  
+                <hc-lazy-tree
                     v-if="ishowTree"
-                    :h-props="treeProps" 
+                    :h-props="treeProps"
                     is-load-menu
-                    :auto-expand-keys="autoExpandKeys" 
-                    tree-key="id" 
-                    @load="treeLoadNode" 
-                    @menu-tap="treeMenuTap" 
-                    @node-tap="treeNodeTap" 
+                    :auto-expand-keys="autoExpandKeys"
+                    tree-key="id"
+                    @load="treeLoadNode"
+                    @menu-tap="treeMenuTap"
+                    @node-tap="treeNodeTap"
                     @load-menu="treeLoadMenu"
                 />
             </hc-new-card>
@@ -304,7 +304,7 @@
 </template>
 
 <script setup>
-import { nextTick, onMounted, ref } from 'vue'
+import { nextTick, onActivated, onMounted, ref } from 'vue'
 import { arrToId, formValidate, getArrValue, getObjValue, getRandom, isNullES } from 'js-fast-way'
 import { getHeader } from 'hc-vue3-ui'
 import { useAppStore } from '~src/store'
@@ -330,9 +330,10 @@ const uuid = getRandom(4)
 //渲染完成
 onMounted(() => {
     setSplitRef()
-   
+})
+
+onActivated(() => {
     getFormType()
-  
 })
 
 //初始化设置拖动分割线
@@ -413,7 +414,7 @@ const getTreeNodeDetail = async (node)=>{
     if (!error && code === 200) {
         infoData.value = getObjValue(data)
         tableData.value = infoData.value['list']
-   
+
     } else {
         infoData.value = {}
         tableData.value = []
@@ -436,7 +437,7 @@ const treeLoadMenu = ({ item, level }, resolve) => {
                     { icon: 'arrow-up-down-line', label: '排序', key: 'sort' },
             ])
         }
-       
+
     } else {
         if (isLock === 1) {
             return resolve([
@@ -494,7 +495,7 @@ const treeMenuTap = ({ key, data, node }) => {
         if (key === 'sort') {
             let nodes = [], childNodes = []
             childNodes = node?.parent?.childNodes || node?.parent?.children || []
-            
+
             for (let i = 0; i < childNodes.length; i++) {
                 const res = childNodes[i]?.data
                 nodes.push({
@@ -509,11 +510,11 @@ const treeMenuTap = ({ key, data, node }) => {
         if (key === 'del') {
             delModalClick()
         }
-    } 
+    }
     if (data?.isLock === 1 && key !== 'lock') {
         window.$message.warning('当前节点为锁定状态,不允许操作')
     }
-   
+
     if (key === 'lock') {
         handleLockNode()
     }
@@ -529,16 +530,16 @@ const changeAddFormType = (val)=>{
 const FchangeIsForm = (val)=>{
     const { hasChild } = treeItem.value
     const { citeStatus } = infoData.value
-  
+
     if (hasChild && val === 1) {
         window.$message.warning('该节点下面存在子节点,不允许修改为清单节点')
         formModel.value.isFormNode = 0
-        
+
     }
     if (citeStatus && val === 0) {
         window.$message.warning('当前前清单已经被计量引用,不允许修改为非清单节点')
         formModel.value.isFormNode = 1
-        
+
     }
 }
 //修改清单节点是否为清单节点限制
@@ -547,7 +548,7 @@ const IchangeIsForm = (val)=>{
     if (citeStatus && val === 0) {
         window.$message.warning('当前清单已经被计量引用,则不允许修改为非清单节点')
         formModel.value.isFormNode = 1
-        
+
     }
 }
 //删除节点
@@ -615,7 +616,7 @@ const treeModalTitle = ref('')
 const formRef = ref(null)
 const formModel = ref({})
 const formRules = ref({
-    
+
     formNumber: {
         required: true,
         trigger: 'blur',
@@ -641,7 +642,7 @@ const formRules = ref({
         trigger: 'blur',
         message: '请输入合同数量',
     },
-    
+
 })
 const addNodeLoading = ref(false)
 //弹窗保存
@@ -676,7 +677,7 @@ const treeModalSave = async () => {
             }
         }
     }
-   
+
 }
 
 //合同工程清单导入
@@ -745,7 +746,7 @@ const addsupply = ()=>{
         isSupplement:1,
         chapterNumber:treeItem.value?.chapterNumber,
         formType:treeItem.value?.formType,
-  
+
     }
     supplementsModalShow.value = true
 }
@@ -754,7 +755,7 @@ const supplementsModalSave = async () => {
     console.log(supplementsFormModel.value, 'val')
     const res = await formValidate(supplementsFormRef.value)
     if (res) {
-       
+
         const { error, code } = await addNode({
             ...supplementsFormModel.value,
             isSupplement:1,
@@ -770,7 +771,7 @@ const supplementsModalSave = async () => {
             window?.location?.reload() //刷新页面
         }
     }
-    
+
 }
 
 //调整排序
@@ -825,7 +826,7 @@ const sortModalSave = async () => {
         sortModalShow.value = false
         window?.location?.reload() //刷新页面
     }
-   
+
 }
 //下载范例模板
 const downLoadExel = async ()=>{
@@ -837,7 +838,7 @@ const downLoadExel = async ()=>{
         } else {
             window.$message.warning(msg)
         }
-       
+
     }
 }
 //修改中标单价
@@ -866,6 +867,6 @@ const changeContractTotal = (val)=>{
     formModel.value.changeTotal = total
     formModel.value.contractMoney = (BigNumber(total).multipliedBy(formModel.value.bidPrice)).toString()
     formModel.value.changeMoney = (BigNumber(total).multipliedBy(formModel.value.bidPrice)).toString()
-    
+
 }
 </script>

+ 4 - 1
src/views/project/debit/contract/pay.vue

@@ -78,7 +78,7 @@
 </template>
 
 <script setup>
-import {nextTick, onMounted, ref} from 'vue'
+import { nextTick, onActivated, onMounted, ref } from 'vue'
 import {getRandom} from 'js-fast-way'
 import infoTable from './components/pay/info-table.vue'
 import systemPay from './components/pay/system-pay.vue'
@@ -100,6 +100,9 @@ const uuid = getRandom(4)
 //渲染完成
 onMounted(() => {
     setSplitRef()
+})
+
+onActivated(() => {
     getTableData()
 })
 

+ 2 - 2
src/views/project/debit/project/affix.vue

@@ -50,14 +50,14 @@
 </template>
 
 <script setup>
-import { onMounted, ref } from 'vue'
+import { onActivated, onMounted, ref } from 'vue'
 
 defineOptions({
     name: 'ProjectDebitProjectAffix',
 })
 
 //渲染完成
-onMounted(() => {
+onActivated(() => {
 
 })
 

+ 4 - 1
src/views/project/debit/project/pay.vue

@@ -78,7 +78,7 @@
 </template>
 
 <script setup>
-import {nextTick, onMounted, ref} from 'vue'
+import { nextTick, onActivated, onMounted, ref } from 'vue'
 import {getRandom} from 'js-fast-way'
 import infoTable from './components/pay/info-table.vue'
 import systemPay from './components/pay/system-pay.vue'
@@ -100,6 +100,9 @@ const uuid = getRandom(4)
 //渲染完成
 onMounted(() => {
     setSplitRef()
+})
+
+onActivated(() => {
     gePayType()
     gePayAppType()
     getTableData()

+ 2 - 2
src/views/project/periods/project/affix.vue

@@ -49,14 +49,14 @@
 </template>
 
 <script setup>
-import { onMounted, ref } from 'vue'
+import { onActivated, onMounted, ref } from 'vue'
 
 defineOptions({
     name: 'ProjectPeriodsProjectAffix',
 })
 
 //渲染完成
-onMounted(() => {
+onActivated(() => {
 
 })
 

+ 2 - 2
src/views/tasks/flow.vue

@@ -36,7 +36,7 @@
 </template>
 
 <script setup>
-import { onMounted, ref } from 'vue'
+import { onActivated, onMounted, ref } from 'vue'
 import { useAppStore } from '~src/store'
 import { getArrValue, getObjValue } from 'js-fast-way'
 import tasksFlowApi from '~api/tasks/flow'
@@ -48,7 +48,7 @@ const projectId = ref(store.getProjectId)
 const contractId = ref(store.getContractId)
 
 //渲染完成
-onMounted(() => {
+onActivated(() => {
     getTableData()
 })
 

+ 2 - 2
src/views/tasks/hc-data.vue

@@ -61,7 +61,7 @@
 </template>
 
 <script setup>
-import { nextTick, onMounted, ref } from 'vue'
+import { nextTick, onActivated, onMounted, ref } from 'vue'
 import { getArrValue } from 'js-fast-way'
 import mainApi from '~api/tasks/hc-data'
 import { useAppStore } from '~src/store'
@@ -73,7 +73,7 @@ const projectId = ref(useAppState.getProjectId || '')
 const contractId = ref(useAppState.getContractId || '')
 
 //渲染完成
-onMounted(() => {
+onActivated(() => {
     queryTaskType()
     queryTaskStatus()
     getTableData()

+ 2 - 2
src/views/tasks/message.vue

@@ -5,10 +5,10 @@
 </template>
 
 <script setup>
-import { onMounted, ref, watch } from 'vue'
+import { onActivated, onMounted, ref, watch } from 'vue'
 
 //渲染完成
-onMounted(() => {
+onActivated(() => {
 
 })
 </script>

+ 2 - 2
src/views/user/index.vue

@@ -98,7 +98,7 @@
 </template>
 
 <script setup>
-import { onMounted, ref } from 'vue'
+import { onActivated, onMounted, ref } from 'vue'
 import { useAppStore } from '~src/store'
 import userApi from '~api/userInfo/index'
 import avatarPng from '~src/assets/images/avatar.png'
@@ -113,7 +113,7 @@ defineOptions({
 
 const userInfo = ref(useState.getUserInfo)
 
-onMounted(() => {
+onActivated(() => {
     uploadFileOptions.value = {
         headers: getHeader(),
         url: '/api/blade-resource/oss/endpoint/put-file',

+ 4 - 4
yarn.lock

@@ -1844,10 +1844,10 @@ has-flag@^4.0.0:
   resolved "http://47.110.251.215:9000/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-hc-vue3-ui@^2.7.7:
-  version "2.7.7"
-  resolved "http://47.110.251.215:9000/hc-vue3-ui/-/hc-vue3-ui-2.7.7.tgz#62a9a4245cc42789d33197fcd8a1d64efd33636c"
-  integrity sha512-m3grVcqd+CIGTW9OTshfypfpgPiUvZ1rCLMXbgcuuqDCdSSbhr6wLnwJ4Z1OV/et0tKy4dAD+wd/jyi6FWA8GA==
+hc-vue3-ui@^2.7.8:
+  version "2.7.8"
+  resolved "http://47.110.251.215:9000/hc-vue3-ui/-/hc-vue3-ui-2.7.8.tgz#c273863412e0ee05c0ce4ae0b820eedd1b632464"
+  integrity sha512-kQphuGsyYKP2bgdaZCp/TxTI4yqqHHCO2obEfIamth30RCEs637q4MwDXTa0ZftPpM9XCiw+2hdP13tBwmgCJw==
 
 human-signals@^2.1.0:
   version "2.1.0"