项目库新增进展流程、日期修改为Number

src/api/jin_ji_hu/project/index.js

@@ -74,4 +74,15 @@ export function delJMemorandum(params) {
     method: "delete",
     params
   })
+}
+
+
+/**
+ * 项目进展
+ */
+export function declarationRecordsId(id){
+  return request({
+    url: "/jjh/jProject/declarationRecordsId/" + id,
+    method: "get",
+  })
 }

src/assets/static/icon/demo_index.html

@@ -54,6 +54,12 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe730;</span>
+                <div class="name">已拒绝</div>
+                <div class="code-name">&amp;#xe730;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe630;</span>
                 <div class="name">返回</div>
@@ -156,9 +162,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1711530177681') format('woff2'),
+  src: url('iconfont.woff2?t=1713417636754') format('woff2'),
-       url('iconfont.woff?t=1711530177681') format('woff'),
+       url('iconfont.woff?t=1713417636754') format('woff'),
-       url('iconfont.ttf?t=1711530177681') format('truetype');
+       url('iconfont.ttf?t=1713417636754') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -184,6 +190,15 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont icon-jc-yijujue"></span>
+            <div class="name">
+              已拒绝
+            </div>
+            <div class="code-name">.icon-jc-yijujue
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-jc-55fanhui"></span>
             <div class="name">
@@ -337,6 +352,14 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-jc-yijujue"></use>
+                </svg>
+                <div class="name">已拒绝</div>
+                <div class="code-name">#icon-jc-yijujue</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-jc-55fanhui"></use>

src/assets/static/icon/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4480457 */
-  src: url('iconfont.woff2?t=1711530177681') format('woff2'),
+  src: url('iconfont.woff2?t=1713417636754') format('woff2'),
-       url('iconfont.woff?t=1711530177681') format('woff'),
+       url('iconfont.woff?t=1713417636754') format('woff'),
-       url('iconfont.ttf?t=1711530177681') format('truetype');
+       url('iconfont.ttf?t=1713417636754') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-jc-yijujue:before {
+  content: "\e730";
+}
+
 .icon-jc-55fanhui:before {
   content: "\e630";
 }

src/assets/static/icon/iconfont.json

@@ -5,6 +5,13 @@
   "css_prefix_text": "icon-jc-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "39509228",
+      "name": "已拒绝",
+      "font_class": "yijujue",
+      "unicode": "e730",
+      "unicode_decimal": 59184
+    },
     {
       "icon_id": "16589939",
       "name": "返回",

src/assets/styles/public.scss

@@ -222,7 +222,6 @@
       .tabOneLabel,.tabOneContent {
         width: 220px;
       }
-      // .tabOneContent {}
       .el-descriptions-item__label {
         background: #F5F8FA;
         width: 220px;
@@ -237,6 +236,22 @@
         font-size: 14px;
         color: #333333;
       }
+      .tabOneFileLabel {
+        font-family: PingFang-SC, PingFang-SC;
+        font-weight: 500;
+        font-size: 16px;
+        color: #333333;
+        width: auto;
+        background-color: #fff;
+      }
+      .tabOneFileContent {
+        a {
+          font-family: PingFang-SC, PingFang-SC;
+          font-weight: 500;
+          font-size: 16px;
+          color: #333333;
+        }
+      }
       .project-info-title {
         margin-bottom: 28px;
         font-family: PingFang-SC, PingFang-SC;
@@ -244,6 +259,9 @@
         font-size: 14px;
         color: #333333;
       }
+      .margin-top-file {
+        margin-top: 20px;
+      }
       // 申报单位信息
       .L-unitInfo {
         .a-primary {
@@ -558,6 +576,9 @@
             .icon-jc-shenpitongguo-copy {
               color: #4EB997;
             }
+            .icon-jc-yijujue {
+              color: #e05858;
+            }
           }
         }
         .schedule-time {

src/views/onlineDeclaration/declareAddContent/index.vue

@@ -1451,10 +1451,10 @@ export default {
               }
             })
             let detailList = []
-            detailList.push({amount: this.form.revenueNowYear1,detailId: '',illustrade: '营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear1',year: this.openInterfaceInfo.year})
+            detailList.push({amount: this.form.revenueNowYear1,detailId: '',illustrate: '营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear1',year: this.openInterfaceInfo.year})
-            detailList.push({amount: this.form.taxationNowYear1,detailId: '',illustrade: '税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear1',year: this.openInterfaceInfo.year})
+            detailList.push({amount: this.form.taxationNowYear1,detailId: '',illustrate: '税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear1',year: this.openInterfaceInfo.year})
-            detailList.push({amount: this.form.revenueNowYear,detailId: '',illustrade: '预计营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear',year: this.openInterfaceInfo.year+1})
+            detailList.push({amount: this.form.revenueNowYear,detailId: '',illustrate: '预计营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear',year: Number(this.openInterfaceInfo.year)+1})
-            detailList.push({amount: this.form.taxationNowYear,detailId: '',illustrade: '预计税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear',year: this.openInterfaceInfo.year+1})
+            detailList.push({amount: this.form.taxationNowYear,detailId: '',illustrate: '预计税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear',year: Number(this.openInterfaceInfo.year)+1})
             params.fundingDetailList = detailList
             console.log('11', params);
             addProjectSettlementAward(params).then((response) => {
@@ -1478,14 +1478,14 @@ export default {
               }
             })
             let detailList = []
-            detailList.push({amount: this.form.revenueNowYear3,detailId: '',illustrade: '营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear3',year: this.openInterfaceInfo.year})
+            detailList.push({amount: this.form.revenueNowYear3,detailId: '',illustrate: '营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear3',year: this.openInterfaceInfo.year})
-            detailList.push({amount: this.form.taxationNowYear3,detailId: '',illustrade: '税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear3',year: this.openInterfaceInfo.year})
+            detailList.push({amount: this.form.taxationNowYear3,detailId: '',illustrate: '税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear3',year: this.openInterfaceInfo.year})
-            detailList.push({amount: this.form.revenueNowYear2,detailId: '',illustrade: '营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear2',year: this.openInterfaceInfo.year+1})
+            detailList.push({amount: this.form.revenueNowYear2,detailId: '',illustrate: '营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear2',year: Number(this.openInterfaceInfo.year)+1})
-            detailList.push({amount: this.form.taxationNowYear2,detailId: '',illustrade: '税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear2',year: this.openInterfaceInfo.year+1})
+            detailList.push({amount: this.form.taxationNowYear2,detailId: '',illustrate: '税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear2',year: Number(this.openInterfaceInfo.year)+1})
-            detailList.push({amount: this.form.revenueNowYear1,detailId: '',illustrade: '营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear1',year: this.openInterfaceInfo.year+2})
+            detailList.push({amount: this.form.revenueNowYear1,detailId: '',illustrate: '营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear1',year: Number(this.openInterfaceInfo.year)+2})
-            detailList.push({amount: this.form.taxationNowYear1,detailId: '',illustrade: '税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear1',year: this.openInterfaceInfo.year+2})
+            detailList.push({amount: this.form.taxationNowYear1,detailId: '',illustrate: '税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear1',year: Number(this.openInterfaceInfo.year)+2})
-            detailList.push({amount: this.form.revenueNowYear,detailId: '',illustrade: '预计营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear',year: this.openInterfaceInfo.year+3})
+            detailList.push({amount: this.form.revenueNowYear,detailId: '',illustrate: '预计营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear',year: Number(this.openInterfaceInfo.year)+3})
-            detailList.push({amount: this.form.taxationNowYear,detailId: '',illustrade: '预计营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear',year: this.openInterfaceInfo.year+3})
+            detailList.push({amount: this.form.taxationNowYear,detailId: '',illustrate: '预计营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear',year: Number(this.openInterfaceInfo.year)+3})
             params.fundingDetailList = detailList
             console.log('11', params);
             addBigStrongAward(params).then((response) => {

src/views/onlineDeclaration/supplementary/index.vue

@@ -1458,10 +1458,10 @@ export default {
               }
             })
             let detailList = []
-            detailList.push({amount: this.form.revenueNowYear1,detailId: '',illustrade: '营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear1',year: this.openInterfaceInfo.year})
+            detailList.push({amount: this.form.revenueNowYear1,detailId: '',illustrate: '营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear1',year: this.openInterfaceInfo.year})
-            detailList.push({amount: this.form.taxationNowYear1,detailId: '',illustrade: '税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear1',year: this.openInterfaceInfo.year})
+            detailList.push({amount: this.form.taxationNowYear1,detailId: '',illustrate: '税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear1',year: this.openInterfaceInfo.year})
-            detailList.push({amount: this.form.revenueNowYear,detailId: '',illustrade: '预计营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear',year: this.openInterfaceInfo.year+1})
+            detailList.push({amount: this.form.revenueNowYear,detailId: '',illustrate: '预计营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear',year: Number(this.openInterfaceInfo.year)+1})
-            detailList.push({amount: this.form.taxationNowYear,detailId: '',illustrade: '预计税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear',year: this.openInterfaceInfo.year+1})
+            detailList.push({amount: this.form.taxationNowYear,detailId: '',illustrate: '预计税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear',year: Number(this.openInterfaceInfo.year)+1})
             params.fundingDetailList = detailList
             console.log('11', params);
             unifyReport({
@@ -1488,14 +1488,14 @@ export default {
               }
             })
             let detailList = []
-            detailList.push({amount: this.form.revenueNowYear3,detailId: '',illustrade: '营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear3',year: this.openInterfaceInfo.year})
+            detailList.push({amount: this.form.revenueNowYear3,detailId: '',illustrate: '营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear3',year: this.openInterfaceInfo.year})
-            detailList.push({amount: this.form.taxationNowYear3,detailId: '',illustrade: '税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear3',year: this.openInterfaceInfo.year})
+            detailList.push({amount: this.form.taxationNowYear3,detailId: '',illustrate: '税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear3',year: this.openInterfaceInfo.year})
-            detailList.push({amount: this.form.revenueNowYear2,detailId: '',illustrade: '营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear2',year: this.openInterfaceInfo.year+1})
+            detailList.push({amount: this.form.revenueNowYear2,detailId: '',illustrate: '营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear2',year: Number(this.openInterfaceInfo.year)+1})
-            detailList.push({amount: this.form.taxationNowYear2,detailId: '',illustrade: '税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear2',year: this.openInterfaceInfo.year+1})
+            detailList.push({amount: this.form.taxationNowYear2,detailId: '',illustrate: '税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear2',year: Number(this.openInterfaceInfo.year)+1})
-            detailList.push({amount: this.form.revenueNowYear1,detailId: '',illustrade: '营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear1',year: this.openInterfaceInfo.year+2})
+            detailList.push({amount: this.form.revenueNowYear1,detailId: '',illustrate: '营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear1',year: Number(this.openInterfaceInfo.year)+2})
-            detailList.push({amount: this.form.taxationNowYear1,detailId: '',illustrade: '税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear1',year: this.openInterfaceInfo.year+2})
+            detailList.push({amount: this.form.taxationNowYear1,detailId: '',illustrate: '税收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear1',year: Number(this.openInterfaceInfo.year)+2})
-            detailList.push({amount: this.form.revenueNowYear,detailId: '',illustrade: '预计营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear',year: this.openInterfaceInfo.year+3})
+            detailList.push({amount: this.form.revenueNowYear,detailId: '',illustrate: '预计营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'revenueNowYear',year: Number(this.openInterfaceInfo.year)+3})
-            detailList.push({amount: this.form.taxationNowYear,detailId: '',illustrade: '预计营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear',year: this.openInterfaceInfo.year+3})
+            detailList.push({amount: this.form.taxationNowYear,detailId: '',illustrate: '预计营收', templateRecordId: this.templateRecordId,type: this.templateId,vmodel: 'taxationNowYear',year: Number(this.openInterfaceInfo.year)+3})
             params.fundingDetailList = detailList
             console.log('11', params);
             unifyReport({

src/views/project/projectInfo/components/projectProgress/index copy.vue

@@ -0,0 +1,80 @@
+<template>
+  <div class="L-projectProgress">
+    <div class="projectProgress-title">【项目进展】</div>
+    <div class="schedule-timeline">
+      <el-timeline>
+        <el-timeline-item
+          v-for="(activity, index) in activities"
+          :key="index"
+          size="large"
+          :class="activity.status == 1 || activity.status == 0 ? 'timeline-item-green' : activity.status == 2 ? 'timeline-item-red' : ''"
+        >
+          <div slot="dot" class="timeline-dot" :class="activity.status == 2 ? 'timeline-dot-red' : ''">
+            <i class="icon iconfont" :class="activity.status == 1 || activity.status == 0 ? 'icon-jc-dian-green' : activity.status == 2 ? 'icon-jc-dian' : ''"></i>
+          </div>
+          <el-card> <!-- 去除阴影  shadow="never -->
+            <div class="schedule-content">
+              <div class="card-content-left">
+                <div class="schedule-card-title">提交项目材料</div>
+                <div class="card-content-one" v-show="activity.status == 0">
+                  <span>提醒</span>
+                  <span>已提交xxx材料</span>
+                </div>
+                <div class="card-content-one" v-show="activity.status == 2">
+                  <span>提醒</span>
+                  <span>请xxx专家审核</span>
+                </div>
+                <div class="card-content-one" v-show="activity.status == 1">
+                  <span>审核结果</span>
+                  <span>xxx审核通过</span>
+                </div>
+                <div class="card-content-two" v-show="activity.status == 1">
+                  <span>审核意见</span>
+                  <span>xxxxxx</span>
+                </div>
+                <div class="card-content-two" v-show="activity.status == 0">
+                  <span>附件</span>
+                  <a>xxx.doc</a>
+                </div>
+                <div class="card-content-three" v-show="activity.status !== 2">2023-05-11</div>
+                <div class="card-content-three-red" v-show="activity.status == 2">请于2023-06-20前审核</div>
+              </div>
+              <div class="card-content-right" v-if="activity.status !== 0">
+                <i class="icon iconfont" :class="activity.status == 2 ? 'icon-jc-daishenpi1-copy' : activity.status == 1 ?  'icon-jc-shenpitongguo-copy' : ''"></i>
+              </div>
+            </div>
+          </el-card>
+        </el-timeline-item>
+      </el-timeline>
+    </div>
+  </div>
+</template>
+<script>
+import { declarationRecordsId } from "@/api/jin_ji_hu/project/index"
+export default {
+  data() {
+    return {
+      activities: [{
+        status: 2,
+      }, {
+        status: 1,
+      }, {
+        status: 1,
+      }, {
+        status: 0,
+      }],
+      flow:[],
+    }
+  },
+  mounted() {
+    this.getFlow(this.$route.query.userId)
+  },
+  methods:{
+    getFlow(id){
+      declarationRecordsId(id).then(res=>{
+        this.flow = res.data;
+      })
+    }
+  },
+}
+</script>

src/views/project/projectInfo/components/projectProgress/index.vue

@@ -4,43 +4,59 @@
     <div class="schedule-timeline">
       <el-timeline>
         <el-timeline-item
-          v-for="(activity, index) in activities"
+          v-for="(activity, index) in flow"
           :key="index"
           size="large"
-          :class="activity.status == 1 || activity.status == 0 ? 'timeline-item-green' : activity.status == 2 ? 'timeline-item-red' : ''"
+          :class="activity.approvalStatus == 1 || activity.approvalStatus == 0 ? 'timeline-item-green' : activity.approvalStatus == 2 ? 'timeline-item-red' : ''"
         >
-          <div slot="dot" class="timeline-dot" :class="activity.status == 2 ? 'timeline-dot-red' : ''">
+          <div slot="dot" class="timeline-dot" :class="activity.approvalStatus == 2 ? 'timeline-dot-red' : ''">
-            <i class="icon iconfont" :class="activity.status == 1 || activity.status == 0 ? 'icon-jc-dian-green' : activity.status == 2 ? 'icon-jc-dian' : ''"></i>
+            <i class="icon iconfont" :class="activity.approvalStatus == 1 || activity.approvalStatus == 0 ? 'icon-jc-dian-green' : activity.approvalStatus == 2 ? 'icon-jc-dian' : ''"></i>
           </div>
           <el-card> <!-- 去除阴影  shadow="never -->
             <div class="schedule-content">
               <div class="card-content-left">
-                <div class="schedule-card-title">提交项目材料</div>
+                <div class="schedule-card-title" v-if="false">提交项目材料</div>
-                <div class="card-content-one" v-show="activity.status == 0">
+                <div class="schedule-card-title" v-if="activity.sort == 1 && activity.approvalStatus == 0">待初审</div>
+                <div class="schedule-card-title" v-if="activity.sort == 1 && activity.approvalStatus == 1">初审通过</div>
+                <div class="schedule-card-title" v-if="activity.sort == 1 && activity.approvalStatus == 2">初审拒绝</div>
+                <div class="schedule-card-title" v-if="activity.sort == 2 && activity.approvalStatus == 0">待复审</div>
+                <div class="schedule-card-title" v-if="activity.sort == 2 && activity.approvalStatus == 1">复审通过</div>
+                <div class="schedule-card-title" v-if="activity.sort == 2 && activity.approvalStatus == 2">复审拒绝</div>
+                <div class="schedule-card-title" v-if="activity.sort == 3 && activity.approvalStatus == 0">待专家评审</div>
+                <div class="schedule-card-title" v-if="activity.sort == 3 && activity.approvalStatus == 1">专家评审通过</div>
+                <div class="schedule-card-title" v-if="activity.sort == 3 && activity.approvalStatus == 2">专家评审拒绝</div>
+                <div class="schedule-card-title" v-if="activity.sort == 4 && activity.approvalStatus == 0">待市级评审</div>
+                <div class="schedule-card-title" v-if="activity.sort == 4 && activity.approvalStatus == 1">市级评审通过</div>
+                <div class="schedule-card-title" v-if="activity.sort == 4 && activity.approvalStatus == 2">市级评审拒绝</div>
+                <div class="card-content-one" v-show="activity.approvalStatus == 0 && activity.approvalAttachment">
                   <span>提醒</span>
                   <span>已提交xxx材料</span>
                 </div>
-                <div class="card-content-one" v-show="activity.status == 2">
+                <div class="card-content-one" v-show="activity.approvalStatus == 2">
                   <span>提醒</span>
                   <span>请xxx专家审核</span>
                 </div>
-                <div class="card-content-one" v-show="activity.status == 1">
+                <div class="card-content-one" v-show="activity.approvalStatus == 1">
                   <span>审核结果</span>
-                  <span>xxx审核通过</span>
+                  <span>{{ activity.approvalByName }}审核通过</span>
                 </div>
-                <div class="card-content-two" v-show="activity.status == 1">
+                <div class="card-content-one" v-show="activity.approvalStatus == 2">
+                  <span>审核结果</span>
+                  <span>{{ activity.approvalByName }}审核不通过</span>
+                </div>
+                <div class="card-content-two" v-show="activity.approvalOpinions">
                   <span>审核意见</span>
-                  <span>xxxxxx</span>
+                  <span>{{ activity.approvalOpinions }}</span>
                 </div>
-                <div class="card-content-two" v-show="activity.status == 0">
+                <div class="card-content-two" v-show="activity.approvalStatus == 0">
                   <span>附件</span>
-                  <a>xxx.doc</a>
+                  <a :href="activity.approvalAttachment" target="_blank">xxx.doc</a>
                 </div>
-                <div class="card-content-three" v-show="activity.status !== 2">2023-05-11</div>
+                <div class="card-content-three">{{ activity.approvalTime }}</div>
-                <div class="card-content-three-red" v-show="activity.status == 2">请于2023-06-20前审核</div>
+                <!-- <div class="card-content-three-red" v-show="activity.approvalStatus == 2">请于2023-06-20前审核</div> -->
               </div>
-              <div class="card-content-right" v-if="activity.status !== 0">
+              <div class="card-content-right">
-                <i class="icon iconfont" :class="activity.status == 2 ? 'icon-jc-daishenpi1-copy' : activity.status == 1 ?  'icon-jc-shenpitongguo-copy' : ''"></i>
+                <i class="icon iconfont" :class="activity.approvalStatus == 2 ? 'icon-jc-yijujue' : activity.approvalStatus == 1 ? 'icon-jc-shenpitongguo-copy' : activity.approvalStatus == 0 ? 'icon-jc-daishenpi1-copy' : ''"></i>
               </div>
             </div>
           </el-card>
@@ -50,22 +66,32 @@
   </div>
 </template>
 <script>
+import { declarationRecordsId } from "@/api/jin_ji_hu/project/index"
 export default {
   data() {
     return {
-      activities: [{
+      // activities: [{
-        status: 2,
+      //   status: 2,
-      }, {
+      // }, {
-        status: 1,
+      //   status: 1,
-      }, {
+      // }, {
-        status: 1,
+      //   status: 1,
-      }, {
+      // }, {
-        status: 0,
+      //   status: 0,
-      }]
+      // }],
+      flow:[],
     }
   },
+  mounted() {
+    this.getFlow(this.$route.query.userId)
+  },
   methods:{
-
+    // approvalStatus   0:待审核 1:审核通过 2:审核不通过
+    getFlow(id){
+      declarationRecordsId(id).then(res=>{
+        this.flow = res.data;
+      })
+    }
   },
 }
 </script>

src/views/project/projectInfo/components/tabOne/index.vue

@@ -4,10 +4,10 @@
  * @Author: JC9527
  * @Date: 2024-03-25 15:37:35
  * @LastEditors: JC9527
- * @LastEditTime: 2024-03-29 09:47:05
+ * @LastEditTime: 2024-04-18 10:22:07
 -->
 <template>
-  <div>
+  <div class="project-info-box">
     <div class="project-info-title">【项目详细信息】</div>
     <el-descriptions class="margin-top" :column="3" size="medium" border v-loading="loading">
       <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" 
@@ -19,6 +19,17 @@
         {{ item.value }}
       </el-descriptions-item>
     </el-descriptions>
+    <el-descriptions class="margin-top-file" :column="3" size="medium" v-loading="loading">
+      <el-descriptions-item labelClassName="tabOneFileLabel" contentClassName="tabOneFileContent" 
+        v-for="(item,index) in fileInfo" 
+        :key="index" 
+        :label="item.key"
+      >
+        <a :href="item.url" target="_blank">
+          {{ item.value }}
+        </a>
+      </el-descriptions-item>
+    </el-descriptions>
   </div>
 </template>
 <script>
@@ -30,6 +41,12 @@ export default {
       default:()=>{
         return {};
       }
+    },
+    fileJson:{
+      type:Object,
+      default:()=>{
+        return {};
+      }
     }
   },
   watch: {
@@ -96,11 +113,31 @@ export default {
       immediate:true,
       deep:true
     },
-    
+    fileJson: {
+      handler(newFile){
+        if(newFile) {
+          let arr = []
+          for (var key in newFile) {
+            if (newFile.hasOwnProperty(key)) {
+              let url = newFile[key] ? newFile[key].split("/") : null;
+              let obj = {};
+              obj["key"] = key;
+              obj["uel"] = newFile[key] ? newFile[key] : '';
+              obj["value"] = url ? url[url.length - 1] : '';
+              arr.push(obj)
+            }
+          }
+          this.fileInfo = arr;
+        }
+      },
+      deep:true,
+      immediate:true
+    }
   },
   data() {
     return {
       info:[],
+      fileInfo:[],
       loading:false,
     }
   },

src/views/project/projectInfo/index.vue

@@ -16,7 +16,7 @@
             <div v-for="(item,index) in tabs" :key="index" class="tabs-top-item" :class="active == index ? 'active-item' : ''" @click="active = index">{{ item.name }}</div>
           </div>
           <div class="tabs-bottom">
-            <tab-one v-if="active == 0" :detailedInfo="detailedInfo"></tab-one>
+            <tab-one v-if="active == 0" :detailedInfo="detailedInfo" :fileJson="fileJson"></tab-one>
             <tab-two v-if="active == 1" :info="info"></tab-two>
             <tab-three v-if="active == 2"></tab-three>
             <tab-four v-if="active == 3" :id="$route.query.userId"></tab-four>
@@ -57,6 +57,7 @@ export default {
       active: 0,
       info:{},
       detailedInfo:{},
+      fileJson:{},
       loading:false,
     }
   },
@@ -70,6 +71,7 @@ export default {
         this.info = res.data;
         this.loading = false;
         this.detailedInfo = JSON.parse(res.data.otherJson);
+        this.fileJson = JSON.parse(res.data.fileJson);
         // for (var key in obj) {
         //   if (obj.hasOwnProperty(key)) {
         //     var value = obj[key];