diff --git a/src/lang/en/business/study/studyFormPre.js b/src/lang/en/business/study/studyFormPre.js
index b332b68..bc5527d 100644
--- a/src/lang/en/business/study/studyFormPre.js
+++ b/src/lang/en/business/study/studyFormPre.js
@@ -1,6 +1,7 @@
 export default {
  jcsz:'Setup',
  bdsj:'Preset Design',
+ xzbd:'Create',
  zc:'暂存',
  next:'Next',
  save:'Save',
diff --git a/src/lang/zh/business/study/studyFormPre.js b/src/lang/zh/business/study/studyFormPre.js
index a16ce21..1787f9a 100644
--- a/src/lang/zh/business/study/studyFormPre.js
+++ b/src/lang/zh/business/study/studyFormPre.js
@@ -1,6 +1,7 @@
 export default {
  jcsz:'基础设置',
  bdsj:'表单设计',
+ xzbd:'新增表单',
  zc:'暂存',
  next:'下一步',
  save:'保存',
diff --git a/src/views/business/comps/select/SelectTemplate.vue b/src/views/business/comps/select/SelectTemplate.vue
index 4952dbc..82412f5 100644
--- a/src/views/business/comps/select/SelectTemplate.vue
+++ b/src/views/business/comps/select/SelectTemplate.vue
@@ -25,6 +25,10 @@ export default {
       type: Boolean,
       default: false
     },
+    needPre: {
+      type: Number,
+      default: 0
+    },
   },
   watch: {
     value: {
@@ -53,7 +57,7 @@ export default {
   methods: {
     showSelectTemplate(){
       if(!this.readOnly){
-        this.$refs.selectTemplateDialog.show()
+        this.$refs.selectTemplateDialog.show({needPre:this.needPre})
       }
     },
     handleChange(obj) {
diff --git a/src/views/business/comps/select/SelectTemplateDialog.vue b/src/views/business/comps/select/SelectTemplateDialog.vue
index 0fbb971..79725b8 100644
--- a/src/views/business/comps/select/SelectTemplateDialog.vue
+++ b/src/views/business/comps/select/SelectTemplateDialog.vue
@@ -72,7 +72,8 @@ export default {
     handleRadioClick(row) {
       this.selectedId = row.id
     },
-    show() {
+    show(val) {
+      this.searchForm=_.merge({}, this.searchForm, val)
       this.selectedId=null
       this.search()
     },
@@ -102,7 +103,8 @@ export default {
     },
     handleSelect() {
       let that = this
-      let _index = _.findIndex(this.list, function (item) { return item.id = that.selectedId })
+      let _index = _.findIndex(this.list, function (item) { return item.id == that.selectedId })
+      debugger
       this.$emit('callback', this.list[_index]);
       this.open = false
     }
diff --git a/src/views/business/study/comp/jhbd/Bj.vue b/src/views/business/study/comp/jhbd/Bj.vue
index dcf2042..9acbc6a 100644
--- a/src/views/business/study/comp/jhbd/Bj.vue
+++ b/src/views/business/study/comp/jhbd/Bj.vue
@@ -63,7 +63,7 @@ G<template>
           </el-form>
         </div>
         <div class="content" v-show="showIndex == 2">
-          <TemplateTable ref="templateTable" :sn="form.templateSn" fillType="prePlan" />
+          <TemplateTable ref="templateTable" :sn="form.templateSn" :templateData="form.bdnr" fillType="prePlan" />
         </div>
       </div>
     </div>
@@ -137,6 +137,7 @@ export default {
   created() {
   },
   methods: {
+   
     next() {
       this.$refs["form"].validate(valid => {
         if (valid) {
diff --git a/src/views/business/study/comp/jhbd/Fh.vue b/src/views/business/study/comp/jhbd/Fh.vue
index 4691a9a..bb2f8f4 100644
--- a/src/views/business/study/comp/jhbd/Fh.vue
+++ b/src/views/business/study/comp/jhbd/Fh.vue
@@ -20,7 +20,7 @@ G<template>
       </div>
       <div class="edit-content">
         <div class="content-left">
-          <TemplateTable ref="templateTable" :sn="form.templateSn" fillType="prePlan" />
+          <TemplateTable ref="templateTable" :sn="form.templateSn" fillType="readonly" :templateData="form.bdnr"/>
           <div class="content-title">
             <div class="line"></div>
             <div class="subtitle"> {{ $t('page.business.study.studyFormPlan.qmxx') }}</div>
@@ -161,6 +161,7 @@ export default {
   created() {
   },
   methods: {
+   
     getJjcgjList(val) {
       this.$modal.loading()
       studyFormPlan_jcgj(_.merge({}, this.queryParamsJcgj, val)).then(response => {
diff --git a/src/views/business/study/comp/jhbd/Sy.vue b/src/views/business/study/comp/jhbd/Sy.vue
index 8450352..67b7c76 100644
--- a/src/views/business/study/comp/jhbd/Sy.vue
+++ b/src/views/business/study/comp/jhbd/Sy.vue
@@ -16,7 +16,7 @@ G<template>
       </div>
       <div class="edit-content">
         <div class="content-left">
-          <TemplateTable ref="templateTable" :sn="form.templateSn" fillType="prePlan" />
+          <TemplateTable ref="templateTable" :sn="form.templateSn" fillType="readonly" :templateData="form.bdnr"/>
           <div class="content-title">
             <div class="line"></div>
             <div class="subtitle"> {{ $t('page.business.study.studyFormPlan.qmxx') }}</div>
@@ -142,6 +142,7 @@ export default {
   created() {
   },
   methods: {
+   
     getJjcgjList(val) {
       this.$modal.loading()
       studyFormPlan_jcgj(_.merge({}, this.queryParamsJcgj, val)).then(response => {
diff --git a/src/views/business/study/comp/jhbd/Xq.vue b/src/views/business/study/comp/jhbd/Xq.vue
index 43ffe9c..185ec2d 100644
--- a/src/views/business/study/comp/jhbd/Xq.vue
+++ b/src/views/business/study/comp/jhbd/Xq.vue
@@ -28,7 +28,7 @@ G<template>
             <el-button type="primary" @click="dcbhsjgj">{{ $t('page.business.study.studyFormPlan.dcbhsjgj') }}
             </el-button>
           </div>
-          <TemplateTable ref="templateTable" :sn="form.templateSn" fillType="prePlan" />
+          <TemplateTable ref="templateTable" :sn="form.templateSn" fillType="readonly" :templateData="form.bdnr"/>
           <div class="content-title">
             <div class="line"></div>
             <div class="subtitle"> {{ $t('page.business.study.studyFormPlan.qmxx') }}</div>
@@ -176,6 +176,7 @@ export default {
   created() {
   },
   methods: {
+    
     dcqbjcgj() {
       alert('todo')
     },
diff --git a/src/views/business/study/comp/sqbd/Bj.vue b/src/views/business/study/comp/sqbd/Bj.vue
index fa4ada7..dd5cb46 100644
--- a/src/views/business/study/comp/sqbd/Bj.vue
+++ b/src/views/business/study/comp/sqbd/Bj.vue
@@ -54,10 +54,10 @@ G<template>
             <el-row>
               <el-col :span="24">
                 <el-form-item :label="$t('page.business.study.studyFormApply.sfbl')" prop="sfbl">
-                  <el-radio-group v-model="form.sfbl">
-                    <el-radio :label="1">{{ $t('page.business.study.studyFormApply.no') }}</el-radio>
-                    <el-radio :label="10">{{ $t('page.business.study.studyFormApply.yes') }}</el-radio>
-                  </el-radio-group>
+                    <el-select v-model="form.sfbl" :placeholder="$t('form.placeholderSelect')" >
+                  <el-option :label="$t('page.business.study.studyFormApply.yes')" :value="10" />
+                  <el-option :label="$t('page.business.study.studyFormApply.no')" :value="1" />
+                </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -73,7 +73,7 @@ G<template>
           </el-form>
         </div>
         <div class="content" v-show="showIndex == 2">
-          <TemplateTable ref="templateTable" :sn="form.templateSn" fillType="preApply" />
+          <TemplateTable ref="templateTable" :sn="form.templateSn" :templateData="form.bdnr" fillType="preApply" />
         </div>
       </div>
     </div>
@@ -152,6 +152,7 @@ export default {
   created() {
   },
   methods: {
+   
     next() {
       this.$refs["form"].validate(valid => {
         if (valid) {
diff --git a/src/views/business/study/comp/sqbd/Fh.vue b/src/views/business/study/comp/sqbd/Fh.vue
index 8ff41f2..4362374 100644
--- a/src/views/business/study/comp/sqbd/Fh.vue
+++ b/src/views/business/study/comp/sqbd/Fh.vue
@@ -20,7 +20,7 @@ G<template>
       </div>
       <div class="edit-content">
         <div class="content-left">
-          <TemplateTable ref="templateTable" :sn="form.templateSn" fillType="preApply" />
+          <TemplateTable ref="templateTable" :sn="form.templateSn" :templateData="form.bdnr" fillType="readonly" />
           <div class="content-title">
             <div class="line"></div>
             <div class="subtitle"> {{ $t('page.business.study.studyFormApply.qmxx') }}</div>
@@ -161,6 +161,7 @@ export default {
   created() {
   },
   methods: {
+   
     getJjcgjList(val) {
       this.$modal.loading()
       studyFormApply_jcgj(_.merge({}, this.queryParamsJcgj, val)).then(response => {
diff --git a/src/views/business/study/comp/sqbd/Sy.vue b/src/views/business/study/comp/sqbd/Sy.vue
index bfa751f..5734b23 100644
--- a/src/views/business/study/comp/sqbd/Sy.vue
+++ b/src/views/business/study/comp/sqbd/Sy.vue
@@ -16,7 +16,7 @@ G<template>
       </div>
       <div class="edit-content">
         <div class="content-left">
-          <TemplateTable ref="templateTable" :sn="form.templateSn" fillType="preApply" />
+          <TemplateTable ref="templateTable" :sn="form.templateSn" :templateData="form.bdnr" fillType="readonly" />
           <div class="content-title">
             <div class="line"></div>
             <div class="subtitle"> {{ $t('page.business.study.studyFormApply.qmxx') }}</div>
@@ -142,6 +142,7 @@ export default {
   created() {
   },
   methods: {
+   
     getJjcgjList(val) {
       this.$modal.loading()
       studyFormApply_jcgj(_.merge({}, this.queryParamsJcgj, val)).then(response => {
diff --git a/src/views/business/study/comp/sqbd/Xq.vue b/src/views/business/study/comp/sqbd/Xq.vue
index 0026406..b2be94f 100644
--- a/src/views/business/study/comp/sqbd/Xq.vue
+++ b/src/views/business/study/comp/sqbd/Xq.vue
@@ -28,7 +28,7 @@ G<template>
             <el-button type="primary" @click="dcbhsjgj">{{ $t('page.business.study.studyFormApply.dcbhsjgj') }}
             </el-button>
           </div>
-          <TemplateTable ref="templateTable" :sn="form.templateSn" :templateData="form" fillType="actApply" />
+          <TemplateTable ref="templateTable" :sn="form.templateSn" :templateData="form.bdnr" fillType="readonly" />
           <div class="content-title">
             <div class="line"></div>
             <div class="subtitle"> {{ $t('page.business.study.studyFormApply.qmxx') }}</div>
@@ -176,6 +176,7 @@ export default {
   created() {
   },
   methods: {
+  
     dcqbjcgj() {
       alert('todo')
     },
diff --git a/src/views/business/study/comp/sqbdList.vue b/src/views/business/study/comp/sqbdList.vue
index a1c4511..0b8e894 100644
--- a/src/views/business/study/comp/sqbdList.vue
+++ b/src/views/business/study/comp/sqbdList.vue
@@ -93,8 +93,8 @@
           <el-table-column :label="$t('page.business.study.studyFormApply.sfbl')" align="center" prop="status"
             width="100">
             <template slot-scope="scope">
-              <span v-if="scope.row.bdzt === 10">{{ $t('page.business.study.studyFormApply.yes') }}</span>
-              <span v-if="scope.row.bdzt === 1">{{ $t('page.business.study.studyFormApply.no') }}</span>
+              <span v-if="scope.row.sfbl === 10">{{ $t('page.business.study.studyFormApply.yes') }}</span>
+              <span v-if="scope.row.sfbl === 1">{{ $t('page.business.study.studyFormApply.no') }}</span>
             </template>
           </el-table-column>
           <el-table-column :label="$t('page.business.form.tjsj')" align="center" prop="tjsj" width="140" />
diff --git a/src/views/business/study/comp/tbbd/Bj.vue b/src/views/business/study/comp/tbbd/Bj.vue
index bcfa432..4c08f79 100644
--- a/src/views/business/study/comp/tbbd/Bj.vue
+++ b/src/views/business/study/comp/tbbd/Bj.vue
@@ -40,7 +40,8 @@ G<template>
             <el-row>
               <el-col :span="24">
                 <el-form-item :label="$t('page.business.form.bdmb')" prop="templateId">
-                  <SelectTemplate v-model="form.templateId" :name="form.templateMc" @change="selectTemplateChange" />
+                  <SelectTemplate v-model="form.templateId" :name="form.templateMc" @change="selectTemplateChange"
+                    :needPre="1" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -54,10 +55,10 @@ G<template>
             <el-row>
               <el-col :span="24">
                 <el-form-item :label="$t('page.business.study.studyFormFill.sfbl')" prop="sfbl">
-                  <el-radio-group v-model="form.sfbl">
-                    <el-radio :label="1">{{ $t('page.business.study.studyFormFill.no') }}</el-radio>
-                    <el-radio :label="10">{{ $t('page.business.study.studyFormFill.yes') }}</el-radio>
-                  </el-radio-group>
+                  <el-select v-model="form.sfbl" :placeholder="$t('form.placeholderSelect')">
+                    <el-option :label="$t('page.business.study.studyFormFill.yes')" :value="10" />
+                    <el-option :label="$t('page.business.study.studyFormFill.no')" :value="1" />
+                  </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -73,7 +74,7 @@ G<template>
           </el-form>
         </div>
         <div class="content" v-show="showIndex == 2">
-          <TemplateTable ref="templateTable" :sn="form.templateSn" fillType="preFill" />
+          <TemplateTable ref="templateTable" :sn="form.templateSn" :templateData="form.bdnr" fillType="preFill" />
         </div>
       </div>
     </div>
@@ -152,6 +153,7 @@ export default {
   created() {
   },
   methods: {
+   
     next() {
       this.$refs["form"].validate(valid => {
         if (valid) {
diff --git a/src/views/business/study/comp/tbbd/Fh.vue b/src/views/business/study/comp/tbbd/Fh.vue
index bc7c005..48a6ae2 100644
--- a/src/views/business/study/comp/tbbd/Fh.vue
+++ b/src/views/business/study/comp/tbbd/Fh.vue
@@ -20,7 +20,7 @@ G<template>
       </div>
       <div class="edit-content">
         <div class="content-left">
-          <TemplateTable ref="templateTable" :sn="form.templateSn" fillType="preFill" />
+          <TemplateTable ref="templateTable" :sn="form.templateSn" :templateData="form.bdnr" fillType="readonly" />
           <div class="content-title">
             <div class="line"></div>
             <div class="subtitle"> {{ $t('page.business.study.studyFormFill.qmxx') }}</div>
@@ -161,6 +161,7 @@ export default {
   created() {
   },
   methods: {
+   
     getJjcgjList(val) {
       this.$modal.loading()
       studyFormFill_jcgj(_.merge({}, this.queryParamsJcgj, val)).then(response => {
diff --git a/src/views/business/study/comp/tbbd/Sy.vue b/src/views/business/study/comp/tbbd/Sy.vue
index 4c5370f..a98f522 100644
--- a/src/views/business/study/comp/tbbd/Sy.vue
+++ b/src/views/business/study/comp/tbbd/Sy.vue
@@ -16,7 +16,7 @@ G<template>
       </div>
       <div class="edit-content">
         <div class="content-left">
-          <TemplateTable ref="templateTable" :sn="form.templateSn" fillType="preFill" />
+          <TemplateTable ref="templateTable" :sn="form.templateSn" fillType="readonly" :templateData="form.bdnr"/>
           <div class="content-title">
             <div class="line"></div>
             <div class="subtitle"> {{ $t('page.business.study.studyFormFill.qmxx') }}</div>
@@ -142,6 +142,7 @@ export default {
   created() {
   },
   methods: {
+   
     getJjcgjList(val) {
       this.$modal.loading()
       studyFormFill_jcgj(_.merge({}, this.queryParamsJcgj, val)).then(response => {
diff --git a/src/views/business/study/comp/tbbd/Xq.vue b/src/views/business/study/comp/tbbd/Xq.vue
index da095c8..b643c82 100644
--- a/src/views/business/study/comp/tbbd/Xq.vue
+++ b/src/views/business/study/comp/tbbd/Xq.vue
@@ -28,7 +28,7 @@ G<template>
             <el-button type="primary" @click="dcbhsjgj">{{ $t('page.business.study.studyFormFill.dcbhsjgj') }}
             </el-button>
           </div>
-          <TemplateTable ref="templateTable" :sn="form.templateSn" :templateData="form" fillType="actFill" />
+          <TemplateTable ref="templateTable" :sn="form.templateSn" :templateData="form.bdnr" fillType="readonly" />
           <div class="content-title">
             <div class="line"></div>
             <div class="subtitle"> {{ $t('page.business.study.studyFormFill.qmxx') }}</div>
@@ -176,6 +176,7 @@ export default {
   created() {
   },
   methods: {
+  
     dcqbjcgj() {
       alert('todo')
     },
diff --git a/src/views/business/study/comp/tbbdList.vue b/src/views/business/study/comp/tbbdList.vue
index a714c7a..00c0d58 100644
--- a/src/views/business/study/comp/tbbdList.vue
+++ b/src/views/business/study/comp/tbbdList.vue
@@ -93,8 +93,8 @@
           <el-table-column :label="$t('page.business.study.studyFormFill.sfbl')" align="center" prop="status"
             width="100">
             <template slot-scope="scope">
-              <span v-if="scope.row.bdzt === 10">{{ $t('page.business.study.studyFormFill.yes') }}</span>
-              <span v-if="scope.row.bdzt === 1">{{ $t('page.business.study.studyFormFill.no') }}</span>
+              <span v-if="scope.row.sfbl === 10">{{ $t('page.business.study.studyFormFill.yes') }}</span>
+              <span v-if="scope.row.sfbl === 1">{{ $t('page.business.study.studyFormFill.no') }}</span>
             </template>
           </el-table-column>
           <el-table-column :label="$t('page.business.form.tjsj')" align="center" prop="tjsj" width="140" />
diff --git a/src/views/business/study/comp/ytbd/Bj.vue b/src/views/business/study/comp/ytbd/Bj.vue
index 9e66adb..25829b7 100644
--- a/src/views/business/study/comp/ytbd/Bj.vue
+++ b/src/views/business/study/comp/ytbd/Bj.vue
@@ -63,7 +63,7 @@ G<template>
           </el-form>
         </div>
         <div class="content" v-show="showIndex == 2">
-          <TemplateTable ref="templateTable" :sn="form.templateSn" fillType="preFill" />
+          <TemplateTable ref="templateTable" :sn="form.templateSn"  :templateData="form.bdnr" fillType="preFill" />
         </div>
       </div>
     </div>
@@ -185,6 +185,7 @@ export default {
   created() {
   },
   methods: {
+   
     next() {
       this.$refs["form"].validate(valid => {
         if (valid) {
@@ -193,6 +194,7 @@ export default {
       })
     },
     selectTemplateChange(val) {
+      debugger
       this.form.bdnr = val.content
       this.form.templateMc = val.name
       this.form.templateSn = val.sn
diff --git a/src/views/business/study/comp/ytbd/Sh.vue b/src/views/business/study/comp/ytbd/Sh.vue
index efa9430..d0f1955 100644
--- a/src/views/business/study/comp/ytbd/Sh.vue
+++ b/src/views/business/study/comp/ytbd/Sh.vue
@@ -16,7 +16,7 @@ G<template>
         </div>
       </div>
       <div class="edit-content ">
-        <TemplateTable ref="templateTable" :sn="form.templateSn" fillType="preFill" />
+        <TemplateTable ref="templateTable" :sn="form.templateSn" :templateData="form.bdnr" fillType="readonly" />
       </div>
     </div>
     <!-- 通过 -->
@@ -177,6 +177,7 @@ export default {
   created() {
   },
   methods: {
+   
     cancel() {
       this.$emit('close')
     },
diff --git a/src/views/business/study/comp/ytbd/Xq.vue b/src/views/business/study/comp/ytbd/Xq.vue
index ccae049..8cf1edb 100644
--- a/src/views/business/study/comp/ytbd/Xq.vue
+++ b/src/views/business/study/comp/ytbd/Xq.vue
@@ -16,7 +16,7 @@ G<template>
       </div>
       <div class="edit-content ">
         <div class="content-left">
-          <TemplateTable ref="templateTable" :sn="form.templateSn" :templateData="form" fillType="preFill" />
+          <TemplateTable ref="templateTable" :sn="form.templateSn" :templateData="form.bdnr" fillType="readonly" />
           <div class="content-title">
             <div class="line"></div>
             <div class="subtitle"> {{ $t('page.business.study.studyFormPre.qmxx') }}</div>
@@ -165,6 +165,7 @@ export default {
   created() {
   },
   methods: {
+   
     getJjcgjList(val) {
       this.$modal.loading()
       studyFormPre_jcgj(_.merge({}, this.queryParamsJcgj, val)).then(response => {
diff --git a/src/views/business/study/comp/ytbdList.vue b/src/views/business/study/comp/ytbdList.vue
index b81b5f3..1bf42e4 100644
--- a/src/views/business/study/comp/ytbdList.vue
+++ b/src/views/business/study/comp/ytbdList.vue
@@ -52,7 +52,7 @@
           <el-col>
             <el-button type="primary" icon="el-icon-plus" @click="showAdd()"
               v-hasPermi="['business:studyFormPre:xz']">{{
-                $t('page.business.form.xzytbd') }}</el-button>
+                $t('page.business.study.studyFormPre.xzbd') }}</el-button>
           </el-col>
         </el-row>
 
@@ -79,7 +79,7 @@
                 $t('form.detail') }}</el-button>
               <!-- 编辑 -->
               <el-button type="text" v-hasPermi="['business:studyFormPre:bj']" @click="edit(scope.row)"
-                v-if="scope.row.bdzt === 1">{{
+                v-if="scope.row.bdzt === 1&&id==scope.row.userId">{{
                   $t('form.edit') }}</el-button>
               <template v-if="scope.row.fzrsh == 10">
                 <template v-if="scope.row.fzrshzt == 5">
diff --git a/vue.config.js b/vue.config.js
index 489b432..bbd8cf9 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -34,7 +34,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        //  target: `http://localhost:8080`,
+         // target: `http://localhost:8080`,
         target: `http://39.99.251.173:8080`,
         changeOrigin: true,
         pathRewrite: {