diff --git a/src/App.vue b/src/App.vue
index 4f7350d..fbf4ad0 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -314,7 +314,6 @@ export default {
 /** 基础信息设置tab **/
 
 .edit-container {
-  background: #ffffff !important;
 
   .edit-top {
     background: #fff;
@@ -344,6 +343,7 @@ export default {
       display: flex;
       justify-content: space-between;
       height: 24px;
+
       .is-finish {
         background: #409eff;
         border: none;
@@ -356,12 +356,17 @@ export default {
         margin-top: 12px;
         margin-left: 5px;
         margin-right: 5px;
-        border-top: 1px  solid #d0d0d0;
+        border-top: 1px solid #d0d0d0;
       }
     }
 
     .right-top {}
   }
 
+  .edit-content {
+    background: #ffffff;
+    padding: 10px 10px;
+    margin-top: 10px;
+  }
 }
 </style>
diff --git a/src/views/business/study/comp/ytbd/Bj.vue b/src/views/business/study/comp/ytbd/Bj.vue
index 351b4cc..9275a6c 100644
--- a/src/views/business/study/comp/ytbd/Bj.vue
+++ b/src/views/business/study/comp/ytbd/Bj.vue
@@ -23,8 +23,45 @@ G<template>
         </div>
         <div class="right-top">
           <el-button @click="cancel()">{{ $t('form.cancel') }}</el-button>
-          <el-button @click="save">暂存</el-button>
-          <el-button type="primary" @click="next">下一步</el-button>
+          <template v-if="showIndex == 1">
+            <el-button @click="save">暂存</el-button>
+            <el-button type="primary" @click="next">下一步</el-button>
+          </template>
+          <template v-else>
+            <el-button @click="save">保存</el-button>
+            <el-button type="primary" @click="tj">提交</el-button>
+          </template>
+        </div>
+      </div>
+      <div class="edit-content ">
+        <el-form ref="form" :model="form" :rules="rules" label-width="120px" v-if="showIndex == 1">
+          <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')" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item :label="$t('page.business.form.bdmc')" prop="bdmc">
+                <el-input type="text" v-model="form.bdmc" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="表单说明" prop="bdsm">
+                <el-input type="textarea" v-model="form.bdsm" :rows="5" maxlength="500"
+                  :placeholder="$t('form.placeholderInput')">
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div v-else>
+          表单详情todo
         </div>
       </div>
     </div>
@@ -32,7 +69,7 @@ G<template>
 </template>
 
 <script>
-import { studyFormPre_bj, studyFormPre_tj } from "@/api/business/study/studyFormPre"
+import { studyFormPre_bc, studyFormPre_tj } from "@/api/business/study/studyFormPre"
 import { mapGetters } from 'vuex'
 
 export default {
@@ -41,48 +78,20 @@ export default {
   data() {
     return {
       open: false,
+      showIndex: 1,
       form: {},
       rules: {
-        mc: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        bh: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        nd: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        nddw: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        sxrq: [{
+        bdmc: [{
           required: true,
           message: ' ',
           trigger: 'blur'
         }],
-        cctj: [{
+        templateId: [{
           required: true,
           message: ' ',
           trigger: 'blur'
-        }],
-        ccwz: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        qmrmm: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
+        }]
+
       }
     }
   },
@@ -94,6 +103,13 @@ export default {
   created() {
   },
   methods: {
+    next() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.showIndex = 2
+        }
+      })
+    },
     cancel() {
       this.$emit('close')
     },
@@ -112,20 +128,27 @@ export default {
     },
     edit(row) {
       this.reset()
-      if (row) {
-        this.form = row
-      }
+      this.showIndex = 1
+      this.form = row
       this.open = true
     },
     save() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          bj(this.form).then(response => {
-            this.open = false
-            this.$emit('callback')
+          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 => {
+        this.$emit('close')
+        this.$modal.closeLoading()
+      })
     }
   }
 }
diff --git a/src/views/business/study/comp/ytbdList.vue b/src/views/business/study/comp/ytbdList.vue
index 7ae8d56..97c5a29 100644
--- a/src/views/business/study/comp/ytbdList.vue
+++ b/src/views/business/study/comp/ytbdList.vue
@@ -43,7 +43,7 @@
       <div class="ytbd-content">
         <el-row class="add-box">
           <el-col>
-            <el-button type="primary" icon="el-icon-plus" @click="edit(null)" v-hasPermi="['business:study:add']">{{
+            <el-button type="primary" icon="el-icon-plus" @click="add()" v-hasPermi="['business:study:add']">{{
               $t('page.business.form.xzytbd') }}</el-button>
           </el-col>
         </el-row>
@@ -68,13 +68,13 @@
           <el-table-column :label="$t('form.operate')" fixed="right" align="center" width="200">
             <template slot-scope="scope">
               <!-- 详情 -->
-              <el-button type="text" @click="detail(scope.row)" v-hasPermi="['business:study:detail']">{{
-                $t('page.business.form.detail') }}</el-button>
+              <el-button type="text" @click="detail(scope.row)">{{
+                $t('form.detail') }}</el-button>
               <!-- 编辑 -->
-              <el-button type="text" @click="edit(scope.row)" v-hasPermi="['business:study:edit']"
-                v-if="scope.row.status === 1">{{ $t('page.business.form.edit') }}</el-button>
+              <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-hasPermi="['business:study:audit']"
+              <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>
             </template>
           </el-table-column>
@@ -162,14 +162,20 @@ export default {
         this.loading = false
       })
     },
+    add() {
+      this.showDetail = true
+      this.$emit('showDetail', this.showDetail)
+      this.$refs.Bj.edit({ studyId: this.searchForm.studyId })
+    },
     edit(row) {
-      this.showDetail=true
-      this.$emit('showDetail',this.showDetail)
+      this.showDetail = true
+      this.$emit('showDetail', this.showDetail)
       this.$refs.Bj.edit(row)
     },
-    bjClose(){
-      this.showDetail=false
-      this.$emit('showDetail',this.showDetail)
+    bjClose() {
+      this.showDetail = false
+      this.$emit('showDetail', this.showDetail)
+      this.search()
     },
     detail(row) {