Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev

front/src/api/personalCenter.js

@@ -337,3 +337,12 @@ export function getDeviceDetail(deviceId) {
     method: 'get',
   })
 }
+
+// 催办
+export function treminders(data) {
+  return request({
+    url: '/reminders/treminders',
+    method: 'post',
+    data,
+  })
+}

front/src/views/home/DetailsPageconetent.vue

@@ -6,7 +6,7 @@
       <detailsPageconetentTree />
     </div>
     <div class="details-pageconetent-left" v-else>
-      <detailsPageInfrastructureTree v-if="flag != '6'" />
+      <detailsPageInfrastructureTree v-if="flag == '1'" />
     </div>
     <div class="top" v-if="Cardsname != '知识库' && Cardsname != '基础设施'">
       <div class="resultListSearchInput-father">
@@ -835,7 +835,7 @@
       let select =
         router.currentRoute.value.query.select ||
         DETAIL_PAGE_CONTENT_DEFAULT_TAB
-        let orderField =router.currentRoute.value.query.orderField 
+      let orderField = router.currentRoute.value.query.orderField
       // 例如：组件服务是大类型，selectSubType是组件服务的智能算法或图层服务等...
       let selectSubType = router.currentRoute.value.query.type || ''
       let queryName = ref('')
@@ -1324,8 +1324,7 @@
           globalData.data = []
         }
         select = router.currentRoute.value.query.select
-      
+
-      
         if (
           (select == '应用资源' &&
             (paramsGetResources.orderField == '' ||
@@ -1786,9 +1785,9 @@
       onMounted(() => {
         // 从本地读取查询条件，赋值
         //西海岸基础设施放在最前面
-        orderField= router.currentRoute.value.query.orderField  //根据什么排序
+        orderField = router.currentRoute.value.query.orderField //根据什么排序
-        if(orderField){
+        if (orderField) {
-          paramsGetResources.orderField=orderField
+          paramsGetResources.orderField = orderField
         }
         setTitle()
         handleSetSearchData()

front/src/views/personalCenter/components/AbilityApplication.vue

@@ -152,7 +152,7 @@
                 >
                   查看详情
                 </a-button>
-               
+
                 <!-- <div class="btn" v-if="val.type == '组件服务'">技术文档</div> -->
               </div>
               <div class="ability-bottom">
@@ -175,7 +175,17 @@
                   </a-button>
                 </div>
               </div>
-              <div  v-if="item.approveStatus === '通过'"  style="    margin-top: 15px;font-size: 16px; color: #ee4457;font-weight: bold;">说明：已申请成功，使用方式及联系人请点击"查看详情"按钮查看。</div>
+              <div
+                v-if="item.approveStatus === '通过'"
+                style="
+                  margin-top: 15px;
+                  font-size: 16px;
+                  color: #ee4457;
+                  font-weight: bold;
+                "
+              >
+                说明：已申请成功，使用方式及联系人请点击"查看详情"按钮查看。
+              </div>
             </div>
           </div>
         </div>
@@ -280,9 +290,7 @@
               </div>
             </div>
           </div>
-         
         </div>
-      
       </div>
     </div>
     <!-- 单个预览弹窗 -->

front/src/views/personalCenter/components/ApplyDetails.vue

@@ -30,7 +30,36 @@
     <div v-if="showType !== '云资源'">
       <div class="title">审批详情</div>
       <template v-for="item in dataSource.data" :key="item">
-        <div class="oddNumbers">子单号:{{ item[0] }}</div>
+        <div class="oddNumbers">
+          <div>子单号:{{ item[0] }}</div>
+          <template
+            v-if="
+              item[1][0].assignee !== store.getters['user/userId'] &&
+              typeStrObj.indexOf(showType) !== -1
+            "
+          >
+            <a-popconfirm
+              v-if="refObj.allowReminders || item[1][0].allowReminders"
+              title="是否催办此流程?"
+              ok-text="是"
+              cancel-text="否"
+              @confirm="urgeThis(item)"
+              @cancel="cancel"
+            >
+              <a-button type="primary" danger>催办</a-button>
+            </a-popconfirm>
+            <a-tooltip
+              v-else-if="refObj.doneReminders || item[1][0].doneReminders"
+            >
+              <template #title>
+                {{
+                  refObj.nextRemindersDays || item[1][0].nextRemindersDays
+                }}天后可再次催办
+              </template>
+              <a-button type="primary" danger>已催办</a-button>
+            </a-tooltip>
+          </template>
+        </div>
         <a-table
           :dataSource="item[1]"
           :columns="dataSourceColumns"
@@ -54,9 +83,11 @@
   </div>
 </template>
 <script setup>
+  import { message } from 'ant-design-vue'
   import AbilityApplication from './AbilityApplication.vue'
   import PutOnTheShelf from './PutOnTheShelf .vue'
   import OffTheShelf from './OffTheShelf.vue'
+  import mybus from '@/myplugins/mybus'
   import Demand from './Demand.vue'
   import Comment from './Comment.vue'
   import dataResourceApplication from './dataResourceApplication.vue'
@@ -64,6 +95,7 @@
   import DeviceApplyDetail from './DeviceApplyDetail.vue'
   import OtherApplications from '@/views/personalCenter/components/OtherApplications '
   import { onMounted, reactive, defineProps, ref } from 'vue'
+  import { useStore } from 'vuex'
   import Cookies from 'js-cookie'
   // import { baseURL } from '@/config'
   import qs from 'qs'
@@ -72,7 +104,7 @@
     getTaskHandleDetailInfo,
     getDemandForm,
     nengliziyuanshangjiaapply,
-    getTaskVariables,
+    treminders,
   } from '@/api/personalCenter'
   import { selectOneDel } from '@/api/home'
   const props = defineProps({
@@ -83,6 +115,7 @@
     refObj: { type: Object, default: null },
     showType: { type: String, default: null },
   })
+  const store = useStore()
   const refObj = ref({})
   const showType = ref('')
   // eslint-disable-next-line vue/no-setup-props-destructure
@@ -92,7 +125,13 @@
   //流转详情
   const dataSource = reactive({ data: [] })
   console.log('refObj------------>', refObj)
-
+  const typeStrObj = [
+    '能力申请',
+    '能力上架',
+    '能力下架',
+    '能力需求',
+    '需求评论',
+  ]
   // console.log(props.refObj, '---------------------------------------')
 
   const downloadFile = (path, name) => {
@@ -285,6 +324,27 @@
     })
   }
 
+  // 催办
+  const urgeThis = (item) => {
+    console.log('催办==========>', item)
+    treminders({
+      instanceId: item[0],
+      processTaskId: item[1][0].id,
+      processTaskStats: 1,
+      applyNumber: refObj.value.applyNumber,
+    }).then((res) => {
+      if (res.data.msg !== 'success') {
+        message.warning('催办失败')
+        return
+      }
+      message.success('催办成功！')
+      mybus.emit('closeModal', {
+        type: showType.value,
+        index: typeStrObj.indexOf(showType.value),
+      })
+    })
+  }
+
   onMounted(() => {
     // getInfo()
     if (props.refObj.resourceApplication) {
@@ -348,4 +408,20 @@
   .oddNumbers {
     margin-bottom: 0.05rem;
   }
+  .oddNumbers {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    .button {
+      width: 96px;
+      height: 30px;
+      background: #ff4d4f;
+      font-size: 14px;
+      color: #fff;
+      border-radius: 4px;
+      text-align: center;
+      line-height: 30px;
+      cursor: pointer;
+    }
+  }
 </style>