fix bug

src/api/dash/index.js

@@ -31,11 +31,11 @@ export default {
   },
 
   /**
-   * 公众号文章
+   * 推荐阅读文章
    * @returns {Promise<unknown>}
    */
   mpList() {
-    return fetch('/blade-project-manage-v2/index/v2/v2/mp-list')
+    return fetch('/blade-pc-applet/wechat/home/getHomeRecommendedList')
   },
   /**
    * 头像更新

src/components/filepicker/index.vue

@@ -98,18 +98,42 @@
             <el-tab-pane label="合同" name="4"></el-tab-pane>
           </el-tabs>
           <div class="area">
-            <div class="full-width flex flex-center flex-justify-start ml-20">
-              <file-way
+            <div class="full-width ml-20">
+              <div
                 v-if="activeName === '2'"
-                :next="currentRow ? currentRow : ''"
-                @before="goBefore"
-                @goHome="getHome"
-              />
-              <div class="tips flex flex-center flex-justify-start" v-else>
-                <el-icon class="mr-10" color="#409eff" :size="20">
-                  <WarningFilled />
-                </el-icon>
-                {{ tips }}
+                class="flex flex-center flex-justify-between flex-col full-width"
+              >
+                <div
+                  class="tips flex flex-center flex-justify-start mb-10"
+                  v-if="list.length === 0"
+                >
+                  <el-icon class="mr-10" color="#409eff" :size="20">
+                    <WarningFilled />
+                  </el-icon>
+                  当前阶段下暂无文件夹，请点击 资料管理
+                  进行创建文件夹并上传相关文件
+                </div>
+                <div class="flex flex-center flex-justify-between full-width">
+                  <file-way
+                    :next="currentRow ? currentRow : ''"
+                    @before="goBefore"
+                    @goHome="getHome"
+                  />
+                  <el-button
+                    text
+                    type="primary"
+                    @click="
+                      $router.push({
+                        path: '/resource',
+                        query: { id: projectId }
+                      })
+                    "
+                    >资料管理
+                    <el-icon class="ml-10">
+                      <ArrowRight />
+                    </el-icon>
+                  </el-button>
+                </div>
               </div>
             </div>
             <div class="files full-height">

src/views/dash/compoents/read.vue

@@ -4,15 +4,21 @@
     <div class="flex flex-center">
       <div class="flex flex-center ml-10" style="flex: 5">
         <div
-          class="flex flex-col flex-center border radius box-shadow mr-15 mt-15"
+          class="flex flex-col flex-center flex-justify-start border radius box-shadow mr-15 mt-15 item"
           v-for="item in data"
+          :key="item.id"
         >
           <div>
-            <img :src="item.thumb_url" style="width: 50px; height: 120px" />
+            <img class="img" :src="item.defaultImg" />
           </div>
-          <div class="bold padding">{{ item.author }}</div>
-          <div class="lines-2 lines-height-15 grey-9 padding">
-            文章内容文章内容文章内容文章内容文章内容文章内容
+          <div
+            class="lines-2 overflow-hide title lines-height-15 grey-9 padding"
+          >
+            <preview :id="item.fileId">
+              <template #title>
+                {{ item.title }}
+              </template>
+            </preview>
           </div>
         </div>
       </div>
@@ -31,8 +37,11 @@
 </template>
 
 <script>
+import Preview from '@/views/resource/component/preview.vue'
+
 export default {
   name: 'read',
+  components: { Preview },
   data() {
     return {
       data: []
@@ -45,7 +54,7 @@ export default {
     getList() {
       this.$api.dash.mpList().then(res => {
         if (res.code === 200) {
-          // this.data = res.data[0].content
+          this.data = res.data.records
         } else {
           console.log(res)
         }
@@ -55,4 +64,20 @@ export default {
 }
 </script>
 
-<style scoped></style>
+<style scoped>
+.item {
+  width: 260px;
+}
+
+.img {
+  border-top-right-radius: 8px;
+  border-top-left-radius: 8px;
+  width: 260px;
+  height: 180px;
+  object-fit: cover;
+}
+.title {
+  height: 30px;
+  margin-bottom: 10px;
+}
+</style>

src/views/project/componens/approval.vue

@@ -15,7 +15,7 @@
           type="textarea"
           :rows="5"
           v-model="approvalMsg"
-          placeholder="请填写审批意见"
+          placeholder="请填写审核意见"
         />
         <div class="full-width flex flex-justify-end mt-20">
           <el-button plain type="primary" @click="showDialog = false"

src/views/project/componens/info1.vue

@@ -136,7 +136,7 @@
           <div class="flex flex-center full-width item">
             <span class="title">民间投资项目:</span>
             <el-select
-              v-model="form.industrial_investment"
+              v-model="form.social_investment"
               placeholder="是否民间投资项目"
               class="full-width"
             >

src/views/project/componens/info3.vue

@@ -92,7 +92,7 @@ export default {
             fixed: true
           },
           {
-            label: '合同金额',
+            label: '合同金额(万元)',
             prop: 'amount',
             width: 180
           },

src/views/project/index.vue

@@ -15,6 +15,20 @@
         />
       </template>
     </tips-custom>
+    <div class="mb-20" v-if="detail.report_type === 4">
+      <el-card shadow="hover" style="background-color: #e2eaf5">
+        <div class="flex flex-center flex-justify-start">
+          <el-icon color="#409eff" :size="30">
+            <WarningFilled />
+          </el-icon>
+          <span class="ml-10"
+            >{{ detail.report_type_name }} 审核意见：{{
+              detail.receipt_msg
+            }}</span
+          >
+        </div>
+      </el-card>
+    </div>
     <!--    content-->
     <div style="margin-bottom: 65px">
       <div v-if="[1, 2].includes(currentStage)">
@@ -41,41 +55,46 @@
       <!--      年度投资情况-->
       <info6 v-if="currentStage === 4" :project-id="projectId" />
       <!--      其他信息-->
-      <info7 v-if="[2, 4, 5].includes(currentStage)" :info="detail" />
+      <info7 v-if="[1, 2, 4, 5].includes(currentStage)" :info="detail" />
       <!--      任务列表-->
       <info8 v-if="user.info.type === 4" :project-id="projectId" />
     </div>
     <!--    buttom-->
     <div
       class="bottom flex flex-center flex-justify-end"
-      v-if="user.info.type === 3"
+      v-if="user.info.type === 3 && currentStage < 6"
     >
       <div class="padding">
-        <el-button type="primary" plain @click="projectCancel">退 库</el-button>
+        <el-button type="primary" plain @click="projectCancel"
+          >退 库
+        </el-button>
         <el-button
           type="primary"
           v-if="[0, 1, 4].includes(detail.report_type)"
           @click="projectReport"
           plain
-          >上报审核</el-button
-        >
+          >上报审核
+        </el-button>
         <el-button
           type="primary"
           plain
           v-if="detail.report_type === 2"
           @click="$refs.approval.show()"
-          >审 核</el-button
-        >
+          >审 核
+        </el-button>
         <el-button
           type="primary"
           plain
           v-if="detail.report_type === 3"
           @click="projectReportFormal"
-          >上报到固定资产</el-button
+          >上报到固定资产
+        </el-button>
+        <el-button type="primary" @click="nextStage" v-if="currentStage < 6"
+          >下一阶段</el-button
         >
-        <el-button type="primary" @click="nextStage">下一阶段</el-button>
       </div>
     </div>
+
     <approval ref="approval" :project-id="projectId" @success="getInfo" />
   </div>
 </template>

src/views/resource/component/preview.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div @click="detail">
+    <div @click="detail" class="pointer">
       <slot name="title">
         <el-button type="primary" text>查看</el-button>
       </slot>
@@ -10,7 +10,7 @@
       :url-list="preList"
       @close="showImage = false"
     />
-    <el-drawer v-model="show" :size="1200">
+    <el-drawer v-model="show" :size="1200" append-to-body>
       <template #title>
         <h4
           class="ml-20 black flex flex-center flex-justify-start full-width font-16 bold"

src/views/resource/component/row1.vue

@@ -53,8 +53,11 @@
         <img v-else src="../../../assets/svg/folder/other.svg" />
       </div>
       <el-tooltip :content="info[column.prop]">
-        <div class="lines-2 padding-right">
-          {{ info[column.prop] }}
+        <div class="padding-right flex flex-align-end flex-justify-start">
+          <div class="lines-2">{{ info[column.prop] }}</div>
+          <div class="font-12 grey-6 ml-10" v-if="info.type === 2">
+            (包含{{ info.fileAmount }}文件)
+          </div>
         </div>
       </el-tooltip>
     </div>