审批流程

src/components/task-modal/task-modal.vue

@@ -36,7 +36,7 @@
             </div>
             <div class="relative h-full flex-1">
                 <hc-body>
-                    <hc-pdf :src="pdfUrl" />
+                    <hc-pdfs :src="pdfUrl" />
                 </hc-body>
             </div>
         </div>
@@ -45,13 +45,13 @@
 
 <script setup>
 import { ref, watch } from 'vue'
-import { getArrValue, getObjValue, isNullES } from 'js-fast-way'
+import { getArrValue } from 'js-fast-way'
 import mainApi from '~api/tasks/hc-data'
 
 const props = defineProps({
-    data: {
-        type: Object,
-        default: () => ({}),
+    ids: {
+        type: [String, Number],
+        default: '',
     },
 })
 
@@ -64,25 +64,22 @@ const isShow = defineModel('modelValue', {
 })
 
 //监听
-const dataInfo = ref(props.data)
-watch(() => props.data, (data) => {
-    dataInfo.value = getObjValue(data)
-}, { immediate: true, deep:true })
+const taskId = ref(props.ids)
+watch(() => props.ids, (id) => {
+    taskId.value = id
+}, { deep:true })
 
 //监听
 watch(isShow, (val) => {
-    if (val) getDataApi()
+    if (val) {
+        getDataApi()
+    }
 })
 
 const pdfUrl = ref('')
 const flowListTask = ref([])
 const getDataApi = async () => {
-    const { taskId } = getObjValue(dataInfo.value)
-    if (isNullES(taskId)) {
-        addModalClose()
-        return
-    }
-    const { data } = await mainApi.getDetail(taskId)
+    const { data } = await mainApi.getDetail(taskId.value)
     const tasks = getArrValue(data?.taskProcessInfo)
     tasks.forEach(item => {
         item.status = item.taskBranchStatus || item.status

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

@@ -32,15 +32,15 @@
         <!-- 查看报表 -->
         <hc-view-report v-model="isReportDrawer" :datas="pdfList" />
         <!-- 任务流程 -->
-        <HcTaskModal v-model="isTaskModal" :data="taskData" />
+        <HcTaskModal v-model="isTaskModal" :ids="taskDataId" @close="taskDataId = ''" />
     </div>
 </template>
 
 <script setup>
-import { deepClone, getArrValue, isNullES } from 'js-fast-way'
 import { onActivated, ref, watch } from 'vue'
 import { useAppStore } from '~src/store'
 import { delMessage } from '~uti/tools'
+import { getArrValue, isNullES } from 'js-fast-way'
 import HcAddModal from './components/certificate/addModal.vue'
 import HcEditModal from './components/certificate/editModal.vue'
 import HcTaskModal from '~src/components/task-modal/task-modal.vue'
@@ -190,14 +190,16 @@ const rowViewRawPdf = (row)=>{
 
 //查看电签流程
 const isTaskModal = ref(false)
-const taskData = ref({})
-const eVisaRowClick = (row) => {
-    if (isNullES(row.taskId)) {
+const taskDataId = ref('')
+const eVisaRowClick = ({ taskId }) => {
+    if (isNullES(taskId)) {
         window.$message.warning('暂无电签数据')
         return
     }
-    taskData.value = row
-    isTaskModal.value = true
+    taskDataId.value = taskId
+    setTimeout(()=> {
+        isTaskModal.value = true
+    }, 200)
 }
 </script>
 

src/views/debit-pay/admin/middlepay.vue

@@ -66,7 +66,7 @@
         <hc-view-report v-model="isReportDrawer" />
 
         <!-- 任务流程 -->
-        <HcTaskModal v-model="isTaskModal" :data="taskData" />
+        <HcTaskModal v-model="isTaskModal" :ids="taskDataId" @close="taskDataId = ''" />
     </div>
 </template>
 
@@ -74,7 +74,7 @@
 import { nextTick, onActivated, onMounted, ref, watch } from 'vue'
 import { useAppStore } from '~src/store'
 import { useRoute, useRouter } from 'vue-router'
-import { deepClone, getArrValue, getObjVal, getObjValue, getRandom, isNullES } from 'js-fast-way'
+import { getArrValue, getObjVal, getObjValue, getRandom, isNullES } from 'js-fast-way'
 import { getStoreValue, setStoreValue } from '~src/utils/storage'
 import { backMeterTask } from '~api/other'
 import { delMessage } from '~uti/tools'
@@ -385,14 +385,16 @@ const autoClick = async ()=>{
 
 //审批状态
 const isTaskModal = ref(false)
-const taskData = ref({})
-const rowTableClick = (row) => {
-    if (isNullES(row.taskId)) {
+const taskDataId = ref('')
+const rowTableClick = ({ taskId }) => {
+    if (isNullES(taskId)) {
         window.$message.warning('暂无审批数据')
         return
     }
-    taskData.value = row
-    isTaskModal.value = true
+    taskDataId.value = taskId
+    setTimeout(()=> {
+        isTaskModal.value = true
+    }, 200)
 }
 
 //撤销上报

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

@@ -45,7 +45,7 @@
             </el-form>
         </hc-new-dialog>
         <!-- 任务流程 -->
-        <HcTaskModal v-model="isTaskModal" :data="taskData" />
+        <HcTaskModal v-model="isTaskModal" :ids="taskDataId" @close="taskDataId = ''" />
     </hc-new-card>
 </template>
 
@@ -54,7 +54,7 @@ import { onActivated, 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'
-import { deepClone, formValidate, getArrValue, isNullES } from 'js-fast-way'
+import { formValidate, getArrValue, isNullES } from 'js-fast-way'
 import { toPdfPage } from '~uti/btn-auth'
 const useAppState = useAppStore()
 const contractId = ref(useAppState.getContractId)
@@ -258,14 +258,16 @@ const rowViewRawPdf = (row)=>{
 
 //查看电签流程
 const isTaskModal = ref(false)
-const taskData = ref({})
-const eVisaRowClick = (row) => {
-    if (isNullES(row.taskId)) {
+const taskDataId = ref('')
+const eVisaRowClick = ({ taskId }) => {
+    if (isNullES(taskId)) {
         window.$message.warning('暂无电签数据')
         return
     }
-    taskData.value = row
-    isTaskModal.value = true
+    taskDataId.value = taskId
+    setTimeout(()=> {
+        isTaskModal.value = true
+    }, 200)
 }
 </script>
 

src/views/debit-pay/material/order.vue

@@ -106,7 +106,7 @@
         <hc-report-dialog v-model="isReport" :info="reportInfo" @finish="reportFinish" />
 
         <!-- 任务流程 -->
-        <HcTaskModal v-model="isTaskModal" :data="taskData" />
+        <HcTaskModal v-model="isTaskModal" :ids="taskDataId" @close="taskDataId = ''" />
     </hc-new-card>
 </template>
 
@@ -118,7 +118,7 @@ import HcDataModal from './components/order/dataModal.vue'
 import HcTaskModal from '~src/components/task-modal/task-modal.vue'
 import mainApi from '~api/debit-pay/material/order.js'
 import periodApi from '~api/debit-pay/material/periods.js'
-import { deepClone, getArrValue, getObjValue, isNullES } from 'js-fast-way'
+import { getArrValue, getObjValue, isNullES } from 'js-fast-way'
 import { toPdfPage } from '~uti/btn-auth'
 import { HcDelMsg } from 'hc-vue3-ui'
 const useAppState = useAppStore()
@@ -292,14 +292,16 @@ const reportClick = () => {
 
 //审批状态
 const isTaskModal = ref(false)
-const taskData = ref({})
-const rowTableClick = (row) => {
-    if (isNullES(row.taskId)) {
+const taskDataId = ref('')
+const rowTableClick = ({ taskId }) => {
+    if (isNullES(taskId)) {
         window.$message.warning('暂无审批数据')
         return
     }
-    taskData.value = row
-    isTaskModal.value = true
+    taskDataId.value = taskId
+    setTimeout(()=> {
+        isTaskModal.value = true
+    }, 200)
 }
 
 //上报完成

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

@@ -45,7 +45,7 @@
             </el-form>
         </hc-new-dialog>
         <!-- 任务流程 -->
-        <HcTaskModal v-model="isTaskModal" :data="taskData" />
+        <HcTaskModal v-model="isTaskModal" :ids="taskDataId" @close="taskDataId = ''" />
     </hc-new-card>
 </template>
 
@@ -54,7 +54,7 @@ import { onActivated, 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'
-import { deepClone, formValidate, getArrValue, isNullES } from 'js-fast-way'
+import { formValidate, getArrValue, isNullES } from 'js-fast-way'
 const useAppState = useAppStore()
 const contractId = ref(useAppState.getContractId)
 const projectId = ref(useAppState.getProjectId)
@@ -255,14 +255,16 @@ const rowViewRawPdf = (row)=>{
 
 //查看电签流程
 const isTaskModal = ref(false)
-const taskData = ref({})
-const eVisaRowClick = (row) => {
-    if (isNullES(row.taskId)) {
+const taskDataId = ref('')
+const eVisaRowClick = ({ taskId }) => {
+    if (isNullES(taskId)) {
         window.$message.warning('暂无电签数据')
         return
     }
-    taskData.value = row
-    isTaskModal.value = true
+    taskDataId.value = taskId
+    setTimeout(()=> {
+        isTaskModal.value = true
+    }, 200)
 }
 </script>
 

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

@@ -95,7 +95,7 @@
         <hc-report-dialog v-model="isReport" :info="reportInfo" @finish="reportFinish" />
 
         <!-- 任务流程 -->
-        <HcTaskModal v-model="isTaskModal" :data="taskData" />
+        <HcTaskModal v-model="isTaskModal" :ids="taskDataId" @close="taskDataId = ''" />
     </hc-new-card>
 </template>
 
@@ -105,7 +105,7 @@ import { backMeterTask } from '~api/other'
 import { useAppStore } from '~src/store'
 import HcDataModal from './components/order/dataModal.vue'
 import HcTaskModal from '~src/components/task-modal/task-modal.vue'
-import { deepClone, getArrValue, getObjValue, isNullES } from 'js-fast-way'
+import { getArrValue, getObjValue, isNullES } from 'js-fast-way'
 import mainApi from '~api/debit-pay/start-work/order.js'
 import periodApi from '~api/debit-pay/material/periods.js'
 import { HcDelMsg } from 'hc-vue3-ui'
@@ -279,14 +279,16 @@ const reportFinish = () => {
 
 //审批状态
 const isTaskModal = ref(false)
-const taskData = ref({})
-const rowTableClick = (row) => {
-    if (isNullES(row.taskId)) {
+const taskDataId = ref('')
+const rowTableClick = ({ taskId }) => {
+    if (isNullES(taskId)) {
         window.$message.warning('暂无审批数据')
         return
     }
-    taskData.value = row
-    isTaskModal.value = true
+    taskDataId.value = taskId
+    setTimeout(()=> {
+        isTaskModal.value = true
+    }, 200)
 }
 
 //撤销上报