From 5c258e16ec4709dd3b8f037c62a4834367eb2331 Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Mon, 15 Jul 2024 09:00:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=BA=93=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=B8=B8=E7=94=A8=E8=81=94=E7=B3=BB=E4=BA=BA=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5=E3=80=81=E6=94=BF=E7=AD=96?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=BA=93=E7=9A=84=E6=94=BF=E7=AD=96=E7=AD=89?=
 =?UTF-8?q?=E7=BA=A7=E6=9B=B4=E6=8D=A2=E5=AD=97=E5=85=B8=E3=80=81=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E6=90=9C=E8=8D=A3=E8=AA=89=E6=90=9C=E8=AF=84=E5=AE=A1?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E7=9A=84=E6=95=B0=E6=8D=AE=E3=80=81=E4=BC=81?=
 =?UTF-8?q?=E4=B8=9A=E8=A7=84=E6=A8=A1=E6=9B=BF=E6=8D=A2=E8=A7=84=E4=B8=8A?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E4=B8=9A=E3=80=81=E5=85=B6=E4=BB=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   2 +-
 src/assets/styles/public.scss                 |  16 +-
 .../enterInfo/components/tabOne/index.vue     |   2 +-
 .../enterInfo/components/tabTwo/index.vue     | 270 +++++++++++++++++-
 .../enterpriselibrary/enterInfo/index.vue     |   2 +-
 src/views/enterpriselibrary/index.vue         |   6 +-
 src/views/infoMaintain/index.vue              |   3 +-
 src/views/policyDocument/index.vue            |  20 +-
 .../projectInfo/components/tabOne/index.vue   |  27 +-
 .../projectInfo/components/tabTwo/index.vue   |   2 +-
 src/views/workbench/index.vue                 |  16 +-
 11 files changed, 319 insertions(+), 47 deletions(-)

diff --git a/package.json b/package.json
index e9abd57..b481b6a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ruoyi",
-  "version": "1.0.202407120913",
+  "version": "1.0.202407121624",
   "description": "金鸡湖现代服务业品牌管理系统",
   "author": "若依",
   "license": "MIT",
diff --git a/src/assets/styles/public.scss b/src/assets/styles/public.scss
index 9a08397..571f7b2 100644
--- a/src/assets/styles/public.scss
+++ b/src/assets/styles/public.scss
@@ -279,6 +279,18 @@
           color: #1890FF;
         }
       }
+      .enter-contacts-list {
+        .el-row {
+          height: 80px;
+        }
+        .el-form-item {
+          margin-top: 20px;
+          margin-bottom: 28px;
+          .el-form-item__content {
+            width: 300px;
+          }
+        }
+      }
       .tabOneLabel,.tabOneContent {
         width: 220px;
       }
@@ -982,9 +994,7 @@
       display: flex;
       align-items: center;
       div {
-        &:first-child {
-          width: 200px;
-        }
+        margin-right: 60px;
       }
     }
     .info-content-content {
diff --git a/src/views/enterpriselibrary/enterInfo/components/tabOne/index.vue b/src/views/enterpriselibrary/enterInfo/components/tabOne/index.vue
index 65007d0..fdbf4d1 100644
--- a/src/views/enterpriselibrary/enterInfo/components/tabOne/index.vue
+++ b/src/views/enterpriselibrary/enterInfo/components/tabOne/index.vue
@@ -84,7 +84,7 @@
       </el-descriptions-item>
       <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="企业规模">
         <!-- {{ info.qygm }} -->
-        {{ info.type == 1 ? "规上" : info.type == 2 ? "规下" : ""}}
+        {{ info.type == 1 ? "规上服务业" : info.type == 2 ? "其他" : ""}}
       </el-descriptions-item>
       <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="法定代表人姓名">
         {{ info.fddbrxm }}
diff --git a/src/views/enterpriselibrary/enterInfo/components/tabTwo/index.vue b/src/views/enterpriselibrary/enterInfo/components/tabTwo/index.vue
index 6a56b83..3d4229d 100644
--- a/src/views/enterpriselibrary/enterInfo/components/tabTwo/index.vue
+++ b/src/views/enterpriselibrary/enterInfo/components/tabTwo/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="L-unitInfo" id="L-contacts-main">
+  <div class="L-unitInfo enter-contacts-list" id="L-contacts-main">
     <div id="L-header-list" class="project-info-title">【联络人列表】</div>
     <section>
       <el-table v-loading="loading" class="tabTwo-table" border :data="tableData" :row-class-name="tableRowClassName" >  <!-- :max-height="tabHeader" -->
@@ -13,36 +13,161 @@
         <el-table-column label="来源机构" prop="dwLyjg" />
       </el-table>
     </section>
-    <div id="L-header-list" class="project-info-title" style="margin-top: 20px;">【常用联系人列表】</div>
+    <el-row>
+      <el-form :inline="true" :model="formInline" size="small" ref="queryFrom">
+        <el-col :span="9" style="display: flex; align-items: center;">
+          <div id="L-header-list" class="project-info-title" style="margin-top: 20px;margin-right: 10px;">【常用联系人列表】</div>
+          <el-button type="primary" icon="el-icon-plus" size="mini" @click="importBtn" style="margin-bottom: 5px;">新增常用联系人</el-button>
+        </el-col>
+        <el-col :span="15" v-if="roles.includes('gov') || roles.includes('other-gov') ">
+          <el-form-item label="联络人姓名">
+            <el-input v-model.trim="formInline.contactName" placeholder="请输入联络人姓名"></el-input>
+          </el-form-item>
+          <el-form-item label="联络人职务">
+            <el-input v-model.trim="formInline.contactOffice" placeholder="请输入联络人职务"></el-input>
+          </el-form-item>
+          <el-form-item class="query-item">
+              <el-button size="mini" @click="resetQuery('queryFrom')">重置</el-button>
+              <el-button size="mini" type="primary" @click="handleQuery('queryFrom')">查询</el-button>
+            </el-form-item>
+        </el-col>
+      </el-form>
+    </el-row>
+    
     <section>
       <el-table v-loading="loadingTwo" class="tabTwo-table" border :data="tableTwoData" :row-class-name="tableRowClassName" >  <!-- :max-height="tabHeader" -->
         <el-table-column label="联络人姓名" prop="contactName" />
         <el-table-column label="联络人职务" prop="contactOffice" />
         <el-table-column label="手机号码" prop="contactPhone" />
         <el-table-column label="邮箱" prop="contactEmail" />
+        <el-table-column label="操作" prop="userId" class-name="table-operation" width="180px">
+          <template slot-scope="scope">
+            <span class="look-info" @click="goInfo(scope.row)">查看详情</span>
+            <span class="edit-info" @click="editInfo(scope.row)">编辑</span>
+            <span class="del-info" @click="delInfo(scope.row)">删除</span>
+          </template>
+        </el-table-column>
       </el-table>
     </section>
+
+    <my-dialog :title="title" @close="importClose" @confirm="confirm" ref="importProject" closeText="关闭" :myclass="true">
+      <el-form :model="addFrom" size="small" ref="importFrom" label-width="180px" :rules="rules" class="newArticle" :disabled="title == '查看常用联系人' ? true : false">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="企业统一社会信用代码：" class="importFormItem">
+              <el-input v-model.trim="addFrom.enterpriseCode" placeholder="请输入内容" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="企业名称：" class="importFormItem">
+              <el-input v-model.trim="addFrom.enterpriseName" placeholder="请输入内容" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="常用联系人名称：" class="importFormItem" prop="contactName">
+              <el-input v-model.trim="addFrom.contactName" placeholder="请输入常用联系人名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="常用联系人公司职务：" class="importFormItem" prop="contactOffice">
+              <el-input v-model.trim="addFrom.contactOffice" placeholder="请输入常用联系人公司职务"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="常用联系人手机号码：" class="importFormItem" prop="contactPhone">
+              <el-input v-model.trim="addFrom.contactPhone" placeholder="请输入常用联系人手机号码"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="常用联系人邮箱：" class="importFormItem" prop="contactEmail">
+              <el-input v-model.trim="addFrom.contactEmail" placeholder="请输入常用联系人邮箱"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </my-dialog>
   </div>
 </template>
 <script>
 import { getjContacts } from "@/api/jin_ji_hu/enterList"
-import { getJEnterpriseContact } from "@/api/jin_ji_hu/infoMaintain"
+import myDialog from "@/views/components/myDialog/index.vue"
+import { getJEnterpriseContact, jEnterpriseContactNew, jEnterpriseContactChange, jEnterpriseContactId, jEnterpriseContactDel } from "@/api/jin_ji_hu/infoMaintain"
 export default {
+  components:{ myDialog},
   name:"tabTwo",
   data() {
+    //验证邮箱的规则
+    var checkEmail = (rule,value,cb) => {
+      //验证邮箱的正则表达式
+      const regEmail = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(\.[a-zA-Z0-9_-])+/;
+      if(regEmail.test(value)){
+        //合法的邮箱
+        return cb();
+      }
+      //邮箱不合法
+      cb(new Error('请输入合法的邮箱！'));
+    }
+    //验证手机号的规则
+    var checkMobile = (rule,value,cb) =>{
+      const regMobile = /^(0|86|17951)?(13[0-9]|15[0123456789]|17[678]|18[0-9]|14[57])[0-9]{8}$/;
+      if(regMobile.test(value)){
+        //合法的手机号
+        return cb();
+      }
+      //手机号不合法
+      cb(new Error('请输入合法的手机号！'));
+    }
     return {
       tableData:[],
       tableTwoData:[],
       loading:false,
       loadingTwo:false,
       tabHeader: null,
+      roles: this.$store.state.user.roles,
+      userType: this.$store.state.user.userType,
+      formInline:{
+        contactName:"",
+        contactOffice:""
+      },
+      addFrom: {
+        contactName:"",
+        contactOffice:"",
+        contactPhone:"",
+        contactEmail:"",
+        enterpriseCode:"",
+        enterpriseName:"",
+      },
+      rules:{
+        contactName:[
+          { required: true, message: '请填写常用联系人姓名', trigger: 'blur' }
+        ],
+        contactOffice:[
+          { required: true, message: '请填写常用联系人公司职务', trigger: 'blur' }
+        ],
+        contactPhone:[
+          { required: true, message: '请填写常用联系人手机号码', trigger: 'blur' },
+          {validator: checkMobile, trigger: 'blur'}
+        ],
+        contactEmail:[
+          { required: true, message: '请填写常用联系人邮箱', trigger: 'blur' },
+          {validator: checkEmail, trigger: 'blur'}
+        ],
+      },
+      title:"新增常用联系人",
+      infoVisible:false,
     }
   },
   props:{
     creditCode:{
       type:String,
       default:""
-    }
+    },
+    detailedInfo:{
+      type:Object,
+      default:()=>{
+        return {};
+      }
+    },
   },
   mounted() {
     this.cancalDebounce();
@@ -54,13 +179,6 @@ export default {
     window.removeEventListener('resize', this.cancalDebounce);
   },
   methods:{
-    // 修改table背景色
-    tableRowClassName({row, rowIndex}){
-      if (rowIndex % 2 !== 0) {
-        return 'evenNumber-row';
-      }
-      return '';
-    },
     // 查询联络人列表
     getList(){
       this.loading = true;
@@ -69,13 +187,141 @@ export default {
         this.loading = false;
       })
     },
+    // 查询常用联系人
     getTwoList(){
       this.loadingTwo = true;
-      getJEnterpriseContact({enterpriseCode: this.creditCode || this.$store.state.user.name, current: 1, size: 10}).then(res=>{
+      getJEnterpriseContact({enterpriseCode: this.creditCode || this.$store.state.user.name, ...this.formInline}).then(res=>{
         this.tableTwoData = res.data.records;
         this.loadingTwo = false;
       })
     },
+    // 重置
+    resetQuery(){
+      this.formInline = {
+        contactName:"",
+        contactOffice:"",
+      }
+      this.getTwoList();
+    },
+    // 搜索
+    handleQuery(){
+      this.getTwoList();
+    },
+    // 新增联系人
+    importBtn(){
+      this.title = "新增常用联系人";
+      // if(this.userType == "01"){
+
+      // } else {
+      //   this.addFrom.enterpriseCode = this.creditCode;
+      //   this.addFrom.enterpriseName = this.info.qymc;
+      // }
+      this.addFrom.enterpriseCode = this.detailedInfo.tyshxydm;
+      this.addFrom.enterpriseName = this.detailedInfo.qymc;
+      console.log(this.detailedInfo);
+      this.$refs.importProject.open();
+    },
+    // 查看详情
+    goInfo(row){
+      this.title = "查看常用联系人"
+      jEnterpriseContactId(row.id).then((res=>{
+        if(res.code == 200) {
+          this.addFrom = res.data;
+          this.$refs.importProject.open();
+        }
+      }))
+    },
+    // 编辑
+    editInfo(row){
+      this.title = "修改常用联系人"
+      // this.addFrom.enterpriseCode = this.name;
+      // this.addFrom.enterpriseName = this.nickName;
+      jEnterpriseContactId(row.id).then((res)=>{
+        if(res.code == 200) {
+          this.addFrom = res.data;
+          this.$refs.importProject.open();
+        }
+      })
+    },
+    // 关闭事件触发
+    importClose(){
+      this.$nextTick(()=>{
+        this.$refs.importFrom.resetFields();
+        this.$refs.importProject.close();
+        this.addFrom = {
+          contactName:"",
+          contactOffice:"",
+          contactPhone:"",
+          contactEmail:"",
+          enterpriseCode:"",
+          enterpriseName:"",
+        }
+      })
+    },
+    // 提交按钮
+    confirm(){
+      this.$refs.importFrom.validate((valid) => {
+        if (valid) {
+          // console.log(this.addFrom);
+          let id = this.addFrom.id ? this.addFrom.id : null;
+          if(id) {
+            jEnterpriseContactChange(this.addFrom).then((res)=>{
+              if(res.code == 200) {
+                this.getTwoList();
+                this.importClose();
+                this.$message({
+                  type: "success",
+                  message: "修改成功!",
+                });
+              }
+            })
+          } else {
+            jEnterpriseContactNew(this.addFrom).then((res)=>{
+              if(res.code == 200) {
+                this.getTwoList();
+                this.importClose();
+                this.$message({
+                  type: "success",
+                  message: "新增成功!",
+                });
+              }
+            })
+          }
+        } else {
+          return false;
+        }
+      });
+    },
+    // 删除
+    delInfo(row){
+      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          jEnterpriseContactDel(row.id).then((res) => {
+            this.getTwoList();
+            this.$message({
+              type: "success",
+              message: "删除成功!",
+            });
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除",
+          });
+        });
+    },
+    // 修改table背景色
+    tableRowClassName({row, rowIndex}){
+      if (rowIndex % 2 !== 0) {
+        return 'evenNumber-row';
+      }
+      return '';
+    },
     // 屏幕尺寸变化
     cancalDebounce(){
       const element = document.getElementById('L-contacts-main'); // 通过元素的 ID 获取元素
diff --git a/src/views/enterpriselibrary/enterInfo/index.vue b/src/views/enterpriselibrary/enterInfo/index.vue
index f402a29..22ec490 100644
--- a/src/views/enterpriselibrary/enterInfo/index.vue
+++ b/src/views/enterpriselibrary/enterInfo/index.vue
@@ -17,7 +17,7 @@
           </div>
           <div class="tabs-bottom" :style="tabStyle">
             <tab-one v-if="active == 0" :detailedInfo="info"></tab-one>
-            <tab-two v-if="active == 1" :creditCode="$route.query.creditCode"></tab-two>
+            <tab-two v-if="active == 1" :creditCode="$route.query.creditCode" :detailedInfo="info"></tab-two>
             <tab-three v-if="active == 2" :creditCode="$route.query.creditCode"></tab-three>
             <tab-four v-if="active == 3" :id="$route.query.userId"></tab-four>
           </div>
diff --git a/src/views/enterpriselibrary/index.vue b/src/views/enterpriselibrary/index.vue
index ab5689d..86b25b6 100644
--- a/src/views/enterpriselibrary/index.vue
+++ b/src/views/enterpriselibrary/index.vue
@@ -14,11 +14,11 @@
                   value="">
                 </el-option>
                 <el-option
-                  label="规上"
+                  label="规上服务业"
                   value="1">
                 </el-option>
                 <el-option
-                  label="规下"
+                  label="其他"
                   value="2">
                 </el-option>
               </el-select>
@@ -65,7 +65,7 @@
           <el-table-column label="行业名称" prop="hymc" />
           <el-table-column label="企业规模" prop="cylx">
             <template slot-scope="scope">
-              <span>{{ scope.row.type == 1 ? "规上" : scope.row.type == 2 ? "规下" : ""}}</span>
+              <span>{{ scope.row.type == 1 ? "规上服务业" : scope.row.type == 2 ? "其他" : ""}}</span>
             </template>
           </el-table-column>
           <el-table-column label="成立日期" prop="clrq" width="200">
diff --git a/src/views/infoMaintain/index.vue b/src/views/infoMaintain/index.vue
index 14bf9fc..510e0c0 100644
--- a/src/views/infoMaintain/index.vue
+++ b/src/views/infoMaintain/index.vue
@@ -29,7 +29,8 @@
           </el-col>
           <el-col :span="2">
             <!-- <el-button type="primary" class="import-btn" icon="icon iconfont icon-jc-shangchuan" size="mini" @click="importBtn">新增发文</el-button> -->
-            <el-button v-if="roles.includes('ent') && tableData.length == 0" type="primary" class="import-btn" icon="el-icon-plus" size="mini" @click="importBtn">新增常用联系人</el-button>
+            <!--  v-if="roles.includes('ent') && tableData.length == 0" -->
+            <el-button type="primary" v-if="roles.includes('ent')" class="import-btn" icon="el-icon-plus" size="mini" @click="importBtn">新增常用联系人</el-button>
           </el-col>
         </el-form>
       </header>
diff --git a/src/views/policyDocument/index.vue b/src/views/policyDocument/index.vue
index dd73470..5ef13ed 100644
--- a/src/views/policyDocument/index.vue
+++ b/src/views/policyDocument/index.vue
@@ -13,7 +13,7 @@
             <el-form-item label="政策等级：" prop="policyLevel">
               <el-select class="ignoreElement" v-model="formInline.policyLevel" placeholder="请选择">
                 <el-option
-                  v-for="dict in dict.type.bms_level"
+                  v-for="dict in dict.type.policy_grade"
                   :key="dict.value"
                   :label="dict.label"
                   :value="dict.value">
@@ -62,7 +62,7 @@
           <el-table-column label="发文单位" prop="enterUnit" />
           <el-table-column label="政策等级" prop="policyLevel">
             <template slot-scope="scope">
-              <dict-tag :options="dict.type.bms_level" :value="scope.row.policyLevel"/>
+              <dict-tag :options="dict.type.policy_grade" :value="scope.row.policyLevel"/>
             </template>
           </el-table-column>
           <el-table-column label="发文时间" prop="enterTime" />
@@ -99,7 +99,7 @@
               <!-- <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.bms_level"
+                  v-for="dict in dict.type.policy_grade"
                   :key="dict.value"
                   :label="dict.label"
                   :value="dict.value">
@@ -163,6 +163,8 @@
         <div class="info-content-top">
           <div>发布人：{{ addFrom.createBy }}</div>
           <div>发布时间：{{ addFrom.enterTime }}</div>
+          <div>发文单位：{{ addFrom.enterUnit }}</div>
+          <div style="display: flex;align-items: center;">政策等级：<dict-tag :options="dict.type.policy_grade" :value="addFrom.policyLevel"/></div>
         </div>
         <div v-html="addFrom.enterContent" class="info-content-content"></div>
       </div>
@@ -183,11 +185,13 @@ import myEditor from "@/views/components/myEditor/index.vue"
 import { getJPolicyFile, jPolicyFileNew, jPolicyFileChange, jPolicyFileId, jPolicyFileDel } from "@/api/jin_ji_hu/policyDocument"
 export default {
   components:{myPagination, myDialog, myEditor},
-  dicts: ['jjh_project_type', 'bms_level'],
+  dicts: ['jjh_project_type', 'policy_grade'],
   data() {
+    var now = new Date();
     return {
       userType: this.$store.state.user.userType,
       deptId: this.$store.state.user.deptId,
+      now:now,
       total:0,
       pagination: {
         current:1,
@@ -206,7 +210,7 @@ export default {
         joinProject:"",
         enterUnit:"",
         policyLevel:"",
-        enterTime:"",
+        enterTime: now,
       },
       rules:{
         name:[
@@ -219,10 +223,10 @@ export default {
           { required: true, message: '请填写发文单位', trigger: 'blur' }
         ],
         policyLevel:[
-          { required: true, message: '请选择发文时间', trigger: 'change' }
+          { required: true, message: '请选择政策等级', trigger: 'change' }
         ],
         enterTime:[
-          { required: true, message: '请选择关联项目', trigger: 'change' }
+          { required: true, message: '请选择发文时间', trigger: 'change' }
         ],
       },
       title:"新增发文",
@@ -299,7 +303,7 @@ export default {
           joinProject:"",
           enterUnit:"",
           policyLevel:"",
-          enterTime:"",
+          enterTime:this.now,
         }
       })
     },
diff --git a/src/views/project/projectInfo/components/tabOne/index.vue b/src/views/project/projectInfo/components/tabOne/index.vue
index f52a0d5..4e307f1 100644
--- a/src/views/project/projectInfo/components/tabOne/index.vue
+++ b/src/views/project/projectInfo/components/tabOne/index.vue
@@ -71,19 +71,20 @@ export default {
               
               let obj = {};
               obj["key"] = key;
-              if(key == "是否获得园区其他经营奖励") {
-                obj["value"] = newInfo[key] == 0 ? '是' : newInfo[key] == 1 ? '否':'';
-              } else if(key == "申报类型") {
-                obj["value"] = newInfo[key] == 1 ? '两业融合示范企业' : newInfo[key] == 2 ? '制造业企业设立财务独立核算的制造服务业职能部门' : newInfo[key] == 3 ? "制造业企业剥离服务业务成立独立的法人制造业企业剥离服务业务成立独立的法人" : "";
-              } else if(key == "所属类型"){
-                obj["value"] = newInfo[key] == 0 ? '市场服务类' : newInfo[key] == 1 ? '公共服务类' : "";
-              } else if(key == "所属行业"){
-                obj["value"] = newInfo[key] == 1 ? '轻工' : newInfo[key] == 2 ? '纺织' : newInfo[key] == 3 ? '冶金' : newInfo[key] == 4 ? '化工' : newInfo[key] == 5 ? '建材' : newInfo[key] == 6 ? '机械加工' : "";
-              } else if(key == "类别"){
-                obj["value"] = newInfo[key] == 1 ? '淘汰落后生产工艺装备' : newInfo[key] == 2 ? '退出低端低效生产工艺装备' : "";
-              } else {
-                obj["value"] = newInfo[key] ? newInfo[key] : '暂无'
-              }
+              // if(key == "是否获得园区其他经营奖励") {
+              //   obj["value"] = newInfo[key] == 0 ? '是' : newInfo[key] == 1 ? '否':'';
+              // } else if(key == "申报类型") {
+              //   obj["value"] = newInfo[key] == 1 ? '两业融合示范企业' : newInfo[key] == 2 ? '制造业企业设立财务独立核算的制造服务业职能部门' : newInfo[key] == 3 ? "制造业企业剥离服务业务成立独立的法人制造业企业剥离服务业务成立独立的法人" : "";
+              // } else if(key == "所属类型"){
+              //   obj["value"] = newInfo[key] == 0 ? '市场服务类' : newInfo[key] == 1 ? '公共服务类' : "";
+              // } else if(key == "所属行业"){
+              //   obj["value"] = newInfo[key] == 1 ? '轻工' : newInfo[key] == 2 ? '纺织' : newInfo[key] == 3 ? '冶金' : newInfo[key] == 4 ? '化工' : newInfo[key] == 5 ? '建材' : newInfo[key] == 6 ? '机械加工' : "";
+              // } else if(key == "类别"){
+              //   obj["value"] = newInfo[key] == 1 ? '淘汰落后生产工艺装备' : newInfo[key] == 2 ? '退出低端低效生产工艺装备' : "";
+              // } else {
+              //   obj["value"] = newInfo[key] ? newInfo[key] : '暂无'
+              // }
+              obj["value"] = newInfo[key] ? newInfo[key] : '暂无'
               obj["span"] = 1;
               arr.push(obj)
             }
diff --git a/src/views/project/projectInfo/components/tabTwo/index.vue b/src/views/project/projectInfo/components/tabTwo/index.vue
index 6f91033..a55f573 100644
--- a/src/views/project/projectInfo/components/tabTwo/index.vue
+++ b/src/views/project/projectInfo/components/tabTwo/index.vue
@@ -92,7 +92,7 @@
       </el-descriptions-item>
       <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="企业规模">
         <!-- {{ info.qygm }} -->
-        {{ info.type == 1 ? "规上" : info.type == 2 ? "规下" : ""}}
+        {{ info.type == 1 ? "规上服务业" : info.type == 2 ? "其他" : ""}}
       </el-descriptions-item>
       <el-descriptions-item labelClassName="tabOneLabel" contentClassName="tabOneContent" label="法定代表人姓名">
         {{ info.fddbrxm }}
diff --git a/src/views/workbench/index.vue b/src/views/workbench/index.vue
index c2d5898..50a4502 100644
--- a/src/views/workbench/index.vue
+++ b/src/views/workbench/index.vue
@@ -9,7 +9,7 @@
         </div>
         <div class="workbench-btn">
           <el-autocomplete 
-            placeholder="请输入企业名称、项目名称、荣誉，查询" 
+            :placeholder="checked == 0 ? '请输入企业名称' : checked == 1 ? '请输入项目名称' : checked == 2 ? '请输入荣誉名称' : ''" 
             ref="autocomplete"
             v-model="search" 
             :fetch-suggestions="querySearch" 
@@ -312,7 +312,14 @@ export default {
           })
         })
       } else if(this.checked == 2) {
-        
+        selectAll({ name: queryString, status: 5}).then(res => {
+          res.data.forEach(item => {
+            results.push({
+              value: item.declareUnit,
+              id: item.id
+            })
+          })
+        })
       }
       // queryString 拿到搜索到的数据
       /**
@@ -336,7 +343,10 @@ export default {
           query: { userId: Number(item.id) }
         })
       } else if(this.checked == 2) {
-
+        this.$router.push({
+          name: 'projectInfo',
+          query: { userId: Number(item.id) }
+        })
       }
     },
     searchBtn(){