From 1f9a3603d8d3487c912645f8f14b10d895a65ff2 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Tue, 14 May 2024 21:07:17 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project-demand/collection/add.vue   |   2 +-
 .../project-demand/collection/detail.vue      | 137 +++++++++---------
 .../project-management/initiation/apply.vue   |  17 ++-
 .../project-management/initiation/index.vue   |   2 +-
 4 files changed, 84 insertions(+), 74 deletions(-)

diff --git a/src/views/project-demand/collection/add.vue b/src/views/project-demand/collection/add.vue
index ca7d58d..fb996e0 100644
--- a/src/views/project-demand/collection/add.vue
+++ b/src/views/project-demand/collection/add.vue
@@ -80,7 +80,7 @@ const formData = ref({
   deadline: '',
   collectExplain: ''
 })
-const showTinymce = ref(false)
+const showTinymce = ref(true)
 const processDiagramViewer = ref(false)
 const typeOption = ref([
   {
diff --git a/src/views/project-demand/collection/detail.vue b/src/views/project-demand/collection/detail.vue
index b6437c4..bbb6157 100644
--- a/src/views/project-demand/collection/detail.vue
+++ b/src/views/project-demand/collection/detail.vue
@@ -2,63 +2,61 @@
   <div class="detail-block">
     <el-form :model="formData" ref="demandForm" label-width="auto" :rules="rules">
       <baseTitle title="需求征集详情"></baseTitle>
-      <div class="left-info">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="名称">
-              <span>{{ formData.requirementName }}</span>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="名称">
+            <span>{{ formData.requirementName }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="所属公司">
+            <span>{{ formData.companyIds }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="征集类型">
+            <span>{{ formData.collectType }}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="截止时间">
+            <span>{{ formData.deadline }}</span>
+          </el-form-item>
+        </el-col>
+        <baseTitle title="征集说明"></baseTitle>
+        <el-col :span="24">
+          <el-form-item>
+            <el-card style="width: 100%">
+              <div v-html="formData.collectExplain">
+              </div>
+            </el-card>
+          </el-form-item>
+        </el-col>
+        <baseTitle title="附件列表"></baseTitle>
+        <el-col :span="24">
+          <el-form-item>
+            <fvTable style="width: 100%;max-height: 200px" v-if="showTable" :tableConfig="tableConfig"
+                     :data="formData.fileList" :isSettingCol="false" :pagination="false">
+              <template #empty>
+                <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
+              </template>
+            </fvTable>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <div v-if="processInstanceData.taskId">
+            <baseTitle title="审核意见"></baseTitle>
+            <el-form-item prop="auditOpinion">
+              <el-input
+                  v-model="formData.auditOpinion"
+                  :rows="3"
+                  type="textarea"
+                  placeholder="请输入审核意见"
+              />
             </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="所属公司">
-              <span>{{ formData.companyIds }}</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="征集类型">
-              <span>{{ formData.collectType }}</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="截止时间">
-              <span>{{ formData.deadline }}</span>
-            </el-form-item>
-          </el-col>
-          <baseTitle title="征集说明"></baseTitle>
-          <el-col :span="24">
-            <el-form-item>
-              <el-card style="width: 100%">
-                <div v-html="formData.collectExplain">
-                </div>
-              </el-card>
-            </el-form-item>
-          </el-col>
-          <baseTitle title="附件列表"></baseTitle>
-          <el-col :span="24">
-            <el-form-item>
-              <fvTable style="width: 100%;max-height: 200px" v-if="showTable" :tableConfig="tableConfig"
-                       :data="formData.fileList" :isSettingCol="false" :pagination="false">
-                <template #empty>
-                  <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
-                </template>
-              </fvTable>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <div v-if="processInstanceData.taskId">
-              <baseTitle title="审核意见"></baseTitle>
-              <el-form-item prop="auditOpinion">
-                <el-input
-                    v-model="formData.auditOpinion"
-                    :rows="3"
-                    type="textarea"
-                    placeholder="请输入审核意见"
-                />
-              </el-form-item>
-            </div>
-          </el-col>
-        </el-row>
-      </div>
+          </div>
+        </el-col>
+      </el-row>
       <div class="approval-record">
         <baseTitle title="审批记录"></baseTitle>
         <div class="process">
@@ -226,28 +224,27 @@ init()
 </script>
 
 <style lang="scss" scoped>
-:deep(.el-empty__description){
+:deep(.el-empty__description) {
   margin-top: 0;
 }
+
 .detail-block {
   overflow: hidden;
   padding-right: 10px;
 
-  .left-info {
-    .info {
-      display: flex;
-      flex-wrap: wrap;
+  .info {
+    display: flex;
+    flex-wrap: wrap;
 
-      > div {
-        width: 350px;
-        margin-bottom: 15px;
-        margin-right: 10px;
+    > div {
+      width: 350px;
+      margin-bottom: 15px;
+      margin-right: 10px;
 
-        > span:first-child {
-          color: black;
-          font-size: 16px;
-          font-weight: bold;
-        }
+      > span:first-child {
+        color: black;
+        font-size: 16px;
+        font-weight: bold;
       }
     }
   }
diff --git a/src/views/project-management/initiation/apply.vue b/src/views/project-management/initiation/apply.vue
index 25f0fd7..1abd1a9 100644
--- a/src/views/project-management/initiation/apply.vue
+++ b/src/views/project-management/initiation/apply.vue
@@ -1,10 +1,23 @@
 <template>
-  <div>
-    项目立项申请
+  <div class="apply-block">
+    <el-form :model="formData" ref="applyForm" label-width="auto" :rules="rules">
+      <baseTitle title="项目立项-申请"></baseTitle>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="前置流程">
+            <el-input v-model="formData.requirementName" clearable></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
   </div>
 </template>
 
 <script setup lang="jsx">
+const formData = ref({})
+const rules = reactive({
+  auditOpinion: [{required: true, message: '请输入审核意见', trigger: 'blur'}],
+})
 </script>
 
 <style scoped>
diff --git a/src/views/project-management/initiation/index.vue b/src/views/project-management/initiation/index.vue
index c7c865f..159b267 100644
--- a/src/views/project-management/initiation/index.vue
+++ b/src/views/project-management/initiation/index.vue
@@ -165,7 +165,7 @@ const tableConfig = reactive({
       }
     }
   ],
-  api: '/workflow/mosr/requirement',
+  api: '',
   params: {},
 })