打印逻辑迭代

src/components/Print/index.vue

@@ -107,9 +107,17 @@
   // 附件原始数据
   const sourceData = ref([])
   // 组件初始化接口 (接收打印的数据list)
+  const ids = ref()
   const init = (v) => {
     visible.value = true
-    if (v) jsonDataStr.value = JSON.stringify(v)
+    if (v) {
+      // 储存选中的ids
+      ids.value = v.map(item => {
+        return item.id
+      })
+      ids.value = String(ids.value)
+      jsonDataStr.value = JSON.stringify(v)
+    }
     loading.value = true
     const postData = {
       pageCondition: {
@@ -163,6 +171,10 @@
         templateCode: item.templateCode,
         tenantId: userStore.getUserInfo.tenantId
       }
+      // 费用打印：paramJsonStr 需要传窜中的费用的id集合
+      if (item.templateCode == 'fee') {
+        postData.paramJsonStr = JSON.stringify({ id: ids.value})
+      }
       loading.value = true
       GetOpenSqlPrintInfo(postData).then(res => {
         loading.value = false

src/views/operation/seaexport/detail/index.vue

@@ -33,6 +33,7 @@
                 ></ActionBar>
                 <!-- 操作按钮组 -->
                 <operationArea
+                  v-if="route.query.status != 'n'"
                   :id="id"
                   :details="bookingDetails"
                   :inChildLoading="inChildLoading"
@@ -95,11 +96,12 @@
                   rejectText="驳回任务"
                   :approve="approveDc"
                   :source="source"
+                  :status="route.query.status == 'WAIT_SI' ? 'WAIT_SI' : undefined"
                   :id="id"
                   businessType="1"
                 >
                   <span>
-                    <a-button v-repeat v-if="route.query.status != 'WAIT_ORDER_AUDIT' && route.query.source != 'Complete'" @click="save(true)" type="primary">
+                    <a-button class="ml10" v-repeat v-if="route.query.status != 'WAIT_ORDER_AUDIT' && route.query.source != 'Complete'" @click="save(true)" type="primary">
                       {{ completeText }}
                     </a-button>
                   </span>
@@ -280,7 +282,7 @@
        return '报关完成'
     } else if (status == 'WAIT_AMS') {
        return '发送AMS'
-    } else if (status == 'ORDER_AUDIT_REJECTED') {
+    } else if (status == 'ORDER_AUDIT_REJECTED' || status == 'WAIT_SI_REJECTED') {
       return '重新提交'
     } else {
       return '完成任务'
@@ -907,6 +909,14 @@
       }).then(res => {
         tabStore.closeTabByKey(fullPath, router)
       })
+    } else if (status == 'WAIT_SI_REJECT') {
+      SubmitAudit({
+        businessId: id.value,
+        businessType: 1,
+        taskTypeName: 'WAIT_SI'
+      }).then(res => {
+        tabStore.closeTabByKey(fullPath, router)
+      })
     } else {
       const postData = {
         businessId: id.value,
@@ -965,7 +975,7 @@
         overflow-x: hidden;
       }
       .approve-main-scorll {
-        height: calc(100vh - 115px);
+        height: calc(100vh - 155px);
       }
     }
     .line {

src/views/taskmanage/index.vue

@@ -435,7 +435,9 @@
   import { useRoute, useRouter } from 'vue-router'
   import { useOptionsStore } from '/@/store/modules/options'
   import { BasicForm, useForm } from '/@/components/Form/index'
+  import { useUserStore } from '/@/store/modules/user'
   import taskCustom from './taskList/taskCustom.vue'
+  const userStore = useUserStore()
   const optionsStore = useOptionsStore()
   const { createMessage } = useMessage()
   const route = useRoute()
@@ -987,6 +989,14 @@
     console.log('handleResetFunc')
   }
   function handleEdit(data) {
+    // 当前用户id
+    const userid = userStore.getUserInfo.userId
+    let statusFlag = false
+    if (data?.recvUserList && data.recvUserList.length) {
+      data.recvUserList.forEach(item => {
+        if (item.recvUserId == userid) statusFlag = true
+      })
+    }
     switch (data.tasK_TYPE) {
       case 'VGM_COMPARE':
         // VGM比对查看页面
@@ -1169,6 +1179,7 @@
       case 'WAIT_Insurance':
       case 'ORDER_AUDIT_REJECTED':
       case 'RETURN_CABIN_AUDIT':
+      case 'WAIT_SI_REJECTED':
         // 跳转到订舱详情查看页面
         go({
           path: '/taskmanage/booking-approval',
@@ -1176,7 +1187,7 @@
             id: data.ouT_BS_NO,
             source: data.tasK_USER_STATUS,
             taskId: data.id,
-            status: data.tasK_TYPE,
+            status: statusFlag ? data.tasK_TYPE : 'n',
           },
         })
         break