Merge branch 'master' of http://175.178.86.109:3000/Niko/shuili_manager

jwtech-pc-page/src/api/zhxx.js

@@ -0,0 +1,21 @@
+import request from "@/http/http";
+
+//政策文件
+export function zhxxList(data) {
+  return request({
+    url: "/enterprise/zhxx/zc/list",
+    method: "post",
+    data: data
+  });
+}
+
+//政策文件
+export function zhxxDetail(id) {
+  return request({
+    url: `enterprise/zhxx/${id}`,
+    method: "get",
+  });
+}
+
+
+

jwtech-pc-page/src/router/index.js

@@ -66,6 +66,13 @@ const router = new Router({
           component: () => import('@/views/policyDoc/index.vue'),
           name: 'policyDoc',
         },
+        {
+          path: '/policyDocDetail',
+          component: () => import('@/views/policyDoc/policyDocDetail.vue'),
+          name: 'policyDocDetail',
+        },
+
+
         {
           path: '/personDetail',
           component: () => import('@/views/enterpriseInformation/personDetail.vue'),

jwtech-pc-page/src/views/enterpriseInformation/components/descriptionsEnterpriseTable.vue

@@ -42,8 +42,8 @@
         >
           {{ item.val }}
         </el-descriptions-item>
-        <el-descriptions-item label="更新时间" span="2">
-          {{ updateTime }}
+        <el-descriptions-item label="注册地址" span="2">
+          {{ registeredAddress }}
         </el-descriptions-item>
         <el-descriptions-item label="经营范围" span="2">
           {{ businessScope }}
@@ -73,16 +73,16 @@ export default {
         //   code: "enterpriseName",
         //   val: ""
         // },
-        {
-          label: "投资组成",
-          code: "investmentComposition",
-          val: ""
-        },
-        {
-          label: "法定代表人",
-          code: "legalRepresentative",
-          val: ""
-        },
+        // {
+        //   label: "投资组成",
+        //   code: "investmentComposition",
+        //   val: ""
+        // },
+        // {
+        //   label: "法定代表人",
+        //   code: "legalRepresentative",
+        //   val: ""
+        // },
         {
           label: "成立日期",
           code: "establishmentDate",
@@ -93,35 +93,46 @@ export default {
         //   code: "unifiedSocialCreditCode",
         //   val: ""
         // },
-        {
-          label: "登记机关",
-          code: "creditCodeIssuingAuthority",
-          val: ""
-        },
+        // {
+        //   label: "登记机关",
+        //   code: "creditCodeIssuingAuthority",
+        //   val: ""
+        // },
         {
           label: "注册地区",
           code: "adcd",
           val: ""
         },
+        // {
+        //   label: "注册地址",
+        //   code: "registeredAddress",
+        //   val: ""
+        // },
+        // {
+        //   label: "注册资本（万元）",
+        //   code: "registeredCapital",
+        //   val: ""
+        // },
+        // {
+        //   label: "实缴注册资本（万元）",
+        //   code: "paidRegisteredCapital",
+        //   val: ""
+        // }
         {
-          label: "注册地址",
-          code: "registeredAddress",
-          val: ""
-        },
-        {
-          label: "注册资本（万元）",
-          code: "registeredCapital",
+          label: "单位性质",
+          code: "investmentComposition",
           val: ""
         },
         {
-          label: "实缴注册资本（万元）",
-          code: "paidRegisteredCapital",
+          label: "单位类别",
+          code: "enterpriseType",
           val: ""
         }
       ],
       updateTime: "",
       businessScope: "",
-      areaList: []
+      areaList: [],
+      registeredAddress: ""
     };
   },
   mounted() {
@@ -143,6 +154,7 @@ export default {
           });
         }
         this.updateTime = this.enterpriseObj.updateTime || "-";
+        this.registeredAddress = this.enterpriseObj.registeredAddress || "-";
         this.businessScope = this.enterpriseObj.businessScope || "-";
       });
     },

jwtech-pc-page/src/views/policyDoc/components/docWrap.vue

@@ -6,9 +6,14 @@
       </span>
     </div>
     <div class="data-list">
-      <div class="item" v-for="(item, index) in docData" :key="index">
+      <div
+        class="item"
+        v-for="(item, index) in docDataList"
+        :key="item.id"
+        @click="toDetail(item)"
+      >
         <span>{{ item.title }}</span>
-        <span>{{ item.time }}</span>
+        <span>{{ item.createTime }}</span>
       </div>
 
       <pagination
@@ -23,6 +28,7 @@
   </div>
 </template>
 <script>
+import { zhxxList } from "@/api/zhxx";
 export default {
   name: "docWrap",
   props: {
@@ -30,6 +36,10 @@ export default {
       type: String,
       default: "政策文件"
     },
+    type: {
+      type: String,
+      default: "1"
+    },
     docData: {
       type: Array,
       default: () => []
@@ -39,20 +49,40 @@ export default {
     return {
       total: 10,
       pageSizes: [10, 20, 30, 50],
+      docDataList: [],
       queryForm: {
         cv: {
           name: "title",
           type: "like",
           value: ""
         },
-        data: {},
+        data: {
+          textType: this.type
+        },
         pageNum: 1,
         pageSize: 10
       }
     };
   },
+  mounted() {
+    this.getResult();
+  },
   methods: {
-    getResult() {}
+    getResult() {
+      zhxxList(this.queryForm).then(res => {
+        this.docDataList = res.data.records;
+        this.total = res.data.total;
+        console.log("xxxxxx", res);
+      });
+    },
+    toDetail(item) {
+      this.$router.push({
+        path: "/policyDocDetail",
+        query: {
+          id: item.id
+        }
+      });
+    }
   }
 };
 </script>
@@ -97,6 +127,13 @@ export default {
       height: 40px;
       line-height: 40px;
       border-bottom: 1px solid #f0f0f0;
+      cursor: pointer;
+
+      &::hover {
+        span {
+          color: #005eb7;
+        }
+      }
       span {
         font-family: PingFangSC, PingFang SC;
         font-weight: 400;

jwtech-pc-page/src/views/policyDoc/index.vue

@@ -1,23 +1,30 @@
 <template>
   <div class="certification-page">
     <div class="search-wrap">
-      <el-form :inline="true" :model="queryForm" class="demo-form-inline">
-        <el-form-item label="标题">
+      <el-form :inline="true" label-width="80px" :model="queryForm">
+        <el-form-item>
           <el-input
-            v-model="queryForm.cv.name"
-            placeholder="请输入标题"
+            class="name-inp-search"
+            placeholder="请输入"
+            v-model="queryForm.cv.value"
           ></el-input>
         </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="onSubmit">查询</el-button>
+        <el-form-item class="btn-row">
+          <el-button type="mini" icon="el-icon-search" @click="getResult()"
+            >查询</el-button
+          >
+          <el-button type="mini" icon="el-icon-refresh" @click="resetForm()"
+            >重置</el-button
+          >
         </el-form-item>
       </el-form>
     </div>
     <div class="docs-wrap">
       <doc-wrap
-        v-for="i in 3"
-        :key="i"
-        :title="'政策文件'"
+        v-for="(item, index) in zhxxType"
+        :key="item.title"
+        :title="item.title"
+        :type="item.value"
         :docData="[
           { id: 1, title: '标题1', content: '内容1', time: '2020-11-11' },
           { id: 2, title: '标题2', content: '内容2', time: '2020-11-12' }
@@ -51,11 +58,29 @@ export default {
         pageNum: 1,
         pageSize: 10
       },
-      tableData: []
+      tableData: [],
+      zhxxType: [
+        { title: "政策法规", value: "1" },
+        { title: "部门规章", value: "2" },
+        { title: "部门规章", value: "3" }
+      ]
     };
   },
   mounted() {},
-  methods: {}
+  methods: {
+    resetForm() {
+      this.queryForm = {
+        cv: {
+          name: "title",
+          type: "like",
+          value: ""
+        },
+        pageNum: 1,
+        pageSize: 10
+      };
+      this.getResult();
+    }
+  }
 };
 </script>
 <style lang="less" scoped>
@@ -77,5 +102,64 @@ export default {
     width: 1200px;
     margin: 0 auto;
   }
+
+  /deep/.el-form {
+    display: flex;
+    align-items: center;
+
+    .el-form-item {
+      margin-right: 20px;
+      &.btn-row {
+        .el-form-item__content {
+          display: flex;
+        }
+      }
+    }
+
+    .el-form-item__label {
+      width: auto !important;
+      height: 50px;
+      line-height: 50px;
+      font-size: 16px;
+      padding-right: 10px;
+      color: #333333;
+    }
+
+    .el-input__inner {
+      width: 260px;
+      height: 50px;
+      line-height: 50px;
+      border-radius: 8px;
+      border: 1px solid #aad8fb;
+    }
+
+    .el-button {
+      padding: 11px 19px;
+      background: linear-gradient(180deg, #005ba6 0%, #0059a5 100%);
+      border-radius: 8px;
+      color: #ffffff;
+
+      span {
+        height: 26px;
+        line-height: 26px;
+        font-size: 18px;
+        font-weight: 600;
+      }
+
+      i {
+        font-size: 20px;
+      }
+    }
+
+    .el-button:nth-child(1) {
+      // margin-left: 50px;
+    }
+
+    .el-button:nth-child(2) {
+      background: linear-gradient(180deg, #ffffff 0%, #ecf6ff 100%);
+      border: 1px solid #005eb7;
+      color: #005eb7;
+    }
+  }
 }
 </style>

jwtech-pc-page/src/views/policyDoc/policyDocDetail.vue

@@ -0,0 +1,97 @@
+<template>
+  <div class="doc-wrap"></div>
+</template>
+<script>
+import { zhxxDetail } from "@/api/zhxx";
+export default {
+  name: "policyDocDetail",
+
+  data() {
+    return {
+      id: this.$route.query.id || ""
+    };
+  },
+  mounted() {
+    this.getDetail();
+  },
+  methods: {
+    getDetail() {
+      zhxxDetail(this.id).then(res => {
+        console.log("xxxxxx", res);
+      });
+    }
+  }
+};
+</script>
+<style scoped lang="less">
+.doc-wrap {
+  overflow: hidden;
+  width: 100%;
+  padding: 20px;
+  background-color: #fff;
+  border-radius: 8px;
+  .table-title {
+    height: 47px;
+    line-height: 47px;
+    background-color: #f6f6f6;
+
+    span {
+      font-family: PingFangSC, PingFang SC;
+      font-weight: 600;
+      font-size: 16px;
+      color: #333333;
+      font-style: normal;
+
+      &::before {
+        content: "";
+        display: inline-block;
+        width: 3px;
+        height: 16px;
+        background: #005eb7;
+        margin-right: 10px;
+        vertical-align: middle;
+      }
+    }
+  }
+
+  .data-list {
+    .item {
+      padding-left: 10px;
+      position: relative;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      height: 40px;
+      line-height: 40px;
+      border-bottom: 1px solid #f0f0f0;
+      cursor: pointer;
+
+      &::hover {
+        span {
+          color: #005eb7;
+        }
+      }
+      span {
+        font-family: PingFangSC, PingFang SC;
+        font-weight: 400;
+        font-size: 14px;
+        color: #333333;
+        font-style: normal;
+      }
+
+      &::before {
+        position: absolute;
+        top: 18px;
+        left: 0;
+        content: "";
+        display: inline-block;
+        width: 5px;
+        height: 5px;
+        background: #005eb7;
+        margin-right: 10px;
+        vertical-align: middle;
+      }
+    }
+  }
+}
+</style>

jwtech-pc-page/static/config.js

@@ -10,7 +10,7 @@ window.g = {
   // url: "http://106.2.224.58:1036/kms-pc-web/api",
   // url: "http://106.2.224.58:1039/kms-pc-web",
   // url: "http://192.168.2.100:18082/tianhui-admin-web",
-  url: "http://localhost:8082/jgThinking/thinking/",
+  url: "http://175.178.86.109:18082/kms-pc-web",
   // url: "http://127.0.0.1:18082/kms-pc-web",
 
   // url: "http://192.168.1.113:8083/kms-pc-web",