diff --git a/.env.development b/.env.development
index 9a1ec0f..0fa1cc8 100644
--- a/.env.development
+++ b/.env.development
@@ -5,8 +5,8 @@ VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统
 ENV = 'development'
 
 # 金鸡湖现代服务业品牌管理系统/开发环境
-# VUE_APP_BASE_API = 'http://192.168.0.111:9040'
-VUE_APP_BASE_API = 'http://39.101.188.84:9040'
+VUE_APP_BASE_API = 'http://192.168.0.104:9040'
+# VUE_APP_BASE_API = 'http://39.101.188.84:9040'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/src/api/onlineDeclartion/enterpriseDirectory.js b/src/api/onlineDeclartion/enterpriseDirectory.js
index 8b05a5b..20f1938 100644
--- a/src/api/onlineDeclartion/enterpriseDirectory.js
+++ b/src/api/onlineDeclartion/enterpriseDirectory.js
@@ -60,7 +60,6 @@ export function getTemplateRecord(query) {
   return request({
     url: `/system/templateRecord/${query.templateRecordId}`,
     method: 'get',
-    arams: query
   })
 }
 
@@ -76,3 +75,21 @@ export function uploadFile(data) {
   })
 }
 
+// 新增项目时根据责任单位和项目分类获取表单模板
+export function allList(params){
+  return request({
+    url: `/system/templateInfo/allList`,
+    method: 'get',
+    params
+  })
+}
+
+// 补录提交
+export function supplementation(data) {
+  return request({
+    url: '/system/templateRecord/supplementation',
+    method: 'post',
+    data: data
+  })
+}
+
diff --git a/src/assets/styles/public.scss b/src/assets/styles/public.scss
index 25c6bd0..b544c22 100644
--- a/src/assets/styles/public.scss
+++ b/src/assets/styles/public.scss
@@ -12,6 +12,18 @@
   //   cursor: pointer;
   // }
 }
+// 申报权限企业名录tab列表样式
+.table-lists {
+  .tab-green {
+    color: #24D3A9;
+  }
+  .tab-red {
+    color: #C51717;
+  }
+  .tab-blue {
+    color: #134EE6;
+  }
+}
 .L-public-main {
   padding: 6px 6px 6px 6px;
   width: 100%;
@@ -809,18 +821,27 @@
         display: flex;
         margin-bottom: 5px;
         .title-item {
+          cursor: pointer;
           padding: 10px 60px 10px 40px;
           border-top-right-radius: 30% 100%;
           margin-right: 15px;
           background: #FFFFFF;
           box-shadow: 2px 0 3px 0px #ccc;
         }
+        .checked-item {
+          background: #409EFF;
+          color: #fff;
+        }
       }
       .workbench-btn {
         height: 45px;
-        .el-input {
+        .el-autocomplete {
           width: 800px;
           height: 100%;
+        }
+        .el-input {
+          width: 100%;
+          height: 100%;
           input {
             height: 100%;
           }
diff --git a/src/layout/components/FixedHeader/components/MenuMain/index.vue b/src/layout/components/FixedHeader/components/MenuMain/index.vue
index 064e12d..424ac1d 100644
--- a/src/layout/components/FixedHeader/components/MenuMain/index.vue
+++ b/src/layout/components/FixedHeader/components/MenuMain/index.vue
@@ -83,11 +83,11 @@ export default {
         //说明创建路由选择的是外部链接
         window.open(key, "_blank");
       } else {
-        if(key == "/Project") {
-          const route = this.routers.find(item => item.path === key);
-          this.$router.push({ path: route.path + '/' + route.children[0].path });
-          return;
-        }
+        // if(key == "/Project") {
+        //   const route = this.routers.find(item => item.path === key);
+        //   this.$router.push({ path: route.path + '/' + route.children[0].path });
+        //   return;
+        // }
         this.$router.push({ path: key });
 
         // if (routeMenu && routeMenu.query) {
diff --git a/src/router/index.js b/src/router/index.js
index 47ea403..6491d50 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -124,6 +124,12 @@ export const constantRoutes = [
         name: 'supplementaryNew',
         meta: { title: '模版详情', icon: 'user' }
       },
+      {
+        path: 'projectInfo',
+        component: () => import('@/views/project/projectInfo/index'),
+        name: 'projectInfo',
+        meta: { title: '项目详情', icon: 'user' }
+      },
     ]
   }
 ];
diff --git a/src/views/onlineDeclaration/enterpriseDirectory/index.vue b/src/views/onlineDeclaration/enterpriseDirectory/index.vue
index 3e380ac..7052ad3 100644
--- a/src/views/onlineDeclaration/enterpriseDirectory/index.vue
+++ b/src/views/onlineDeclaration/enterpriseDirectory/index.vue
@@ -1,10 +1,10 @@
 <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="enterpriseDirectory">
+      <el-form-item label="申报任务标题" prop="enterpriseDirectory">
         <el-input
           v-model="queryParams.enterpriseDirectory"
-          placeholder="请输入业名录分类"
+          placeholder="请输入申报任务标题"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -49,25 +49,33 @@
       v-loading="loading"
       :data="contentList"
       :height="tabHeader"
+      class="table-lists"
     >
       <el-table-column label="序号" align="center" width="50" fixed>
         <template slot-scope="scope">
           <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="enterpriseDirectory" label="企业名录分类" :show-overflow-tooltip="true" min-width="190"></el-table-column>
+      <el-table-column prop="enterpriseDirectory" label="申报任务标题" :show-overflow-tooltip="true" min-width="190"></el-table-column>
+      <!-- <el-table-column prop="enterpriseDirectory" label="企业名录分类" :show-overflow-tooltip="true" min-width="190"></el-table-column> -->
       <el-table-column prop="templateName" label="模版名称" min-width="180" :show-overflow-tooltip="true"></el-table-column>
-      <el-table-column label="级别" min-width="60">
+      <el-table-column label="状态" min-width="50" >
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.bms_level" :value="scope.row.level"/>
+          <span :class="scope.row.status == 2 ? 'tab-green' : scope.row.status == 1 ? 'tab-red' : scope.row.status == 0 ? 'tab-blue' : ''">{{ scope.row.status == 2 ? '有效' : scope.row.status == 1 ? '过期' : scope.row.status == 0 ? '未开始' : '' }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="perms" label="申报途径"  min-width="100" :show-overflow-tooltip="true">
+      <!-- <el-table-column label="级别" min-width="60">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.bms_level" :value="scope.row.level"/>
+        </template>
+      </el-table-column> -->
+      <!-- <el-table-column prop="perms" label="申报途径"  min-width="100" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.bms_declaration_channels" :value="scope.row.road"/>
         </template>
-      </el-table-column>
-      <el-table-column align="center" label="开放时间" :show-overflow-tooltip="true" min-width="180" >
+      </el-table-column> -->
+      <!-- <el-table-column align="center" label="开放时间" :show-overflow-tooltip="true" min-width="180" > -->
+      <el-table-column align="center" label="任务填报时间" :show-overflow-tooltip="true" min-width="180" >
         <template slot-scope="scope">
           <span>{{ scope.row.startTime }}~{{ scope.row.endTime }}</span>
         </template>
@@ -77,20 +85,27 @@
           <dict-tag :options="dict.type.bms_responsibility_unit" :value="scope.row.responsibilityUnit"/>
         </template>
       </el-table-column>
-      <el-table-column prop="notes" label="说明" min-width="210" :show-overflow-tooltip="true"></el-table-column>
+      <el-table-column prop="notes" label="说明" min-width="80" :show-overflow-tooltip="true"></el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime"  min-width="160">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column prop="createByName" label="创建人" min-width="80"></el-table-column>
-      <el-table-column label="操作" align="center" width="150" fixed="right">
+      <el-table-column label="操作" align="center" width="180" fixed="right">
         <template slot-scope="scope">
-          <!-- <el-button
+          <el-button
+            size="mini"
+            type="text"
+            style="color: red;"
+            v-if="scope.row.status == 1"
+            @click="handleReplace(scope.row)"
+          >补录</el-button>
+          <el-button
             size="mini"
             type="text"
             @click="handleUpdate(scope.row)"
-          >编辑</el-button> -->
+          >编辑</el-button>
           <el-button
             size="mini"
             type="text"
@@ -118,7 +133,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="责任单位" prop="responsibilityUnit">
-              <el-select v-model="form.responsibilityUnit" placeholder="请选择责任单位" style="width: 100%;" @change="changeResponsibilityUnit">
+              <el-select v-model="form.responsibilityUnit" placeholder="请选择责任单位" style="width: 100%;" @change="changeResponsibilityUnit" :disabled="isReplace">
                 <el-option
                   v-for="dict in dict.type.bms_responsibility_unit"
                   :key="dict.value"
@@ -128,9 +143,33 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <el-form-item label="项目分类" prop="projectClassify">
+              <el-select v-model="form.projectClassify" placeholder="请选择项目分类" style="width: 100%;" @change="changeProjectClassify" :disabled="isReplace">
+                <el-option
+                  v-for="dict in dict.type.jjh_project_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="24">
+            <el-form-item label="项目分类" prop="responsibilityUnit">
+              <el-select v-model="form.responsibilityUnit" placeholder="请选择项目分类" style="width: 100%;" @change="changeResponsibilityUnit">
+                <el-option
+                  v-for="dict in dict.type.bms_responsibility_unit"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col> -->
           <el-col :span="24">
             <el-form-item label="申报表单模版" prop="templateId">
-              <el-select v-model="form.templateId" placeholder="请选择申报表单模版" style="width: 100%;" @change="changeTemplate">
+              <el-select v-model="form.templateId" placeholder="请选择申报表单模版" style="width: 100%;" @change="changeTemplate" :disabled="isReplace">
                 <el-option
                   v-for="dict in templateList"
                   :key="dict.id"
@@ -140,13 +179,19 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="24">
+          <!-- <el-col :span="24">
             <el-form-item label="企业名录分类" prop="enterpriseDirectory">
-              <el-input v-model="form.enterpriseDirectory" placeholder="请选择申报表单模版后带出" disabled />
+              <el-input v-model="form.enterpriseDirectory" placeholder="请选择申报表单模版后带出"  />
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="24">
+            <el-form-item label="申报任务标题" prop="enterpriseDirectory">
+              <el-input v-model="form.enterpriseDirectory" placeholder="请输入申报任务标题"  :disabled="isReplace" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="申报时间" prop="reportTime">
+            <!-- <el-form-item label="申报时间" prop="reportTime"> -->
+            <el-form-item label="任务填报时间" prop="reportTime">
               <el-date-picker
                 v-model="form.reportTime"
                 type="daterange"
@@ -160,7 +205,7 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="24">
+          <!-- <el-col :span="24">
             <el-form-item label="申报途径" prop="road">
               <el-select v-model="form.road" placeholder="请选择申报途径" style="width: 100%;">
                 <el-option
@@ -171,10 +216,10 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="24">
             <el-form-item label="说明" prop="notes">
-              <el-input v-model="form.notes" type="textarea" placeholder="请输入说明"></el-input>
+              <el-input v-model="form.notes" type="textarea" placeholder="请输入说明" :disabled="isReplace"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -183,8 +228,8 @@
                 <el-radio label="0">Excel批量导入</el-radio>
               </el-radio-group> -->
               <el-radio-group v-model="form.isFrame">
-                <el-radio label="0">所有企业</el-radio>
-                <el-radio label="1">部分企业</el-radio>
+                <el-radio :label="0">所有企业</el-radio>
+                <el-radio :label="1">部分企业</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -255,12 +300,13 @@
 </template>
 
 <script>
-import { listTemplate, listBusiness, exportData, addTemplateRecord, putTemplateRecord, listTemplateInfo, getTemplateRecord, uploadFile } from "@/api/onlineDeclartion/enterpriseDirectory"
+import { listTemplate, listBusiness, exportData, addTemplateRecord, putTemplateRecord, listTemplateInfo, getTemplateRecord, uploadFile, allList, supplementation } from "@/api/onlineDeclartion/enterpriseDirectory"
 import * as XLSX from 'xlsx'
 
 export default {
   name: "EnterpriseDirectory",
-  dicts: ['sys_show_hide', 'sys_normal_disable', 'bms_responsibility_unit', 'bms_declaration_channels', 'bms_template_type', 'bms_level'],
+  // 'sys_show_hide', 'sys_normal_disable', 'bms_template_type', 
+  dicts: ['bms_responsibility_unit', 'bms_declaration_channels', 'bms_level', 'jjh_project_type'],
   data() {
     return {
       // 遮罩层
@@ -274,6 +320,8 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      // 是否是补录按钮点击
+      isReplace: false,
       // 重新渲染表格状态
       refreshTable: true,
       total: 10,
@@ -294,12 +342,18 @@ export default {
         responsibilityUnit: [
           { required: true, message: "请选择责任单位", trigger: "blur" }
         ],
+        projectClassify: [
+        { required: true, message: "请选择项目分类", trigger: "blur" }
+        ],
         templateId: [
           { required: true, message: "请选择模版", trigger: "blur" }
         ],
         notes: [
           { required: true, message: "请输入说明", trigger: "blur" }
         ],
+        enterpriseDirectory: [
+          { required: true, message: "请输入说明", trigger: "blur" }
+        ],
         road: [
           { required: true, message: "请选择申报途径", trigger: "blur" }
         ],
@@ -324,6 +378,8 @@ export default {
       fileList: [],
       excelData: [],
       tabHeader: undefined,
+      unitId: undefined,
+      projectId: undefined,
     };
   },
   mounted() {
@@ -354,8 +410,8 @@ export default {
     getList() {
       this.loading = true;
       listTemplate(this.queryParams).then(response => {
-        this.contentList = response.rows;
-        this.total = response.total
+        this.contentList = response.data.records;
+        this.total = response.data.total
         this.loading = false;
       });
     },
@@ -374,6 +430,7 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
+      this.isReplace = false;
       this.reset();
     },
     // 表单重置
@@ -385,7 +442,7 @@ export default {
         road: undefined,
         notes: undefined,
         orderNum: undefined,
-        isFrame: "0",
+        isFrame: 0,
       };
       this.resetForm("form");
     },
@@ -402,8 +459,41 @@ export default {
     handleAdd(row) {
       this.reset();
       this.open = true;
-      this.fileList = []
-      this.title = "在线申报企业名录";
+      this.isReplace = false;
+      this.fileList = [];
+      this.form.isFrame = 0;
+      this.title = "发布申报任务";
+    },
+    /** 补录按钮操作 */
+    handleReplace(row){
+      this.reset();
+      getTemplateRecord({templateRecordId: row.templateRecordId}).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.isReplace = true;
+        this.title = "申报补录";
+        this.form.responsibilityUnit = this.form.responsibilityUnit + ''
+        this.form.projectClassify = this.form.projectClassify + ''
+        this.form.road = this.form.road + ''
+        
+        if(this.form.fileName) {
+          let fileList = this.form.fileName.split(',')
+          let isFrame
+          fileList.length > 0 ? isFrame = 1 : isFrame = 0
+          this.$set(this.form, 'isFrame', isFrame)
+        } else {
+          this.$set(this.form, 'isFrame', 0)
+        }
+        this.form.fileList = this.form.fileName || []
+        this.fileList = this.form.fileName || []
+        let arr = []
+        arr.push(this.form.startTime, this.form.endTime)
+        this.$set(this.form, 'reportTime', arr)
+        this.templateList = this.templateListLock.filter((item) => {
+          return item.responsibilityUnit == this.form.responsibilityUnit
+        })
+        // this.form.reportTime = [this.form.startTime, this.form.endTime]
+      });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -411,19 +501,26 @@ export default {
       getTemplateRecord({templateRecordId: row.templateRecordId}).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "在线申报企业名录";
+        this.isReplace = false;
+        this.title = "修改申报任务";
         this.form.responsibilityUnit = this.form.responsibilityUnit + ''
+        this.form.projectClassify = this.form.projectClassify + ''
         this.form.road = this.form.road + ''
-        this.form.isFrame = "0"
         if(this.form.fileName) {
           let fileList = this.form.fileName.split(',')
-          fileList.length > 0 ? this.form.isFrame = "1" : this.form.isFrame = "0"
+          let isFrame
+          fileList.length > 0 ? isFrame = 1 : isFrame = 0
+          this.$set(this.form, 'isFrame', isFrame)
+        } else {
+          this.$set(this.form, 'isFrame', 0)
         }
         this.form.fileList = this.form.fileName || []
         this.fileList = this.form.fileName || []
         let arr = []
         arr.push(this.form.startTime, this.form.endTime)
         this.$set(this.form, 'reportTime', arr)
+        
+        // console.log(this.form,"form");
         this.templateList = this.templateListLock.filter((item) => {
           return item.responsibilityUnit == this.form.responsibilityUnit
         })
@@ -434,16 +531,25 @@ export default {
     submitForm: function() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.id != undefined) {
+          if(this.title == "申报补录") {
+            supplementation(this.form).then(res=>{
+              this.$modal.msgSuccess("补录成功");
+              this.open = false;
+              this.isReplace = false;
+              this.getList();
+            })
+          } else if (this.form.id != undefined) {
             putTemplateRecord(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
+              this.isReplace = false;
               this.getList();
             });
           } else {
             addTemplateRecord(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
+              this.isReplace = false;
               this.getList();
             });
           }
@@ -495,21 +601,43 @@ export default {
         window.URL.revokeObjectURL(url)
       })
     },
+    // 责任单位选择
     changeResponsibilityUnit(valid) {
-      this.templateList = this.templateListLock.filter((item) => {
-        return item.responsibilityUnit == valid
-      })
+      this.unitId = valid;
+      
+      if(this.projectId) {
+        // this.templateList = this.templateListLock.filter((item) => {
+        //   return item.responsibilityUnit == valid
+        // })
+        allList({responsibilityUnit:Number(valid),projectClassify:Number(this.projectId)}).then(res=>{
+          console.log(res);
+          this.templateList = res.data || []
+        })
+      }
       this.form.templateId = null
       this.form.enterpriseDirectory = null
     },
+    // 项目分类选择
+    changeProjectClassify(valId){
+      this.projectId = valId
+      if(this.unitId) {
+        // this.templateList = this.templateListLock.filter((item) => {
+        //   return item.responsibilityUnit == valId
+        // })
+        allList({responsibilityUnit:Number(this.unitId),projectClassify:Number(valId)}).then(res=>{
+          console.log(res);
+          this.templateList = res.data || []
+        })
+      }
+    },
     changeTemplate(){
-      this.templateList.forEach((item) => {
-        if(item.id == this.form.templateId){
-          this.form.enterpriseDirectory = item.templateName + '企业名录'
-        }
-      })
+      // this.templateList.forEach((item) => {
+      //   if(item.id == this.form.templateId){
+      //     this.form.enterpriseDirectory = item.templateName + '企业名录'
+      //   }
+      // })
 
-      this.$forceUpdate()
+      // this.$forceUpdate()
     },
     changeDateRange(val) {
       // console.log('val: ', val);
diff --git a/src/views/onlineDeclaration/records/index.vue b/src/views/onlineDeclaration/records/index.vue
index 8ba21fe..2ea1906 100644
--- a/src/views/onlineDeclaration/records/index.vue
+++ b/src/views/onlineDeclaration/records/index.vue
@@ -36,7 +36,7 @@
     </el-form>
 
     <el-row :gutter="10" id="I-rowOne" class="mb8">
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           plain
@@ -45,8 +45,8 @@
           v-if="userType == '01'"
           class="btn"
         >在线申报</el-button>
-      </el-col>
-      <el-col :span="1.5">
+      </el-col> -->
+      <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           plain
@@ -55,7 +55,7 @@
           v-if="userType == '01'"
           class="btn"
         >补录</el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
           type="info"
@@ -163,7 +163,8 @@
           <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
         </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="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">
         <template slot-scope="scope">
diff --git a/src/views/onlineDeclaration/template/index.vue b/src/views/onlineDeclaration/template/index.vue
index 82357bd..4c9bce1 100644
--- a/src/views/onlineDeclaration/template/index.vue
+++ b/src/views/onlineDeclaration/template/index.vue
@@ -9,7 +9,17 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="产业领域" prop="productArea">
+      <el-form-item label="项目分类" prop="projectClassify">
+        <el-select v-model="queryParams.projectClassify" placeholder="请选择产业领域" clearable>
+          <el-option
+            v-for="dict in dict.type.jjh_project_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <!-- <el-form-item label="产业领域" prop="productArea">
         <el-select v-model="queryParams.productArea" placeholder="请选择产业领域" clearable>
           <el-option
             v-for="dict in dict.type.bms_product_area"
@@ -28,7 +38,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
@@ -50,19 +60,30 @@
       v-loading="loading"
       :data="InfoList"
       :height="tabHeader"
+      class="table-lists"
     >
       <el-table-column label="序号" align="center" width="50" fixed>
         <template slot-scope="scope">
           <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="templateName" label="模版名称" min-width="240" :show-overflow-tooltip="true"></el-table-column>
+      <el-table-column label="年份" align="center" prop="createTime" min-width="80">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="templateName" label="模版名称" min-width="150" :show-overflow-tooltip="true"></el-table-column>
+      <el-table-column label="项目分类" :show-overflow-tooltip="true" min-width="150">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.jjh_project_type" :value="scope.row.projectClassify"/>
+        </template>
+      </el-table-column>
       <el-table-column label="级别" min-width="100">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.bms_level" :value="scope.row.level"/>
         </template>
       </el-table-column>
-      <el-table-column label="产业领域" :show-overflow-tooltip="true" min-width="150">
+      <!-- <el-table-column label="产业领域" :show-overflow-tooltip="true" min-width="150">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.bms_product_area" :value="scope.row.productArea"/>
         </template>
@@ -71,13 +92,20 @@
         <template slot-scope="scope">
           <dict-tag :options="dict.type.bms_declaration_type" :value="scope.row.type"/>
         </template>
-      </el-table-column>
-      <el-table-column prop="notes" :show-overflow-tooltip="true" label="说明" min-width="200"></el-table-column>
+      </el-table-column> -->
+      <!-- <el-table-column prop="notes" :show-overflow-tooltip="true" label="说明" min-width="200"></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 prop="useStart" align="center" :show-overflow-tooltip="true" label="模板使用有效期开始时间" min-width="150"></el-table-column>
+      <el-table-column prop="useEnd" align="center" :show-overflow-tooltip="true" label="模板使用有效期结束时间" min-width="150"></el-table-column>
+      <el-table-column label="状态" align="center" prop="createTime" min-width="80">
+        <template slot-scope="scope">
+          <span :class="scope.row.status == 1 ? 'tab-green' : scope.row.status == 0 ? 'tab-red' : ''">{{ scope.row.status == 0 ? '过期' : scope.row.status == 1 ? '有效' : '' }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" min-width="120">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
@@ -114,7 +142,7 @@ import { listInfo, exportData } from "@/api/onlineDeclartion/declarationManageme
 
 export default {
   name: "Template",
-  dicts: ['bms_product_area', 'bms_declaration_type', 'bms_responsibility_unit', 'bms_level'],
+  dicts: ['bms_product_area', 'bms_declaration_type', 'bms_responsibility_unit', 'bms_level', 'jjh_project_type'],
   data() {
     return {
       // 遮罩层
@@ -127,8 +155,8 @@ export default {
       // 查询参数
       queryParams: {
         templateName: undefined,
-        productArea: undefined,
-        type: undefined,
+        projectClassify: undefined,
+        // type: undefined,
         responsibilityUnit: undefined,
         pageNum: 1,
         pageSize: 20,
diff --git a/src/views/onlineDeclaration/templateDetail/index.vue b/src/views/onlineDeclaration/templateDetail/index.vue
index cd913a8..41741a0 100644
--- a/src/views/onlineDeclaration/templateDetail/index.vue
+++ b/src/views/onlineDeclaration/templateDetail/index.vue
@@ -4,14 +4,26 @@
       <div class="left_content">
         <el-form ref="form" :model="form"  label-width="120px" label-position="left" class="form">
           <el-row>
-            <el-col :span="12" style="height: 50px">
-              申报类别：{{ info.type == 0 ? '/' : info.type == 1 ? '试点区域' : info.type == 2 ? '龙头型' : info.type == 3 ? '创新型' : '' }}
+            <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="12" style="height: 50px">
+            <el-col :span="8" style="height: 50px">
               责任单位：{{ info.responsibilityUnit == 0 ? '经发委' : info.responsibilityUnit == 1 ? '规建委' : info.responsibilityUnit == 2 ? '行审局' : info.responsibilityUnit == 3 ? '市监局' : '' }}
             </el-col>
-            <el-col :span="12" style="height: 50px">
-              申报时间：
+            <el-col :span="8" style="height: 50px">
+              创建时间：{{ info.createTime }}
+            </el-col>
+            <el-col :span="8" style="height: 50px">
+              模板使用有效期开始日期：{{ info.useStart }}
+            </el-col>
+            <el-col :span="8" style="height: 50px">
+              模板使用有效期结束日期：{{ info.useEnd }}
+            </el-col>
+            <el-col :span="8" style="height: 50px">
+              年份：{{ parseTime(info.createTime, '{y}') }}
+            </el-col>
+            <el-col :span="8" style="height: 50px">
+              级别：{{ info.level == 0 ? '本级' : info.level == 1 ? '省级' : '' }}
             </el-col>
           </el-row>
           <el-descriptions class="margin-top" title="【申报企业信息】" :column="3" :size="size" border :label-style="LS">
@@ -355,6 +367,7 @@ import JsPDF from 'jspdf';
 import { getInfo } from "@/api/onlineDeclartion/declarationManagement"
 export default {
   name: "declareAddContent",
+  dicts: ['jjh_project_type'],
   data() {
     return {
       size: '',
@@ -373,9 +386,9 @@ export default {
   async mounted(){
     let { templateId, pageType} = this.$route.query;
     this.templateId = templateId
-    console.log('this.templateId: ', this.templateId);
+    // console.log('this.templateId: ', this.templateId);
     getInfo(this.templateId).then(res=>{
-      console.log(res);
+      // console.log(res);
       this.info = res.data
     })
     switch (this.templateId){
diff --git a/src/views/project/index.vue b/src/views/project/index.vue
index 0c4b1c0..a6c0adc 100644
--- a/src/views/project/index.vue
+++ b/src/views/project/index.vue
@@ -385,7 +385,7 @@ export default {
     // 查看详情
     goInfo(rwo){
       this.$router.push({
-        path: '/project/projectInfo',
+        name: 'projectInfo',
         query: { userId: rwo.id }
       })
     },
diff --git a/src/views/workbench/index.vue b/src/views/workbench/index.vue
index 9ad861f..0f44cd2 100644
--- a/src/views/workbench/index.vue
+++ b/src/views/workbench/index.vue
@@ -3,20 +3,27 @@
     <header>
       <div class="workbench-serch">
         <div class="workbench-title">
-          <div class="title-item">
-            查企业
+          <div class="title-item" :class="checked == index ? 'checked-item' : ''" v-for="(item,index) in tabs" :key="index" @click="checked = index">
+            {{ item.value }}
           </div>
-          <div class="title-item">
+          <!-- <div class="title-item">
             查项目
           </div>
           <div class="title-item">
             查荣誉
-          </div>
+          </div> -->
         </div>
         <div class="workbench-btn">
-          <el-input placeholder="请输入企业名称、项目名称、荣誉，查询" v-model="search" class="input-with-select">
+          <el-autocomplete 
+            placeholder="请输入企业名称、项目名称、荣誉，查询" 
+            v-model="search" 
+            :fetch-suggestions="querySearch" 
+            :trigger-on-focus="false" 
+            @select="handleSelect"
+            class="input-with-select"
+          >
             <template slot="append" class="work-btn">搜索</template>
-          </el-input>
+          </el-autocomplete>
         </div>
       </div>
     </header>
@@ -125,6 +132,16 @@ export default {
       },
       fileList: [],
       uploadList: [],
+      tabs: [
+        {
+          value:"查企业"
+        },{
+          value:"查项目"
+        },{
+          value:"查荣誉"
+        },
+      ],
+      checked: 0
     }
   },
   mounted(){
@@ -165,6 +182,20 @@ export default {
       this.resetForm("form");
       this.uploadList = []
     },
+    querySearch(queryString, cb) {
+      // queryString 拿到搜索到的数据
+      /**
+       * 通过queryString 调用接口参数搜索到的数据【数据处理成所需的列表⌈ 对象带value ⌋】使用callback返回列表数据
+       */
+      // var restaurants = this.restaurants;
+      // var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
+      // 调用 callback 返回建议列表的数据
+      cb(results);
+    },
+    // 点击搜索到的数据
+    handleSelect(item) {
+      console.log(item);
+    },
     handleFileUpload(params) {
       const file = params.file
       let form = new FormData()