Merge pull request 'fix : 修复项目详情前置流程更改回显' (#425) from dd into master

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/425

src/components/DetailComponent/AllocationSummaryDetail.vue

@@ -12,7 +12,7 @@
         <div v-else>--</div>
       </template>
     </el-table-column>
-    <el-table-column prop="researchStage" label="项目阶段" align="center">
+    <el-table-column prop="researchStage" label="研发阶段" align="center">
       <template #default="scope">
         <div
             v-if="scope.row.researchStage !== null && scope.row.researchStage !== null && scope.row.researchStage !== undefined">

src/components/DetailComponent/ProjectApply.vue

@@ -57,7 +57,7 @@
         </el-form-item>
       </el-form>
       <el-table :data="preProcessList" stripe v-loading="loading"
-                @select="handleSelect" row-key="requestId">
+                @select="handleSelect" row-key="requestId" ref="preProcessTable">
         <el-table-column type="selection" width="55" :reserve-selection="true"/>
         <el-table-column prop="requestId" label="请求id"></el-table-column>
         <el-table-column prop="requestName" label="请求名称"></el-table-column>
@@ -106,6 +106,7 @@ import Paging from "@/components/pagination/index.vue";
 const router = useRouter()
 const route = useRoute()
 const changeDiagram = ref(false)
+const preProcessTable = ref()
 const emit = defineEmits(["getAttachment", "getOtherFile"])
 const props = defineProps({
   title: {
@@ -210,6 +211,13 @@ const getPreProcessList = () => {
         searchArray.push(item)
       }
     })
+    res.data.forEach((item) => {
+      localFormData.value.preProcess.forEach((item1) => {
+        if (item.requestId == item1.requestId) {
+          preProcessTable.value.toggleRowSelection(item)
+        }
+      })
+    })
     total.value = searchArray.length
     currentList.value = searchArray
     preProcessList.value = currentList.value.slice(0, 10)

src/views/expense-management/share/moblieDetail/AllocationSummaryDetailMoblie.vue

@@ -12,7 +12,7 @@
         <div v-else>--</div>
       </template>
     </el-table-column>
-    <el-table-column prop="researchStage" label="项目阶段" align="center">
+    <el-table-column prop="researchStage" label="研发阶段" align="center">
       <template #default="scope">
         <div
             v-if="scope.row.researchStage !== null && scope.row.researchStage !== null && scope.row.researchStage !== undefined">

src/views/project-management/implementation/account.vue

@@ -310,7 +310,6 @@ const search = (val) => {
 }
 const init = async () => {
   const {code, msg, data} = await searchUpdateLedgerData(route.query.id)
-  console.log("🚀 ~ init ~ data:", data)
   if (data) {
     tableData.value = data
     baseForm.value.setValues(data)

src/views/project-management/mobledetail/AllocationSummaryDetailMobile.vue

@@ -12,7 +12,7 @@
         <div v-else>--</div>
       </template>
     </el-table-column>
-    <el-table-column prop="researchStage" label="项目阶段" align="center" min-width="100">
+    <el-table-column prop="researchStage" label="研发阶段" align="center" min-width="100">
       <template #default="scope">
         <div
             v-if="scope.row.researchStage !== null && scope.row.researchStage !== null && scope.row.researchStage !== undefined">