up

src/router/index.js

@@ -75,9 +75,18 @@ export const constantRoutes = [{
     }, ]
   },
   {
-    path: '/fill/formindex',
+    path: '/fill',
+    component: Layout,
+    hidden:true,
+    children:[{
+      path: 'formindex',
+      name: '填报查看',
       component: () => import('@/views/fill/formindex.vue'),
-    hidden: true
+      meta: {
+        title: '填报查看',
+        icon: 'dashboard'
+      }
+    }],
   },
   {
     path: "/h5",

src/views/fill/formindex.vue

@@ -268,7 +268,8 @@ export default {
 .card {
   height: 100%;
   background-color: #fff;
-  margin: 40px;
+  // margin: 40px;
+  margin-top:20px;
 }
 .info {
   border-top: 1px solid #EBEEF5;

src/views/fill/formshow.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog title="填报" width="860px" :visible.sync="visible">
+    <el-dialog title="填报详情" width="860px" :visible.sync="visible">
 
       <xy-table style="width: 820px"
                 stripe
@@ -12,6 +12,64 @@
                 :table-item="table">
       </xy-table>
     </el-dialog>
+
+    <el-drawer
+      title="内容详情"
+      :visible.sync="isShowDrawer"
+      position="rtl"
+      size="750px"
+      :wrapper-closable="false"
+    >
+      <div style="padding: 20px 40px">
+        <el-form
+          class="form"
+          ref="elForm"
+          :model="showInfoDetail"
+          label-width="80px"
+          size="small"
+        >
+          <el-form-item label="标题" prop="title">
+            {{showInfoDetail.title}}
+          </el-form-item>
+          <el-form-item label="内容" required prop="content">
+            {{showInfoDetail.content}}
+          </el-form-item>
+          <el-form-item label="附件" prop="files">
+            <div v-if="showInfoDetail.files&&showInfoDetail.files.length>0">
+              <div v-for="item in showInfoDetail.files">
+                <a style="color:blue" :href="item.url" target="_blank">{{item.original_name}}</a>
+              </div>
+            </div>
+           <!-- <el-upload
+              class="upload-demo"
+              :action="action"
+              multiple
+              :limit="10"
+              :headers="{
+                'Authorization': 'Bearer ' + getToken(true)
+              }"
+              :before-upload="beforeUpload"
+              :on-success="uploadSuccess"
+              :file-list="fileList"
+            >
+              <el-button size="small" type="primary">点击上传</el-button>
+            </el-upload> -->
+          </el-form-item>
+          <!-- <el-form-item label="所属周期" prop="_week">
+            <el-input
+              placeholder="请选择所属周期"
+              readonly
+              v-model="form._week"
+            ></el-input>
+          </el-form-item> -->
+
+          <el-form-item>
+            <el-button @click="isShowDrawer = false,showInfoDetail={}">关闭</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+    </el-drawer>
+
   </div>
 </template>
 
@@ -22,6 +80,8 @@ export default {
     return {
       auth: [],
       visible: false,
+      isShowDrawer:false,
+      showInfoDetail:{},
       list:[],
       select:{
         category_id: "",
@@ -49,8 +109,8 @@ export default {
         {
           prop: "operate",
           label: "操作",
-          align: "left",
+          align: "center",
-          width: 140,
+          width: 80,
           customFn: row => {
             const _this = this
             return (
@@ -95,7 +155,12 @@ export default {
       this.$refs['xyTable'].getTableData()
     },
     showInfo(id){
-
+      recordShow({
+        id:id
+      }).then(res=>{
+        this.showInfoDetail = res
+        this.isShowDrawer = true
+      })
     },
 
   },

src/views/fill/index.vue

@@ -5,7 +5,7 @@
         <slot>
           <div style="display: flex">
             <div style="margin-right:10px">
-              <DatePicker v-model="select.year" @on-change="changeYear" type="year" placeholder="选择总览年份" style="width: 150px" />
+              <DatePicker v-model="select.year" @on-change="changeYear" type="year" placeholder="选择年份" style="width: 150px" />
             </div>
             <div style="margin-right:10px">
               <Select v-model="select.department_id" placeholder="请选择部门" style="width:150px">
@@ -51,6 +51,7 @@ import { index,destroy } from "@/api/person"
 import { authMixin } from "@/mixin/authMixin";
 import headerContent from "@/components/LxHeader/XyContent.vue";
 import LxHeader from "@/components/LxHeader/index.vue";
+import { listCommondepartment } from "@/api/common";
 export default {
   mixins: [authMixin],
   components: {
@@ -82,7 +83,7 @@ export default {
           width: 120
         },
         {
-          prop: "person.name",
+          prop: "category_type.title",
           label: "清单类型",
           width: 120
         },
@@ -102,7 +103,7 @@ export default {
           width: 160,
           customFn: (row) => {
             return ( <el-switch
-              v-model={row.status}
+              v-model={row.is_active}
               on = {
                 {
                   ['change']: (e) => {
@@ -137,12 +138,23 @@ export default {
       ]
     }
   },
+  created(){
+    this.getDep()
+  },
   methods: {
     index,destroy,
     getList(){},
     changeYear(){
 
     },
+    getDep(){
+      listCommondepartment().then(res => {
+        // res.data.map(item=>{
+        //   item.name=item.name+"("+item.abbr+")"
+        // })
+        this.depList = res.data
+      })
+    }
   },
   computed: {},
 }

src/views/fill/view.vue

@@ -13,23 +13,23 @@
       </lx-header>
     </div>
     <div class="content">
-      <div>
+      <div class="box1">
         <div>{{viewlist.count_category_type?viewlist.count_category_type:0}}</div>
         <div>清单类型</div>
       </div>
-      <div>
+      <div class="box2">
         <div>{{viewlist.count_category?viewlist.count_category:0}}</div>
         <div>填报清单项</div>
       </div>
-      <div>
+      <div class="box3">
         <div>{{viewlist.count_person?viewlist.count_person:0}}</div>
         <div>“一把手”和领导班子</div>
       </div>
-      <div>
+      <div class="box4">
         <div>{{viewlist.count_record?viewlist.count_record:0}}</div>
         <div>条填报记录</div>
       </div>
-      <div>
+      <div class="box5">
         <div>{{viewlist.count_record_missed?viewlist.count_record_missed:0}}</div>
         <div>超期未报</div>
       </div>
@@ -43,7 +43,7 @@
     data(){
       return{
         select:{
-          year:''
+          year:this.$moment().format('YYYY')
         },
         viewlist:{}
       }
@@ -69,15 +69,48 @@
     display: flex;
     justify-content: space-between;
     text-align: center;
+        position: absolute;
+        width: 95%;
+        top: 50%;
   }
   .content>div{
-    border:1px solid #333;
+    /* border:1px solid #333; */
     width:18%;
     padding:60px 0;
-    background-color: #fff;
+    /* background-color: #fff; */
-    font-size: 18px;
+    font-size: 16px;
+    color:#fff;
+    /* flex: 1; */
+    position: relative;
+    margin-bottom: 2.375rem;
+    box-shadow: 0px 8px 15px 0px rgba(212, 84, 32, 0.3100);
+    border-radius: 8px;
+    box-sizing: border-box;
+    opacity: 0.8;
+    padding: 1.25rem 0;
   }
   .content>div>div:first-child{
-    font-size: 30px;
+    font-size: 45px;
+  }
+  .content .box1{
+    background: linear-gradient(134deg, #D1AC7B, #DFC69C);
+
+  }
+  .content .box2{
+     background: linear-gradient(134deg, #9193BC, #B7B9D4);
+
+  }
+  .content .box3{
+     background: linear-gradient(-55deg, #F6A868, #F4C59E);
+
+  }
+  .content .box4{
+    background: linear-gradient(-55deg, #64A48E, #9ECABB);
+
+  }
+  .content .box5{
+    background: linear-gradient(134deg, #40c9c6, #34bfa3);
+
   }
+
 </style>

src/views/person/person.vue

@@ -122,7 +122,7 @@ export default {
           width: 160,
           customFn: (row) => {
             return ( <el-switch
-              v-model={row.status}
+              v-model={row.is_active}
               // disabled
               // readonly
               on = {