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

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

@@ -193,7 +193,7 @@ export default {
     onPlanCallback(data) {
       console.log("data:" + JSON.stringify(data))
       console.log("formdata:" + JSON.stringify(this.$refs.templateTable.getFilledFormData()))
-      if (data.type == 'fieldChanged'&&data.newRecord&&data.newRecord!='') {
+      if (data.type == 'fieldChanged' ) {
         studyFormPlan_updateBdnr(
           {
             id: this.form.id,
@@ -223,7 +223,7 @@ export default {
           this.$modal.loading()
           studyFormPlan_bcOnly(this.form).then(response => {
             this.form = response.data
-            this.templateData = deepClone(this.form)
+            this.templateData.bdmc = this.form.bdmc
             this.showIndex = 2
             this.$modal.closeLoading()
           }).finally(() => {

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

@@ -76,7 +76,7 @@
         </div>
         <div class="content" v-if="showIndex == 2">
           <TemplateTable ref="templateTable" emitName="onApplyCallback" @onApplyCallback="onApplyCallback"
-            :sn="form.templateSn" :templateData="form" fillType="actFill" />
+            :sn="form.templateSn" :templateData="templateData" fillType="actFill" />
         </div>
       </div>
     </div>
@@ -193,7 +193,7 @@ export default {
     onApplyCallback(data) {
       console.log("data:" + JSON.stringify(data))
       console.log("formdata:" + JSON.stringify(this.$refs.templateTable.getFilledFormData()))
-      if (data.type == 'fieldChanged'&&data.newRecord&&data.newRecord!='') {
+      if (data.type == 'fieldChanged') {
         studyFormApply_updateBdnr(
           {
             id: this.form.id,
@@ -224,7 +224,7 @@ export default {
           this.$modal.loading()
           studyFormApply_bcOnly(this.form).then(response => {
             this.form = response.data
-            this.templateData = deepClone(this.form)
+            this.templateData.bdmc = this.form.bdmc
             this.showIndex = 2
             this.$modal.closeLoading()
           }).finally(() => {

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

@@ -320,7 +320,7 @@ export default {
         remark: '',
         bdnr: '',
         resource: '',
-        yqResource:'',
+        yqResource: '',
         qmrmm: '',
         sfcz: false,
         czfs: '',
@@ -332,7 +332,7 @@ export default {
         ccids: '',
       },
       resource: [],
-      yqResource:[],
+      yqResource: [],
       bdmbTitle: this.$t('page.business.form.bdmb'),
       rulesApprove: {
         qmrmm: [{
@@ -363,7 +363,7 @@ export default {
     onFillCallback(data) {
       console.log("data:" + JSON.stringify(data))
       console.log("formdata:" + JSON.stringify(this.$refs.templateTable.getFilledFormData()))
-      if (data.type == 'fieldChanged'&&data.newRecord&&data.newRecord!='') {
+      if (data.type == 'fieldChanged' ) {
         studyFormFill_updateBdnr(
           {
             id: this.form.id,
@@ -517,9 +517,9 @@ export default {
           this.$modal.loading()
           studyFormFill_bcOnly(this.form).then(response => {
             this.form = response.data
-            this.templateData = deepClone(this.form)
+            this.templateData.bdmc = this.form.bdmc
             this.showIndex = 2
-            const obj = Object.assign({}, this.$route, { title: this.form.bdmc }) 
+            const obj = Object.assign({}, this.$route, { title: this.form.bdmc })
             this.$tab.updatePage(obj);
           }).finally(() => {
             this.$modal.closeLoading()

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

@@ -73,7 +73,7 @@
     <el-dialog :title="$t('page.business.study.studyFormPre.tjysb')" :visible.sync="openSubmit" width="500px"
       append-to-body :close-on-click-modal="false">
       <el-form ref="formSubmit" :model="form" :rules="rulesApprove" label-width="120px" v-if="openSubmit">
-        <div class="sbzdtcma"> <input type="text"> <input  type="password" show-password> </div>
+        <div class="sbzdtcma"> <input type="text"> <input type="password" show-password> </div>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('page.business.study.studyFormPre.shryId')" prop="shryId">
@@ -123,7 +123,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input  type="password" show-password v-model="form.qmrmm" maxlength="20"
+              <el-input type="password" show-password v-model="form.qmrmm" maxlength="20"
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
@@ -199,7 +199,7 @@ export default {
     onPreCallback(data) {
       console.log("data:" + JSON.stringify(data))
       console.log("formdata:" + JSON.stringify(this.$refs.templateTable.getFilledFormData()))
-      if (data.type == 'fieldChanged'&&data.newRecord&&data.newRecord!='') {
+      if (data.type == 'fieldChanged' ) {
         studyFormPre_updateBdnr(
           {
             id: this.form.id,
@@ -220,7 +220,7 @@ export default {
           this.$modal.loading()
           studyFormPre_bcOnly(this.form).then(response => {
             this.form = response.data
-            this.templateData = deepClone(this.form)
+            this.templateData.bdmc = this.form.bdmc
             this.showIndex = 2
             this.$modal.closeLoading()
           }).finally(() => {