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

src/views/business/comps/template/formConfig/SWYPFXFFXYPZBBTableConfig.js

@@ -43,6 +43,7 @@ export const getSWYPFXFFXYPZBBTableConfig = (
       prop: 'yjryxql',
       width: 320,
       headerSelectKey: 'yjryxqlUnit',
+      headerSelectTo: 'sjryxqlUnit',
       fillType: 'preFill',
       headerOptions: $this.getDictOptions('business_tjdw'),
       bodyType: 'inputNumber',
@@ -67,6 +68,7 @@ export const getSWYPFXFFXYPZBBTableConfig = (
       prop: 'yjjzxql',
       width: isXsy ? 350 : 280,
       headerSelectKey: 'yjjzxqlUnit',
+      headerSelectTo: 'sjjzxqlUnit',
       fillType: 'preFill',
       headerOptions: $this.getDictOptions('business_tjdw'),
       bodyType: 'inputNumber',
@@ -145,6 +147,7 @@ export const getSWYPFXFFXYPZBBTQHSLTableConfig = ($this, selectKey) => {
       prop: 'yjryxql',
       width: 320,
       headerSelectKey: 'yjryxqlUnit',
+      headerSelectTo: 'sjryxqlUnit',
       fillType: 'preFill',
       headerOptions: $this.getDictOptions('business_tjdw'),
       bodyType: 'inputNumber',
@@ -169,6 +172,7 @@ export const getSWYPFXFFXYPZBBTQHSLTableConfig = ($this, selectKey) => {
       prop: 'yjgzyxql',
       width: 350,
       headerSelectKey: 'yjgzyxqlUnit',
+      headerSelectTo: 'sjgzyxqlUnit',
       fillType: 'preFill',
       headerOptions: $this.getDictOptions('business_tjdw'),
       bodyType: 'inputNumber',
@@ -193,6 +197,7 @@ export const getSWYPFXFFXYPZBBTQHSLTableConfig = ($this, selectKey) => {
       prop: 'yjxsyxql',
       width: 350,
       headerSelectKey: 'yjxsyxqlUnit',
+      headerSelectTo: 'sjxsyxqlUnit',
       fillType: 'preFill',
       headerOptions: $this.getDictOptions('business_tjdw'),
       bodyType: 'inputNumber',

src/views/business/form/drug/comp/sqbdList.vue

@@ -229,7 +229,7 @@ export default {
       searchForm: {
         pageNum: 1,
         pageSize: 10,
-        studyId: '',
+        studyId: -1,
         studySn: '',
         studyMc: '',
         bdbh: '',

src/views/business/form/drug/comp/tbbdList.vue

@@ -230,7 +230,7 @@ export default {
       searchForm: {
         pageNum: 1,
         pageSize: 10,
-        studyId: '',
+        studyId: -1,
         studySn: '',
         studyMc: '',
         bdbh: '',

src/views/business/form/drug/comp/ytbdList.vue

@@ -86,14 +86,14 @@
               <el-button type="text" v-hasPermi="['business:drugFormPre:bj']" @click="edit(scope.row)"
                 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.fzrsh == '是'">
                 <template v-if="scope.row.fzrshzt == 5">
                   <!-- 负责人审核 -->
                   <el-button type="text" @click="audit(scope.row)" v-hasPermi="['business:drugFormPre:sh']"
                     v-if="scope.row.bdzt === 3 && id == leader">{{
                       $t('page.business.form.audit') }}</el-button>
                 </template>
-                <template>
+                <template v-else>
                   <!-- 有权限审核 -->
                   <el-button type="text" @click="audit(scope.row)" v-hasPermi="['business:drugFormPre:sh']"
                     v-if="scope.row.bdzt === 3&&id!=scope.row.userId">{{ $t('page.business.form.audit') }}</el-button>
@@ -251,7 +251,7 @@ export default {
       searchForm: {
         pageNum: 1,
         pageSize: 10,
-        studyId: '',
+        studyId: -1,
         studySn: '',
         studyMc: '',
         bdbh: '',
@@ -349,7 +349,7 @@ export default {
     },
     studyChange() {
       this.$modal.loading()
-      studyFormPre_studyFormPreList({ studyId: this.formXz.studyId }).then(response => {
+      studyFormPre_studyFormPreList({ studyId: this.formXz.studyId,bdzt:5 }).then(response => {
         this.formXz.formPre = null
         this.formPreList = response.data
         this.$modal.closeLoading()

src/views/business/form/nonTrial/comp/tbbdList.vue

@@ -237,7 +237,7 @@ export default {
       searchForm: {
         pageNum: 1,
         pageSize: 10,
-        studyId: '',
+        studyId: -1,
         studySn: '',
         studyMc: '',
         bdbh: '',

src/views/business/form/nonTrial/comp/ytbdList.vue

@@ -90,14 +90,14 @@
               <el-button type="text" v-hasPermi="['business:nonTrialFormPre:bj']" @click="edit(scope.row)"
                 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.fzrsh == '是'">
                 <template v-if="scope.row.fzrshzt == 5">
                   <!-- 负责人审核 -->
                   <el-button type="text" @click="audit(scope.row)" v-hasPermi="['business:nonTrialFormPre:sh']"
                     v-if="scope.row.bdzt === 3 && id == leader">{{
                       $t('page.business.form.audit') }}</el-button>
                 </template>
-                <template>
+                <template v-else>
                   <!-- 有权限审核 -->
                   <el-button type="text" @click="audit(scope.row)" v-hasPermi="['business:nonTrialFormPre:sh']"
                     v-if="scope.row.bdzt === 3 && id != scope.row.userId">{{ $t('page.business.form.audit')
@@ -260,7 +260,7 @@ export default {
       searchForm: {
         pageNum: 1,
         pageSize: 10,
-        studyId: '',
+        studyId: -1,
         studySn: '',
         studyMc: '',
         bdbh: '',
@@ -358,7 +358,7 @@ export default {
     },
     studyChange() {
       this.$modal.loading()
-      studyFormPre_studyFormPreList({ studyId: this.formXz.studyId }).then(response => {
+      studyFormPre_studyFormPreList({ studyId: this.formXz.studyId,bdzt:5 }).then(response => {
         this.formXz.formPre = null
         this.formPreList = response.data
         this.$modal.closeLoading()

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

@@ -65,14 +65,15 @@
           </el-form>
         </div>
         <div class="content" v-if="showIndex == 2">
-          <TemplateTable ref="templateTable" emitName="onPlanCallback" @onPlanCallback="onPlanCallback" :sn="form.templateSn" :templateData="templateData" fillType="actFill" />
+          <TemplateTable ref="templateTable" emitName="onPlanCallback" @onPlanCallback="onPlanCallback"
+            :sn="form.templateSn" :templateData="templateData" fillType="actFill" />
         </div>
       </div>
     </div>
     <el-dialog :title="$t('page.business.study.studyFormPlan.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" 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.studyFormPlan.shryId')" prop="fshryId">
@@ -111,7 +112,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>
@@ -126,7 +127,7 @@
 </template>
 
 <script>
-import { studyFormPlan_bc,studyFormPlan_bcOnly, 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';
@@ -188,7 +189,7 @@ export default {
   created() {
   },
   methods: {
-     onPlanCallback(data) {
+    onPlanCallback(data) {
       console.log("data:" + JSON.stringify(data))
       console.log("formdata:" + JSON.stringify(this.$refs.templateTable.getFilledFormData()))
       if (data.type == 'fieldChanged') {
@@ -201,7 +202,7 @@ export default {
           }
         ).then(response => {
         })
-      } else  if (data.type == 'reply') {
+      } else if (data.type == 'reply') {
         studyFormFill_updateFhyjjl(
           {
             id: this.form.id,
@@ -272,8 +273,8 @@ export default {
           this.templateData = deepClone(this.form)
           this.open = true
         }).finally(() => {
-            this.$modal.closeLoading()
-          })
+          this.$modal.closeLoading()
+        })
       } else {
         this.showIndex = 1
         this.form = _.merge({}, this.form, row)
@@ -295,17 +296,14 @@ export default {
       })
     },
     async saveNext() {
-      let content = await this.$refs.templateTable.getFormData()
-      if (content) {
-        this.form.bdnr = JSON.stringify(content)
-        this.$modal.loading()
-        studyFormPlan_bc(this.form).then(response => {
-          this.$emit('close')
-          this.open = false
-        }).finally(() => {
-          this.$modal.closeLoading()
-        })
-      }
+      this.form.bdnr = JSON.stringify(this.$refs.templateTable.getFilledFormData())
+      this.$modal.loading()
+      studyFormPlan_bc(this.form).then(response => {
+        this.$emit('close')
+        this.open = false
+      }).finally(() => {
+        this.$modal.closeLoading()
+      })
     },
     tj() {
       this.$refs["formSubmit"].validate(valid => {

src/views/business/study/comp/jhbdList.vue

@@ -164,7 +164,7 @@ export default {
       searchForm: {
         pageNum: 1,
         pageSize: 10,
-        studyId: '',
+        studyId: -1,
         bdbh: '',
         bdmc: '',
         studySn: '',

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

@@ -83,7 +83,7 @@
     <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" 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('form.qmyy')" prop="qmyy">
@@ -112,7 +112,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>
@@ -127,7 +127,7 @@
 </template>
 
 <script>
-import { studyFormApply_bc,studyFormApply_bcOnly, 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';
@@ -305,17 +305,14 @@ export default {
       }
     },
     async saveNext() {
-      let content = await this.$refs.templateTable.getFormData()
-      if (content) {
-        this.form.bdnr = JSON.stringify(content)
-        this.$modal.loading()
-        studyFormApply_bc(this.form).then(response => {
-          this.$emit('close')
-          this.open = false
-        }).finally(() => {
-          this.$modal.closeLoading()
-        })
-      }
+      this.form.bdnr = JSON.stringify(this.$refs.templateTable.getFilledFormData())
+      this.$modal.loading()
+      studyFormApply_bc(this.form).then(response => {
+        this.$emit('close')
+        this.open = false
+      }).finally(() => {
+        this.$modal.closeLoading()
+      })
     },
     tj() {
       this.$refs["formSubmit"].validate(valid => {

src/views/business/study/comp/tbbdList.vue

@@ -238,7 +238,7 @@ export default {
       searchForm: {
         pageNum: 1,
         pageSize: 10,
-        studyId: '',
+        studyId: -1,
         studySn: '',
         studyMc: '',
         studySubjectId: '',

src/views/business/study/comp/ytbdList.vue

@@ -89,17 +89,17 @@
               <el-button type="text" v-hasPermi="['business:studyFormPre:bj']" @click="edit(scope.row)"
                 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.fzrsh == '是'">
                 <template v-if="scope.row.fzrshzt == 5">
                   <!-- 负责人审核 -->
                   <el-button type="text" @click="audit(scope.row)" v-hasPermi="['business:studyFormPre:sh']"
                     v-if="scope.row.bdzt === 3 && id == leader">{{
                       $t('page.business.form.audit') }}</el-button>
                 </template>
-                <template>
+                <template v-else>
                   <!-- 有权限审核 -->
                   <el-button type="text" @click="audit(scope.row)" v-hasPermi="['business:studyFormPre:sh']"
-                    v-if="scope.row.bdzt === 3 && isMatchSubjectt && (id != scope.row.userId||id<=103)">{{
+                    v-if="scope.row.bdzt === 3 && isMatchSubject && (id != scope.row.userId||id<=103)">{{
                       $t('page.business.form.audit') }}</el-button>
                 </template>
               </template>
@@ -253,7 +253,7 @@ export default {
       searchForm: {
         pageNum: 1,
         pageSize: 10,
-        studyId: '',
+        studyId: -1,
         studySn: '',
         studyMc: '',
         studySubjectId: '',
@@ -342,6 +342,7 @@ export default {
               templateSn: tmp.templateSn,
               bdmc: tmp.bdmc,
               bdnr: tmp.bdnr,
+              studySubjectId: this.searchForm.studySubjectId,
               studySn: this.searchForm.studySn,
               studyMc: this.searchForm.studyMc,
               studyId: this.searchForm.studyId,
@@ -356,7 +357,7 @@ export default {
     },
     studyChange() {
       this.$modal.loading()
-      studyFormPre_studyFormPreList({ studyId: this.formXz.studyId }).then(response => {
+      studyFormPre_studyFormPreList({ studyId: this.formXz.studyId,bdzt:5 }).then(response => {
         this.formXz.formPre = null
         this.formPreList = response.data
         this.$modal.closeLoading()