From ab152ab5d1ecca18d2a1d5cca89800b5c110431c Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Fri, 11 Aug 2023 09:20:40 +0800
Subject: [PATCH] upup

---
 src/api/system/baseForm.js                |  24 +-
 src/components/XyDialog/index.vue         |   2 +-
 src/components/XyTable/index.vue          |   6 +-
 src/views/component/table.vue             |   5 +-
 src/views/jsc/index.vue                   |   3 +-
 src/views/record/components/addRecord.vue |   6 +-
 src/views/record/index.vue                | 414 +++++++++++---------
 src/views/record/searchall.vue            | 438 ++++++++++++++++++++++
 src/views/system/form.vue                 |   2 +-
 9 files changed, 716 insertions(+), 184 deletions(-)
 create mode 100644 src/views/record/searchall.vue

diff --git a/src/api/system/baseForm.js b/src/api/system/baseForm.js
index f5f5284..f79df0e 100644
--- a/src/api/system/baseForm.js
+++ b/src/api/system/baseForm.js
@@ -4,13 +4,23 @@ function customParamsSerializer(params) {
   for (let key in params) {
     if (params.hasOwnProperty(key)) {
       if (Array.isArray(params[key])) {
-          params[key].forEach((item,index) => {
-            if(typeof item === 'object'){
-              result += `${key}[${index}][key]=${item.key}&${key}[${index}][op]=${item.op}&${key}[${index}][value]=${item.value}&`;
-            }else{
-              result += `${key}[${index}]=${item}&`;
-            }
-          });
+          if(key=='link_tables'){
+            params[key].forEach((item,index) => {
+              if(typeof item === 'object'){
+                console.log('item.tables',item.tables)
+                result += `${key}[year]=${item.year}&${key}[tables]=${item.tables}&`;
+              }
+            });
+          }else{
+            params[key].forEach((item,index) => {
+              if(typeof item === 'object'){
+                result += `${key}[${index}][key]=${item.key}&${key}[${index}][op]=${item.op}&${key}[${index}][value]=${item.value}&`;
+              }else{
+                result += `${key}[${index}]=${item}&`;
+              }
+            });
+          }
+
       } else {
         result += `${key}=${params[key]}&`;
       }
diff --git a/src/components/XyDialog/index.vue b/src/components/XyDialog/index.vue
index 32bda2d..62d7f45 100644
--- a/src/components/XyDialog/index.vue
+++ b/src/components/XyDialog/index.vue
@@ -208,7 +208,7 @@ export default {
 
 <style lang="scss">
 .xy-table-item-label{
-  width: 140px;
+  width: 160px;
   text-align: right;
 }
 .xy-table-item-min{
diff --git a/src/components/XyTable/index.vue b/src/components/XyTable/index.vue
index dc8427d..392783d 100644
--- a/src/components/XyTable/index.vue
+++ b/src/components/XyTable/index.vue
@@ -163,6 +163,7 @@ export default {
     },
     pageSize: {
       type: Number,
+      default:40
     },
     pageSizeOpts: {
       type: Array,
@@ -188,7 +189,7 @@ export default {
       listData: [],
       selectOpt: {
         page: 1,
-        page_size: 10,
+        page_size: 40,
         sort_name: "",
         sort_type: "",
       },
@@ -497,9 +498,12 @@ export default {
                   },
                   ["on-change"]: (e) => {
                     if (this.action) {
+                       console.log("E",e)
                       this.selectOpt.page = e;
                       this.getTableData();
                     }
+
+                    // this.selectOpt.page = e;
                     this.$emit("pageIndexChange", e);
                   },
                 }}
diff --git a/src/views/component/table.vue b/src/views/component/table.vue
index 90d118d..63a0c92 100644
--- a/src/views/component/table.vue
+++ b/src/views/component/table.vue
@@ -245,6 +245,7 @@
       :action="index"
       :req-opt="select"
       :destroy-req-opt="select"
+      @pageIndexChange='pageIndexChange'
       :table-item="table"
       @detail="
         (row) => {
@@ -349,7 +350,9 @@ export default {
         value: "",
       };
     },
-
+    pageIndexChange(e){
+      this.select.page = e
+    },
     async exportExcel(sheetName) {
       const res = await index(
         Object.assign(this.select, { page: 1, page_size: 99999 })
diff --git a/src/views/jsc/index.vue b/src/views/jsc/index.vue
index 54d8d91..70b2b4f 100644
--- a/src/views/jsc/index.vue
+++ b/src/views/jsc/index.vue
@@ -255,7 +255,8 @@
           this.jscMtList[3].num = res.total.year_viewrecords
           // 年龄
           for(var age in res.age_total){
-            this.ageX.push(age)
+            let xAge = age==0?'0-15':(age==1?'16-59':(age==2?'60及以上':''))
+            this.ageX.push(xAge)
             this.ageY.push(res.age_total[age])
           }
           //需求类别 业务类别
diff --git a/src/views/record/components/addRecord.vue b/src/views/record/components/addRecord.vue
index e27224a..979b2d0 100644
--- a/src/views/record/components/addRecord.vue
+++ b/src/views/record/components/addRecord.vue
@@ -4,7 +4,7 @@
       :form="form" :rules="rules" @submit="submit">
       <template v-slot:infotext>
         <div class="xy-table-item">
-          <div class="xy-table-item-content" style="width:1600px">
+          <div class="xy-table-item-content" style="width:1200px">
             个人信息
           </div>
         </div>
@@ -187,7 +187,7 @@
       </template>
       <template v-slot:disabilitytext>
         <div class="xy-table-item">
-          <div class="xy-table-item-content" style="width:1600px">
+          <div class="xy-table-item-content" style="width:1200px">
             残疾证信息
           </div>
         </div>
@@ -289,7 +289,7 @@
       </template>
       <template v-slot:guardiantext>
         <div class="xy-table-item">
-          <div class="xy-table-item-content" style="width:1600px">
+          <div class="xy-table-item-content" style="width:1200px">
             监护人信息
           </div>
         </div>
diff --git a/src/views/record/index.vue b/src/views/record/index.vue
index acf9e2d..d6d31e3 100644
--- a/src/views/record/index.vue
+++ b/src/views/record/index.vue
@@ -5,37 +5,39 @@
       <lx-header icon="md-apps" text="档案管理" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
         <slot>
           <div style="display: flex;justify-content: flex-start;flex-wrap: wrap;">
-            <Input v-model="select.keyword" style="width: 150px;margin-right: 10px;" placeholder="搜索姓名" />
-            <el-select class='street' v-model="select.street" placeholder="请选择街道" clearable>
-                <el-option
-                  v-for="item in lists.streetList"
-                  :key="item.value"
-                  :label="item.value"
-                  :value="item.value">
-                </el-option>
-              </el-select>
-              <el-select class='street' v-model="select.disabilityType" placeholder="请选择残疾类别" clearable>
-                  <el-option
-                    v-for="item in lists.disabilitytypeList"
-                    :key="item.value"
-                    :label="item.value"
-                    :value="item.value">
-                  </el-option>
-                </el-select>
-                <el-select class='street' v-model="select.disabilityLevel" placeholder="请选择残疾等级" clearable>
-                    <el-option
-                      v-for="item in lists.disabilitylevelList"
-                      :key="item.value"
-                      :label="item.value"
-                      :value="item.value">
-                    </el-option>
-                  </el-select>
+            <Input v-model="select.keyword" style="width: 150px;margin-right: 10px;" placeholder="搜索姓名" />
+            <el-select class='street' v-model="select.street" placeholder="请选择街道" clearable>
+              <el-option v-for="item in lists.streetList" :key="item.value" :label="item.value" :value="item.value">
+              </el-option>
+            </el-select>
+            <el-select class='street' v-model="select.disabilityType" placeholder="请选择残疾类别" clearable>
+              <el-option v-for="item in lists.disabilitytypeList" :key="item.value" :label="item.value"
+                :value="item.value">
+              </el-option>
+            </el-select>
+            <el-select class='street' v-model="select.disabilityLevel" placeholder="请选择残疾等级" clearable>
+              <el-option v-for="item in lists.disabilitylevelList" :key="item.value" :label="item.value"
+                :value="item.value">
+              </el-option>
+            </el-select>
+            <el-select class='street' style='width:120px' v-model="select.link_tables[0]['year']" placeholder="请选择年份"
+              clearable>
+              <el-option v-for="item in [{label:2021,value:2021},{label:2022,value:2022},{label:2023,value:2023}]"
+                :key="item.value" :label="item.value" :value="item.value">
+              </el-option>
+            </el-select>
+            <el-select collapse-tags class='street' style='width:240px' v-model="select.link_tables[0]['tables']" multiple placeholder="请选择业务" clearable>
+              <el-option v-for="item in lists.workflowList"
+                :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
+
+
             <Button type="primary" @click="getindex">查询</Button>
             <Button type="primary" style="margin-left: 10px;" @click="resetindex">重置</Button>
             <Button type="primary" style="margin-left: 10px;"
               @click="$refs['addRecord'].isShow = true,$refs['addRecord'].type = 'add'">添加</Button>
-            <Button type="primary" style="margin-left: 10px;"
-              @click="$refs['imports'].show()">导入</Button>
+            <Button type="primary" style="margin-left: 10px;" @click="$refs['imports'].show()">导入</Button>
             <Button type="primary" style="margin-left: 10px;"
               @click="exportExcel(new Date().getTime().toString())">导出</Button>
           </div>
@@ -50,9 +52,8 @@
           <template slot-scope="scope">
             <Button type="primary" size="small" @click="editorRecord(scope.row.id,'editor')">编辑</Button>
             <Button type="primary" size="small" style="margin-left: 10px;"
-              @click="editorView(scope.row.id,'add')">访视</Button>
-            <Button type="primary" size="small" style="margin-left: 10px;"
-              @click="showInfo(scope.row.id)">视图</Button>
+              @click="editorView(scope.row.id,'add')">访视</Button>
+            <Button type="primary" size="small" style="margin-left: 10px;" @click="showInfo(scope.row.id)">视图</Button>
             <Poptip transfer confirm title="确认要删除吗？" @on-ok="deleteRecord(scope.row)">
               <Button type="primary" style="margin-left: 10px;" size="small" ghost>删除</Button>
             </Poptip>
@@ -78,17 +79,16 @@
     Message
   } from 'element-ui'
   import imports from "@/views/component/imports.vue"
-  import * as XLSX from "xlsx";
-  import { saveAs } from "file-saver";
+  import * as XLSX from "xlsx";
+  import {
+    saveAs
+  } from "file-saver";
   import {
     index as fieldIndex
   } from "@/api/system/customFormField";
   import {
     getparameter
-  } from "@/api/system/dictionary";
-  import {
-    getSsttToken
-  } from "@/api/sstt";
+  } from "@/api/system/dictionary";
   export default {
     components: {
       addRecord,
@@ -96,28 +96,81 @@
       imports
     },
     data() {
-      return {
+      return {
 
         select: {
           pageSize: 40,
           pageIndex: 1,
-          keyword: "",
-          street:'',
-          disabilityLevel:"",
-          disabilityType:""
-        },
-        lists:{
-          disabilitytypeList: [],
-          disabilitylevelList: [],
-          streetList:[]
+          keyword: "",
+          street: '',
+          disabilityLevel: "",
+          disabilityType: "",
+          link_tables: [{
+            'year': '',
+            "tables": []
+          }]
+        },
+        lists: {
+          disabilitytypeList: [],
+          disabilitylevelList: [],
+          streetList: [],
+          workflowList: [{
+            label: '机动轮椅车燃油补贴',
+            value: 'fuels'
+          }, {
+            label: '无障碍改造',
+            value: 'reforms'
+          }, {
+            label: '免费服药',
+            value: 'medicines'
+          }, {
+            label: '儿童康复',
+            value: 'childrens'
+          }, {
+            label: '辅具适配',
+            value: 'assists'
+          }, {
+            label: '社区康复',
+            value: 'communities'
+          }, {
+            label: '教育专项补贴',
+            value: 'educations'
+          }, {
+            label: '托养',
+            value: 'raises'
+          }, {
+            label: '自主创业补贴',
+            value: 'starts_subsidys'
+          }, {
+            label: '自主创业经营场地租金补贴',
+            value: 'starts_addresses'
+          }, {
+            label: '两项补贴',
+            value: 'doubles'
+          }, {
+            label: '残疾人证申请',
+            value: 'disabilities'
+          }, {
+            label: '培训记录',
+            value: 'trains'
+          }, {
+            label: '商业保险',
+            value: 'insures'
+          }, {
+            label: '已就业人员',
+            value: 'jobs'
+          }, {
+            label: '死亡注销',
+            value: 'cancels'
+          }]
         },
         customForm: {
           customFormId: 1,
           tableName: "records"
         },
-        form: [],
-        importForm:[],
-        exportForm:[],
+        form: [],
+        importForm: [],
+        exportForm: [],
         total: 0,
         list: [],
         table: [{
@@ -125,12 +178,12 @@
             type: 'index',
             fixed: 'left',
             width: 60
-          },
-          // {
-          //   label: "所属街道",
-          //   width: 120,
-          //   prop: 'street',
-          //   align: 'center'
+          },
+          // {
+          //   label: "所属街道",
+          //   width: 120,
+          //   prop: 'street',
+          //   align: 'center'
           // },
           {
             label: "姓名",
@@ -144,15 +197,15 @@
             width: 80,
             prop: 'sex',
             align: 'center',
-          },
-          {
-            label: "年龄",
-            width: 80,
-            prop: 'idcard',
-            align: 'center',
-            formatter:(cell,data,value)=>{
-              return this.getName(value)
-            }
+          },
+          {
+            label: "年龄",
+            width: 80,
+            prop: 'idcard',
+            align: 'center',
+            formatter: (cell, data, value) => {
+              return this.getName(value)
+            }
           },
           // {
           //   label: "身份证号",
@@ -189,15 +242,15 @@
             width: 80,
             prop: 'disabilitylevel',
             align: 'center'
-          },
-          {
-            label: "户籍地址",
-            // width: 240,
-            prop: 'address',
-            align: 'left',
-            formatter:(cell,data,value)=>{
-              return value.indexOf('江苏省常州市金坛区')>-1? value.replace('江苏省常州市金坛区',''):value
-            }
+          },
+          {
+            label: "户籍地址",
+            // width: 240,
+            prop: 'address',
+            align: 'left',
+            formatter: (cell, data, value) => {
+              return value.indexOf('江苏省常州市金坛区') > -1 ? value.replace('江苏省常州市金坛区', '') : value
+            }
           },
           // {
           //   label: "有效期至",
@@ -215,40 +268,51 @@
         ]
       }
     },
-    methods: {
-      showInfo(id) {
-        this.$router.push({path:"/record/personinfo",query:{id:id}})
-      },
-      resetindex(){
+    methods: {
+      showInfo(id) {
+        this.$router.push({
+          path: "/record/personinfo",
+          query: {
+            id: id
+          }
+        })
+      },
+      resetindex() {
         this.select = {
           pageSize: 40,
           pageIndex: 1,
-          keyword: "",
-          street:'',
-          disabilityLevel:"",
-          disabilityType:""
-        }
-        this.getindex()
+          keyword: "",
+          street: '',
+          disabilityLevel: "",
+          disabilityType: "",
+          link_tables: [{
+            'year': '',
+            "tables": []
+          }]
+        }
+        this.getindex()
       },
       async getindex() {
         const res = await index({
           page_size: this.select.pageSize,
           page: this.select.pageIndex,
-          table_name: this.customForm.tableName,
-          show_relation:['admin','department'],
+          table_name: this.customForm.tableName,
+          link_tables: this.select.link_tables,
+          // link_tables[0]['year']:'2023',
+          show_relation: ['admin', 'department'],
           filter: [{
             "key": "name",
             "op": "like",
             "value": this.select.keyword
-          },{
+          }, {
             "key": "street",
             "op": "eq",
             "value": this.select.street
-          },{
+          }, {
             "key": "disabilitytype",
             "op": "eq",
             "value": this.select.disabilityType
-          },{
+          }, {
             "key": "disabilitylevel",
             "op": "eq",
             "value": this.select.disabilityLevel
@@ -259,7 +323,7 @@
       },
 
       pageChange(e) {
-        this.select.pageIndex = e
+        this.select.pageIndex = e
         this.getindex()
       },
       editorRecord(id, type) {
@@ -267,8 +331,8 @@
         this.$refs['addRecord'].isShow = true
         this.$refs['addRecord'].type = type
       },
-      editorView(id, type) {
-        console.log(id,type)
+      editorView(id, type) {
+        console.log(id, type)
         this.$refs['addViewRecord'].person_id = id
         this.$refs['addViewRecord'].isShow = true
         this.$refs['addViewRecord'].type = type
@@ -285,28 +349,28 @@
           })
           this.getindex()
         })
-      },
-      getName(iden) {
-          let val = iden.length;
-          let myDate = new Date();
-          let month = myDate.getMonth() + 1;
-          let day = myDate.getDate();
-          let age = 0;
-
-          if (val === 18) {
-            age = myDate.getFullYear() - iden.substring(6, 10) - 1;
-
-            if (iden.substring(10, 12) < month || iden.substring(10, 12) == month && iden.substring(12, 14) <= day) age++;
-
-          }
-          if (val === 15) {
-            age = myDate.getFullYear() - iden.substring(6, 8) - 1901;
-
-            if (iden.substring(8, 10) < month || iden.substring(8, 10) == month && iden.substring(10, 12) <= day) age++;
-          }
-
-          return age
-        },
+      },
+      getName(iden) {
+        let val = iden.length;
+        let myDate = new Date();
+        let month = myDate.getMonth() + 1;
+        let day = myDate.getDate();
+        let age = 0;
+
+        if (val === 18) {
+          age = myDate.getFullYear() - iden.substring(6, 10) - 1;
+
+          if (iden.substring(10, 12) < month || iden.substring(10, 12) == month && iden.substring(12, 14) <= day) age++;
+
+        }
+        if (val === 15) {
+          age = myDate.getFullYear() - iden.substring(6, 8) - 1901;
+
+          if (iden.substring(8, 10) < month || iden.substring(8, 10) == month && iden.substring(10, 12) <= day) age++;
+        }
+
+        return age
+      },
       // 获取表信息
       async getField() {
         // console.log(this.$route.meta.params, "---", this.$route)
@@ -358,69 +422,81 @@
             }
           })
         }
-        this.form = res.data
-        this.importForm = this.form
-          ?.filter((i) => i.form_show&&i.list_show)
-          .map((i)=>{
-            return i
-          })
-          this.exportForm = this.form
-            ?.filter((i) => i.list_show)
-            .map((i)=>{
-              return i
-            })
-      },
-      async exportExcel(sheetName) {
-        const res = await index(Object.assign(this.select,{ page: 1,page_size: 99999,table_name: this.customForm.tableName}))
-        if(res.data){
-          let headers = this.exportForm.map(i => {
-            return {
-              key: i.field,
-              title: i.name
-            }
-          })
-          const data = res.data.map(row => headers.map(header => row[header.key]));
-          data.unshift(headers.map(header => header.title));
-          const wb = XLSX.utils.book_new();
-          const ws = XLSX.utils.aoa_to_sheet(data);
-          XLSX.utils.book_append_sheet(wb, ws, sheetName);
-          const wbout = XLSX.write(wb, { bookType: 'xlsx', bookSST: true, type: 'array' });
-          saveAs(new Blob([wbout], { type: 'application/octet-stream' }), `${sheetName}.xlsx`);
-        }
-      },
-      async getLabel() {
-        let numbers = {
-          number:['streetList','disabilitylevelList','disabilitytypeList']
-        }
-        const res = await getparameter(numbers);
-        for(var k of res){
-          for(var m in this.lists){
-            if(m==k.number){
-              this.lists[m] = k.detail
-            }
-          }
-        }
+        this.form = res.data
+        this.importForm = this.form
+          ?.filter((i) => i.form_show && i.list_show)
+          .map((i) => {
+            return i
+          })
+        this.exportForm = this.form
+          ?.filter((i) => i.list_show)
+          .map((i) => {
+            return i
+          })
+      },
+      async exportExcel(sheetName) {
+        const res = await index(Object.assign(this.select, {
+          page: 1,
+          page_size: 99999,
+          table_name: this.customForm.tableName
+        }))
+        if (res.data) {
+          let headers = this.exportForm.map(i => {
+            return {
+              key: i.field,
+              title: i.name
+            }
+          })
+          const data = res.data.map(row => headers.map(header => row[header.key]));
+          data.unshift(headers.map(header => header.title));
+          const wb = XLSX.utils.book_new();
+          const ws = XLSX.utils.aoa_to_sheet(data);
+          XLSX.utils.book_append_sheet(wb, ws, sheetName);
+          const wbout = XLSX.write(wb, {
+            bookType: 'xlsx',
+            bookSST: true,
+            type: 'array'
+          });
+          saveAs(new Blob([wbout], {
+            type: 'application/octet-stream'
+          }), `${sheetName}.xlsx`);
+        }
+      },
+      async getLabel() {
+        let numbers = {
+          number: ['streetList', 'disabilitylevelList', 'disabilitytypeList']
+        }
+        const res = await getparameter(numbers);
+        for (var k of res) {
+          for (var m in this.lists) {
+            if (m == k.number) {
+              this.lists[m] = k.detail
+            }
+          }
+        }
       },
     },
     mounted() {
-      this.getindex()
-      this.getField()
-      this.getLabel()
+      this.getindex()
+      this.getField()
+      this.getLabel()
 
     }
 
   }
 </script>
 
-<style scoped>
-  .street{
-    margin-right:10px;
-    width:150px
-  }
-  /deep/ .street .el-input__inner{
-    height:32px;
-  }
-  /deep/ .street .el-select__caret{
-    line-height: 32px;
+<style scoped>
+  .street {
+    margin-right: 10px;
+    width: 150px
+  }
+
+  /deep/ .street .el-input__inner {
+    height: 32px;
+  }
+
+  /deep/ .street .el-select__caret {
+    line-height: 32px;
   }
 </style>
diff --git a/src/views/record/searchall.vue b/src/views/record/searchall.vue
new file mode 100644
index 0000000..270e757
--- /dev/null
+++ b/src/views/record/searchall.vue
@@ -0,0 +1,438 @@
+<template>
+  <div style="padding: 0 20px">
+
+    <div ref="lxHeader">
+      <lx-header icon="md-apps" text="档案管理" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
+        <slot>
+          <div style="display: flex;justify-content: flex-start;flex-wrap: wrap;">
+            <Input v-model="select.keyword" style="width: 150px;margin-right: 10px;" placeholder="搜索姓名" />
+            <el-select class='street' v-model="select.street" placeholder="请选择街道" clearable>
+              <el-option v-for="item in lists.streetList" :key="item.value" :label="item.value" :value="item.value">
+              </el-option>
+            </el-select>
+            <el-select class='street' v-model="select.disabilityType" placeholder="请选择残疾类别" clearable>
+              <el-option v-for="item in lists.disabilitytypeList" :key="item.value" :label="item.value"
+                :value="item.value">
+              </el-option>
+            </el-select>
+            <el-select class='street' v-model="select.disabilityLevel" placeholder="请选择残疾等级" clearable>
+              <el-option v-for="item in lists.disabilitylevelList" :key="item.value" :label="item.value"
+                :value="item.value">
+              </el-option>
+            </el-select>
+            <el-select class='street' style='width:120px' v-model="select.link_tables[0]['year']" placeholder="请选择年份"
+              clearable>
+              <el-option v-for="item in [{label:2021,value:2021},{label:2022,value:2022},{label:2023,value:2023}]"
+                :key="item.value" :label="item.value" :value="item.value">
+              </el-option>
+            </el-select>
+            <el-select collapse-tags class='street' style='width:240px' v-model="select.link_tables[0]['tables']" multiple placeholder="请选择业务" clearable>
+              <el-option v-for="item in lists.workflowList"
+                :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
+
+
+            <Button type="primary" @click="getindex">查询</Button>
+            <Button type="primary" style="margin-left: 10px;" @click="resetindex">重置</Button>
+          </div>
+        </slot>
+      </lx-header>
+    </div>
+
+    <xy-table :list="list" :total="total" @pageSizeChange="e => select.pageSize = e" @pageIndexChange="pageChange"
+      :table-item="table">
+      <template v-slot:btns>
+        <div></div>
+        <!-- <el-table-column fixed="right" label="操作" width="260" header-align="center">
+          <template slot-scope="scope">
+            <Button type="primary" size="small" @click="editorRecord(scope.row.id,'editor')">编辑</Button>
+            <Button type="primary" size="small" style="margin-left: 10px;"
+              @click="editorView(scope.row.id,'add')">访视</Button>
+            <Button type="primary" size="small" style="margin-left: 10px;" @click="showInfo(scope.row.id)">视图</Button>
+            <Poptip transfer confirm title="确认要删除吗？" @on-ok="deleteRecord(scope.row)">
+              <Button type="primary" style="margin-left: 10px;" size="small" ghost>删除</Button>
+            </Poptip>
+          </template>
+        </el-table-column> -->
+      </template>
+    </xy-table>
+  </div>
+</template>
+
+<script>
+  import {
+    index
+  } from "@/api/system/baseForm.js"
+  import {
+    Message
+  } from 'element-ui'
+  import {
+    index as fieldIndex
+  } from "@/api/system/customFormField";
+  import {
+    getparameter
+  } from "@/api/system/dictionary";
+  export default {
+    data() {
+      return {
+
+        select: {
+          pageSize: 40,
+          pageIndex: 1,
+          keyword: "",
+          street: '',
+          disabilityLevel: "",
+          disabilityType: "",
+          link_tables: [{
+            'year': '',
+            "tables": []
+          }]
+        },
+        lists: {
+          disabilitytypeList: [],
+          disabilitylevelList: [],
+          streetList: [],
+          workflowList: [{
+            label: '机动轮椅车燃油补贴',
+            value: 'fuels'
+          }, {
+            label: '无障碍改造',
+            value: 'reforms'
+          }, {
+            label: '免费服药',
+            value: 'medicines'
+          }, {
+            label: '儿童康复',
+            value: 'childrens'
+          }, {
+            label: '辅具适配',
+            value: 'assists'
+          }, {
+            label: '社区康复',
+            value: 'communities'
+          }, {
+            label: '教育专项补贴',
+            value: 'educations'
+          }, {
+            label: '托养',
+            value: 'raises'
+          }, {
+            label: '自主创业补贴',
+            value: 'starts_subsidys'
+          }, {
+            label: '自主创业经营场地租金补贴',
+            value: 'starts_addresses'
+          }, {
+            label: '两项补贴',
+            value: 'doubles'
+          }, {
+            label: '残疾人证申请',
+            value: 'disabilities'
+          }, {
+            label: '培训记录',
+            value: 'trains'
+          }, {
+            label: '商业保险',
+            value: 'insures'
+          }, {
+            label: '已就业人员',
+            value: 'jobs'
+          }, {
+            label: '死亡注销',
+            value: 'cancels'
+          }]
+        },
+        customForm: {
+          customFormId: 1,
+          tableName: "records"
+        },
+        form: [],
+        importForm: [],
+        exportForm: [],
+        total: 0,
+        list: [],
+        table: [{
+            label: '序号',
+            type: 'index',
+            fixed: 'left',
+            width: 60
+          },
+          {
+            label: "姓名",
+            width: 120,
+            prop: 'name',
+            align: 'center',
+            fixed: 'left'
+          },
+          {
+            label: "性别",
+            width: 80,
+            prop: 'sex',
+            align: 'center',
+          },
+          {
+            label: "年龄",
+            width: 80,
+            prop: 'idcard',
+            align: 'center',
+            formatter: (cell, data, value) => {
+              return this.getName(value)
+            }
+          },
+          {
+            label: "残疾类别",
+            width: 80,
+            prop: 'disabilitytype',
+            align: 'center'
+          },
+          {
+            label: "残疾等级",
+            width: 80,
+            prop: 'disabilitylevel',
+            align: 'center'
+          },
+          {
+            label: "户籍地址",
+            // width: 240,
+            prop: 'address',
+            align: 'left',
+            formatter: (cell, data, value) => {
+              return value.indexOf('江苏省常州市金坛区') > -1 ? value.replace('江苏省常州市金坛区', '') : value
+            }
+          },
+        ]
+      }
+    },
+    methods: {
+      showInfo(id) {
+        this.$router.push({
+          path: "/record/personinfo",
+          query: {
+            id: id
+          }
+        })
+      },
+      resetindex() {
+        this.select = {
+          pageSize: 40,
+          pageIndex: 1,
+          keyword: "",
+          street: '',
+          disabilityLevel: "",
+          disabilityType: "",
+          link_tables: [{
+            'year': '',
+            "tables": []
+          }]
+        }
+        this.getindex()
+      },
+      async getindex() {
+        const res = await index({
+          page_size: this.select.pageSize,
+          page: this.select.pageIndex,
+          table_name: this.customForm.tableName,
+          link_tables: this.select.link_tables,
+          // link_tables[0]['year']:'2023',
+          show_relation: ['admin', 'department'],
+          filter: [{
+            "key": "name",
+            "op": "like",
+            "value": this.select.keyword
+          }, {
+            "key": "street",
+            "op": "eq",
+            "value": this.select.street
+          }, {
+            "key": "disabilitytype",
+            "op": "eq",
+            "value": this.select.disabilityType
+          }, {
+            "key": "disabilitylevel",
+            "op": "eq",
+            "value": this.select.disabilityLevel
+          }],
+        })
+        this.list = res.data
+        this.total = res.total
+      },
+
+      pageChange(e) {
+        this.select.pageIndex = e
+        this.getindex()
+      },
+      editorRecord(id, type) {
+        this.$refs['addRecord'].id = id
+        this.$refs['addRecord'].isShow = true
+        this.$refs['addRecord'].type = type
+      },
+      editorView(id, type) {
+        console.log(id, type)
+        this.$refs['addViewRecord'].person_id = id
+        this.$refs['addViewRecord'].isShow = true
+        this.$refs['addViewRecord'].type = type
+
+      },
+      deleteRecord(row) {
+        destroy({
+          id: row.id,
+          table_name: this.customForm.tableName
+        }).then(res => {
+          Message({
+            type: 'success',
+            message: '删除成功'
+          })
+          this.getindex()
+        })
+      },
+      getName(iden) {
+        let val = iden.length;
+        let myDate = new Date();
+        let month = myDate.getMonth() + 1;
+        let day = myDate.getDate();
+        let age = 0;
+
+        if (val === 18) {
+          age = myDate.getFullYear() - iden.substring(6, 10) - 1;
+
+          if (iden.substring(10, 12) < month || iden.substring(10, 12) == month && iden.substring(12, 14) <= day) age++;
+
+        }
+        if (val === 15) {
+          age = myDate.getFullYear() - iden.substring(6, 8) - 1901;
+
+          if (iden.substring(8, 10) < month || iden.substring(8, 10) == month && iden.substring(10, 12) <= day) age++;
+        }
+
+        return age
+      },
+      // 获取表信息
+      async getField() {
+        // console.log(this.$route.meta.params, "---", this.$route)
+        // return
+        // if (this.$route.meta.params?.custom_form) {
+        //   let decode = decodeURIComponent(this.$route.meta.params?.custom_form)
+        //   try {
+        //     let custom_form = JSON.parse(decode)
+        //     this.customForm.customFormId = custom_form.custom_form_id
+        //     this.customForm.tableName = custom_form.table_name
+        //     console.log("123", this.customForm)
+        //     // this.select.table_name = custom_form.table_name
+        //   } catch (err) {
+        //     console.warn(err)
+        //   }
+        // }
+        const res = await fieldIndex({
+          page: 1,
+          page_size: 999,
+          custom_form_id: this.customForm.customFormId,
+          sort_name: 'sort',
+          sort_type: 'asc',
+        })
+        if (res.data && res.data instanceof Array) {
+          res.data.forEach(i => {
+            if (i.field) {
+              if (
+                (i.edit_input === "checkbox" || i.edit_input === "radio" || i.edit_input === "select") &&
+                i.parameter_id
+              ) {
+                getparameter({
+                  id: i.parameter_id
+                }).then((res) => {
+                  i._paramters = res.detail ?? [];
+                });
+              }
+              if (
+                (i.edit_input === "checkbox" || i.edit_input === "radio" || i.edit_input === "select") &&
+                i.link_table_name
+              ) {
+                index({
+                  page: 1,
+                  page_size: 999,
+                  table_name: i.link_table_name,
+                }).then((res) => {
+                  i._paramters = res.data ?? [];
+                });
+              }
+            }
+          })
+        }
+        this.form = res.data
+        this.importForm = this.form
+          ?.filter((i) => i.form_show && i.list_show)
+          .map((i) => {
+            return i
+          })
+        this.exportForm = this.form
+          ?.filter((i) => i.list_show)
+          .map((i) => {
+            return i
+          })
+      },
+      async exportExcel(sheetName) {
+        const res = await index(Object.assign(this.select, {
+          page: 1,
+          page_size: 99999,
+          table_name: this.customForm.tableName
+        }))
+        if (res.data) {
+          let headers = this.exportForm.map(i => {
+            return {
+              key: i.field,
+              title: i.name
+            }
+          })
+          const data = res.data.map(row => headers.map(header => row[header.key]));
+          data.unshift(headers.map(header => header.title));
+          const wb = XLSX.utils.book_new();
+          const ws = XLSX.utils.aoa_to_sheet(data);
+          XLSX.utils.book_append_sheet(wb, ws, sheetName);
+          const wbout = XLSX.write(wb, {
+            bookType: 'xlsx',
+            bookSST: true,
+            type: 'array'
+          });
+          saveAs(new Blob([wbout], {
+            type: 'application/octet-stream'
+          }), `${sheetName}.xlsx`);
+        }
+      },
+      async getLabel() {
+        let numbers = {
+          number: ['streetList', 'disabilitylevelList', 'disabilitytypeList']
+        }
+        const res = await getparameter(numbers);
+        for (var k of res) {
+          for (var m in this.lists) {
+            if (m == k.number) {
+              this.lists[m] = k.detail
+            }
+          }
+        }
+      },
+    },
+    mounted() {
+      this.getindex()
+      this.getField()
+      this.getLabel()
+
+    }
+
+  }
+</script>
+
+<style scoped>
+  .street {
+    margin-right: 10px;
+    width: 150px
+  }
+
+  /deep/ .street .el-input__inner {
+    height: 32px;
+  }
+
+  /deep/ .street .el-select__caret {
+    line-height: 32px;
+  }
+</style>
diff --git a/src/views/system/form.vue b/src/views/system/form.vue
index 6001fb6..c0a0a7d 100644
--- a/src/views/system/form.vue
+++ b/src/views/system/form.vue
@@ -64,7 +64,7 @@ export default {
     return {
       select:{
         page:1,
-        page_size:10
+        page_size:40
       },
       list:[],
       table:[