新增工作台、政策文件库、打包下载、申报模板可选所有企业及部分企业

.env.development

@@ -5,7 +5,7 @@ VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统
 ENV = 'development'
 
 # 金鸡湖现代服务业品牌管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.0.106:9040'
+VUE_APP_BASE_API = 'http://192.168.0.105:9040'
 # VUE_APP_BASE_API = 'http://39.101.188.84:9040'
 
 # 路由懒加载

src/api/jin_ji_hu/policyDocument/index.js

@@ -0,0 +1,45 @@
+import request from "@/utils/request"
+
+// 分页查询政策文件
+export function getJPolicyFile(params) {
+  return request({
+    url: "/jjh/jPolicyFile",
+    method: "get",
+    params
+  })
+}
+
+// 新增政策文件
+export function jPolicyFileNew(data) {
+  return request({
+    url: "/jjh/jPolicyFile",
+    method: "post",
+    data
+  })
+}
+
+// 删除政策文件
+export function jPolicyFileChange(data) {
+  return request({
+    url: "/jjh/jPolicyFile",
+    method: "put",
+    data
+  })
+}
+
+// 根据主键查询政策文件
+export function jPolicyFileId(id) {
+  return request({
+    url: "/jjh/jPolicyFile/" + id,
+    method: "get",
+  })
+}
+
+// 删除政策文件
+export function jPolicyFileDel(params) {
+  return request({
+    url: "/jjh/jPolicyFile",
+    method: "delete",
+    params
+  })
+}

src/api/onlineDeclartion/records.js

@@ -72,7 +72,7 @@ export function putMunicipalBureauReview(data) {
 // 导出zip压缩包
 export function exportZip(params) {
   return request({
-    url: '/system/declarationRecords/exportZip',
+    url: '/system/declarationRecords/fileList',
     method: 'get',
     responseType: 'blob',
     headers: {

src/assets/styles/public.scss

@@ -123,14 +123,26 @@
       .table-operation {
         span {
           cursor: pointer;
-          &:nth-of-type(1) {
+        }
+        .look-info {
           color: #192A92;
           margin-right: 15px;
         }
-          &:nth-of-type(2) {
+        .edit-info {
+          color: #29A07A;
+          margin-right: 15px;
+        }
+        .del-info {
           color: #C51717;
         }
       }
+      .project-name {
+        text-decoration: underline;
+        font-family: PingFang-SC, PingFang-SC;
+        font-weight: 500;
+        font-size: 14px;
+        color: #1890FF;
+        cursor: pointer;
       }
     }
     .el-pagination {
@@ -593,6 +605,7 @@
   }
 }
 // 导入新项目弹框
+.project-import-dialog {
   .importFormItem {
     .el-form-item__label {
       text-align: left;
@@ -645,6 +658,7 @@
       }
     }
   }
+}
 .importExplain {
   .importExplain-title {
     font-family: PingFang-SC, PingFang-SC;
@@ -700,3 +714,201 @@
 .el-table__fixed::before,.el-table__fixed-right::before {
   height: 0;
 }
+
+// 新增发文
+.newArticle {
+  .el-date-editor {
+    width: 100%;
+  }
+  .el-select {
+    width: 100%;
+  }
+}
+
+// 发文详情
+.info-dialog {
+  .el-dialog__body {
+    padding: 10px 20px;
+  }
+  .info-content {
+    padding: 10px 20px;
+    .info-title {
+      font-family: PingFang-SC, PingFang-SC;
+      font-weight: bold;
+      font-size: 20px;
+      color: #000000;
+      text-align: center;
+    }
+    .info-content-top {
+      font-family: PingFang-SC, PingFang-SC;
+      font-weight: 500;
+      font-size: 12px;
+      color: #999999;
+      margin: 20px 0 10px 0;
+      display: flex;
+      align-items: center;
+      div {
+        &:first-child {
+          width: 200px;
+        }
+      }
+    }
+    .info-content-content {
+      font-family: PingFang-SC, PingFang-SC;
+      font-weight: 500;
+      font-size: 12px;
+      color: #000000;
+      max-height: 400px;
+      overflow-y: scroll;
+    }
+  }
+  .el-dialog__header {
+    border-bottom: 1px solid #DDDDDD;
+    span {
+      font-family: PingFang-SC, PingFang-SC;
+      font-weight: 800;
+      font-size: 16px;
+      color: #000000;
+    }
+  }
+  .el-dialog__footer {
+    border-top: 1px solid #DDDDDD;
+    padding: 10px 20px;
+    .dialog-footer {
+      .el-form {
+        .dialog-from-item {
+          margin-bottom: 0;
+          .el-form-item__content {
+            .el-button {
+              padding: 10px 17px;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+// 工作台
+.workbench-box {
+  height: 100%;
+  header {
+    height: 32%;
+    background: url("../images/workbench.png");
+    background-size: 100% 100%;
+    display: flex;
+    align-items: center;
+    .workbench-serch {
+      padding-left: 200px;
+      .workbench-title {
+        display: flex;
+        margin-bottom: 5px;
+        .title-item {
+          padding: 10px 60px 10px 40px;
+          border-top-right-radius: 30% 100%;
+          margin-right: 15px;
+          background: #FFFFFF;
+          box-shadow: 2px 0 3px 0px #ccc;
+        }
+      }
+      .workbench-btn {
+        height: 45px;
+        .el-input {
+          width: 800px;
+          height: 100%;
+          input {
+            height: 100%;
+          }
+          .el-input-group__append {
+            width: 80px;
+            text-align: center;
+            cursor: pointer;
+            // background: radial-gradient( farthest-side at 40px 40px, #1B84D2 20%, #30CEF5 100%);
+            background: linear-gradient( to right, #1B84D2, #30CEF5);
+            font-family: PingFang-SC, PingFang-SC;
+            font-weight: bold;
+            font-size: 16px;
+            color: #FFFFFF;
+          }
+        }
+      }
+    }
+  }
+  main {
+    padding: 10px;
+    height: calc(100% - 38%);
+    overflow-y: scroll;
+    .main-row {
+      height: 100%;
+      display: flex;
+      background-color: #f6f7f9;
+      .work-main-left {
+        background-color: #fff;
+        margin-right: 10px;
+        height: 100%;
+      }
+      .work-main-right {
+        background-color: #fff;
+        height: 100%;
+        .main-right {
+          padding: 10px 20px;
+          .right-header {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            margin-bottom: 15px;
+            .title {
+              font-family: PingFang-SC, PingFang-SC;
+              font-weight: bold;
+              font-size: 14px;
+              color: #333333;
+            }
+            .el-button {
+              font-family: PingFang-SC, PingFang-SC;
+              font-weight: 500;
+              font-size: 14px;
+              color: #134EE6;
+            }
+          }
+          .right-main {
+            .main-items {
+              display: flex;
+              align-items: center;
+              padding: 10px 30px;
+              background: #F5F8FA;
+              border: 1px solid #D9D9D9;
+              border-bottom: none;
+              text-align: center;
+              &:last-child {
+                border-bottom: 1px solid #D9D9D9;
+              }
+              div {
+                width: 40%;
+                overflow: hidden;
+                white-space: nowrap;
+                text-overflow: ellipsis;
+                -o-text-overflow:ellipsis;
+                font-family: PingFang-SC, PingFang-SC;
+                font-weight: 500;
+                font-size: 14px;
+                color: #666666;
+                &:last-child {
+                  width: 20%;
+                  font-family: PingFang-SC, PingFang-SC;
+                  font-weight: 500;
+                  font-size: 14px;
+                  color: #1890FF;
+                  text-decoration: underline;
+                  cursor: pointer;
+                }
+              }
+            }
+            .main-item {
+              background-color: #fff;
+            }
+          }
+        }
+      }
+    }
+  }
+}

src/components/Editor/index.vue

@@ -71,6 +71,19 @@ export default {
         bounds: document.body,
         debug: "warn",
         modules: {
+          // 工具栏配置
+          // toolbar: [
+          //   ["bold", "italic", "underline", "strike"],       // 加粗 斜体 下划线 删除线
+          //   ["blockquote", "code-block"],                    // 引用  代码块
+          //   [{ list: "ordered" }, { list: "bullet" }],       // 有序、无序列表
+          //   [{ indent: "-1" }, { indent: "+1" }],            // 缩进
+          //   [{ size: ["small", false, "large", "huge"] }],   // 字体大小
+          //   [{ header: [1, 2, 3, 4, 5, 6, false] }],         // 标题
+          //   [{ color: [] }, { background: [] }],             // 字体颜色、字体背景颜色
+          //   [{ align: [] }],                                 // 对齐方式
+          //   ["clean"],                                       // 清除文本格式
+          //   ["link", "image", "video"]                       // 链接、图片、视频
+          // ],
           // 工具栏配置
           toolbar: [
             ["bold", "italic", "underline", "strike"],       // 加粗 斜体 下划线 删除线
@@ -81,8 +94,7 @@ export default {
             [{ header: [1, 2, 3, 4, 5, 6, false] }],         // 标题
             [{ color: [] }, { background: [] }],             // 字体颜色、字体背景颜色
             [{ align: [] }],                                 // 对齐方式
-            ["clean"],                                       // 清除文本格式
-            ["link", "image", "video"]                       // 链接、图片、视频
+            ["link", "image"]                       // 链接、图片、视频
           ],
         },
         placeholder: "请输入内容",

src/layout/components/AppMain.vue

@@ -1,5 +1,5 @@
 <template>
-  <section class="app-main">
+  <section class="app-main" :class="breadcrumb ? '' : 'app-main-breadcrumb'">
     <transition name="fade-transform" mode="out-in">
       <keep-alive :include="cachedViews">
         <router-view v-if="!$route.meta.link" :key="key" />
@@ -15,6 +15,24 @@ import iframeToggle from "./IframeToggle/index";
 export default {
   name: "AppMain",
   components: { iframeToggle },
+  watch:{
+    $route: {
+      handler(route) {
+        // console.log(route,"route");
+        if(route.path == "/workbench") {
+          this.breadcrumb = false;
+        } else {
+          this.breadcrumb = true;
+        }
+      },
+      immediate:true
+    }
+  },
+  data() {
+    return {
+      breadcrumb: false,
+    };
+  },
   computed: {
     cachedViews() {
       return this.$store.state.tagsView.cachedViews;
@@ -37,6 +55,10 @@ export default {
   background: #f6f7f9;
   overflow: hidden;
 }
+.app-main-breadcrumb {
+  height: calc(100% - 1px);
+  padding: 0 0 10px 0;
+}
 
 .fixed-header + .app-main {
   padding-top: 50px;

src/layout/components/FixedHeader/index.vue

@@ -33,7 +33,7 @@
         </el-dropdown>
       </div>
     </div>
-    <div class="crumbs-box">
+    <div class="crumbs-box" v-if="breadcrumbShow">
       <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
     </div>
   </div>
@@ -52,9 +52,23 @@ export default {
   data() {
     return {
       systemTitle: process.env.VUE_APP_TITLE,
-      username: ""
+      username: "",
+      breadcrumbShow: false,
     };
   },
+  watch:{
+    $route: {
+      handler(route) {
+        // console.log(route,"route");
+        if(route.path == "/workbench") {
+          this.breadcrumbShow = false;
+        } else {
+          this.breadcrumbShow = true;
+        }
+      },
+      immediate:true
+    }
+  },
   computed: {
     ...mapGetters(["avatar", "name", "sidebarRouters"]),
     variables() {

src/views/components/myDialog/index.vue

@@ -12,7 +12,7 @@
     <div slot="footer" class="dialog-footer">
       <el-form size="small">
         <el-form-item class="dialog-from-item">
-          <el-button size="mini" @click="resetCancel">取消</el-button>
+          <el-button size="mini" @click="resetCancel">{{ closeText }}</el-button>
           <el-button type="primary" size="mini" @click="resetConfirm">确定</el-button>
         </el-form-item>
       </el-form>
@@ -34,6 +34,10 @@ export default {
     myclass:{
       type:Boolean,
       default:false,
+    },
+    closeText:{
+      type:String,
+      default:'取消'
     }
   },
   methods:{

src/views/onlineDeclaration/enterpriseDirectory/index.vue

@@ -189,7 +189,13 @@
             </el-form-item>
           </el-col>
           <el-col :span="14" v-show="form.isFrame == 1">
-            <el-form-item label="excel导入企业名录" label-width="150px" prop="fileList">
+            <el-form-item 
+              label="excel导入企业名录" 
+              label-width="150px" 
+              prop="fileList"
+              :rules="form.isFrame == 1 ? rules.fileList : [
+					      {required: false, message: '请填写存在内容', trigger: 'change' }]"
+            >
               <el-upload
                 class="upload-demo"
                 :show-file-list="false"
@@ -441,17 +447,17 @@ export default {
       });
     },
     // 监听企业名录维护方式的选择
-    changeIsFrame(value){
+    // changeIsFrame(value){
       
-      if(value == 1){
-        // 1 部分企业
+    //   if(value == 1){
+    //     // 1 部分企业
 
-      } else if(value == 0){
-        // 0 所有企业
+    //   } else if(value == 0){
+    //     // 0 所有企业
         
-      }
+    //   }
       
-    },
+    // },
     /** 查看按钮操作 */
     handleView(row) {
       this.viewVisible = true

src/views/onlineDeclaration/records/index.vue

@@ -490,21 +490,31 @@ export default {
     /** 打包下载 */
     zipDowmload() {
       // this.multipleSelection选中的数据
+      let id = [];
+      let name = [];
+      let enterpriseName = [];
       this.multipleSelection.map((item)=>{
-
+        id.push(Number(item.id))
+        name.push(item.projectName)
+        enterpriseName.push(item.enterpriseName)
       })
-      exportZip().then((response) => {
-        let blob = new Blob([response.data], { type: "application/zip" });
+      exportZip({list:id.join(",")}).then((response) => {
+        let blob = new Blob([response], { type: "application/zip" });
         let url = window.URL.createObjectURL(blob);
         const link = document.createElement("a"); // 创建a标签
         link.href = url;
-        link.download = "模板下载"; // 重命名文件
+        if(this.multipleSelection.length == 1){
+          link.download = name[0] + enterpriseName[0];
+        } else {
+          link.download = "申报表单"; // 重命名文件
+        }
         link.click();
         URL.revokeObjectURL(url); // 释放内存
-        this.checkList = [];
+        // this.checkList = [];
+        // console.log(response);
       })
       .catch((error) => {
-        console.log(error.data);
+        Message.error('下载文件出现错误，请联系管理员！')
       });
     },
     /** 切换审批项 */

src/views/policyDocument/index.vue

@@ -4,14 +4,14 @@
       <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="政策文件名称：" prop="policyName">
-              <el-input v-model.trim="formInline.policyName" placeholder="请输入内容"></el-input>
+            <el-form-item label="政策文件：" prop="name">
+              <el-input v-model.trim="formInline.name" placeholder="请输入内容"></el-input>
             </el-form-item>
-            <el-form-item label="发文单位：" prop="dispatchUnit">
-              <el-input v-model.trim="formInline.dispatchUnit" placeholder="请输入内容"></el-input>
+            <el-form-item label="发文单位：" prop="enterUnit">
+              <el-input v-model.trim="formInline.enterUnit" placeholder="请输入内容"></el-input>
             </el-form-item>
-            <el-form-item label="政策等级：" prop="level">
-              <el-select class="ignoreElement" v-model="formInline.level" placeholder="请选择">
+            <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"
                   :key="dict.value"
@@ -28,7 +28,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="发文时间：" prop="projectYear">
+            <!-- <el-form-item label="发文时间：" prop="projectYear">
               <el-date-picker
                 class="ignoreElement"
                 v-model="formInline.projectYear"
@@ -37,29 +37,37 @@
                 type="daterange"
                 placeholder="选择发文时间">
               </el-date-picker>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-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-col :span="2">
-            <el-button type="primary" class="import-btn" icon="icon iconfont icon-jc-shangchuan" size="mini" @click="importBtn">新增发文</el-button>
+            <!-- <el-button type="primary" class="import-btn" icon="icon iconfont icon-jc-shangchuan" size="mini" @click="importBtn">新增发文</el-button> -->
+            <el-button type="primary" class="import-btn" icon="el-icon-plus" size="mini" @click="importBtn">新增发文</el-button>
           </el-col>
         </el-form>
       </header>
       <section>
         <el-table v-loading="loading" :data="tableData" :row-class-name="tableRowClassName" :height="tabHeader" :max-height="tabHeader">
-          <el-table-column label="政策文件名称" width="450px" prop="projectClassify" />
-          <el-table-column label="关联项目" prop="projectName" />
-          <el-table-column label="发文单位" prop="declareUnit" />
-          <el-table-column label="政策等级" prop="projectYear" />
-          <el-table-column label="发文时间" prop="projectYear" />
-          <el-table-column label="上传用户" prop="projectYear" />
-          <el-table-column label="上传时间" prop="projectYear" />
-          <el-table-column label="操作" prop="userId" class-name="table-operation">
+          <el-table-column label="政策文件名称" width="500px" prop="name" />
+          <el-table-column label="关联项目" width="450px" prop="joinProject">
+            <template slot-scope="scope">
+              <div class="project-name" @click="goToProject(scope.row.joinProject)">
+                <dict-tag :options="dict.type.jjh_project_type" :value="scope.row.joinProject"/>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="发文单位" prop="enterUnit" />
+          <el-table-column label="政策等级" prop="policyLevel" />
+          <el-table-column label="发文时间" prop="enterTime" />
+          <el-table-column label="上传用户" prop="createBy" />
+          <el-table-column label="上传时间" prop="createTime" width="180px" />
+          <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>
@@ -74,11 +82,12 @@
         ></my-pagination>
       </section>
     </div>
-    <my-dialog title="title" @close="importClose" ref="importProject">
-      <el-row>
-        <el-col :span="24">
-          <el-form :model="addFrom" size="small" ref="importFrom" label-width="100px" :rules="rules">
-            <el-form-item label="政策文件名称：" class="importFormItem" prop="projectClassify">
+    <my-dialog :title="title" @close="importClose" @confirm="confirm" ref="importProject" closeText="关闭" :myclass="true">
+      <el-form :model="addFrom" size="small" ref="importFrom" label-width="120px" :rules="rules" class="newArticle">
+        <el-row :gutter="20">
+          <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-option
                   v-for="dict in dict.type.jjh_project_type"
@@ -88,17 +97,88 @@
                 </el-option>
               </el-select> -->
             </el-form-item>
-          </el-form>
+          </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-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="发文单位：" class="importFormItem" prop="enterUnit">
+              <el-input v-model.trim="addFrom.enterUnit" placeholder="请输入内容"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="发文时间：" class="importFormItem" prop="enterTime">
+              <el-date-picker
+                v-model="addFrom.enterTime"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+                type="date"
+                placeholder="选择发文时间">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="关联项目：" class="importFormItem" prop="joinProject">
+              <el-select v-model="addFrom.joinProject" placeholder="请选择">
+                <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-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="发文内容：" class="importFormItem" prop="enterContent">
+              <Editor :height="200" v-model="addFrom.enterContent"></Editor>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </my-dialog>
+    <el-dialog
+      title="查看详情" 
+      :visible.sync="infoVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      @close="infoVisible = false"
+      custom-class="info-dialog"
+      append-to-body
+    >
+      <div class="info-content">
+        <div class="info-title">{{ addFrom.name }}</div>
+        <div class="info-content-top">
+          <div>发布人：{{ addFrom.createBy }}</div>
+          <div>发布时间：{{ addFrom.enterTime }}</div>
+        </div>
+        <div v-html="addFrom.enterContent" class="info-content-content"></div>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-form size="small">
+          <el-form-item class="dialog-from-item">
+            <el-button size="mini" @click="infoVisible = false">关闭</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
 import myPagination from "@/views/components/Pagination/index.vue"
 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'],
   data() {
     return {
       total:0,
@@ -108,24 +188,55 @@ export default {
       },
       loading:false,
       formInline: {
-        policyName: '',
-        dispatchUnit:"",
-        level:"",
-        projectYear:"",
-        status: ''
+        name: '',
+        enterUnit:"",
+        policyLevel:"",
       },
-      tableData:[],
+      tableData:[
+        {
+          projectName:"苏财建[2021]101号 关于下达2021年江苏省级现代服务业发展 专项资金（现代服务业项目）的通知",
+          project:"全方位生物大分子药定制研发生产（CDMO）服务平台",
+          unit:"苏财政",
+          grade:"市级",
+          issueTime:"2023-03-19",
+          user:"张珊",
+          uploadingTime:"2023-05-11 14:00",
+        }
+      ],
       tabHeader: undefined,
       addFrom: {
-        projectClassify:""
-      }
+        name:"",
+        joinProject:"",
+        enterUnit:"",
+        policyLevel:"",
+        enterTime:"",
+      },
+      rules:{
+        name:[
+          { required: true, message: '请填写政策文件名称', trigger: 'blur' }
+        ],
+        joinProject:[
+          { required: true, message: '请填写政策等级', trigger: 'blur' }
+        ],
+        enterUnit:[
+          { required: true, message: '请填写发文单位', trigger: 'blur' }
+        ],
+        policyLevel:[
+          { required: true, message: '请选择发文时间', trigger: 'change' }
+        ],
+        enterTime:[
+          { required: true, message: '请选择关联项目', trigger: 'change' }
+        ],
+      },
+      title:"新增发文",
+      infoVisible:false,
     }
   },
   mounted() {
     this.cancalDebounce();
     window.addEventListener('resize', this.cancalDebounce);
     
-    // this.getList();
+    this.getList();
   },
   destroyed() {
     window.removeEventListener('resize', this.cancalDebounce);
@@ -134,7 +245,7 @@ export default {
     // 列表获取
     getList(){
       this.loading = true;
-      jProject(this.pagination).then(res=>{
+      getJPolicyFile(this.pagination).then(res=>{
         this.loading = false;
         this.total = res.data.total;
         this.tableData = res.data.records;
@@ -164,7 +275,7 @@ export default {
         current: 1,
         size: 10
       }
-      // this.getList();
+      this.getList();
     },
     // 修改table背景色
     tableRowClassName({row, rowIndex}){
@@ -175,22 +286,76 @@ export default {
     },
     // 导入按钮
     importBtn(){
+      this.title = "新增发文";
       this.$refs.importProject.open();
     },
     // 关闭事件触发
     importClose(){
-      this.$refs.importProject.close();
       this.$nextTick(()=>{
         this.$refs.importFrom.resetFields();
+        this.$refs.importProject.close();
+        this.addFrom = {
+          name:"",
+          joinProject:"",
+          enterUnit:"",
+          policyLevel:"",
+          enterTime:"",
+        }
       })
     },
     // 查看详情
-    goInfo(rwo){
-      this.$router.push({
-        path: '/project/projectInfo',
-        query: { userId: rwo.id }
+    goInfo(row){
+      jPolicyFileId(row.id).then((res=>{
+        if(res.code == 200) {
+          this.addFrom = res.data;
+          this.infoVisible = true;
+        }
+      }))
+    },
+    // 编辑
+    editInfo(row){
+      jPolicyFileId(row.id).then((res)=>{
+        if(res.code == 200) {
+          this.addFrom = res.data;
+          this.addFrom.joinProject = this.addFrom.joinProject + ''
+          this.$refs.importProject.open();
+        }
       })
     },
+    // 新增发文
+    confirm(){
+      this.$refs.importFrom.validate((valid) => {
+        if (valid) {
+          // console.log(this.addFrom);
+          let id = this.addFrom.id ? this.addFrom.id : null;
+          if(id) {
+            jPolicyFileChange(this.addFrom).then((res)=>{
+              if(res.code == 200) {
+                this.getList();
+                this.importClose();
+                this.$message({
+                  type: "success",
+                  message: "修改成功!",
+                });
+              }
+            })
+          } else {
+            jPolicyFileNew(this.addFrom).then((res)=>{
+              if(res.code == 200) {
+                this.getList();
+                this.importClose();
+                this.$message({
+                  type: "success",
+                  message: "新增成功!",
+                });
+              }
+            })
+          }
+        } else {
+          return false;
+        }
+      });
+    },
     // 删除
     delInfo(row){
       this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
@@ -214,6 +379,13 @@ export default {
           });
         });
     },
+    // 去往项目库搜索
+    goToProject(id){
+      this.$router.replace({
+        path: '/project/index',
+        query: { projectId: id }
+      })
+    },
     // 屏幕尺寸变化
     cancalDebounce(){
       const element = document.getElementById('L-size-main'); // 通过元素的 ID 获取元素
@@ -228,5 +400,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-
+::v-deep .info-dialog {
+  margin-top: 15vh !important;
+}
 </style>

src/views/project/index.vue

@@ -121,7 +121,7 @@
         ></my-pagination>
       </section>
     </div>
-    <my-dialog :title="title" @close="importClose" ref="importProject">
+    <my-dialog :title="title" @close="importClose" ref="importProject" class="project-import-dialog">
       <el-row>
         <el-col :span="12">
           <el-form :model="importFrom" size="small" ref="importFrom" label-width="100px" :rules="rules">

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

@@ -94,7 +94,7 @@ export default {
     // approvalStatus   0:待审核 1:审核通过 2:审核不通过
     getFlow(id){
       declarationRecordsId(id).then(res=>{
-        this.flow = res.data;
+        this.flow = res.data[0] ? res.data : [];
       })
     }
   },

src/views/project/projectInfo/index.vue

@@ -90,7 +90,7 @@ export default {
       })
     },
     goback(id){
-      console.log(id,"id");
+      // console.log(id,"id");
       this.$router.replace({
         path: '/project/index',
         query: { projectId: id }

src/views/workbench/index.vue

@@ -0,0 +1,77 @@
+<template>
+  <div class="workbench-box">
+    <header>
+      <div class="workbench-serch">
+        <div class="workbench-title">
+          <div class="title-item">
+            查企业
+          </div>
+          <div class="title-item">
+            查项目
+          </div>
+          <div class="title-item">
+            查荣誉
+          </div>
+        </div>
+        <div class="workbench-btn">
+          <el-input placeholder="请输入企业名称、项目名称、荣誉，查询" v-model="search" class="input-with-select">
+            <template slot="append" class="work-btn">搜索</template>
+          </el-input>
+        </div>
+      </div>
+    </header>
+    <main>
+      <el-row class="main-row">
+        <el-col :span="16" class="work-main-left">
+          <div class="main-left">
+            
+          </div>
+        </el-col>
+        <el-col :span="8" class="work-main-right">
+          <div class="main-right">
+            <div class="right-header">
+              <div class="title">【待办提醒】</div>
+              <el-button type="text">>> 更多记录</el-button>
+            </div>
+            <div class="right-main">
+              <div class="main-items" v-for="(item,index) in backlogArray" :key="index" :class="index % 2 == 0 ? '':'main-item'">
+                <div>{{ item.projectName }}</div>
+                <div>审批【知识产权】材料</div>
+                <div>去审批</div>
+              </div>
+            </div>
+          </div>
+        </el-col>
+      </el-row>
+    </main>
+  </div>
+</template>
+<script>
+import { approvalList } from "@/api/onlineDeclartion/pendingReview"
+export default {
+  data() {
+    return {
+      search:"",
+      backlogArray:[],
+      pagination: {
+        pageNum:1,
+        pageSize:10,
+      },
+    }
+  },
+  mounted(){
+    this.getList();
+  },
+  methods:{
+    getList(){
+      approvalList(this.pagination).then(res=>{
+        console.log(res);
+        this.backlogArray = res.rows
+      })
+    }
+  },
+}
+</script>
+<style lang="scss" scoped>
+
+</style>