diff --git a/src/api/business/study/studyFormFill.js b/src/api/business/study/studyFormFill.js
index 2dfe2b3..3a0daeb 100644
--- a/src/api/business/study/studyFormFill.js
+++ b/src/api/business/study/studyFormFill.js
@@ -34,6 +34,42 @@ export function studyFormFill_info(query) {
   })
 }
 
+//加签
+export function studyFormFill_jq(data) {
+  return request({
+    url: '/system/business/studyFormFill/jq',
+    method: 'post',
+    data: data
+  })
+}
+
+//废止
+export function studyFormFill_fz(data) {
+  return request({
+    url: '/system/business/studyFormFill/fz',
+    method: 'post',
+    data: data
+  })
+}
+
+//审核废止
+export function studyFormFill_shfz(data) {
+  return request({
+    url: '/system/business/studyFormFill/shfz',
+    method: 'post',
+    data: data
+  })
+}
+
+//更换归属人
+export function studyFormFill_ghgsr(data) {
+  return request({
+    url: '/system/business/studyFormFill/ghgsr',
+    method: 'post',
+    data: data
+  })
+}
+
 //保存
 export function studyFormFill_bc(data) {
   return request({
@@ -52,15 +88,32 @@ export function studyFormFill_tj(data) {
   })
 }
 
-//填报
-export function studyFormFill_tb(data) {
+//观察
+export function studyFormFill_gc(data) {
+  return request({
+    url: '/system/business/studyFormFill/gc',
+    method: 'post',
+    data: data
+  })
+}
+
+//复核通过
+export function studyFormFill_fhtg(data) {
   return request({
-    url: '/system/business/studyFormFill/tb',
+    url: '/system/business/studyFormFill/fhtg',
     method: 'post',
     data: data
   })
 }
 
+//复核拒绝
+export function studyFormFill_fhjj(data) {
+  return request({
+    url: '/system/business/studyFormFill/fhjj',
+    method: 'post',
+    data: data
+  })
+}
 
 //通过
 export function studyFormFill_tg(data) {
@@ -71,12 +124,11 @@ export function studyFormFill_tg(data) {
   })
 }
 
-
-//拒绝
-export function studyFormFill_jj(data) {
+//审阅
+export function studyFormFill_sy(data) {
   return request({
-    url: '/system/business/studyFormFill/jj',
+    url: '/system/business/studyFormFill/sy',
     method: 'post',
     data: data
   })
-}
\ No newline at end of file
+}
diff --git a/src/lang/en/business/study/studyFormFill.js b/src/lang/en/business/study/studyFormFill.js
index 73eaf03..4fcb333 100644
--- a/src/lang/en/business/study/studyFormFill.js
+++ b/src/lang/en/business/study/studyFormFill.js
@@ -33,4 +33,12 @@ export default {
  dcbjjcgj:'导出(编辑稽查轨迹)',
  dcxgjcgj:'导出(修改稽查轨迹)',
  dcbhsjgj:'导出(不含数据轨迹)',
+
+ tbz:'填报中',
+ ytj:'已提交',
+ ywc:'已完成',
+ ywcfh:'已完成（经复核）',
+ ywc:'已完成',
+ dfz:'待废止',
+ yfz:'已废止',
 }
diff --git a/src/lang/zh/business/study/studyFormFill.js b/src/lang/zh/business/study/studyFormFill.js
index 70958b1..7de9685 100644
--- a/src/lang/zh/business/study/studyFormFill.js
+++ b/src/lang/zh/business/study/studyFormFill.js
@@ -32,4 +32,13 @@ export default {
  dcbjjcgj:'导出(编辑稽查轨迹)',
  dcxgjcgj:'导出(修改稽查轨迹)',
  dcbhsjgj:'导出(不含数据轨迹)',
+
+ tbz:'填报中',
+ ytj:'已提交',
+ ywc:'已完成',
+ ywcfh:'已完成（经复核）',
+ ywc:'已完成',
+ dfz:'待废止',
+ yfz:'已废止',
+
 }
diff --git a/src/views/business/study/comp/tbbd/Bj.vue b/src/views/business/study/comp/tbbd/Bj.vue
index 0488f31..f333151 100644
--- a/src/views/business/study/comp/tbbd/Bj.vue
+++ b/src/views/business/study/comp/tbbd/Bj.vue
@@ -198,7 +198,7 @@ export default {
           this.$modal.closeLoading()
         })
       } else {
-        this.form = row
+        this.form =  _.merge({}, this.form, row)
         this.open = true
       }
     },
diff --git a/src/views/business/study/comp/tbbd/Sh.vue b/src/views/business/study/comp/tbbd/Sh.vue
index 86f11c5..bf390a0 100644
--- a/src/views/business/study/comp/tbbd/Sh.vue
+++ b/src/views/business/study/comp/tbbd/Sh.vue
@@ -12,15 +12,17 @@ G<template>
         <div class="right-top">
           <el-button @click="cancel()">{{ $t('form.cancel') }}</el-button>
           <el-button type="danger" @click="showReject">{{ $t('page.business.study.studyFormFill.reject') }}</el-button>
-          <el-button type="primary" @click="showApprove">{{ $t('page.business.study.studyFormFill.approve') }}</el-button>
+          <el-button type="primary" @click="showApprove">{{ $t('page.business.study.studyFormFill.approve')
+            }}</el-button>
         </div>
       </div>
       <div class="edit-content ">
-        表单详情todo
+        <TemplateTable ref="templateTable" :sn="form.templateSn" fillType="preFill" />
       </div>
     </div>
     <!-- 通过 -->
-    <el-dialog :title="$t('page.business.study.studyFormFill.shtg')" :visible.sync="openApprove" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.study.studyFormFill.shtg')" :visible.sync="openApprove" width="500px"
+      append-to-body :close-on-click-modal="false">
       <el-form ref="formApprove" :model="formApprove" :rules="rulesApprove" label-width="120px">
         <el-row>
           <el-col :span="24">
@@ -63,7 +65,8 @@ G<template>
     </el-dialog>
 
     <!-- 拒绝 -->
-    <el-dialog :title="$t('page.business.study.studyFormFill.shjj')" :visible.sync="openReject" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.study.studyFormFill.shjj')" :visible.sync="openReject" width="500px"
+      append-to-body :close-on-click-modal="false">
       <el-form ref="formReject" :model="formReject" :rules="rulesReject" label-width="120px">
         <el-row>
           <el-col :span="24">
@@ -110,10 +113,11 @@ G<template>
 <script>
 import { studyFormFill_tg, studyFormFill_jj, studyFormFill_info } from "@/api/business/study/studyFormFill"
 import { mapGetters } from 'vuex'
+import TemplateTable from '@/views/business/comps/template/TemplateTable';
 
 export default {
   name: "Sh",
-  components: {},
+  components: { TemplateTable },
   data() {
     return {
       showIndex: 1,
diff --git a/src/views/business/study/comp/tbbdList.vue b/src/views/business/study/comp/tbbdList.vue
index cb0f152..b8db700 100644
--- a/src/views/business/study/comp/tbbdList.vue
+++ b/src/views/business/study/comp/tbbdList.vue
@@ -82,9 +82,12 @@
           <el-table-column :label="$t('page.business.form.gsr')" align="center" prop="userMc" width="100" />
           <el-table-column :label="$t('page.business.form.status')" prop="status"  align="center" width="100">
             <template slot-scope="scope">
-              <span v-if="scope.row.bdzt === 1">{{ $t('page.business.form.statusTbz') }}</span>
-              <span v-if="scope.row.bdzt === 3">{{ $t('page.business.form.statusYtj') }}</span>
-              <span v-if="scope.row.bdzt === 5">{{ $t('page.business.form.statusYtg') }}</span>
+              <span v-if="scope.row.bdzt === 1">{{ $t('page.business.study.studyFormFill.tbz') }}</span>
+              <span v-if="scope.row.bdzt === 3">{{ $t('page.business.study.studyFormFill.ytj') }}</span>
+              <span v-if="scope.row.bdzt === 5">{{ $t('page.business.study.studyFormFill.ywc') }}</span>
+              <span v-if="scope.row.bdzt === 7">{{ $t('page.business.study.studyFormFill.ywcfh') }}</span>
+              <span v-if="scope.row.bdzt === 9">{{ $t('page.business.study.studyFormFill.dfz') }}</span>
+              <span v-if="scope.row.bdzt === 11">{{ $t('page.business.study.studyFormFill.yfz') }}</span>
             </template>
           </el-table-column>
           <el-table-column :label="$t('page.business.study.studyFormFill.sfbl')"  align="center" prop="status" width="100">
@@ -96,32 +99,33 @@
           <el-table-column :label="$t('page.business.form.tjsj')" align="center" prop="tjsj" width="140" />
           <el-table-column :label="$t('form.operate')" align="left" fixed="right" width="200">
             <template slot-scope="scope">
+              <!-- 表单状态：1：填报中；3：已提交；5：已完成（经复核）；7：已完成；9：待废止；11：已废止 -->
               <!-- 详情 -->
               <el-button type="text" @click="detail(scope.row)" v-hasPermi="['business:studyFormFill:xq']">{{
                 $t('form.detail') }}</el-button>
               <!-- 编辑 -->
-              <el-button type="text" @click="edit(scope.row)" v-hasPermi="['business:studyFormFill:bj']">{{
+              <el-button type="text" v-if="scope.row.bdzt === 1||scope.row.bdzt === 5||scope.row.bdzt === 7" @click="edit(scope.row)" v-hasPermi="['business:studyFormFill:bj']">{{
                 $t('form.edit') }}</el-button>
               <!-- 复核 -->
-              <el-button type="text" @click="edit(scope.row)" v-hasPermi="['business:studyFormFill:fh']">{{
+              <el-button type="text" v-if="scope.row.bdzt === 3" @click="edit(scope.row)" v-hasPermi="['business:studyFormFill:fh']">{{
                 $t('page.business.study.studyFormFill.fh') }}</el-button>
               <!-- 加签 -->
-              <el-button type="text" @click="edit(scope.row)" v-hasPermi="['business:studyFormFill:jq']">{{
+              <el-button type="text" v-if="scope.row.bdzt === 1" @click="edit(scope.row)" v-hasPermi="['business:studyFormFill:jq']">{{
                 $t('page.business.study.studyFormFill.jq') }}</el-button>
               <!-- 更换归属人 -->
-              <el-button type="text" @click="edit(scope.row)" v-hasPermi="['business:studyFormFill:ghgsr']">{{
+              <el-button type="text" v-if="scope.row.bdzt === 1||scope.row.bdzt === 3||scope.row.bdzt === 5||scope.row.bdzt === 7" @click="edit(scope.row)" v-hasPermi="['business:studyFormFill:ghgsr']">{{
                 $t('page.business.study.studyFormFill.ghgsr') }}</el-button>
               <!-- 审阅 -->
-              <el-button type="text" @click="edit(scope.row)" v-hasPermi="['business:studyFormFill:sy']">{{
+              <el-button type="text" v-if="scope.row.bdzt === 5||scope.row.bdzt === 7" @click="edit(scope.row)" v-hasPermi="['business:studyFormFill:sy']">{{
                 $t('page.business.study.studyFormFill.sy') }}</el-button>
               <!-- 废止 -->
-              <el-button type="text" @click="edit(scope.row)" v-hasPermi="['business:studyFormFill:fz']">{{
+              <el-button type="text" v-if="scope.row.bdzt === 1" @click="edit(scope.row)" v-hasPermi="['business:studyFormFill:fz']">{{
                 $t('page.business.study.studyFormFill.fz') }}</el-button>
               <!-- 确认废止 -->
-              <el-button type="text" @click="edit(scope.row)" v-hasPermi="['business:studyFormFill:shfz']">{{
+              <el-button type="text" v-if="scope.row.bdzt === 9" @click="edit(scope.row)" v-hasPermi="['business:studyFormFill:shfz']">{{
                 $t('page.business.study.studyFormFill.shfz') }}</el-button>
               <!-- 观察 -->
-              <el-button type="text" @click="edit(scope.row)" v-hasPermi="['business:studyFormFill:gc']">{{
+              <el-button type="text" v-if="scope.row.bdzt === 1" @click="edit(scope.row)" v-hasPermi="['business:studyFormFill:gc']">{{
                 $t('page.business.study.studyFormFill.gc') }}</el-button>
             </template>
           </el-table-column>
@@ -247,7 +251,7 @@ export default {
     add() {
       this.showEdit = true
       this.$emit('showDetail', this.showEdit)
-      this.$refs.Bj.edit({ studyId: this.searchForm.studyId })
+      this.$refs.Bj.edit({ studyId: this.searchForm.studyId,studySubjectId:this.searchForm.studySubjectId })
     },
     edit(row) {
       this.showEdit = true
diff --git a/src/views/business/study/comp/ytbd/Bj.vue b/src/views/business/study/comp/ytbd/Bj.vue
index 7b2af7e..966a511 100644
--- a/src/views/business/study/comp/ytbd/Bj.vue
+++ b/src/views/business/study/comp/ytbd/Bj.vue
@@ -230,7 +230,7 @@ export default {
           this.$modal.closeLoading()
         })
       } else {
-        this.form = row
+        this.form = _.merge({}, this.form, row)
         this.open = true
       }
     },
diff --git a/src/views/business/study/comp/ytbdList.vue b/src/views/business/study/comp/ytbdList.vue
index e9fb29e..30c9803 100644
--- a/src/views/business/study/comp/ytbdList.vue
+++ b/src/views/business/study/comp/ytbdList.vue
@@ -109,6 +109,7 @@ import Bj from "./ytbd/Bj";
 import Xq from "./ytbd/Xq";
 import Sh from "./ytbd/Sh";
 import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
+import moment from "moment";
 import { mapGetters } from 'vuex'
 export default {
   name: 'YtbdList',
@@ -196,7 +197,7 @@ export default {
     add() {
       this.showEdit = true
       this.$emit('showDetail', this.showEdit)
-      this.$refs.Bj.edit({ studyId: this.searchForm.studyId })
+      this.$refs.Bj.edit({ studyId: this.searchForm.studyId,studySubjectId:this.searchForm.studySubjectId })
     },
     edit(row) {
       this.showEdit = true