Merge branch 'master' of http://182.151.8.209:9010/eln_TD/eln_web

src/api/business/study/studyFormApply.js

@@ -86,6 +86,14 @@ export function studyFormApply_bc(data) {
   })
 }
 
+//仅保存
+export function studyFormApply_bcOnly(data) {
+  return request({
+    url: '/system/business/studyFormApply/bcOnly',
+    method: 'post',
+    data: data
+  })
+}
 //提交
 export function studyFormApply_tj(data) {
   return request({

src/api/business/study/studyFormFill.js

@@ -88,6 +88,14 @@ export function studyFormFill_bc(data) {
   })
 }
 
+//仅保存
+export function studyFormFill_bcOnly(data) {
+  return request({
+    url: '/system/business/studyFormFill/bcOnly',
+    method: 'post',
+    data: data
+  })
+}
 //提交
 export function studyFormFill_tj(data) {
   return request({

src/api/business/study/studyFormPlan.js

@@ -61,6 +61,14 @@ export function studyFormPlan_bc(data) {
   })
 }
 
+//仅保存
+export function studyFormPlan_bcOnly(data) {
+  return request({
+    url: '/system/business/studyFormPlan/bcOnly',
+    method: 'post',
+    data: data
+  })
+}
 //提交
 export function studyFormPlan_tj(data) {
   return request({

src/api/business/study/studyFormPre.js

@@ -43,6 +43,14 @@ export function studyFormPre_bc(data) {
   })
 }
 
+//仅保存
+export function studyFormPre_bcOnly(data) {
+  return request({
+    url: '/system/business/studyFormPre/bcOnly',
+    method: 'post',
+    data: data
+  })
+}
 //提交
 export function studyFormPre_tj(data) {
   return request({

src/lang/en/business/study/studyFormFill.js

@@ -71,5 +71,7 @@ export default {
   smxz: 'Declaration of Collaboration',
   bcsm: 'Additional Remark',
   fztgjj: 'Approve/Reject Record Abolition',
-  ysy: 'Reviewed'
+  ysy: 'Reviewed',
+  bcjl:'保存记录',
+  txbbc:'填写并保存'
 }

src/lang/zh/business/study/studyFormFill.js

@@ -73,4 +73,6 @@ export default {
   bcsm: '补充说明',
   fztgjj: '废止通过/拒绝',
   ysy: '已审阅',
+  bcjl:'保存记录',
+  txbbc:'填写并保存'
 }

src/views/business/study/comp/jhbd/Bj.vue

@@ -126,7 +126,7 @@
 </template>
 
 <script>
-import { studyFormPlan_bc, studyFormPlan_tj, studyFormPlan_info,studyFormPlan_updateBdnr,studyFormFill_updateFhyjjl } from "@/api/business/study/studyFormPlan"
+import { studyFormPlan_bc,studyFormPlan_bcOnly, studyFormPlan_tj, studyFormPlan_info,studyFormPlan_updateBdnr,studyFormFill_updateFhyjjl } from "@/api/business/study/studyFormPlan"
 import { mapGetters } from 'vuex'
 import SelectTemplate from "@/views/business/comps/select/SelectTemplate";
 import SelectStudyUser from '@/views/business/comps/select/SelectStudyUser';
@@ -219,7 +219,7 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           this.$modal.loading()
-          studyFormPlan_bc(this.form).then(response => {
+          studyFormPlan_bcOnly(this.form).then(response => {
             this.form = response.data
             this.templateData = deepClone(this.form)
             this.showIndex = 2

src/views/business/study/comp/sqbd/Bj.vue

@@ -127,7 +127,7 @@
 </template>
 
 <script>
-import { studyFormApply_bc, studyFormApply_tj, studyFormApply_info, studyFormApply_updateBdnr ,studyFormApply_updateFhyjjl } from "@/api/business/study/studyFormApply"
+import { studyFormApply_bc,studyFormApply_bcOnly, studyFormApply_tj, studyFormApply_info, studyFormApply_updateBdnr ,studyFormApply_updateFhyjjl } from "@/api/business/study/studyFormApply"
 import { mapGetters } from 'vuex'
 import SelectTemplate from "@/views/business/comps/select/SelectTemplate";
 import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
@@ -221,7 +221,7 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           this.$modal.loading()
-          studyFormApply_bc(this.form).then(response => {
+          studyFormApply_bcOnly(this.form).then(response => {
             this.form = response.data
             this.templateData = deepClone(this.form)
             this.showIndex = 2

src/views/business/study/comp/tbbd/Bj.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="edit-container" >
+    <div class="edit-container">
       <div class="edit-top">
         <div class="left-top">
           <img src="@/assets/images/back.png" @click="cancel()" />
@@ -28,7 +28,7 @@
             <el-button type="primary" @click="next">{{ $t('page.business.study.studyFormFill.next') }}</el-button>
           </template>
           <template v-else>
-            <el-button @click="saveNext">{{ $t('page.business.study.studyFormFill.save') }}</el-button>
+            <el-button @click="showSave">{{ $t('page.business.study.studyFormFill.save') }}</el-button>
             <el-button type="primary" @click="showApprove">{{ $t('page.business.study.studyFormFill.submit')
             }}</el-button>
             <el-button type="primary" @click="pre">{{ $t('page.business.study.studyFormFill.pre') }}</el-button>
@@ -56,8 +56,7 @@
             <el-row>
               <el-col :span="24">
                 <el-form-item :label="$t('page.business.study.studyFormFill.sfbl')" prop="sfbl">
-                  <el-select v-model="form.sfbl" :placeholder="$t('form.placeholderSelect')"
-                    :disabled="form.id && form.id !== ''">
+                  <el-select v-model="form.sfbl" :placeholder="$t('form.placeholderSelect')">
                     <el-option :label="$t('page.business.study.studyFormFill.yes')" value="是" />
                     <el-option :label="$t('page.business.study.studyFormFill.no')" value="否" />
                   </el-select>
@@ -220,11 +219,55 @@
         <el-button @click="openApprove = false">{{ $t('form.cancel') }}</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog :title="$t('page.business.study.studyFormFill.bcjl')" :visible.sync="openSave" width="600px"
+      append-to-body :close-on-click-modal="false">
+      <el-form ref="formSave" :model="formSave" :rules="rulesSave" label-width="120px" v-if="openSave">
+        <div class="sbzdtcma"> <input type="text"> <input type="password"> </div>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.qmyy')" prop="qmyy">
+              <el-input type="text" :value="formSave.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="formSave.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="formSave.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="saveNext">{{ $t('form.confirm') }}</el-button>
+        <el-button @click="openSave = false">{{ $t('form.cancel') }}</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { studyFormFill_bc, studyFormFill_updateBdnr, studyFormFill_tj, studyFormFill_info,studyFormFill_updateFhyjjl } from "@/api/business/study/studyFormFill"
+import { studyFormFill_bc, studyFormFill_bcOnly, studyFormFill_updateBdnr, studyFormFill_tj, studyFormFill_info, studyFormFill_updateFhyjjl } from "@/api/business/study/studyFormFill"
 import { study_info } from "@/api/business/study/study"
 import { mapGetters } from 'vuex'
 import SelectTemplate from "@/views/business/comps/select/SelectTemplate";
@@ -260,7 +303,13 @@ export default {
       },
       czlist: [],
       cclist: [],
+      openSave: false,
       openApprove: false,
+      formSave: {
+        qmyy: this.$t('page.business.study.studyFormFill.txbbc'),
+        remark: '',
+        qmrmm: '',
+      },
       formApprove: {
         id: null,
         qmyy: this.$t('page.business.study.studyFormFill.txbtjjl'),
@@ -286,6 +335,13 @@ export default {
           trigger: 'blur'
         }]
       },
+      rulesSave: {
+        qmrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }]
+      },
       templateData: {}
     }
   },
@@ -306,12 +362,12 @@ export default {
           {
             id: this.form.id,
             bdnr: JSON.stringify(this.$refs.templateTable.getFilledFormData()),
-            zdxgjl:data.resourceList? JSON.stringify(data.resourceList):'',
-            filedValue:data.newRecord? JSON.stringify(data.newRecord):''
+            zdxgjl: data.resourceList ? JSON.stringify(data.resourceList) : '',
+            filedValue: data.newRecord ? JSON.stringify(data.newRecord) : ''
           }
         ).then(response => {
         })
-      }  else  if (data.type == 'reply') {
+      } else if (data.type == 'reply') {
         studyFormFill_updateFhyjjl(
           {
             id: this.form.id,
@@ -452,7 +508,7 @@ export default {
         if (valid) {
           this.showIndex = 2
           this.$modal.loading()
-          studyFormFill_bc(this.form).then(response => {
+          studyFormFill_bcOnly(this.form).then(response => {
             this.form = response.data
             this.showIndex = 2
           }).finally(() => {
@@ -476,7 +532,7 @@ export default {
           this.$tab.closeOpenPage(obj)
         }
       } catch (e) {
-          this.$tab.closeOpenPage('/404')
+        this.$tab.closeOpenPage('/404')
       }
     },
     reset() {
@@ -506,7 +562,7 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           this.$modal.loading()
-          studyFormFill_bc(this.form).then(response => {
+          studyFormFill_bcOnly(this.form).then(response => {
             this.$modal.closeLoading()
             this.cancel()
           }).finally(() => {
@@ -515,18 +571,26 @@ export default {
         }
       })
     },
+    showSave() {
+      this.formSave.remark = ''
+      this.formSave.qmrmm = ''
+      this.openSave = true
+    },
     async saveNext() {
-      let content = await this.$refs.templateTable.getFormData()
-      if (content) {
-        this.form.bdnr = JSON.stringify(content)
-        this.$modal.loading()
-        studyFormFill_bc(this.form).then(response => {
-          this.$modal.closeLoading()
-          this.cancel()
-        }).finally(() => {
-          this.$modal.closeLoading()
-        })
-      }
+      this.$refs["formSave"].validate(valid => {
+        if (valid) {
+          this.form.bdnr = JSON.stringify(this.$refs.templateTable.getFilledFormData())
+          this.form.qmrmm = this.formSave.qmrmm
+          this.form.remark = this.formSave.remark
+          this.$modal.loading()
+          studyFormFill_bc(this.form).then(response => {
+            this.$modal.closeLoading()
+            this.cancel()
+          }).finally(() => {
+            this.$modal.closeLoading()
+          })
+        }
+      })
     },
     tj() {
       let that = this

src/views/business/study/comp/ytbd/Bj.vue

@@ -77,7 +77,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('page.business.study.studyFormPre.shryId')" prop="shryId">
-              <SelectStudyUser  v-model="form.shryId" :query="{
+              <SelectStudyUser v-model="form.shryId" :query="{
                 studyId: form.studyId,
                 studySubjectId: form.studySubjectId,
                 permit: permitForSecectUser
@@ -138,7 +138,7 @@
 </template>
 
 <script>
-import { studyFormPre_bc, studyFormPre_tj, studyFormPre_info, studyFormPre_updateBdnr } from "@/api/business/study/studyFormPre"
+import { studyFormPre_bc, studyFormPre_bcOnly, studyFormPre_tj, studyFormPre_info, studyFormPre_updateBdnr } from "@/api/business/study/studyFormPre"
 import { mapGetters } from 'vuex'
 import SelectTemplate from "@/views/business/comps/select/SelectTemplate";
 import SelectStudyUser from '@/views/business/comps/select/SelectStudyUser';
@@ -154,7 +154,7 @@ export default {
       form: {},
       open: false,
       openSubmit: false,
-      permitForSecectUser:'',
+      permitForSecectUser: '',
       rulesApprove: {
         qmrmm: [{
           required: true,
@@ -218,7 +218,7 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           this.$modal.loading()
-          studyFormPre_bc(this.form).then(response => {
+          studyFormPre_bcOnly(this.form).then(response => {
             this.form = response.data
             this.templateData = deepClone(this.form)
             this.showIndex = 2
@@ -262,7 +262,7 @@ export default {
     },
     edit(row) {
       this.reset()
-      this.permitForSecectUser=row.permitForSecectUser
+      this.permitForSecectUser = row.permitForSecectUser
       if (row && row.id) {
         this.showIndex = 2
         this.$modal.loading()
@@ -297,18 +297,15 @@ export default {
       })
     },
     async saveNext() {
-      let content = await this.$refs.templateTable.getFormData()
-      if (content) {
-        this.form.bdnr = JSON.stringify(content)
-        this.$modal.loading()
-        studyFormPre_bc(this.form).then(response => {
-          this.$emit('close')
-          this.open = false
-          this.$modal.closeLoading()
-        }).finally(() => {
-          this.$modal.closeLoading()
-        })
-      }
+      this.form.bdnr = JSON.stringify(this.$refs.templateTable.getFilledFormData())
+      this.$modal.loading()
+      studyFormPre_bc(this.form).then(response => {
+        this.$emit('close')
+        this.open = false
+        this.$modal.closeLoading()
+      }).finally(() => {
+        this.$modal.closeLoading()
+      })
     },
     async showtj() {
       let content = await this.$refs.templateTable.getFormData()