From 513e6dbdc481bf7648ab88ea5ff281c0e2a9bf63 Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Wed, 22 May 2024 19:11:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B3=E6=8A=A5=E5=BC=80=E5=A7=8B=E5=A1=AB?=
 =?UTF-8?q?=E6=8A=A5=E5=8F=8A=E6=9F=A5=E7=9C=8B=E8=AF=A6=E6=83=85=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5=E3=80=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E9=A1=B9=E7=9B=AE=E5=BA=93=E7=9A=84=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E3=80=81=E8=AF=A6=E6=83=85=E7=9A=84=E5=9F=BA?=
 =?UTF-8?q?=E6=9C=AC=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   2 +-
 src/api/onlineDeclartion/declareAddContent.js |   8 ++
 .../declarationManagement/index.vue           |  10 +-
 .../declareAddContent/index.vue               |  95 +++++++++-----
 .../declareDetailContent/index.vue            |  80 +++++++-----
 .../onlineDeclaration/pendingReview/index.vue |  74 +++++++----
 src/views/onlineDeclaration/records/index.vue | 119 ++++++++++++------
 .../templateDetail/index.vue                  |   7 +-
 src/views/policyDocument/index.vue            |  34 ++---
 src/views/project/index.vue                   |  43 +++----
 .../projectInfo/components/tabFour/index.vue  |   1 +
 src/views/project/projectInfo/index.vue       |   2 +-
 12 files changed, 301 insertions(+), 174 deletions(-)

diff --git a/.env.development b/.env.development
index 0fa1cc8..65db24a 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统
 ENV = 'development'
 
 # 金鸡湖现代服务业品牌管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.0.104:9040'
+VUE_APP_BASE_API = 'http://192.168.0.105:9040'
 # VUE_APP_BASE_API = 'http://39.101.188.84:9040'
 
 # 路由懒加载
diff --git a/src/api/onlineDeclartion/declareAddContent.js b/src/api/onlineDeclartion/declareAddContent.js
index 103930a..e595f8b 100644
--- a/src/api/onlineDeclartion/declareAddContent.js
+++ b/src/api/onlineDeclartion/declareAddContent.js
@@ -60,6 +60,14 @@ export function templateList(query) {
   })
 }
 
+// 查询申报模版详情
+export function templateGetId(id) {
+  return request({
+    url: '/system/templateRecord/' + id,
+    method: 'get',
+  })
+}
+
 // 导出
 export function exportData(data) {
   return request({
diff --git a/src/views/onlineDeclaration/declarationManagement/index.vue b/src/views/onlineDeclaration/declarationManagement/index.vue
index d673f3f..78897fb 100644
--- a/src/views/onlineDeclaration/declarationManagement/index.vue
+++ b/src/views/onlineDeclaration/declarationManagement/index.vue
@@ -45,7 +45,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row id="I-rowOne" :gutter="10" class="mb8">
+    <!-- <el-row id="I-rowOne" :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -55,7 +55,7 @@
           class="btn"
         >新增在线申报</el-button>
       </el-col>
-    </el-row>
+    </el-row> -->
 
     <el-table
       v-if="refreshTable"
@@ -222,13 +222,13 @@ export default {
     cancalDebounce(){
       const element = document.getElementById('app-container'); // 通过元素的 ID 获取元素
       const header = document.getElementById('I-form'); // 通过元素的 ID 获取元素
-      const headerTwo = document.getElementById('I-rowOne'); // 通过元素的 ID 获取元素
+      // const headerTwo = document.getElementById('I-rowOne'); // 通过元素的 ID 获取元素
       const pagination = document.getElementById('L-pagination'); // 通过元素的 ID 获取元素
       const elementHeight = element.offsetHeight;
       const headerHeight = header.offsetHeight;
-      const headerOHeight = headerTwo.offsetHeight;
+      // const headerOHeight = headerTwo.offsetHeight;
       const paginationtHeight = pagination.offsetHeight;
-      this.tabHeader = elementHeight - headerHeight - headerOHeight - paginationtHeight - 100;
+      this.tabHeader = elementHeight - headerHeight - paginationtHeight - 80;
     },
     /** 查询菜单列表 */
     getList() {
diff --git a/src/views/onlineDeclaration/declareAddContent/index.vue b/src/views/onlineDeclaration/declareAddContent/index.vue
index c2d07b6..bdbbc5b 100644
--- a/src/views/onlineDeclaration/declareAddContent/index.vue
+++ b/src/views/onlineDeclaration/declareAddContent/index.vue
@@ -4,22 +4,41 @@
       <div class="left_content">
         <el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="left" class="form">
           <el-row>
-            <el-col :span="12" style="height: 50px">
+            <el-col :span="8" style="height: 50px">
               <div class="templateInfo">
-                <div class="templateInfo_left">申报类别</div>
-                <div>{{ templateInfo.templateName }}</div>
+                <div class="templateInfo_left">申报任务标题：</div>
+                <div>{{ enterpriseDirectory }}</div>
               </div>
             </el-col>
-            <el-col :span="12" style="height: 50px">
+            <el-col :span="8" style="height: 50px">
               <div class="templateInfo">
-                <div class="templateInfo_left">责任单位</div>
+                <div class="templateInfo_left">申报单位：</div>
+                <div>{{ baseInfo.enterpriseName }}</div>
+              </div>
+            </el-col>
+            <el-col :span="8" style="height: 50px">
+              <div class="templateInfo">
+                <div class="templateInfo_left">年份：</div>
+                <!-- <div>{{ parseTime(new Date(), '{y}-{m}-{d}') }}</div> -->
+                <div>{{ parseTime(templateInfo.createTime, '{y}') }}</div>
+              </div>
+            </el-col>
+            <el-col :span="8" style="height: 50px">
+              <div class="templateInfo">
+                <div class="templateInfo_left">项目分类：</div>
+                <dict-tag :options="dict.type.jjh_project_type" :value="templateInfo.projectClassify"/>
+              </div>
+            </el-col>
+            <el-col :span="8" style="height: 50px">
+              <div class="templateInfo">
+                <div class="templateInfo_left">责任单位：</div>
                 <dict-tag :options="dict.type.bms_responsibility_unit" :value="templateInfo.responsibilityUnit"/>
               </div>
             </el-col>
-            <el-col :span="12" style="height: 50px">
+            <el-col :span="8" style="height: 50px">
               <div class="templateInfo">
-                <div class="templateInfo_left">申报时间</div>
-                <div>{{ parseTime(new Date(), '{y}-{m}-{d}') }}</div>
+                <div class="templateInfo_left">级别：</div>
+                <dict-tag :options="dict.type.bms_level" :value="templateInfo.level"/>
               </div>
             </el-col>
           </el-row>
@@ -62,7 +81,7 @@
               <template slot="label">
                 项目名称
               </template>
-              {{ openInterfaceInfo.projectName }}
+              {{ templateInfo.templateName }}
             </el-descriptions-item>
             <el-descriptions-item>
               <template slot="label">
@@ -137,7 +156,7 @@
                 <template slot="label">
                   项目名称
                 </template>
-                {{ openInterfaceInfo.projectName }}
+                {{ templateInfo.templateName }}
               </el-descriptions-item>
               <el-descriptions-item>
                 <template slot="label">
@@ -262,7 +281,7 @@
                 <template slot="label">
                   项目名称
                 </template>
-                {{ openInterfaceInfo.projectName }}
+                {{ templateInfo.templateName }}
               </el-descriptions-item>
               <el-descriptions-item>
                 <template slot="label">
@@ -321,7 +340,7 @@
                 <template slot="label">
                   项目名称
                 </template>
-                {{ openInterfaceInfo.projectName }}
+                {{ templateInfo.templateName }}
               </el-descriptions-item>
               <el-descriptions-item>
                 <template slot="label">
@@ -347,7 +366,7 @@
                 <template slot="label">
                   项目名称
                 </template>
-                {{ openInterfaceInfo.projectName }}
+                {{ templateInfo.templateName }}
               </el-descriptions-item>
               <el-descriptions-item>
                 <template slot="label">
@@ -387,7 +406,7 @@
                 <template slot="label">
                   项目名称
                 </template>
-                {{ openInterfaceInfo.projectName }}
+                {{ templateInfo.templateName }}
               </el-descriptions-item>
               <el-descriptions-item>
                 <template slot="label">
@@ -413,7 +432,7 @@
                 <template slot="label">
                   项目名称
                 </template>
-                {{ openInterfaceInfo.projectName }}
+                {{ templateInfo.templateName }}
               </el-descriptions-item>
               <el-descriptions-item>
                 <template slot="label">
@@ -434,7 +453,7 @@
               <template slot="label">
                 项目名称
               </template>
-              {{ openInterfaceInfo.projectName }}
+              {{ templateInfo.templateName }}
             </el-descriptions-item>
           </el-descriptions>
           </div>
@@ -445,7 +464,7 @@
                 <template slot="label">
                   项目名称
                 </template>
-                {{ openInterfaceInfo.projectName }}
+                {{ templateInfo.templateName }}
               </el-descriptions-item>
               <el-descriptions-item>
                 <template slot="label">
@@ -1175,6 +1194,7 @@
 
 <script>
 import { getTemplateInfo, getBasicInfo, getOpenInterface, templateList, uploadFile,
+  templateGetId,
   addProjectSettlementAward, putProjectSettlementAward,
   addBigStrongAward, putBigStrongAward,
   addCarrierConstructionAward, putCarrierConstructionAward,
@@ -1192,7 +1212,7 @@ import { dealFormatDate } from "@/utils/index.js"
 export default {
   name: "declareAddContent",
   dicts: ['sys_show_hide', 'sys_normal_disable', 'bms_product_area', 'bms_declaration_type',
-  'bms_responsibility_unit', 'bms_level', 'bms_template_type', 'bms_declaration_channels', 'bms_affiliation_type', 'sys_declaration_type'],
+  'bms_responsibility_unit', 'bms_level', 'bms_template_type', 'bms_declaration_channels', 'bms_affiliation_type', 'sys_declaration_type', 'jjh_project_type'],
   data() {
     return {
       size: '',
@@ -1200,9 +1220,11 @@ export default {
       baseInfo: {},
       openInterfaceInfo: {},
       templateDataList: [],
+      enterpriseDirectory: null,
       form: {},
       active: 4,
       templateId: null,
+      declarationId: null,
       templateRecordId: null,
       uploadLabel: null,
       // 表格宽度
@@ -1334,7 +1356,8 @@ export default {
     };
   },
   async mounted(){
-    let { templateId, templateRecordId, pageType} = this.$route.query;
+    let { templateId, templateRecordId, pageType, declarationId} = this.$route.query;
+    this.declarationId = declarationId
     this.templateId = templateId
     this.templateRecordId = templateRecordId
     let { data } = await getTemplateInfo({templateId: templateId})
@@ -1360,16 +1383,20 @@ export default {
     getBasicInfo({enterpriseId: this.$store.state.user.enterpriseId}).then((response) => {
       this.baseInfo = response.data
     })
-    getOpenInterface({templateRecordId: templateRecordId}).then((response) => {
-      this.openInterfaceInfo = response.data
-    })
-    templateList({
-      responsibilityUnit: this.templateInfo.responsibilityUnit,
-      enterpriseId: this.$store.state.user.enterpriseId,
-      pageNum: 1,
-      pageSize: 10,
-    }).then((response) => {
-      this.templateDataList = response.rows
+    // getOpenInterface({templateRecordId: templateRecordId}).then((response) => {
+    //   this.openInterfaceInfo = response.data
+    // })
+    // templateList({
+    //   responsibilityUnit: this.templateInfo.responsibilityUnit,
+    //   enterpriseId: this.$store.state.user.enterpriseId,
+    //   pageNum: 1,
+    //   pageSize: 10,
+    // }).then((response) => {
+    //   this.templateDataList = response.rows
+    // })
+
+    templateGetId(templateRecordId).then(res=>{
+      this.enterpriseDirectory = res.data.enterpriseDirectory
     })
 
   },
@@ -1381,14 +1408,15 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           let params = {
+            declarationId: this.declarationId,
             address: this.baseInfo.address,
             contacts: this.baseInfo.contacts,
             contactsNumber: this.baseInfo.contactsNumber,
             creditCode: this.baseInfo.creditCode,
             enterpriseName: this.baseInfo.enterpriseName,
-            declarationTemplateType: this.openInterfaceInfo.declarationTemplateType,
-            projectName: this.openInterfaceInfo.projectName,
-            year: this.openInterfaceInfo.year,
+            // declarationTemplateType: this.openInterfaceInfo.declarationTemplateType,
+            // projectName: this.openInterfaceInfo.projectName,
+            // year: this.openInterfaceInfo.year,
             projectId: this.templateId,
             templateRecordId: this.templateRecordId,
             status: 1,
@@ -2113,7 +2141,8 @@ list-style: none; /* 清除列表项前的标记 */
   justify-content: flex-start;
   font-size: 14px;
   .templateInfo_left {
-    width: 80px;
+    // width: 100px;
+    margin-right: 10px;
   }
 }
 .f_validate {
diff --git a/src/views/onlineDeclaration/declareDetailContent/index.vue b/src/views/onlineDeclaration/declareDetailContent/index.vue
index e07b785..0ae2110 100644
--- a/src/views/onlineDeclaration/declareDetailContent/index.vue
+++ b/src/views/onlineDeclaration/declareDetailContent/index.vue
@@ -4,22 +4,43 @@
       <div class="left_content">
         <el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="left" class="form">
           <el-row>
-            <el-col :span="12" style="height: 50px">
+            <el-col :span="8" style="height: 50px">
               <div class="templateInfo">
-                <div class="templateInfo_left">申报类别</div>
-                <div>{{ templateInfo.templateName }}</div>
+                <div class="templateInfo_left">申报任务标题：</div>
+                <div>{{ templateInfo.enterpriseDirectory }}</div>
               </div>
             </el-col>
-            <el-col :span="12" style="height: 50px">
+            <el-col :span="8" style="height: 50px">
               <div class="templateInfo">
-                <div class="templateInfo_left">责任单位</div>
-                   <dict-tag :options="dict.type.bms_responsibility_unit" :value="templateInfo.responsibilityUnit"/>
+                <div class="templateInfo_left">申报单位：</div>
+                <div>{{ baseInfo.enterpriseName }}</div>
               </div>
             </el-col>
-            <el-col :span="12" style="height: 50px">
+            <el-col :span="8" style="height: 50px">
               <div class="templateInfo">
-                <div class="templateInfo_left">申报时间</div>
-                <div>{{ parseTime(new Date(), '{y}-{m}-{d}') }}</div>
+                <div class="templateInfo_left">年份：</div>
+                <!-- <div>{{ parseTime(new Date(), '{y}-{m}-{d}') }}</div> -->
+                <div>{{ parseTime(templateInfo.createTime, '{y}') }}</div>
+              </div>
+            </el-col>
+            <el-col :span="8" style="height: 50px">
+              <div class="templateInfo">
+                <div class="templateInfo_left">项目分类：</div>
+                <dict-tag :options="dict.type.jjh_project_type" :value="templateInfo.projectClassify"/>
+              </div>
+            </el-col>
+            <el-col :span="8" style="height: 50px">
+              <div class="templateInfo">
+                <div class="templateInfo_left">责任单位：</div>
+                <dict-tag :options="dict.type.bms_responsibility_unit" :value="templateInfo.responsibilityUnit"/>
+                <!-- <div>{{ templateInfo.responsibilityUnit == 0 ? '经发委' : templateInfo.responsibilityUnit == 1 ? '规建委' : templateInfo.responsibilityUnit == 2 ? '行审局' : templateInfo.responsibilityUnit == 3 ? '市监局' : '' }}</div> -->
+              </div>
+            </el-col>
+            <el-col :span="8" style="height: 50px">
+              <div class="templateInfo">
+                <div class="templateInfo_left">级别：</div>
+                <!-- <div>{{ parseTime(new Date(), '{y}-{m}-{d}') }}</div> -->
+                <div>{{ templateInfo.level == 0 ? '本级' : templateInfo.level == 1 ? '省级' : '' }}</div>
               </div>
             </el-col>
           </el-row>
@@ -62,7 +83,7 @@
                 <template slot="label">
                   项目名称
                 </template>
-                {{ openInterfaceInfo.projectName }}
+                {{ templateInfo.templateName }}
               </el-descriptions-item>
               <el-descriptions-item>
                 <template slot="label">
@@ -156,7 +177,7 @@
               <template slot="label">
                 项目名称
               </template>
-              {{ openInterfaceInfo.projectName }}
+              {{ templateInfo.templateName }}
             </el-descriptions-item>
             <el-descriptions-item>
               <template slot="label">
@@ -315,7 +336,7 @@
                 <template slot="label">
                   项目名称
                 </template>
-                {{ openInterfaceInfo.projectName }}
+                {{ templateInfo.templateName }}
               </el-descriptions-item>
               <el-descriptions-item>
                 <template slot="label">
@@ -386,7 +407,7 @@
                 <template slot="label">
                   项目名称
                 </template>
-                {{ openInterfaceInfo.projectName }}
+                {{ templateInfo.templateName }}
               </el-descriptions-item>
               <el-descriptions-item>
                 <template slot="label">
@@ -416,7 +437,7 @@
                 <template slot="label">
                   项目名称
                 </template>
-                {{ openInterfaceInfo.projectName }}
+                {{ templateInfo.templateName }}
               </el-descriptions-item>
               <el-descriptions-item>
                 <template slot="label">
@@ -463,7 +484,7 @@
                 <template slot="label">
                   项目名称
                 </template>
-                {{ openInterfaceInfo.projectName }}
+                {{ templateInfo.templateName }}
               </el-descriptions-item>
               <el-descriptions-item>
                 <template slot="label">
@@ -492,7 +513,7 @@
                 <template slot="label">
                   项目名称
                 </template>
-                {{ openInterfaceInfo.projectName }}
+                {{ templateInfo.templateName }}
               </el-descriptions-item>
               <el-descriptions-item>
                 <template slot="label">
@@ -516,7 +537,7 @@
                 <template slot="label">
                   项目名称
                 </template>
-                {{ openInterfaceInfo.projectName }}
+                {{ templateInfo.templateName }}
               </el-descriptions-item>
             </el-descriptions>
           </div>
@@ -527,7 +548,7 @@
                 <template slot="label">
                   项目名称
                 </template>
-                {{ openInterfaceInfo.projectName }}
+                {{ templateInfo.templateName }}
               </el-descriptions-item>
               <el-descriptions-item>
                 <template slot="label">
@@ -1642,7 +1663,7 @@
             <el-step title="复审中"></el-step>
             <!-- <el-step title="专家评审中"></el-step> -->
             <!-- <el-step title="市级评定中"></el-step> -->
-            <!-- <el-step title="上级评定中"></el-step> -->
+            <el-step title="上级评定中"></el-step>
             <el-step title="评定通过"></el-step>
           </el-steps>
         </div>
@@ -1743,7 +1764,7 @@ import JsPDF from 'jspdf';
 export default {
   name: "declareDetailContent",
   dicts: ['sys_show_hide', 'sys_normal_disable', 'bms_product_area', 'bms_declaration_type',
-  'bms_responsibility_unit', 'bms_level', 'bms_template_type', 'bms_declaration_channels', 'bms_affiliation_type', 'sys_declaration_type'],
+  'bms_responsibility_unit', 'bms_level', 'bms_template_type', 'bms_declaration_channels', 'bms_affiliation_type', 'sys_declaration_type', 'jjh_project_type'],
   data() {
     return {
       VUE_APP_BASE_API:process.env.VUE_APP_BASE_API,
@@ -1918,9 +1939,9 @@ export default {
     getBasicInfo({enterpriseId:this.enterpriseId}).then((response) => {
       this.baseInfo = response.data
     })
-    getOpenInterface({templateRecordId: templateRecordId}).then((response) => {
-      this.openInterfaceInfo = response.data
-    })
+    // getOpenInterface({templateRecordId: templateRecordId}).then((response) => {
+    //   this.openInterfaceInfo = response.data
+    // })
     this.getDetailInfo(detailId)
   },
   filters: {
@@ -1936,6 +1957,8 @@ export default {
     getDetailInfo(id) {
       getDeclarationRecords({id}).then((response) => {
         let approvalInfoList = response.data.approvalInfoList
+        this.templateInfo.enterpriseDirectory = response.data.enterpriseDirectory
+        // this.templateInfo.enterpriseName = response.data.bmsEnterpriseBasicInfo.enterpriseName
         approvalInfoList.forEach(item => {
           if(item.approvalAttachment) {
             item.children = item.approvalAttachment.split(',')
@@ -2240,9 +2263,9 @@ export default {
             contactsNumber: this.baseInfo.contactsNumber,
             creditCode: this.baseInfo.creditCode,
             enterpriseName: this.baseInfo.enterpriseName,
-            declarationTemplateType: this.openInterfaceInfo.declarationTemplateType,
-            projectName: this.openInterfaceInfo.projectName,
-            year: this.openInterfaceInfo.year,
+            // declarationTemplateType: this.openInterfaceInfo.declarationTemplateType,
+            // projectName: this.openInterfaceInfo.projectName,
+            // year: this.openInterfaceInfo.year,
             projectId: this.templateId,
             templateRecordId: this.templateRecordId,
             declarationRecordsId: this.detailId,
@@ -2946,7 +2969,7 @@ export default {
     /* 打印 */
     printOutpdf() {
       let name = ''
-      name = `${this.openInterfaceInfo.projectName}_${this.baseInfo.enterpriseName}`
+      name = `${this.templateInfo.templateName}_${this.baseInfo.enterpriseName}`
       html2canvas(this.$refs.pdf).then(function(canvas) {
         let contentWidth = canvas.width;
         let contentHeight = canvas.height;
@@ -3067,7 +3090,8 @@ list-style: none; /* 清除列表项前的标记 */
   justify-content: flex-start;
   font-size: 14px;
   .templateInfo_left {
-    width: 80px;
+    // width: 80px;
+    margin-right: 10px;
   }
 }
 .f_validate {
diff --git a/src/views/onlineDeclaration/pendingReview/index.vue b/src/views/onlineDeclaration/pendingReview/index.vue
index bd305f0..0ab993e 100644
--- a/src/views/onlineDeclaration/pendingReview/index.vue
+++ b/src/views/onlineDeclaration/pendingReview/index.vue
@@ -1,26 +1,26 @@
 <template>
   <div class="app-container" id="app-container">
     <el-form id="I-form" :model="queryParams" ref="queryForm" size="small" :inline="true">
-      <el-form-item label="项目名称" prop="projectName">
+      <el-form-item label="申报任务标题" prop="enterpriseDirectory">
         <el-input
-          v-model="queryParams.projectName"
-          placeholder="请输入项目名称"
+          v-model="queryParams.enterpriseDirectory"
+          placeholder="请输入申报任务标题"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="申报单位" prop="enterpriseName">
+      <!-- <el-form-item label="项目名称" prop="projectName">
         <el-input
-          v-model="queryParams.enterpriseName"
-          placeholder="请输入申报单位"
+          v-model="queryParams.projectName"
+          placeholder="请输入项目名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="事项" prop="matter">
+      </el-form-item> -->
+      <el-form-item label="申报单位" prop="enterpriseName">
         <el-input
-          v-model="queryParams.matter"
-          placeholder="请输入事项"
+          v-model="queryParams.enterpriseName"
+          placeholder="请输入申报单位"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -73,15 +73,30 @@
           <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="matter" label="事项" :show-overflow-tooltip="true" min-width="160"></el-table-column>
-      <el-table-column prop="projectName" label="项目名称"  :show-overflow-tooltip="true" min-width="180"></el-table-column>
-      <el-table-column prop="productArea" label="项目类型" :show-overflow-tooltip="true" min-width="160">
+      <el-table-column prop="enterpriseDirectory" label="申报任务标题" :show-overflow-tooltip="true" min-width="160"></el-table-column>
+      <!-- <el-table-column prop="projectName" label="项目名称"  :show-overflow-tooltip="true" min-width="180"></el-table-column>
+      <el-table-column prop="productArea" label="项目类型" :show-overflow-tooltip="true" min-width="120">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.bms_product_area" :value="scope.row.productArea"/>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column prop="enterpriseName" label="申报单位" min-width="180" :show-overflow-tooltip="true"></el-table-column>
-      <el-table-column label="扶持方式" min-width="120">
+      <el-table-column prop="startTime" label="级别" min-width="80">
+        <template slot-scope="scope">
+          <span>{{ scope.row.level == 0 ? '本级' : scope.row.level == 1 ? '省级' : '' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="createTime" label="年份" min-width="80">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="责任单位" min-width="120">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.bms_responsibility_unit" :value="scope.row.responsibilityUnit"/>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="扶持方式" min-width="120">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.bms_support_methods" :value="scope.row.supportMethods"/>
         </template>
@@ -95,22 +110,23 @@
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
-      <el-table-column prop="status" label="审核状态" min-width="140">
+      </el-table-column> -->
+      <el-table-column prop="status" label="审核状态" min-width="120">
         <template slot-scope="scope">
           <span v-if="scope.row.status == 5" class="approval_status5">评审通过</span>
           <span v-if="scope.row.status == 4" class="approval_status3">市级评定中</span>
           <span v-if="scope.row.status == 3" class="approval_status3">上级评审中</span>
           <span v-if="scope.row.status == 2" class="approval_status1">复审中</span>
           <span v-if="scope.row.status == 1" class="approval_status1">初审中</span>
-          <span v-if="scope.row.status == 0" class="approval_status0">草稿</span>
+          <span v-if="scope.row.status == 0" class="approval_status0">待填报</span>
           <span v-if="scope.row.status == 8" class="approval_status8">初审-拒绝</span>
           <span v-if="scope.row.status == 7" class="approval_status9">复审-拒绝</span>
           <span v-if="scope.row.status == 6" class="approval_status9">上级评审-拒绝</span>
           <span v-if="scope.row.status == 9" class="approval_status9">评定不通过</span>
+          <span v-if="scope.row.status == 10" class="approval_status9">退回修改</span>
         </template>
       </el-table-column>
-      <el-table-column label="申请时间" align="center" prop="createTime" min-width="140">
+      <el-table-column label="申报时间" align="center" prop="createTime" min-width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
         </template>
@@ -145,10 +161,14 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="审批状态" prop="approvalStatus">
-              <el-radio-group v-model="form.approvalStatus">
-                <el-radio label="1">审批通过</el-radio>
-                <el-radio label="2">审批驳回</el-radio>
-              </el-radio-group>
+              <div>
+                <el-radio-group v-model="form.approvalStatus">
+                  <el-radio label="1">审批通过</el-radio>
+                  <el-radio label="2">审批驳回</el-radio>
+                  <el-radio label="3" v-if="deptId == '105'">退回修改</el-radio>
+                </el-radio-group>
+              </div>
+              <div style="font-size: 12px;color: #999;line-height: 20px;">注：审批不通过（该企业的申报将被终止结束），退回修改（该申报将退回到企业，由企业重新填报）</div>
             </el-form-item>
           </el-col>
           <el-col :span="24" v-if="deptId == '103'">
@@ -213,7 +233,7 @@ export default {
       // 查询参数
       queryParams: {
         projectName: undefined,
-        enterpriseName: undefined,
+        enterpriseDirectory: undefined,
         enterpriseName: undefined,
         approvalStatusStr: undefined,
         pageNum: 1,
@@ -351,7 +371,7 @@ export default {
               this.form.approvalAttachment+=`${item.url},`
             }
           })
-          console.log("sdas", this.form);
+          // console.log("sdas", this.form);
           approvalEdit(this.form).then(response => {
             this.$modal.msgSuccess("审核完成");
             this.open = false;
@@ -502,7 +522,7 @@ list-style: none; /* 清除列表项前的标记 */
   transform: translate(-50%, -50%);
 }
 .approval_status0 {
-  color: #cdcccc;
+  color: #5EFCE8;
   position: relative;
   padding-left: 15px;
 }
@@ -512,7 +532,7 @@ list-style: none; /* 清除列表项前的标记 */
   width: 7px;
   height: 7px;
   border-radius: 50%;
-  background-color: #cdcccc;
+  background-color: #5EFCE8;
   left: 5px;
   top: 50%;
   transform: translate(-50%, -50%);
diff --git a/src/views/onlineDeclaration/records/index.vue b/src/views/onlineDeclaration/records/index.vue
index 2ea1906..b407f82 100644
--- a/src/views/onlineDeclaration/records/index.vue
+++ b/src/views/onlineDeclaration/records/index.vue
@@ -1,15 +1,15 @@
 <template>
   <div class="app-container" id="app-container">
     <el-form id="I-form" :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-      <el-form-item label="模版名称" prop="templateName">
+      <el-form-item label="申报任务标题" prop="enterpriseDirectory">
         <el-input
-          v-model="queryParams.templateName"
+          v-model="queryParams.enterpriseDirectory"
           placeholder="请输入模版名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="申报类型" prop="type">
+      <!-- <el-form-item label="申报类型" prop="type">
         <el-select v-model="queryParams.type" placeholder="请选择申报类型" clearable>
           <el-option
             v-for="dict in dict.type.bms_declaration_type"
@@ -18,7 +18,7 @@
             :value="dict.value"
           />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="责任单位" prop="responsibilityUnit">
         <el-select v-model="queryParams.responsibilityUnit" placeholder="请选择责任单位" clearable>
           <el-option
@@ -57,7 +57,7 @@
         >补录</el-button>
       </el-col> -->
       <el-col :span="1.5">
-        <el-button
+        <!-- <el-button
           type="info"
           plain
           
@@ -66,7 +66,7 @@
           v-if="userType == '02'"
           :disabled="deptId != '104' || cityList.length == 0"
           class="btn"
-        >市级评定结果确认</el-button>
+        >市级评定结果确认</el-button> -->
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -149,6 +149,15 @@
     </el-row>
     <!-- :header-cell-style="{
       background:'#cfcccc',color:'#000000'}" -->
+    <el-row id="I-rowTwo" class="radio_btn" v-if="userType == '01'">
+      <el-col>
+        <el-radio-group v-model="radioEnter" @change="toggleOptionsEnter">
+          <el-radio-button label="">全部</el-radio-button>
+          <el-radio-button label="1,8">未填报</el-radio-button>
+          <el-radio-button label="2,7">已填报</el-radio-button>
+        </el-radio-group>
+      </el-col>
+    </el-row>
     <el-table
       v-if="refreshTable"
       v-loading="loading"
@@ -164,69 +173,81 @@
         </template>
       </el-table-column>
       <!-- <el-table-column prop="projectName" label="项目名称" :show-overflow-tooltip="true" min-width="160"></el-table-column> -->
-      <el-table-column prop="projectName" label="申报任务标题" :show-overflow-tooltip="true" min-width="160"></el-table-column>
-      <el-table-column prop="enterpriseName" label="申报单位" :show-overflow-tooltip="true" min-width="180"></el-table-column>
-      <el-table-column label="级别" width="60">
+      <el-table-column prop="enterpriseDirectory" label="申报任务标题" :show-overflow-tooltip="true" min-width="160"></el-table-column>
+      <el-table-column prop="enterpriseName" label="申报单位" :show-overflow-tooltip="true" min-width="120"></el-table-column>
+      <!--  width="60" -->
+      <el-table-column label="级别">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.bms_level" :value="scope.row.level"/>
         </template>
       </el-table-column>
-      <el-table-column prop="year" label="年份" :show-overflow-tooltip="true"  min-width="80"></el-table-column>
-      <el-table-column prop="component" label="申报类型" min-width="110">
+      <!--   min-width="80" -->
+      <el-table-column prop="year" label="年份" :show-overflow-tooltip="true"></el-table-column>
+      <!-- <el-table-column prop="component" label="申报类型" min-width="110">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.bms_declaration_type" :value="scope.row.type"/>
         </template>
-      </el-table-column>
-      <el-table-column label="责任单位" width="80">
+      </el-table-column> -->
+      <!--  width="80" -->
+      <el-table-column label="责任单位">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.bms_responsibility_unit" :value="scope.row.responsibilityUnit"/>
         </template>
       </el-table-column>
-      <el-table-column label="申报表单" :show-overflow-tooltip="true" min-width="130">
+      <!-- <el-table-column label="申报表单" :show-overflow-tooltip="true" min-width="130">
         <template slot-scope="scope">
           <div>
             {{ scope.row.projectName.slice(0, scope.row.projectName.length - 2) }}
           </div>
         </template>
-      </el-table-column>
-      <el-table-column label="申报途径" min-width="80">
+      </el-table-column> -->
+      <!-- <el-table-column label="申报途径" min-width="80">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.bms_declaration_channels" :value="scope.row.road"/>
         </template>
-      </el-table-column>
-      <el-table-column prop="status" label="审批状态" min-width="110">
+      </el-table-column> -->
+      <!--  min-width="80" -->
+      <el-table-column prop="status" label="审批状态">
         <template slot-scope="scope">
           <span v-if="scope.row.status == 5" class="approval_status5">评审通过</span>
           <span v-if="scope.row.status == 4" class="approval_status3">市级评定中</span>
           <span v-if="scope.row.status == 3" class="approval_status3">上级评审中</span>
           <span v-if="scope.row.status == 2" class="approval_status1">复审中</span>
           <span v-if="scope.row.status == 1" class="approval_status1">初审中</span>
-          <span v-if="scope.row.status == 0" class="approval_status0">草稿</span>
+          <span v-if="scope.row.status == 0" class="approval_status0">待填报</span>
           <span v-if="scope.row.status == 8" class="approval_status8">初审-拒绝</span>
           <span v-if="scope.row.status == 7" class="approval_status9">复审-拒绝</span>
           <!-- <span v-if="scope.row.status == 6" class="approval_status9">专家评审-拒绝</span> -->
           <span v-if="scope.row.status == 9" class="approval_status9">评定不通过</span>
+          <span v-if="scope.row.status == 10" class="approval_status9">退回修改</span>
         </template>
       </el-table-column>
-      <el-table-column label="申报时间" align="center" prop="createTime" min-width="120">
+      <!--  min-width="120" -->
+      <el-table-column label="申报时间" align="center" prop="createTime">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="updateTime" label="更新时间" min-width="120">
+      <!-- <el-table-column prop="updateTime" label="更新时间" min-width="120">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="操作" align="center" width="200" fixed="right">
-        <!-- 0: 草稿 8：初审拒绝  7：复审拒绝 6：专家评审拒绝  9：评定不通过 -->
+        <!-- 0: 待填报 8：初审拒绝  7：复审拒绝 6：专家评审拒绝  9：评定不通过 -->
         <!-- v-if="userType == '01' && (scope.row.status == 0 || scope.row.status == 8||scope.row.status == 7||scope.row.status == 6||scope.row.status == 9)" -->
         <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleAdd(scope.row)"
+            v-if="userType == '01' && scope.row.status == 0"
+          >开始填报</el-button>
           <el-button
             size="mini"
             type="text"
             @click="handleEdit(scope.row)"
-            v-if="userType == '01' && (scope.row.status == 0 || scope.row.status == 8)"
+            v-if="userType == '01' && scope.row.status == 10"
           >编辑</el-button>
           <el-button
             size="mini"
@@ -238,6 +259,7 @@
             size="mini"
             type="text"
             @click="handleDetail(scope.row)"
+            v-if="scope.row.status !== 0"
           >查看详情</el-button>
           <!-- <el-button
             size="mini"
@@ -366,9 +388,9 @@ export default {
       total: 5,
       // 查询参数
       queryParams: {
-        templateName: undefined,
+        enterpriseDirectory: undefined,
         responsibilityUnit: undefined,
-        type: undefined,
+        // type: undefined,
         pageNum: 1,
         pageSize: 10,
       },
@@ -396,7 +418,10 @@ export default {
         ]
       },
       tabHeader: undefined,
+      // 政务端筛选
       radio:'',
+      // 企业端筛选
+      radioEnter:''
     };
   },
   components:{
@@ -428,9 +453,9 @@ export default {
       if(this.userType == '02') {
         const headerThree = document.getElementById('I-rowTwo'); // 通过元素的 ID 获取元素
         const headerTHeight = headerThree.offsetHeight;
-        this.tabHeader = elementHeight - headerHeight - headerOHeight - headerTHeight - paginationtHeight - 100;
+        this.tabHeader = elementHeight - headerHeight - headerOHeight - headerTHeight - paginationtHeight - 120;
       } else {
-        this.tabHeader = elementHeight - headerHeight - headerOHeight - paginationtHeight - 100;
+        this.tabHeader = elementHeight - headerHeight - headerOHeight - paginationtHeight - 120;
       }
       
     },
@@ -447,13 +472,13 @@ export default {
         this.queryParams.enterpriseId = this.$store.state.user.enterpriseId
       }
       /** 获取市级需评定数量 */
-      listRecords({
-        pageNum: 1,
-        pageSize: 10,
-        ['statusStr[0]']:4,
-      }).then(response => {
-        this.cityList = response.rows;
-      });
+      // listRecords({
+      //   pageNum: 1,
+      //   pageSize: 10,
+      //   ['statusStr[0]']:4,
+      // }).then(response => {
+      //   this.cityList = response.rows;
+      // });
       listRecords(this.queryParams).then(response => {
         this.menuList = response.rows;
         this.total = response.total
@@ -531,11 +556,25 @@ export default {
       // this.queryParams['statusStr[1]'] = value2
       this.queryParams['statusStr[1]'] = arr[1]
       this.handleQuery();
+    },
+    // 政务端切换是否填报
+    toggleOptionsEnter(val){
+
     },
     /** 新增按钮操作 */
-    handleAdd(row) {
-      this.reset();
-      this.open = true;
+    // handleAdd(row) {
+    //   this.reset();
+    //   this.open = true;
+    // },
+    /** 开始填报按钮操作 */
+    handleAdd(row){
+      console.log(row);
+      this.$router.push({name: 'declareAddContent',query: {
+        templateId: row.templateId,
+        templateRecordId: row.templateRecordId,
+        declarationId: row.id,
+        pageType: "add",
+      }})
     },
     /** 查看审核详情操作 */
     handleDetail(row){
@@ -823,7 +862,7 @@ export default {
   transform: translate(-50%, -50%);
 }
 .approval_status0 {
-  color: #cdcccc;
+  color: #5EFCE8;
   position: relative;
   padding-left: 15px;
 }
@@ -833,7 +872,7 @@ export default {
   width: 7px;
   height: 7px;
   border-radius: 50%;
-  background-color: #cdcccc;
+  background-color: #5EFCE8;
   left: 5px;
   top: 50%;
   transform: translate(-50%, -50%);
diff --git a/src/views/onlineDeclaration/templateDetail/index.vue b/src/views/onlineDeclaration/templateDetail/index.vue
index 41741a0..e438873 100644
--- a/src/views/onlineDeclaration/templateDetail/index.vue
+++ b/src/views/onlineDeclaration/templateDetail/index.vue
@@ -7,8 +7,9 @@
             <el-col :span="8" style="height: 50px;display: flex;">
               项目分类：<dict-tag :options="dict.type.jjh_project_type" :value="info.projectClassify"/>
             </el-col>
-            <el-col :span="8" style="height: 50px">
-              责任单位：{{ info.responsibilityUnit == 0 ? '经发委' : info.responsibilityUnit == 1 ? '规建委' : info.responsibilityUnit == 2 ? '行审局' : info.responsibilityUnit == 3 ? '市监局' : '' }}
+            <el-col :span="8" style="height: 50px;display: flex;">
+              <!-- {{ info.responsibilityUnit == 0 ? '经发委' : info.responsibilityUnit == 1 ? '规建委' : info.responsibilityUnit == 2 ? '行审局' : info.responsibilityUnit == 3 ? '市监局' : '' }} -->
+              责任单位：<dict-tag :options="dict.type.bms_responsibility_unit" :value="templateInfo.responsibilityUnit"/>
             </el-col>
             <el-col :span="8" style="height: 50px">
               创建时间：{{ info.createTime }}
@@ -367,7 +368,7 @@ import JsPDF from 'jspdf';
 import { getInfo } from "@/api/onlineDeclartion/declarationManagement"
 export default {
   name: "declareAddContent",
-  dicts: ['jjh_project_type'],
+  dicts: ['jjh_project_type', 'bms_responsibility_unit'],
   data() {
     return {
       size: '',
diff --git a/src/views/policyDocument/index.vue b/src/views/policyDocument/index.vue
index 673013b..beaad5f 100644
--- a/src/views/policyDocument/index.vue
+++ b/src/views/policyDocument/index.vue
@@ -12,20 +12,20 @@
             </el-form-item>
             <el-form-item label="政策等级：" prop="policyLevel">
               <el-select class="ignoreElement" v-model="formInline.policyLevel" placeholder="请选择">
-                <!-- <el-option
-                  v-for="dict in dict.type.jjh_project_type"
+                <el-option
+                  v-for="dict in dict.type.bms_level"
                   :key="dict.value"
                   :label="dict.label"
                   :value="dict.value">
-                </el-option> -->
-                <el-option
+                </el-option>
+                <!-- <el-option
                   label="省级"
                   value="0">
                 </el-option>
                 <el-option
                   label="市级"
                   value="1">
-                </el-option>
+                </el-option> -->
               </el-select>
             </el-form-item>
             <!-- <el-form-item label="发文时间：" prop="projectYear">
@@ -60,7 +60,11 @@
             </template>
           </el-table-column>
           <el-table-column label="发文单位" prop="enterUnit" />
-          <el-table-column label="政策等级" prop="policyLevel" />
+          <el-table-column label="政策等级" prop="policyLevel">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.bms_level" :value="scope.row.policyLevel"/>
+            </template>
+          </el-table-column>
           <el-table-column label="发文时间" prop="enterTime" />
           <el-table-column label="上传用户" prop="createBy" />
           <el-table-column label="上传时间" prop="createTime" width="180px" />
@@ -88,19 +92,19 @@
           <el-col :span="12">
             <el-form-item label="政策文件名称：" class="importFormItem" prop="name">
               <el-input v-model.trim="addFrom.name" placeholder="请输入内容"></el-input>
-              <!-- <el-select class="ignoreElement" v-model="addFrom.projectClassify" placeholder="请选择">
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="政策等级：" class="importFormItem" prop="policyLevel">
+              <!-- <el-input v-model.trim="addFrom.policyLevel" placeholder="请输入内容"></el-input> -->
+              <el-select class="ignoreElement" v-model="addFrom.policyLevel" placeholder="请选择">
                 <el-option
-                  v-for="dict in dict.type.jjh_project_type"
+                  v-for="dict in dict.type.bms_level"
                   :key="dict.value"
                   :label="dict.label"
                   :value="dict.value">
                 </el-option>
-              </el-select> -->
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="政策等级：" class="importFormItem" prop="policyLevel">
-              <el-input v-model.trim="addFrom.policyLevel" placeholder="请输入内容"></el-input>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -178,7 +182,7 @@ import myDialog from "@/views/components/myDialog/index.vue"
 import { getJPolicyFile, jPolicyFileNew, jPolicyFileChange, jPolicyFileId, jPolicyFileDel } from "@/api/jin_ji_hu/policyDocument"
 export default {
   components:{myPagination, myDialog},
-  dicts: ['jjh_project_type'],
+  dicts: ['jjh_project_type', 'bms_level'],
   data() {
     return {
       userType: this.$store.state.user.userType,
diff --git a/src/views/project/index.vue b/src/views/project/index.vue
index a6c0adc..570798a 100644
--- a/src/views/project/index.vue
+++ b/src/views/project/index.vue
@@ -4,6 +4,16 @@
       <header id="L-header">
         <el-form :inline="true" :model="formInline" size="small" class="demo-form-inline" ref="queryFrom">
           <el-col :span="22">
+            <el-form-item label="年份：">
+              <el-date-picker
+                class="ignoreElement"
+                v-model="formInline.projectYear"
+                format="yyyy"
+                value-format="yyyy"
+                type="year"
+                placeholder="选择年份">
+              </el-date-picker>
+            </el-form-item>
             <el-form-item label="项目分类：">
               <el-select class="ignoreElement" v-model="formInline.projectClassify" placeholder="请选择">
                 <el-option
@@ -20,16 +30,7 @@
             <el-form-item label="申报单位：">
               <el-input v-model.trim="formInline.declareUnit" placeholder="请输入内容"></el-input>
             </el-form-item>
-            <el-form-item label="年份：">
-              <el-date-picker
-                class="ignoreElement"
-                v-model="formInline.projectYear"
-                format="yyyy"
-                value-format="yyyy"
-                type="year"
-                placeholder="选择年份">
-              </el-date-picker>
-            </el-form-item>
+            
             <el-form-item label="状态：">
               <el-select class="ignoreElement" v-model="formInline.status" placeholder="请选择">
                 <el-option
@@ -52,19 +53,19 @@
       </header>
       <section>
         <el-table v-loading="loading" :data="tableData" :row-class-name="tableRowClassName" :height="tabHeader" :max-height="tabHeader">
+          <el-table-column label="年份" key="projectYear" width="200px" prop="projectYear" />
+          <el-table-column label="项目名称" key="projectName" width="450px" prop="projectName" />
+          <el-table-column label="申报单位" key="declareUnit" width="550px" prop="declareUnit" />
           <el-table-column label="项目分类" key="projectClassify" width="250px" prop="projectClassify">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.jjh_project_type" :value="scope.row.projectClassify"/>
             </template>
           </el-table-column>
-          <el-table-column label="项目名称" key="projectName" width="450px" prop="projectName" />
-          <el-table-column label="申报单位" key="declareUnit" width="550px" prop="declareUnit" />
-          <el-table-column label="年份" key="projectYear" width="200px" prop="projectYear" />
           <el-table-column label="状态" key="status" width="200px" prop="status" class-name="table-status">
             <template slot-scope="scope">
               <p class="statusisZero" v-if="scope.row.status === 0">
                 <span></span>
-                <span>草稿</span>
+                <span>待填报</span>
               </p>
               <p class="statusisThree" v-if="scope.row.status === 1">
                 <span></span>
@@ -76,11 +77,7 @@
               </p>
               <p class="statusisTwo" v-if="scope.row.status === 3">
                 <span></span>
-                <span>专家评审中</span>
-              </p>
-              <p class="statusisTwo" v-if="scope.row.status === 4">
-                <span></span>
-                <span>市级评定中</span>
+                <span>上级评审中</span>
               </p>
               <p class="statusisOne" v-if="scope.row.status === 5">
                 <span></span>
@@ -88,7 +85,7 @@
               </p>
               <p class="statusisNine" v-if="scope.row.status === 6">
                 <span></span>
-                <span>专家评审-拒绝</span>
+                <span>上级评审-拒绝</span>
               </p>
               <p class="statusisNine" v-if="scope.row.status === 7">
                 <span></span>
@@ -98,9 +95,13 @@
                 <span></span>
                 <span>初审-拒绝</span>
               </p>
-              <p class="statusisNine" v-if="scope.row.status === 9">
+              <!-- <p class="statusisNine" v-if="scope.row.status === 9">
                 <span></span>
                 <span>评定不通过</span>
+              </p> -->
+              <p class="statusisNine" v-if="scope.row.status === 10">
+                <span></span>
+                <span>退回修改</span>
               </p>
             </template>
           </el-table-column>
diff --git a/src/views/project/projectInfo/components/tabFour/index.vue b/src/views/project/projectInfo/components/tabFour/index.vue
index 8d6d9d4..355eb7b 100644
--- a/src/views/project/projectInfo/components/tabFour/index.vue
+++ b/src/views/project/projectInfo/components/tabFour/index.vue
@@ -7,6 +7,7 @@
             <div class="project-info-top">
               <div class="project-info">【备忘录】</div>
               <el-button type="primary" icon="icon iconfont icon-jc-xinjian" size="mini" @click="newMemo">新建备忘录</el-button>
+              <el-button type="primary" icon="icon iconfont icon-jc-daoru" size="mini" @click="newMemo">一键导出</el-button>
             </div>
           </el-col>
           <el-col :span="15">
diff --git a/src/views/project/projectInfo/index.vue b/src/views/project/projectInfo/index.vue
index 9e87daf..2d980f3 100644
--- a/src/views/project/projectInfo/index.vue
+++ b/src/views/project/projectInfo/index.vue
@@ -5,10 +5,10 @@
         <div class="left-info" id="L-header">
           <div class="project-info-title">【{{ info.projectName }}】</div>
           <el-descriptions class="margin-top" :column="2" size="medium" border v-loading="loading">
+            <el-descriptions-item label="项目名称"><dict-tag :options="dict.type.jjh_status" :value="info.status"/></el-descriptions-item>
             <el-descriptions-item label="项目分类" contentClassName="info-link"><a class="a-primary" @click="goback(info.projectClassify)"><dict-tag :options="dict.type.jjh_project_type" :value="info.projectClassify"/></a></el-descriptions-item>
             <el-descriptions-item label="申报单位" contentClassName="info-link">{{ info.declareUnit }}<a v-show="info.declareUnit">查看详情</a></el-descriptions-item>
             <el-descriptions-item label="年份">{{ info.projectYear }}</el-descriptions-item>
-            <el-descriptions-item label="状态"><dict-tag :options="dict.type.jjh_status" :value="info.status"/></el-descriptions-item>
           </el-descriptions>
         </div>
         <div class="left-tabs">