diff --git a/src/api/followup.js b/src/api/followup.js
index ac5d5edbf2ee3a1b637339f40fc27e9e2dfbd972..b26fd90fee73c9f985f27598c5fdcc0bc613cead 100644
--- a/src/api/followup.js
+++ b/src/api/followup.js
@@ -4,7 +4,14 @@ import request from "@/utils/request";
  * 随访
  *
  *  */
-
+//随访调查 列表
+export function getFollowSurvey(params = {}) {
+  return request({
+    url: "/disease-data/follow/survey",
+    method: "get",
+    params,
+  });
+}
 //审核质控 随访
 export function getFollowCheck(params = {}) {
   return request({
diff --git a/src/components/CustomsTable/index.vue b/src/components/CustomsTable/index.vue
index 0cbc6305c51aeec2ca2865cb9898c60579547655..2d595fc315de58819820a2cb7c7173f8420300ba 100644
--- a/src/components/CustomsTable/index.vue
+++ b/src/components/CustomsTable/index.vue
@@ -11,8 +11,7 @@
       :header-row-class-name="headerClass"
       style="width: 100%"
     >
-      <el-table-column v-if="showIndex" type="index" width="120" label="序号">
-      </el-table-column>
+      <el-table-column v-if="showIndex" type="index" width="120" label="序号"></el-table-column>
       <template v-for="(column, index) in columns">
         <template v-if="!column.type && !column.operType">
           <el-table-column
@@ -31,15 +30,20 @@
           >
             <!-- 表头插槽 -->
             <template slot="header" slot-scope="scope">
-              <span :style="{ fontSize: fontSize[fontIndex] }">{{
-                column.label
-              }}</span>
+              <span :style="{ fontSize: fontSize[fontIndex] }">{{column.label}}</span>
             </template>
             <!-- 表内容插槽 -->
             <template slot-scope="scope">
-              <span :style="{ fontSize: fontSize[fontIndex] }">
-                {{ scope.row[column.value] || "--" }}</span
-              >
+              <!-- 转化文字 -->
+              <span
+                :style="{ fontSize: fontSize[fontIndex] }"
+                v-if="column.transList"
+              >{{column.transList[scope.row[String(column.value)]]|| "--"}}</span>
+              <!-- 一般情况 -->
+              <span
+                :style="{ fontSize: fontSize[fontIndex] }"
+                v-else
+              >{{ scope.row[column.value] || "--" }}</span>
             </template>
           </el-table-column>
         </template>
@@ -57,16 +61,16 @@
           >
             <!-- 表头插槽 -->
             <template slot="header" slot-scope="scope">
-              <span :style="{ fontSize: fontSize[fontIndex] }">{{
+              <span :style="{ fontSize: fontSize[fontIndex] }">
+                {{
                 column.label
-              }}</span>
+                }}
+              </span>
             </template>
             <!-- 表内容插槽 -->
             <template slot-scope="scope">
               <!-- 按钮 -->
-              <template
-                v-if="column.type === 'button' || column.operType === 'button'"
-              >
+              <template v-if="column.type === 'button' || column.operType === 'button'">
                 <!-- 按钮数组 -->
                 <template v-for="(op, opIndex) in column.operations">
                   <el-button
@@ -84,11 +88,11 @@
                     @click="op.func(scope.row, scope.$index)"
                   >
                     {{
-                      op.formatter
-                        ? op.formatter(scope.row).label
-                        : op.label
-                        ? op.label
-                        : scope.row[column.value]
+                    op.formatter
+                    ? op.formatter(scope.row).label
+                    : op.label
+                    ? op.label
+                    : scope.row[column.value]
                     }}
                   </el-button>
                 </template>
@@ -115,16 +119,17 @@
                         scope.row[column.value][0].uuidName
                       : '',
                   ]"
-                >
-                </el-image>
+                ></el-image>
               </template>
               <!-- 文件 -->
               <template v-if="column.type === 'file'">
-                <span>{{
+                <span>
+                  {{
                   scope.row[column.value]
-                    ? scope.row[column.value][0].fileName
-                    : ""
-                }}</span>
+                  ? scope.row[column.value][0].fileName
+                  : ""
+                  }}
+                </span>
               </template>
               <!-- html -->
               <template v-if="column.type === 'html'">
@@ -137,8 +142,7 @@
                   :active-value="1"
                   :inactive-value="0"
                   @change="column.func(scope.row, scope.$index)"
-                >
-                </el-switch>
+                ></el-switch>
               </template>
             </template>
           </el-table-column>
diff --git a/src/components/FormComponents/index.vue b/src/components/FormComponents/index.vue
index e54a8968cfdf4d99bd860161b4f7dc88028f4e2a..efdf5363d5e5742678425bc1249e4bd2b7f59a1a 100644
--- a/src/components/FormComponents/index.vue
+++ b/src/components/FormComponents/index.vue
@@ -38,9 +38,11 @@
           @focus="item.focusFunc ? item.focusFunc($event) : {}"
           @change="item.func ? item.func($event) : {}"
         >
-          <span v-if="item.unit" :slot="item.slot ? item.slot : 'append'">{{
+          <span v-if="item.unit" :slot="item.slot ? item.slot : 'append'">
+            {{
             item.unit
-          }}</span>
+            }}
+          </span>
         </el-input>
 
         <template v-if="item.type === 'textarea'">
@@ -88,8 +90,7 @@
             :key="optIndex"
             :label="opt.label"
             :value="item.isSelect ? opt.selectValue : opt.value"
-          >
-          </el-option>
+          ></el-option>
         </el-select>
 
         <!-- 日期区间 -->
@@ -105,8 +106,7 @@
           :picker-options="item.options"
           :format="item.format"
           :value-format="item.valueFormat"
-        >
-        </el-date-picker>
+        ></el-date-picker>
 
         <!-- 日期 -->
         <el-date-picker
@@ -117,8 +117,7 @@
           :picker-options="item.options"
           :format="item.format"
           :value-format="item.valueFormat"
-        >
-        </el-date-picker>
+        ></el-date-picker>
 
         <!-- 下拉框 -->
         <el-select
@@ -135,8 +134,7 @@
             :key="optIndex"
             :label="opt.label"
             :value="item.isSelect ? opt.selectValue : opt.value"
-          >
-          </el-option>
+          ></el-option>
         </el-select>
 
         <!-- 单选框 -->
@@ -148,8 +146,7 @@
           :class="item.class"
           :label="opt.value"
           @change="item.func ? item.func($event) : {}"
-          >{{ opt.label }}
-        </el-radio>
+        >{{ opt.label }}</el-radio>
 
         <!-- 级联 -->
         <el-cascader
@@ -162,9 +159,7 @@
         ></el-cascader>
 
         <!-- 文字 -->
-        <span v-else-if="item.type === 'text'">
-          {{ item.text ? item.text : form[item.prop] }}
-        </span>
+        <span v-else-if="item.type === 'text'">{{ item.text ? item.text : form[item.prop] }}</span>
 
         <!-- 数字输入框 -->
         <el-input-number
@@ -195,10 +190,8 @@
             :size="size"
             :icon="btn.icon"
             :style="btn.style"
-            @click="btn.func"
-          >
-            {{ btn.btnText }}
-          </el-button>
+            @click="btn.func(form)"
+          >{{ btn.btnText }}</el-button>
           <div
             v-if="btn.btnType == 'tobeModified'"
             :key="index"
@@ -206,13 +199,8 @@
             :style="{ backgroundColor: modifiedFlag ? '#4E68FF' : '#fff' }"
             @click="changeModified"
           >
-            <i
-              :style="{ color: modifiedFlag ? '#fff' : '#d9d9d9' }"
-              class="el-icon-check"
-            ></i>
-            <span :style="{ color: modifiedFlag ? '#fff' : '#000' }"
-              >待修改（{{ btn.tobeModified }}）</span
-            >
+            <i :style="{ color: modifiedFlag ? '#fff' : '#d9d9d9' }" class="el-icon-check"></i>
+            <span :style="{ color: modifiedFlag ? '#fff' : '#000' }">待修改（{{ btn.tobeModified }}）</span>
           </div>
         </template>
       </div>
@@ -227,9 +215,7 @@
         :icon="btn.icon"
         :style="btn.style"
         @click="btn.func"
-      >
-        {{ btn.btnText }}
-      </el-button>
+      >{{ btn.btnText }}</el-button>
     </el-col>
   </el-form>
 </template>
@@ -270,6 +256,7 @@ export default {
   methods: {
     // 查询
     handleSearch() {
+      console.log("this.form",this.form)
       this.$emit("handleSearch", this.form)
     },
 
diff --git a/src/views/followupquery/index.vue b/src/views/followupquery/index.vue
index 937c72676444429a82b4f5a347b3c86628b226b4..67ba6ab4a7f0e600e4b47b2dd0cfb9ad94494611 100644
--- a/src/views/followupquery/index.vue
+++ b/src/views/followupquery/index.vue
@@ -174,7 +174,7 @@ export default {
           prop: "screeningTime",
           placeholder: "请选择时间",
           rules: [],
-          opts: [{ label: "123", value: "1" }],
+          opts: [],
         },
         {
           type: "select",
@@ -182,7 +182,7 @@ export default {
           prop: "screeningStatus",
           placeholder: "请选择随访状态",
           rules: [],
-          opts: [{ label: "123", value: "1" }],
+          opts: [],
         },
         {
           type: "select",
@@ -190,7 +190,7 @@ export default {
           prop: "screeningProgress",
           placeholder: "请选择随访进度",
           rules: [],
-          opts: [{ label: "123", value: "1" }],
+          opts: [],
         },
         {
           type: "select",
@@ -198,7 +198,7 @@ export default {
           prop: "planScreeningTime",
           placeholder: "请选择计划随访时间",
           rules: [],
-          opts: [{ label: "123", value: "1" }],
+          opts: [],
         },
         {
           type: "input",
diff --git a/src/views/followupresearch/index.vue b/src/views/followupresearch/index.vue
index 420ff7187041078739fe40bffc4394564ba3c263..b8e3487a16929c3ca0baa5bb7dbe06f99d081e13 100644
--- a/src/views/followupresearch/index.vue
+++ b/src/views/followupresearch/index.vue
@@ -2,7 +2,7 @@
   <!-- 随访调查 -->
   <div class="screeningSearch">
     <div class="top">
-      <form-components :forms="formList"></form-components>
+      <form-components :forms="formList" @handleSearch="onSearch"></form-components>
     </div>
     <div class="bot">
       <customs-table
@@ -25,6 +25,8 @@
 import FormComponents from "@/components/FormComponents"
 import CustomsTable from "@/components/CustomsTable"
 import paginationMixin from "@/components/TabComponents/mixin"
+import { getFollowSurvey } from "@/api/followup"
+import { getDictDetail } from "@/api/dict.js"
 export default {
   components: {
     CustomsTable,
@@ -39,51 +41,64 @@ export default {
       columns: [
         {
           label: "医联体",
-          value: "name",
+          value: "unionName",
           minWidth: 120,
         },
         {
           label: "姓名",
-          value: "1",
+          value: "name",
           minWidth: 120,
         },
         {
           label: "性别",
-          value: "2",
+          value: "sex",
           minWidth: 120,
+          // trans:'d-sex',
+          transList:{
+            1:'男',
+            2:'女'
+          }
         },
         {
           label: "身份证",
-          value: "3",
+          value: "idCard",
           minWidth: 120,
         },
         {
           label: "年龄",
+          value:"age",
           minWidth: 120,
         },
         {
           label: "筛查时间",
-          value: "5",
+          value: "screeningTime",
           minWidth: 120,
         },
         {
           label: "风险评估结果",
-          value: "6",
+          value: "riskRank",
+          trans:'risk_level',
+          transList:{
+          },
           minWidth: 120,
         },
         {
           label: "上次随访时间",
-          value: "7",
+          value: "followTime",
           minWidth: 120,
         },
         {
           label: "随访进度",
-          value: "8",
+          value: "followBatch",
+          trans:'follow_type',
+          transList:{
+          },
           minWidth: 120,
         },
         {
           label: "计划随访时间",
-          value: "9",
+          value: "nextFollowTime",
+          trans:'next_follow_time',
           minWidth: 120,
         },
         {
@@ -104,12 +119,7 @@ export default {
           ],
         },
       ],
-      tableData: [
-        {
-          name: "1",
-          1: 2,
-        },
-      ],
+      tableData: [],
       formList: [
         {
           xs: 24,
@@ -119,7 +129,8 @@ export default {
           xl: 7,
           type: "select",
           label: "计划随访时间",
-          prop: "planScreeningTime",
+          prop: "nextFollowTime",
+          trans:'next_follow_time',
           placeholder: "请选择计划随访时间",
           rules: [],
           opts: [{ label: "123", value: "1" }],
@@ -131,9 +142,33 @@ export default {
           lg: 7,
           xl: 7,
           type: "input",
-          label: "关键词",
-          prop: "keyWord",
-          placeholder: "请输入医联体/姓名/身份证",
+          label: "姓名",
+          prop: "name",
+          placeholder: "请输入姓名",
+          rules: [],
+        },
+        {
+          xs: 24,
+          sm: 12,
+          md: 12,
+          lg: 7,
+          xl: 7,
+          type: "input",
+          label: "身份证",
+          prop: "idCard",
+          placeholder: "请输入身份证",
+          rules: [],
+        },
+        {
+          xs: 24,
+          sm: 12,
+          md: 12,
+          lg: 7,
+          xl: 7,
+          type: "input",
+          label: "医联体",
+          prop: "unionName",
+          placeholder: "请输入医联体",
           rules: [],
         },
         {
@@ -144,7 +179,8 @@ export default {
           xl: 7,
           type: "select",
           label: "随访进度",
-          prop: "screeningProgress",
+          prop: "followBatch",
+          trans:'follow_type',
           placeholder: "请选择随访进度",
           rules: [],
           opts: [{ label: "123", value: "1" }],
@@ -168,9 +204,7 @@ export default {
                 marginLeft: "40px",
               },
               btnText: "查询",
-              func: () => {
-                this.onSearch()
-              },
+              func: this.onSearch
             },
             // {
             //   btnType: "tobeModified",
@@ -179,10 +213,18 @@ export default {
           ],
         },
       ],
+      // pageSize:1,
+      // pageNum:10,
+      // totalCount:20
     }
   },
   watch: {},
-  mounted() {},
+  created(){
+    this.initColumn()
+  },
+  mounted() {
+    this.handleSearch()
+  },
   methods: {
     changeModified() {
       this.modifiedFlag = !this.modifiedFlag
@@ -197,13 +239,61 @@ export default {
       console.log(this.page)
       this.$refs.customTable.loading = false
     },
-    onSearch() {
-      console.log(123456)
+    onSearch(form) {
+      console.log(form)
     },
     rowOpration(data, i) {
       console.log(data, i)
       this.$router.push("/followupentry")
     },
+    async handleSearch(){
+      let params={
+        pageSize:this.pageSize,
+        pageNum:this.pageIndex
+      }
+      let res = await getFollowSurvey(params)
+      if(res.code==1){
+        //分页内容
+        const d = res.data
+        this.total= d.total
+        this.tableData=d['records']
+      }
+    },
+    initColumn(){
+      this.columns.forEach((item,index) => {
+        if(item.trans){
+          this.initDict(item.trans,index)
+        }
+      })
+    },
+    async initDict(type,index){
+      let params={
+        type:type
+      }
+      const res = await getDictDetail(params)
+      let item = this.formList.find(_ => _.trans == type)
+      res.data.forEach((itemD,inx) => {
+        if(!this.columns[index]['transList']){
+           this.columns[index]['transList']={}
+        }
+        else{
+          this.columns[index]['transList'][itemD.code]=itemD.name
+        }
+        if(item){
+          if(!item['opts']){
+           item['opts']=[]
+        }
+        else {
+            item['opts']=res.data.map((_) => {
+              return {
+                label: _.name,
+                value: _.code,
+              }
+            })
+          }
+        }
+      })
+    }
   },
 }
 </script>
diff --git a/src/views/screening/components/ConfigForms.vue b/src/views/screening/components/ConfigForms.vue
index 0027d23b8131a5360c08f91ef16f2222edc7b66f..c0edf6ff3de8d66636deaf0a174b0d41fe32e826 100644
--- a/src/views/screening/components/ConfigForms.vue
+++ b/src/views/screening/components/ConfigForms.vue
@@ -114,6 +114,7 @@ export default {
         this.loading = false
       } else {
         // 返回
+        this.$router.back()
       }
     },
     dialogSubmit() {},