fix : 修复前置流程弹窗的提示,首页需求上报跳转位置

src/components/DetailComponent/ApprovalDetail.vue

@@ -68,6 +68,10 @@ const props = defineProps({
     type: Array,
     default: []
   },
+  basicData: {
+    type: Object,
+    default: {}
+  },
   fileListShow: {
     type: String,
     default: 'READ'
@@ -251,7 +255,7 @@ const schema = computed(() => {
         component: () => (
             <div>
               {
-                <select-pre-process formData={props.formData}/>
+                <select-pre-process formData={props.formData} basicData={props.basicData}/>
               }
             </div>
         )
@@ -304,7 +308,7 @@ const schema = computed(() => {
         component: () => (
             <div>
               {
-                <select-pre-process formData={props.formData}/>
+                <select-pre-process formData={props.formData} basicData={props.basicData}/>
               }
             </div>
         )

src/components/DetailComponent/Opinion.vue

@@ -132,13 +132,13 @@ const back = () => {
         }
       }
       break;
-    case 'Summary/detail':
-      if (route.query.source === 'home') {
-        router.push('/home')
-      } else {
-        router.push({name: 'Summary'})
-      }
-      break;
+    // case 'Summary/detail':
+    //   if (route.query.source === 'home') {
+    //     router.push('/home')
+    //   } else {
+    //     router.push({name: 'Summary'})
+    //   }
+    //   break;
     case 'Requirement/detail':
       if (route.query.source === 'home') {
         router.push('/home')

src/components/SelectPreProcess.vue

@@ -1,16 +1,17 @@
 <template>
- <div style="display: flex;align-items: center;flex-wrap: wrap;">
-   <el-button color="#DED0B2" @click="handleShowPreTable" style="margin-right: 10px">
-     {{
-       localFormData.preProcess && localFormData.preProcess.length > 0 ? '更改' : '请选择前置流程'
-     }}
-   </el-button>
-   <div v-for="(item,index) in localFormData.preProcess" :key="item.requestId">
-     <a :href="item.baseUrl" target="_blank"
-        style="color: #2a99ff;cursor: pointer">{{ item.requestName }}<span v-if="index != localFormData.preProcess.length -1">，</span>
-     </a>
-   </div>
- </div>
+  <div style="display: flex;align-items: center;flex-wrap: wrap;">
+    <el-button color="#DED0B2" @click="handleShowPreTable" style="margin-right: 10px">
+      {{
+        localFormData.preProcess && localFormData.preProcess.length > 0 ? '更改' : '请选择前置流程'
+      }}
+    </el-button>
+    <div v-for="(item,index) in localFormData.preProcess" :key="item.requestId">
+      <a :href="item.baseUrl" target="_blank"
+         style="color: #2a99ff;cursor: pointer">{{ item.requestName }}<span
+          v-if="index != localFormData.preProcess.length -1">，</span>
+      </a>
+    </div>
+  </div>
   <el-dialog v-if="showPreTable" title="前置流程" v-model="showPreTable" width="80%">
     <el-form :model="preProcessForm" inline @submit.prevent="getPreProcessList">
       <el-form-item label="请求名称">
@@ -21,6 +22,9 @@
         <el-button color="#DED0B2" @click="getPreProcessList">搜索</el-button>
         <el-button @click="handleReset">重置</el-button>
       </el-form-item>
+      <el-form-item>
+        <el-tag style="font-size: 14px">{{ getPreProcessTag(localFormData.projectImpact,basicData.projectImpact) }}</el-tag>
+      </el-form-item>
     </el-form>
     <el-table :data="preProcessList" v-loading="loading"
               @select="handleSelect" @select-all="handleSelect" row-key="requestId" ref="preProcessTable">
@@ -53,11 +57,16 @@ import {
   getPreProcess
 } from "@/api/project-manage";
 import Paging from "@/components/pagination/index.vue";
+
 const props = defineProps({
   formData: {
     type: Object,
     default: {}
   },
+  basicData: {
+    type: Object,
+    default: {}
+  },
 })
 const loading = ref(false)
 //暂存数据
@@ -84,6 +93,24 @@ const pageInfo = reactive({
   pageNum: 1,
   pageSize: 10,
 })
+const getPreProcessTag = (impact,basicImpact) => {
+  let data=''
+  if(impact){
+    data= impact
+  }else if(basicImpact){
+    data= basicImpact
+  }
+  if (data == 1) {
+    //一般项目
+    return '一般项目20万以下要总经理审批'
+  } else if (data == 2) {
+    //重大项目
+    return '重大项目20万元到500万元之间要总办会审批'
+  } else if (data == 3) {
+    //特别重大项目
+    return '特别重大项目500万元以上要董事会审批'
+  }
+}
 const handleReset = () => {
   preProcessForm.requestName = ''
   getPreProcessList()
@@ -152,7 +179,7 @@ const handleCurrentChange = (val) => {
   preProcessList.value = currentList.value.slice((val - 1) * pageInfo.pageSize, val * pageInfo.pageSize)
 };
 watchEffect(() => {
- return  Object.keys(props.formData).length && (localFormData.value = props.formData)
+  return Object.keys(props.formData).length && (localFormData.value = props.formData)
 })
 </script>
 

src/components/steps/index.vue

@@ -595,6 +595,7 @@ const getBaseInfo = async () => {
     localStepSuccess.value = formatProcedure(data.procedure)
     baseForm.value.setValues(data)
     baseFormData.value = data
+    emits('getBasicData', data)
     emits('setDetail', formatActive(localActive.value))
     loading.close()
     nextTick(() => {