diff --git a/src/views/business/form/drug/comp/ytbdList.vue b/src/views/business/form/drug/comp/ytbdList.vue
index 465cf8a..7b89a00 100644
--- a/src/views/business/form/drug/comp/ytbdList.vue
+++ b/src/views/business/form/drug/comp/ytbdList.vue
@@ -79,7 +79,7 @@
                 $t('form.detail') }}</el-button>
               <!-- 编辑 -->
               <el-button type="text" v-hasPermi="['business:drugFormPre:bj']" @click="edit(scope.row)"
-                v-if="scope.row.bdzt === 1&&id==scope.row.userId">{{
+                v-if="(scope.row.bdzt === 1||scope.row.bdzt === 7)&&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/src/views/business/form/nonTrial/comp/ytbdList.vue b/src/views/business/form/nonTrial/comp/ytbdList.vue
index 6557a49..12095da 100644
--- a/src/views/business/form/nonTrial/comp/ytbdList.vue
+++ b/src/views/business/form/nonTrial/comp/ytbdList.vue
@@ -79,7 +79,7 @@
                 $t('form.detail') }}</el-button>
               <!-- 编辑 -->
               <el-button type="text" v-hasPermi="['business:nonTrialFormPre:bj']" @click="edit(scope.row)"
-                v-if="scope.row.bdzt === 1&&id==scope.row.userId">{{
+                v-if="(scope.row.bdzt === 1||scope.row.bdzt === 7)&&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/src/views/business/study/comp/jhbd/Bj.vue b/src/views/business/study/comp/jhbd/Bj.vue
index 8b34d2f..d91ccd6 100644
--- a/src/views/business/study/comp/jhbd/Bj.vue
+++ b/src/views/business/study/comp/jhbd/Bj.vue
@@ -41,7 +41,7 @@
             <el-row>
               <el-col :span="24">
                 <el-form-item :label="$t('page.business.form.bdmb')" prop="templateId">
-                  <SelectTemplate v-model="form.templateId" :disabled="form.id && form.id !== ''" :needPre="1"
+                  <SelectTemplate v-model="form.templateId" :disabled="true" :needPre="1"
                     :name="form.templateMc" @change="selectTemplateChange" />
                 </el-form-item>
               </el-col>
@@ -70,15 +70,48 @@
       </div>
     </div>
 
-    <el-dialog :title="$t('page.business.study.studyFormPlan.tjjl')" :visible.sync="openSubmit" width="500px"
+   
+    <el-dialog :title="$t('page.business.study.studyFormApply.tjjl')" :visible.sync="openSubmit" width="500px"
       append-to-body :close-on-click-modal="false">
       <el-form ref="formSubmit" :model="form" :rules="rulesApprove" label-width="120px">
-        todo
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.qmyy')" prop="qmyy">
+              <el-input type="text" :value="form.qmyy" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.remark')" prop="remark">
+              <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
+                :placeholder="$t('form.placeholderInput')">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.signer')">
+              <el-input type="text" v-model="nickName" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.password')" prop="qmrmm">
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
-      <!-- <div slot="footer" class="dialog-footer">
+      <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="tj">{{ $t('form.confirm') }}</el-button>
         <el-button @click="openSubmit = false">{{ $t('form.cancel') }}</el-button>
-      </div> -->
+      </div>
     </el-dialog>
   </div>
 </template>
diff --git a/src/views/business/study/comp/sqbd/Bj.vue b/src/views/business/study/comp/sqbd/Bj.vue
index eb212a9..d4f3416 100644
--- a/src/views/business/study/comp/sqbd/Bj.vue
+++ b/src/views/business/study/comp/sqbd/Bj.vue
@@ -41,7 +41,7 @@
             <el-row>
               <el-col :span="24">
                 <el-form-item :label="$t('page.business.form.bdmb')" prop="templateId">
-                  <SelectTemplate v-model="form.templateId" :disabled="form.id && form.id !== ''"
+                  <SelectTemplate v-model="form.templateId" :disabled="true"
                     :name="form.templateMc" @change="selectTemplateChange" />
                 </el-form-item>
               </el-col>
diff --git a/src/views/business/study/comp/ytbd/Bj.vue b/src/views/business/study/comp/ytbd/Bj.vue
index 1572949..54006d1 100644
--- a/src/views/business/study/comp/ytbd/Bj.vue
+++ b/src/views/business/study/comp/ytbd/Bj.vue
@@ -41,15 +41,15 @@
             <el-row>
               <el-col :span="24">
                 <el-form-item :label="$t('page.business.form.bdmb')" prop="templateId">
-                  <SelectTemplate v-model="form.templateId" :disabled="form.id&&form.id!==''" :needPre="10" :name="form.templateMc"
-                    @change="selectTemplateChange" />
+                  <SelectTemplate v-model="form.templateId" :disabled="form.id && form.id !== ''" :needPre="10"
+                    :name="form.templateMc" @change="selectTemplateChange" />
                 </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-input type="text" v-model="form.bdmc" maxlength="50" :placeholder="$t('form.placeholderInput')" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -187,8 +187,8 @@ export default {
   created() {
   },
   methods: {
-    pre(){
-          this.showIndex = 1
+    pre() {
+      this.showIndex = 1
     },
     next() {
       this.$refs["form"].validate(valid => {
@@ -261,18 +261,22 @@ export default {
     },
     async saveNext() {
       let content = await this.$refs.templateTable.getFormData()
-      this.form.bdnr = JSON.stringify(content)
-      this.$modal.loading()
-      studyFormPre_bc(this.form).then(response => {
-        this.$emit('close')
-        this.$modal.closeLoading()
-      }).finally(() => {
-        this.$modal.closeLoading()
-      })
+      if (content) {
+        this.form.bdnr = JSON.stringify(content)
+        this.$modal.loading()
+        studyFormPre_bc(this.form).then(response => {
+          this.$emit('close')
+          this.$modal.closeLoading()
+        }).finally(() => {
+          this.$modal.closeLoading()
+        })
+      }
     },
     async showtj() {
-      await this.$refs.templateTable.getFormData()
+      let content = await this.$refs.templateTable.getFormData()
+      if (content) {
       this.openSubmit = true
+      }
     },
     tj() {
       this.$refs["formSubmit"].validate(valid => {
@@ -283,15 +287,17 @@ export default {
     },
     async dotj() {
       let content = await this.$refs.templateTable.getFormData()
-      this.form.bdnr = JSON.stringify(content)
-      this.$modal.loading()
-      studyFormPre_tj(this.form).then(response => {
-        this.$emit('close')
-        this.openSubmit = false
-        this.$modal.closeLoading()
-      }).finally(() => {
-        this.$modal.closeLoading()
-      })
+      if (content) {
+        this.form.bdnr = JSON.stringify(content)
+        this.$modal.loading()
+        studyFormPre_tj(this.form).then(response => {
+          this.$emit('close')
+          this.openSubmit = false
+          this.$modal.closeLoading()
+        }).finally(() => {
+          this.$modal.closeLoading()
+        })
+      }
     }
   }
 }
diff --git a/src/views/business/study/comp/ytbdList.vue b/src/views/business/study/comp/ytbdList.vue
index c647016..284aa49 100644
--- a/src/views/business/study/comp/ytbdList.vue
+++ b/src/views/business/study/comp/ytbdList.vue
@@ -80,7 +80,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&&id==scope.row.userId">{{
+                v-if="(scope.row.bdzt === 1||scope.row.bdzt === 7)&&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 fda6a2f..f82b590 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -34,8 +34,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:8080`,
-         // target: `http://39.99.251.173:8080`,
+        //target: `http://localhost:8080`,
+          target: `http://39.99.251.173:8080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''