From 9bd8a27b0ceea4c2607fb5721f6f519bfbd05e17 Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Tue, 6 Aug 2024 11:28:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E7=94=B3=E6=8A=A5=E5=A1=AB?=
 =?UTF-8?q?=E6=8A=A5=E3=80=81=E6=9F=A5=E7=9C=8B=E8=AF=A6=E6=83=85=E7=9A=84?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=88=97=E8=A1=A8=E5=8A=A8=E7=94=BB=E3=80=81?=
 =?UTF-8?q?=E6=94=BF=E5=8A=A1=E7=AB=AF=E6=90=9C=E7=B4=A2=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E5=B0=86=E5=8F=82=E6=95=B0=E5=B8=A6=E5=8E=BB=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E3=80=81=E6=94=BF=E5=8A=A1=E7=AB=AF=E5=BE=85?=
 =?UTF-8?q?=E5=8A=9E=E6=9B=B4=E5=A4=9A=E8=AE=B0=E5=BD=95=E5=8F=AA=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E8=B7=9F=E8=87=AA=E5=B7=B1=E7=9B=B8=E5=85=B3=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  2 +-
 package.json                                  |  2 +-
 src/assets/styles/public.scss                 | 18 +++++++++++++++
 src/views/enterpriselibrary/index.vue         |  2 +-
 .../declareAddContent/ismybuild/index.vue     |  9 --------
 .../declareDetailContent/index.vue            |  9 ++++++++
 .../components/daibanrenwu/index.vue          | 23 +++++++++++++++----
 .../components/emphasisProject/index.vue      |  9 +++++++-
 src/views/workbench/index.vue                 |  2 +-
 9 files changed, 58 insertions(+), 18 deletions(-)

diff --git a/.env.development b/.env.development
index c6cec0b..2773117 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统
 ENV = 'development'
 
 # 金鸡湖现代服务业品牌管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.0.109:9040'
+VUE_APP_BASE_API = 'http://192.168.0.111:9040'
 # VUE_APP_BASE_API = 'http://39.101.188.84:9040'
 # VUE_APP_BASE_API = 'https://idp.sipac.gov.cn/api'
 
diff --git a/package.json b/package.json
index bb2bdbd..52f3972 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ruoyi",
-  "version": "1.0.202408051543",
+  "version": "1.0.202408061104",
   "description": "金鸡湖现代服务业品牌管理系统",
   "author": "若依",
   "license": "MIT",
diff --git a/src/assets/styles/public.scss b/src/assets/styles/public.scss
index dc4c641..f8a801a 100644
--- a/src/assets/styles/public.scss
+++ b/src/assets/styles/public.scss
@@ -3705,6 +3705,24 @@
           font-weight: 500;
           font-size: 14px;
         }
+        .approval_status5 {
+          color: #24d3a9;
+        }
+        .approval_status3 {
+          color: #134ee6;
+        }
+        .approval_status1 {
+          color: #1890ff;
+        }
+        .approval_status0 {
+          color: #14ecd0;
+        }
+        .approval_status8 {
+          color: #f39801;
+        }
+        .approval_status9 {
+          color: red;
+        }
         th {
           font-weight: bold;
           font-size: 14px;
diff --git a/src/views/enterpriselibrary/index.vue b/src/views/enterpriselibrary/index.vue
index b3a9283..d9ba7d3 100644
--- a/src/views/enterpriselibrary/index.vue
+++ b/src/views/enterpriselibrary/index.vue
@@ -219,7 +219,7 @@ export default {
     this.cancalDebounce();
     window.addEventListener('resize', this.cancalDebounce);
     if(this.$route.params.enterpriseName) {
-      this.formInline.enterpriseName = this.$route.params.enterpriseName;
+      this.formInline.qymc = this.$route.params.enterpriseName;
       this.pagination = { ...this.pagination,...this.formInline };
     }
     this.getList();
diff --git a/src/views/onlineDeclaration/declareAddContent/ismybuild/index.vue b/src/views/onlineDeclaration/declareAddContent/ismybuild/index.vue
index 3a8d0e2..2c794b8 100644
--- a/src/views/onlineDeclaration/declareAddContent/ismybuild/index.vue
+++ b/src/views/onlineDeclaration/declareAddContent/ismybuild/index.vue
@@ -388,15 +388,6 @@ export default {
 </script>
 
 <style lang='scss'>
-::v-deep .el-form {
-  .el-form-item__content {
-    .el-upload-list {
-      .el-upload-list__item{
-        transition: none !important;
-      } 
-    }
-  }
-}
 .editor-tabs {
   background: #121315;
 
diff --git a/src/views/onlineDeclaration/declareDetailContent/index.vue b/src/views/onlineDeclaration/declareDetailContent/index.vue
index abb9a9b..35e36d1 100644
--- a/src/views/onlineDeclaration/declareDetailContent/index.vue
+++ b/src/views/onlineDeclaration/declareDetailContent/index.vue
@@ -1209,6 +1209,15 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+::v-deep .el-form {
+  .el-form-item__content {
+    .el-upload-list {
+      .el-upload-list__item{
+        transition: none !important;
+      } 
+    }
+  }
+}
 ul,
 li {
   list-style: none;
diff --git a/src/views/workbench/components/daibanrenwu/index.vue b/src/views/workbench/components/daibanrenwu/index.vue
index 6d2bd30..8c39ef4 100644
--- a/src/views/workbench/components/daibanrenwu/index.vue
+++ b/src/views/workbench/components/daibanrenwu/index.vue
@@ -36,7 +36,18 @@
           <el-table-column label="待办任务标题" prop="enterpriseDirectory" align="center"/>
           <el-table-column label="审核状态" prop="enterpriseDirectory" align="center">
             <template slot-scope="scope">
-              <div class="project-trace-table-type">初审中</div>
+              <span v-if="scope.row.status == 5" class="project-trace-table-type approval_status5">评审通过</span>
+              <!-- <span v-if="scope.row.status == 4" class="approval_status3">市级评定中</span> -->
+              <span v-if="scope.row.status == 3" class="project-trace-table-type approval_status3">终审中</span>
+              <span v-if="scope.row.status == 2" class="project-trace-table-type approval_status1">复审中</span>
+              <span v-if="scope.row.status == 1" class="project-trace-table-type approval_status1">初审中</span>
+              <span v-if="scope.row.status == 0" class="project-trace-table-type approval_status0">待填报</span>
+              <span v-if="scope.row.status == 8" class="project-trace-table-type approval_status8">初审不通过</span>
+              <span v-if="scope.row.status == 7" class="project-trace-table-type approval_status9">复审不通过</span>
+              <!-- <span v-if="scope.row.status == 6" class="approval_status9">专家评审-拒绝</span> -->
+              <span v-if="scope.row.status == 6" class="project-trace-table-type approval_status5">已填报</span>
+              <span v-if="scope.row.status == 9" class="project-trace-table-type approval_status9">终审不通过</span>
+              <span v-if="scope.row.status == 10" class="project-trace-table-type approval_status9">初审驳回</span>
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center" width="200">
@@ -77,6 +88,7 @@ export default {
       pagination: {
         pageNum:1,
         pageSize:10,
+        approvalStatusStr: 0,
       },
       total:40,
     }
@@ -86,7 +98,8 @@ export default {
       this.infoVisible = true;
       this.pagination = {
         pageNum: 1,
-        pageSize: 10
+        pageSize: 10,
+        approvalStatusStr: 0,
       }
       this.pagination = { ...this.pagination,...this.formInline };
       this.getList();
@@ -112,7 +125,8 @@ export default {
     resetQuery(){
       this.pagination = {
         pageNum: 1,
-        pageSize: 10
+        pageSize: 10,
+        approvalStatusStr: 0,
       }
       this.formInline = {
         alertContent:"",
@@ -124,7 +138,8 @@ export default {
     handleQuery(){
       this.pagination = {
         pageNum: 1,
-        pageSize: 10
+        pageSize: 10,
+        approvalStatusStr: 0,
       }
       this.pagination = { ...this.pagination,...this.formInline };
       this.getList();
diff --git a/src/views/workbench/components/emphasisProject/index.vue b/src/views/workbench/components/emphasisProject/index.vue
index 9c55271..d2043f2 100644
--- a/src/views/workbench/components/emphasisProject/index.vue
+++ b/src/views/workbench/components/emphasisProject/index.vue
@@ -7,7 +7,7 @@
       <el-table-column label="项目类别" key="projectType" prop="projectType" align="center" />
       <el-table-column label="操作" key="operation" prop="operation" align="center">
         <template slot-scope="scope">
-          <div class="project-table-Info" @click="ProjectInfo(scope.row)">查看详情</div>
+          <div class="project-table-Info" v-if="scope.row.show" @click="ProjectInfo(scope.row)">查看详情</div>
         </template>
       </el-table-column>
     </el-table>
@@ -23,30 +23,37 @@ export default {
           projectName:"项目落户",
           year: 2024,
           projectType:"省级总部",
+          show:true,
         },{
           projectName:"项目落户",
           year: 2024,
           projectType:"省级总部",
+          show:true,
         },{
           projectName:"项目落户",
           year: 2024,
           projectType:"省级总部",
+          show:false,
         },{
           projectName:"项目落户",
           year: 2024,
           projectType:"省级总部",
+          show:false,
         },{
           projectName:"项目落户",
           year: 2024,
           projectType:"省级总部",
+          show:true,
         },{
           projectName:"项目落户",
           year: 2024,
           projectType:"省级总部",
+          show:true,
         },{
           projectName:"项目落户",
           year: 2024,
           projectType:"省级总部",
+          show:false,
         },
       ],
       tabHeader: 300,
diff --git a/src/views/workbench/index.vue b/src/views/workbench/index.vue
index 0dd2226..0fa37ce 100644
--- a/src/views/workbench/index.vue
+++ b/src/views/workbench/index.vue
@@ -341,7 +341,7 @@ export default {
       backlogArray:[],
       pagination: {
         current:1,
-        size:20,
+        size:10,
         approvalStatusStr: 0,
       },
       // 是否显示弹出层