diff --git a/src/App.vue b/src/App.vue
index fbf4ad0..edcb463 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -346,10 +346,14 @@ export default {
 
       .is-finish {
         background: #409eff;
-        border: none;
+        border: 1px  solid #409eff;
         color: #fff;
       }
 
+       .is-info {
+        border: 1px  solid #d0d0d0;
+      }
+
       .line {
         height: 0px;
         width: 100px;
diff --git a/src/api/business/public/public.js b/src/api/business/public/public.js
index ee08942..3e55a78 100644
--- a/src/api/business/public/public.js
+++ b/src/api/business/public/public.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 查询暂存柜列表
+// 暂存柜列表
 export function public_zcgList(query) {
   return request({
     url: '/system/business/public/zcgList',
@@ -8,3 +8,12 @@ export function public_zcgList(query) {
     params: query
   })
 }
+
+// 模板列表
+export function public_templateList(query) {
+  return request({
+    url: '/system/business/public/templateList',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/api/business/study/studyFormPre.js b/src/api/business/study/studyFormPre.js
index 471bf9c..ab06478 100644
--- a/src/api/business/study/studyFormPre.js
+++ b/src/api/business/study/studyFormPre.js
@@ -36,3 +36,31 @@ export function studyFormPre_tj(data) {
   })
 }
 
+//填报
+export function studyFormPre_tb(data) {
+  return request({
+    url: '/system/business/studyFormPre/tb',
+    method: 'post',
+    data: data
+  })
+}
+
+
+//通过
+export function studyFormPre_tg(data) {
+  return request({
+    url: '/system/business/studyFormPre/tg',
+    method: 'post',
+    data: data
+  })
+}
+
+
+//拒绝
+export function studyFormPre_jj(data) {
+  return request({
+    url: '/system/business/studyFormPre/jj',
+    method: 'post',
+    data: data
+  })
+}
\ No newline at end of file
diff --git a/src/lang/en/system/template.js b/src/lang/en/system/template.js
index 2e05049..d75b423 100644
--- a/src/lang/en/system/template.js
+++ b/src/lang/en/system/template.js
@@ -8,4 +8,6 @@ export default {
   detail: 'Enter',
   bj: 'Edit',
   bdpz: 'Template Config',
+  select: 'Select',
+  selectTemplate: 'Select Table Template',
 }
diff --git a/src/lang/zh/system/template.js b/src/lang/zh/system/template.js
index eeca33c..2a5e815 100644
--- a/src/lang/zh/system/template.js
+++ b/src/lang/zh/system/template.js
@@ -7,5 +7,7 @@ export default {
   statusDisable: '禁用',
   bj: '编辑',
   bdpz: '表单配置',
+  select: '选择',
+  selectTemplate: '选择表单模板',
   detail: '详情'
 }
diff --git a/src/views/business/study/comp/ytbd/Bj.vue b/src/views/business/study/comp/ytbd/Bj.vue
index 9275a6c..41a25da 100644
--- a/src/views/business/study/comp/ytbd/Bj.vue
+++ b/src/views/business/study/comp/ytbd/Bj.vue
@@ -8,14 +8,14 @@ G<template>
         </div>
         <div class="center-top">
           <div>
-            <div class="el-step__icon is-text is-finish">
+            <div :class="showIndex == 1? 'el-step__icon is-text is-finish':'el-step__icon is-text is-info'">
               <div class="el-step__icon-inner">1</div>
             </div>
             基础设置
           </div>
           <div class="line"></div>
           <div>
-            <div class="el-step__icon is-text">
+            <div :class="showIndex == 2? 'el-step__icon is-text is-finish':'el-step__icon is-text is-info'">
               <div class="el-step__icon-inner">2</div>
             </div>
             表单设计
@@ -28,7 +28,7 @@ G<template>
             <el-button type="primary" @click="next">下一步</el-button>
           </template>
           <template v-else>
-            <el-button @click="save">保存</el-button>
+            <el-button @click="saveNext">保存</el-button>
             <el-button type="primary" @click="tj">提交</el-button>
           </template>
         </div>
@@ -38,8 +38,7 @@ G<template>
           <el-row>
             <el-col :span="24">
               <el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateId">
-                <el-input type="text" v-model="form.templateId" maxlength="50"
-                  :placeholder="$t('form.placeholderInput')" />
+                <SelectTemplate v-model="form.templateId" :name="form.templateMc" @change="selectTemplateChange" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -69,12 +68,13 @@ G<template>
 </template>
 
 <script>
-import { studyFormPre_bc, studyFormPre_tj } from "@/api/business/study/studyFormPre"
+import { studyFormPre_bc, studyFormPre_tj, studyFormPre_info } from "@/api/business/study/studyFormPre"
 import { mapGetters } from 'vuex'
+import SelectTemplate from "@/views/business/comps/select/SelectTemplate";
 
 export default {
   name: "Bj",
-  components: {},
+  components: { SelectTemplate },
   data() {
     return {
       open: false,
@@ -110,6 +110,10 @@ export default {
         }
       })
     },
+    selectTemplateChange(val) {
+      this.form.bdnr = val.content
+      this.form.templateMc = val.name
+    },
     cancel() {
       this.$emit('close')
     },
@@ -129,8 +133,17 @@ export default {
     edit(row) {
       this.reset()
       this.showIndex = 1
-      this.form = row
-      this.open = true
+      if (row && row.id) {
+        this.$modal.loading()
+        studyFormPre_info({ id: row.id }).then(response => {
+          this.form = response.data
+          this.open = true
+          this.$modal.closeLoading()
+        })
+      } else {
+        this.form = row
+        this.open = true
+      }
     },
     save() {
       this.$refs["form"].validate(valid => {
@@ -143,6 +156,13 @@ export default {
         }
       })
     },
+    saveNext() {
+      this.$modal.loading()
+      studyFormPre_bc(this.form).then(response => {
+        this.$emit('close')
+        this.$modal.closeLoading()
+      })
+    },
     tj() {
       this.$modal.loading()
       studyFormPre_tj(this.form).then(response => {
diff --git a/src/views/business/study/comp/ytbdList.vue b/src/views/business/study/comp/ytbdList.vue
index 97c5a29..d3129af 100644
--- a/src/views/business/study/comp/ytbdList.vue
+++ b/src/views/business/study/comp/ytbdList.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="ytbd-list" v-show="!showDetail">
+    <div class="ytbd-list" v-show="!showDetail && !showEdit && !showAudit">
       <div class="ytbd-search">
         <el-form :model="searchForm" ref="searchForm" :inline="true">
           <el-form-item :label="$t('page.business.form.bdmc')" prop="name">
@@ -59,8 +59,7 @@
             <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.statusWtg') }}</span>
-              <span v-if="scope.row.bdzt === 10">{{ $t('page.business.form.statusYtg') }}</span>
+              <span v-if="scope.row.bdzt === 5">{{ $t('page.business.form.statusYtg') }}</span>
             </template>
           </el-table-column>
 
@@ -74,8 +73,8 @@
               <el-button type="text" @click="edit(scope.row)" v-if="scope.row.bdzt === 1">{{
                 $t('form.edit') }}</el-button>
               <!-- 审核 -->
-              <el-button type="text" @click="audit(scope.row)"
-                v-if="scope.row.status === 3 || scope.row.status === 5">{{ $t('page.business.form.audit') }}</el-button>
+              <el-button type="text" @click="audit(scope.row)" 
+                v-if="scope.row.bdzt === 3 ">{{ $t('page.business.form.audit') }}</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -85,17 +84,22 @@
       </div>
     </div>
     <!-- 编辑 -->
-    <Bj v-show="showDetail" key="Bj" ref="Bj" @close="bjClose" />
+    <Bj v-show="showEdit" key="Bj" ref="Bj" @close="bjClose" />
+    <!-- 详情 -->
+    <Xq v-show="showDetail" key="Xq" ref="Xq" @close="xqClose" />
+    <!-- 审核 -->
+    <Sh v-show="showAudit" key="Sh" ref="Sh" @close="shClose" />
   </div>
 
 </template>
 
 <script>
 import {
-  studyFormPre_list,
-  studyFormPre_info
+  studyFormPre_list
 } from '@/api/business/study/studyFormPre'
 import Bj from "./ytbd/Bj";
+import Xq from "./ytbd/Xq";
+import Sh from "./ytbd/Sh";
 export default {
   name: 'YtbdList',
   props: {
@@ -116,9 +120,11 @@ export default {
       deep: true
     }
   },
-  components: { Bj },
+  components: { Bj, Xq,Sh },
   data() {
     return {
+      showAudit: false,
+      showEdit: false,
       showDetail: false,
       daterange: [],
       searchForm: {
@@ -163,25 +169,39 @@ export default {
       })
     },
     add() {
-      this.showDetail = true
-      this.$emit('showDetail', this.showDetail)
+      this.showEdit = true
+      this.$emit('showDetail', this.showEdit)
       this.$refs.Bj.edit({ studyId: this.searchForm.studyId })
     },
     edit(row) {
-      this.showDetail = true
-      this.$emit('showDetail', this.showDetail)
+      this.showEdit = true
+      this.$emit('showDetail', this.showEdit)
       this.$refs.Bj.edit(row)
     },
     bjClose() {
+      this.showEdit = false
+      this.$emit('showDetail', this.showEdit)
+      this.search()
+    },
+    xqClose() {
       this.showDetail = false
       this.$emit('showDetail', this.showDetail)
       this.search()
     },
+    shClose() {
+      this.showAudit = false
+      this.$emit('showDetail', this.showAudit)
+      this.search()
+    },
     detail(row) {
-
+      this.showDetail = true
+      this.$emit('showDetail', this.showDetail)
+      this.$refs.Xq.edit(row)
     },
     audit(row) {
-
+      this.showAudit = true
+      this.$emit('showDetail', this.showAudit)
+      this.$refs.Sh.edit(row)
     },
   }
 }