From 707b1ae36fe11356b38361ac6d2823d21d49a1bf Mon Sep 17 00:00:00 2001
From: Liuyujia <18050528999@163.com>
Date: Wed, 1 Feb 2023 17:24:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=8F=E8=AE=BF=E5=AE=A1=E6=A0=B8=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/followup.js                           |  15 +-
 src/components/CustomsTable/index.vue         |   2 +-
 src/views/audit-detail/index.vue              |  62 +++---
 src/views/audit-qualitycontrol/community.vue  | 210 ------------------
 .../audit-qualitycontrol/healthcheckup.vue    | 174 ---------------
 src/views/audit-qualitycontrol/hospital.vue   | 174 ---------------
 src/views/audit-qualitycontrol/index.vue      | 140 +++++++++---
 src/views/followupresearch/index.vue          |  23 +-
 8 files changed, 168 insertions(+), 632 deletions(-)
 delete mode 100644 src/views/audit-qualitycontrol/community.vue
 delete mode 100644 src/views/audit-qualitycontrol/healthcheckup.vue
 delete mode 100644 src/views/audit-qualitycontrol/hospital.vue

diff --git a/src/api/followup.js b/src/api/followup.js
index b50ff2f..08b715e 100644
--- a/src/api/followup.js
+++ b/src/api/followup.js
@@ -12,15 +12,24 @@ export function getFollowSurvey(params = {}) {
     params,
   });
 }
-//审核质控 随访已审核列表
+///////////////审核质控/////////////////////
+//随访已审核列表
 export function getFollowCheck(params = {}) {
   return request({
-    url: "/disease-data/follow/check",
+    url: "/disease-data/dataCheck/follow/check",
     method: "get",
     params,
   });
 }
-//审核质控 随访病例待审核(详情数据)
+//随访待审核列表
+export function getFollowUncheck(params = {}) {
+  return request({
+    url: "/disease-data/dataCheck/follow/unCheck",
+    method: "get",
+    params,
+  });
+}
+//随访病例待审核(详情数据)
 export function getFollowUnCheckDetail(params = {}) {
   return request({
     url: "/disease-data/dataCheck/follow/unCheck/detail/",
diff --git a/src/components/CustomsTable/index.vue b/src/components/CustomsTable/index.vue
index c1c9fab..5c79e45 100644
--- a/src/components/CustomsTable/index.vue
+++ b/src/components/CustomsTable/index.vue
@@ -43,7 +43,7 @@
               <span
                 :style="{ fontSize: fontSize + 'px' }"
                 v-else
-              >{{ String(scope.row[column.value]) || "--" }}</span>
+              >{{ String(scope.row[column.value]|| "--") }}</span>
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/audit-detail/index.vue b/src/views/audit-detail/index.vue
index af52ac0..08d28a7 100644
--- a/src/views/audit-detail/index.vue
+++ b/src/views/audit-detail/index.vue
@@ -20,8 +20,7 @@
             class="p-btn"
             size="medium"
             @click="showDialog(item.value)"
-            >{{ item.text }}</el-button
-          >
+          >{{ item.text }}</el-button>
           <span v-if="editStatus" class="op">驳回修改建议:胃镜图片不合规</span>
         </div>
       </div>
@@ -36,26 +35,20 @@
         <div class="content">
           <div class="showTips">
             该病例已经审核【驳回修改】，需要改为{{
-              btnGroup[curBtn - 1] ? btnGroup[curBtn - 1].text : ""
+            btnGroup[curBtn - 1] ? btnGroup[curBtn - 1].text : ""
             }}吗
           </div>
         </div>
         <div class="btn">
-          <el-button type="primary" :loading="loading" @click="onCancel"
-            >否</el-button
-          >
-          <el-button type="primary" :loading="loading" @click="editSubmit"
-            >是</el-button
-          >
+          <el-button type="primary" :loading="loading" @click="onCancel">否</el-button>
+          <el-button type="primary" :loading="loading" @click="editSubmit">是</el-button>
         </div>
       </template>
     </public-dialog>
     <public-dialog ref="publicDialog" @onSubmit="onSubmit" @onCancel="onCancel">
       <!-- 审核结果回显 -->
       <template v-if="!confirmStatus" slot="content">
-        <div class="title">
-          {{ btnGroup[curBtn - 1] ? btnGroup[curBtn - 1].text : "" }}
-        </div>
+        <div class="title">{{ btnGroup[curBtn - 1] ? btnGroup[curBtn - 1].text : "" }}</div>
         <div class="content">
           <div v-if="curBtn != 1" class="noPass">
             <el-form
@@ -66,10 +59,7 @@
               label-width="100px"
               class="demo-ruleForm"
             >
-              <el-form-item
-                :label="curBtn == 2 ? '不合格原因' : '驳回修改建议'"
-                prop="reson"
-              >
+              <el-form-item :label="curBtn == 2 ? '不合格原因' : '驳回修改建议'" prop="reson">
                 <el-input
                   v-model="form.reson"
                   type="textarea"
@@ -82,9 +72,7 @@
           </div>
         </div>
         <div class="btn">
-          <el-button type="primary" :loading="loading" @click="onSubmit"
-            >确 定</el-button
-          >
+          <el-button type="primary" :loading="loading" @click="onSubmit">确 定</el-button>
         </div>
       </template>
       <!-- 提交后结果 -->
@@ -94,17 +82,11 @@
           <div v-if="curBtn == 1" class="pass">该病例审核合格成功！</div>
           <div v-if="curBtn != 1" class="noPass">
             <!-- 不合格和驳回 -->
-            <div class="label">
-              {{ curBtn == 2 ? "不合格原因" : "驳回修改建议" }}
-            </div>
-            <div class="reson">
-              {{ form.reson }}
-            </div>
+            <div class="label">{{ curBtn == 2 ? "不合格原因" : "驳回修改建议" }}</div>
+            <div class="reson">{{ form.reson }}</div>
           </div>
         </div>
-        <div v-if="curBtn != 1" class="showTips">
-          该病例审核{{ curBtn == 2 ? "不合格原因" : "驳回修改建议" }}提交成功！
-        </div>
+        <div v-if="curBtn != 1" class="showTips">该病例审核{{ curBtn == 2 ? "不合格原因" : "驳回修改建议" }}提交成功！</div>
         <div class="btn">
           <el-button type="primary" @click="nextExample">下一例</el-button>
         </div>
@@ -115,6 +97,7 @@
 <script>
 import publicDialog from "./components/publicDialog.vue"
 import screenReview from "./components/screenReview.vue"
+import { getFollowUnCheckDetail } from "@/api/followup"
 export default {
   components: { publicDialog, screenReview },
   data() {
@@ -145,7 +128,14 @@ export default {
     }
   },
   watch: {},
-  mounted() {},
+  computed:{
+    unionId(){
+      return this.$route.query.id
+    }
+  },
+  mounted() {
+    this.getDetail()
+  },
   methods: {
     showDialog(val) {
       this.curBtn = val
@@ -210,6 +200,20 @@ export default {
     nextExample() {
       this.onCancel()
     },
+    async getDetail(){
+      this.loading = true
+      let params={
+        unionId:this.unionId,
+      }
+      let res = await getFollowUnCheckDetail(params)
+      if(res.code==1){
+        //分页内容
+        // const d = res.data
+        // this.total= d.total
+        // this.tableData=d['records']
+      }
+      this.loading = false
+    },
   },
 }
 </script>
diff --git a/src/views/audit-qualitycontrol/community.vue b/src/views/audit-qualitycontrol/community.vue
deleted file mode 100644
index dca5e45..0000000
--- a/src/views/audit-qualitycontrol/community.vue
+++ /dev/null
@@ -1,210 +0,0 @@
-<template>
-  <div class="audit-qualitycontrol">
-    <div class="aq-top-tab">
-      <el-tabs v-model="type" @tab-click="handleClick">
-        <el-tab-pane label="筛查病例数据" name="0"></el-tab-pane>
-        <el-tab-pane label="随访病例数据" name="1"></el-tab-pane>
-      </el-tabs>
-    </div>
-    <div class="aq-bot-table">
-      <div class="table-top-tab">
-        <el-tabs v-model="auditStatus" type="card" @tab-click="handleClick">
-          <el-tab-pane label="待审核" name="0"></el-tab-pane>
-          <el-tab-pane label="已审核" name="1"></el-tab-pane>
-        </el-tabs>
-        <div v-show="auditStatus == 1" class="keyExplain">
-          字段说明
-          <img src="~@/assets/img/DataCenter/question.png" alt />
-        </div>
-      </div>
-      <div class="bot-table">
-        <customs-table
-          ref="table"
-          :table-data="tableData"
-          :columns="columns"
-          :header-class="'newHeader'"
-          :list-loading="listLoading"
-          :current-page="pageIndex"
-          :total-count="total"
-          :page-sizes="pageSizes"
-          :page-size="pageSize"
-          @pageSizeChange="handleSizeChange"
-          @currentPageChange="handleCurrentChange"
-        />
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-import CustomsTable from "@/components/CustomsTable"
-import paginationMixin from "@/components/TabComponents/mixin"
-import { getFollowCheck } from "@/api/followup"
-export default {
-  components: {
-    CustomsTable,
-  },
-  mixins: [paginationMixin],
-  data() {
-    return {
-      type: "0",
-      auditStatus: "0",
-      listLoading: false,
-      columns: [
-        {
-          label: "医联体",
-          minWidth: 120,
-          value: "unionName",
-        },
-        {
-          label: "已审核（例）",
-          minWidth: 120,
-          value: "checkNums",
-        },
-        {
-          label: "待审核（例）备份",
-          minWidth: 120,
-          value: "unCheckNums",
-        },
-        {
-          label: "最新上报时间",
-          minWidth: 120,
-          value: "reportTime",
-        },
-        {
-          label: "操作",
-          width: 220,
-          fixed: "right",
-          operType: "button",
-          operations: [
-            {
-              func: this.auditHandle,
-              label: "审核",
-              type: "text",
-            },
-          ],
-        },
-      ],
-      tableData: [
-        {
-          "unionId": "2", 
-          
-          "unionName": "合肥高新附院", 
-          
-          "unCheckNums": 2, 
-          
-          "checkNums": 0, 
-          
-          "reportTime": "2022-12-09 09:12:35" 
-        
-        } 
-      ],
-    }
-  },
-  watch: {
-    auditStatus(val){
-       switch (this.type) {
-        case '1':
-          this.getFollowupList()
-          break;
-      }
-    },
-    type(val){
-      switch (val) {
-        case '1':
-          this.getFollowupList()
-          break;
-      }
-    }
-  },
-  mounted() {},
-  methods: {
-    handleClick() {
-      console.log("type:" + this.type, "auditStatus" + this.auditStatus)
-      if (this.auditStatus == 1) {
-        this.columns[this.columns.length - 1].operations[0].label =
-          "修改审核意见"
-      } else {
-        this.columns[this.columns.length - 1].operations[0].label = "审核"
-      }
-    },
-    auditHandle(data, i) {
-      console.log(data, i)
-      if(this.type=="1"){
-        this.$router.push("/followaudit")
-      }
-      else{
-          this.$router.push({
-          path: "/auditdetail",
-          query: {
-            id: i,
-          },
-        })
-      }
-    },
-    async getFollowupList(){
-      let params={
-        pageSize:10,
-        pageNum:1
-      }
-      let res
-      switch (this.auditStatus) {
-        case '1':
-          res = await getFollowCheck(params);
-          break;
-      }
-    },
-  },
-}
-</script>
-<style lang="scss" scoped>
-.audit-qualitycontrol {
-  padding: 20px 0;
-  .table-top-tab {
-    margin-bottom: 15px;
-    position: relative;
-    .keyExplain {
-      position: absolute;
-      display: flex;
-      align-items: center;
-      right: 0;
-      top: 10%;
-      font-size: 16px;
-      font-family: AlibabaPuHuiTiR;
-      color: #999999;
-      img {
-        width: 18px;
-        height: 18px;
-        margin-left: 5px;
-        transform: translateY(1px);
-      }
-    }
-  }
-  .aq-bot-table {
-    padding: 20px;
-    ::v-deep {
-      .el-tabs__nav {
-        border: none;
-      }
-      .el-tabs__item {
-        margin-right: 10px;
-        border: 1px solid #e4e7ed;
-        border-radius: 5px 5px 0 0;
-      }
-      .is-active {
-        background: #4e68ff;
-        color: #fff;
-      }
-    }
-  }
-}
-::v-deep {
-  .el-tabs__item {
-    padding-left: 20px !important;
-    font-size: 18px;
-    font-family: AlibabaPuHuiTiM;
-  }
-  .is-active {
-    color: #4e68ff;
-  }
-}
-</style>
diff --git a/src/views/audit-qualitycontrol/healthcheckup.vue b/src/views/audit-qualitycontrol/healthcheckup.vue
deleted file mode 100644
index ce102c3..0000000
--- a/src/views/audit-qualitycontrol/healthcheckup.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-<template>
-  <div class="audit-qualitycontrol">
-    <div class="aq-top-tab">
-      <el-tabs v-model="type" @tab-click="handleClick">
-        <el-tab-pane label="筛查病例数据" name="0"></el-tab-pane>
-        <el-tab-pane label="随访病例数据" name="1"></el-tab-pane>
-      </el-tabs>
-    </div>
-    <div class="aq-bot-table">
-      <div class="table-top-tab">
-        <el-tabs v-model="auditStatus" type="card" @tab-click="handleClick">
-          <el-tab-pane label="待审核" name="0"></el-tab-pane>
-          <el-tab-pane label="已审核" name="1"></el-tab-pane>
-        </el-tabs>
-        <div v-show="auditStatus == 1" class="keyExplain">
-          字段说明
-          <img src="~@/assets/img/DataCenter/question.png" alt />
-        </div>
-      </div>
-      <div class="bot-table">
-        <customs-table
-          ref="table"
-          :table-data="tableData"
-          :columns="columns"
-          :header-class="'newHeader'"
-          :list-loading="listLoading"
-          :current-page="pageIndex"
-          :total-count="total"
-          :page-sizes="pageSizes"
-          :page-size="pageSize"
-          @pageSizeChange="handleSizeChange"
-          @currentPageChange="handleCurrentChange"
-        />
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-import CustomsTable from "@/components/CustomsTable"
-import paginationMixin from "@/components/TabComponents/mixin"
-export default {
-  components: {
-    CustomsTable,
-  },
-  mixins: [paginationMixin],
-  data() {
-    return {
-      type: "0",
-      auditStatus: "0",
-      listLoading: false,
-      columns: [
-        {
-          label: "医联体",
-          minWidth: 120,
-          value: "title",
-        },
-        {
-          label: "已审核（例）",
-          minWidth: 120,
-          value: "file",
-        },
-        {
-          label: "待审核（例）备份",
-          minWidth: 120,
-          value: "uploadTime",
-        },
-        {
-          label: "最新上报时间",
-          minWidth: 120,
-          value: "editTime",
-        },
-        {
-          label: "操作",
-          width: 220,
-          fixed: "right",
-          operType: "button",
-          operations: [
-            {
-              func: this.auditHandle,
-              label: "审核",
-              type: "text",
-            },
-          ],
-        },
-      ],
-      tableData: [
-        {
-          title: "第一个",
-          isOpen: true,
-        },
-      ],
-    }
-  },
-  watch: {},
-  mounted() {},
-  methods: {
-    handleClick() {
-      console.log("type:" + this.type, "auditStatus" + this.auditStatus)
-      if (this.auditStatus == 1) {
-        this.columns[this.columns.length - 1].operations[0].label =
-          "修改审核意见"
-      } else {
-        this.columns[this.columns.length - 1].operations[0].label = "审核"
-      }
-    },
-    auditHandle(data, i) {
-      console.log(data, i)
-      if(this.type=="1"){
-          this.$router.push("/followaudit")
-        }
-        else{
-            this.$router.push({
-            path: "/auditdetail",
-            query: {
-              id: i,
-            },
-          })
-        }
-    },
-  },
-}
-</script>
-<style lang="scss" scoped>
-.audit-qualitycontrol {
-  padding: 20px 0;
-  .table-top-tab {
-    margin-bottom: 15px;
-    position: relative;
-    .keyExplain {
-      position: absolute;
-      display: flex;
-      align-items: center;
-      right: 0;
-      top: 10%;
-      font-size: 16px;
-      font-family: AlibabaPuHuiTiR;
-      color: #999999;
-      img {
-        width: 18px;
-        height: 18px;
-        margin-left: 5px;
-        transform: translateY(1px);
-      }
-    }
-  }
-  .aq-bot-table {
-    padding: 20px;
-    ::v-deep {
-      .el-tabs__nav {
-        border: none;
-      }
-      .el-tabs__item {
-        margin-right: 10px;
-        border: 1px solid #e4e7ed;
-        border-radius: 5px 5px 0 0;
-      }
-      .is-active {
-        background: #4e68ff;
-        color: #fff;
-      }
-    }
-  }
-}
-::v-deep {
-  .el-tabs__item {
-    padding-left: 20px !important;
-    font-size: 18px;
-    font-family: AlibabaPuHuiTiM;
-  }
-  .is-active {
-    color: #4e68ff;
-  }
-}
-</style>
diff --git a/src/views/audit-qualitycontrol/hospital.vue b/src/views/audit-qualitycontrol/hospital.vue
deleted file mode 100644
index 75bcf8c..0000000
--- a/src/views/audit-qualitycontrol/hospital.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-<template>
-  <div class="audit-qualitycontrol">
-    <div class="aq-top-tab">
-      <el-tabs v-model="type" @tab-click="handleClick">
-        <el-tab-pane label="筛查病例数据" name="0"></el-tab-pane>
-        <el-tab-pane label="随访病例数据" name="1"></el-tab-pane>
-      </el-tabs>
-    </div>
-    <div class="aq-bot-table">
-      <div class="table-top-tab">
-        <el-tabs v-model="auditStatus" type="card" @tab-click="handleClick">
-          <el-tab-pane label="待审核" name="0"></el-tab-pane>
-          <el-tab-pane label="已审核" name="1"></el-tab-pane>
-        </el-tabs>
-        <div v-show="auditStatus == 1" class="keyExplain">
-          字段说明
-          <img src="~@/assets/img/DataCenter/question.png" alt />
-        </div>
-      </div>
-      <div class="bot-table">
-        <customs-table
-          ref="table"
-          :table-data="tableData"
-          :columns="columns"
-          :header-class="'newHeader'"
-          :list-loading="listLoading"
-          :current-page="pageIndex"
-          :total-count="total"
-          :page-sizes="pageSizes"
-          :page-size="pageSize"
-          @pageSizeChange="handleSizeChange"
-          @currentPageChange="handleCurrentChange"
-        />
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-import CustomsTable from "@/components/CustomsTable"
-import paginationMixin from "@/components/TabComponents/mixin"
-export default {
-  components: {
-    CustomsTable,
-  },
-  mixins: [paginationMixin],
-  data() {
-    return {
-      type: "0",
-      auditStatus: "0",
-      listLoading: false,
-      columns: [
-        {
-          label: "医联体",
-          minWidth: 120,
-          value: "title",
-        },
-        {
-          label: "已审核（例）",
-          minWidth: 120,
-          value: "file",
-        },
-        {
-          label: "待审核（例）备份",
-          minWidth: 120,
-          value: "uploadTime",
-        },
-        {
-          label: "最新上报时间",
-          minWidth: 120,
-          value: "editTime",
-        },
-        {
-          label: "操作",
-          width: 220,
-          fixed: "right",
-          operType: "button",
-          operations: [
-            {
-              func: this.auditHandle,
-              label: "审核",
-              type: "text",
-            },
-          ],
-        },
-      ],
-      tableData: [
-        {
-          title: "第一个",
-          isOpen: true,
-        },
-      ],
-    }
-  },
-  watch: {},
-  mounted() {},
-  methods: {
-    handleClick() {
-      console.log("type:" + this.type, "auditStatus" + this.auditStatus)
-      if (this.auditStatus == 1) {
-        this.columns[this.columns.length - 1].operations[0].label =
-          "修改审核意见"
-      } else {
-        this.columns[this.columns.length - 1].operations[0].label = "审核"
-      }
-    },
-    auditHandle(data, i) {
-      console.log(data,i,"表单")
-        if(this.type=="1"){
-          this.$router.push("/followaudit")
-        }
-        else{
-            this.$router.push({
-            path: "/auditdetail",
-            query: {
-              id: i,
-            },
-          })
-        }
-    },
-  },
-}
-</script>
-<style lang="scss" scoped>
-.audit-qualitycontrol {
-  padding: 20px 0;
-  .table-top-tab {
-    margin-bottom: 15px;
-    position: relative;
-    .keyExplain {
-      position: absolute;
-      display: flex;
-      align-items: center;
-      right: 0;
-      top: 10%;
-      font-size: 16px;
-      font-family: AlibabaPuHuiTiR;
-      color: #999999;
-      img {
-        width: 18px;
-        height: 18px;
-        margin-left: 5px;
-        transform: translateY(1px);
-      }
-    }
-  }
-  .aq-bot-table {
-    padding: 20px;
-    ::v-deep {
-      .el-tabs__nav {
-        border: none;
-      }
-      .el-tabs__item {
-        margin-right: 10px;
-        border: 1px solid #e4e7ed;
-        border-radius: 5px 5px 0 0;
-      }
-      .is-active {
-        background: #4e68ff;
-        color: #fff;
-      }
-    }
-  }
-}
-::v-deep {
-  .el-tabs__item {
-    padding-left: 20px !important;
-    font-size: 18px;
-    font-family: AlibabaPuHuiTiM;
-  }
-  .is-active {
-    color: #4e68ff;
-  }
-}
-</style>
diff --git a/src/views/audit-qualitycontrol/index.vue b/src/views/audit-qualitycontrol/index.vue
index 4303fee..9c0624e 100644
--- a/src/views/audit-qualitycontrol/index.vue
+++ b/src/views/audit-qualitycontrol/index.vue
@@ -38,7 +38,7 @@
 <script>
 import CustomsTable from "@/components/CustomsTable"
 import paginationMixin from "@/components/TabComponents/mixin"
-import { getFollowCheck } from "@/api/followup"
+import { getFollowCheck,getFollowUncheck } from "@/api/followup"
 export default {
   components: {
     CustomsTable,
@@ -49,26 +49,62 @@ export default {
       type: "0",
       auditStatus: "0",
       listLoading: false,
-      columns: [
+      tableData: [
+        {
+          "unionId": "2", 
+          
+          "unionName": "合肥高新附院", 
+          
+          "unCheckNums": 2, 
+          
+          "checkNums": 0, 
+          
+          "reportTime": "2022-12-09 09:12:35" 
+        
+        } 
+      ],
+    }
+  },
+  watch: {
+    auditStatus(val) {
+      sessionStorage.setItem('audit-status',val)
+      switch (this.type) {
+        case "1":
+          this.getFollowupList()
+          break
+      }
+    },
+    type(val) {
+      sessionStorage.setItem('audit-type',val)
+      switch (val) {
+        case "1":
+          this.getFollowupList()
+          break
+      }
+    },
+  },
+  computed:{
+    columns(){
+      const unCkeckColumns = [
         {
           label: "医联体",
           minWidth: 120,
-          value: "title",
+          value: "unionName",
         },
         {
           label: "已审核（例）",
           minWidth: 120,
-          value: "file",
+          value: "checkNums",
         },
         {
           label: "待审核（例）备份",
           minWidth: 120,
-          value: "uploadTime",
+          value: "unCheckNums",
         },
         {
           label: "最新上报时间",
           minWidth: 120,
-          value: "editTime",
+          value: "reportTime",
         },
         {
           label: "操作",
@@ -83,32 +119,71 @@ export default {
             },
           ],
         },
-      ],
-      tableData: [
+      ]
+      const checkColumns = [
+        {
+          label: "筛查编号",
+          minWidth: 120,
+          value: "unionId",
+        },
         {
-          title: "第一个",
-          isOpen: true,
+          label: "医联体",
+          minWidth: 120,
+          value: "unionName",
         },
-      ],
+        {
+          label: "姓名",
+          minWidth: 120,
+          formatter: (row) => {
+            return row.name ? row.name : "--"
+          },
+          value: "name",
+        },
+        {
+          label: "年龄",
+          minWidth: 120,
+          value: "age",
+          formatter: (row) => {
+            return row.age ? row.age : "--"
+          },
+        },
+        {
+          label: "风险评估",
+          minWidth: 120,
+          value: "checkNums",
+        },
+        {
+          label: "审核状态",
+          minWidth: 120,
+          value: "unCheckNums",
+        },
+        {
+          label: "上报时间",
+          minWidth: 120,
+          value: "reportTime",
+        },
+        {
+          label: "操作",
+          width: 220,
+          fixed: "right",
+          operType: "button",
+          operations: [
+            {
+              func: this.auditHandle,
+              label: "审核",
+              type: "text",
+            },
+          ],
+        },
+      ]
+      return this.auditStatus == "1" ? checkColumns:unCkeckColumns
     }
   },
-  watch: {
-    auditStatus(val) {
-      switch (this.type) {
-        case "1":
-          this.getFollowupList()
-          break
-      }
-    },
-    type(val) {
-      switch (val) {
-        case "1":
-          this.getFollowupList()
-          break
-      }
-    },
+  mounted() {
+      this.auditStatus = sessionStorage.getItem('audit-status') || "0"
+      this.type = sessionStorage.getItem('audit-type') || "0"
+      this.getFollowupList()
   },
-  mounted() {},
   methods: {
     handleClick() {
       console.log("type:" + this.type, "auditStatus" + this.auditStatus)
@@ -127,7 +202,7 @@ export default {
         this.$router.push({
           path: "/auditdetail",
           query: {
-            id: i,
+            id: data['unionId'],
           },
         })
       }
@@ -139,10 +214,15 @@ export default {
       }
       let res
       switch (this.auditStatus) {
+        case "0":
+          res = await getFollowUncheck(params) //待审核
+          break;
         case "1":
-          res = await getFollowCheck(params)
-          break
+          res = await getFollowCheck(params) //已审核
+          break;
       }
+      this.tableData = res.records
+      this.total= res.total
     },
   },
 }
diff --git a/src/views/followupresearch/index.vue b/src/views/followupresearch/index.vue
index aa4e0ac..c6dfcd3 100644
--- a/src/views/followupresearch/index.vue
+++ b/src/views/followupresearch/index.vue
@@ -53,11 +53,12 @@ export default {
           label: "性别",
           value: "sex",
           minWidth: 120,
-          // trans:'d-sex',
-          transList:{
-            1:'男',
-            2:'女'
-          }
+          formatter: (row) => {
+            return this.$handle.formatDicList(
+              this.dictMap["d-sex"],
+              String(row.sex)
+            )
+          },
         },
         {
           label: "身份证",
@@ -346,12 +347,12 @@ export default {
       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(!this.columns[index]['transList']){
+        //    this.columns[index]['transList']={}
+        // }
+        // else{
+        //   this.columns[index]['transList'][itemD.code]=itemD.name
+        // }
         if(item){
           if(!item['opts']){
            item['opts']=[]
-- 
2.22.0