Merge branch 'refs/heads/master' into master_ljb

src/pages/modules/mocp/panel/assign-work/details.vue

@@ -201,21 +201,15 @@ const assignWorkStore = useAssignWorkStore()
 const { details, arrangeWorkExtendList, arrangeWorkExtend } = storeToRefs(assignWorkStore)
 onLoad(async () => {
     assignWorkStore.setState('id', query.id)
+    uni.showLoading({
+        title: '加载中...',
+        mask: true
+    })
+    await assignWorkStore.getArrangeWorkDetail()
     if (arrangeWorkExtendList.value.length > 1) {
-        uni.showLoading({
-            title: '加载中...',
-            mask: true
-        })
-        await Promise.all([assignWorkStore.getArrangeWorkDetail(), assignWorkStore.getEnetOrgTree()])
-        uni.hideLoading()
-    } else {
-        uni.showLoading({
-            title: '加载中...',
-            mask: true
-        })
-        await assignWorkStore.getArrangeWorkDetail()
-        uni.hideLoading()
+        await assignWorkStore.getEnetOrgTree()
     }
+    uni.hideLoading()
 })
 //责任公司弹框
 const companyPopupRef = ref()

src/pages/modules/mocp/panel/assign-work/list.vue

@@ -46,19 +46,17 @@
 </template>
 
 <script setup>
-import useBaseStore from 'mocp/store/base'
 import { timeStampFormat } from 'mocp/utils/tool'
 import { getArrangeWorkListApi } from 'mocp/api/assign-work'
 import useAssignWorkStore from 'mocp/store/assign-work'
-import { onShow, onUnload } from '@dcloudio/uni-app'
+import { onLoad, onUnload } from '@dcloudio/uni-app'
 import { ref } from 'vue'
 import { storeToRefs } from 'pinia'
 import { getParamNameByValue } from 'mocp/hooks/use-params/useParams'
 
-const baseStore = useBaseStore()
 //加载下拉框数据
 const assignWorkStore = useAssignWorkStore()
-onShow(() => {
+onLoad(() => {
     assignWorkStore.getSeatUnit()
 })
 //跳转