fix:[麻精药表单]bug

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

@@ -60,5 +60,9 @@ export default {
   smxz: 'Declaration of Collaboration',
   bcsm: 'Additional Remark',
   fztgjj: 'Approve/Reject Record Abolition',
-  ysy: 'Reviewed'
+  ysy: 'Reviewed',
+  sybhbm: 'Study Number/Department',
+  sywzmc: 'Study Material Name',
+  xynd: 'Required Concentration',
+  xysj: 'Required Time',
 }

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

@@ -60,5 +60,9 @@ export default {
   smxz: '申明协作',
   bcsm: '补充说明',
   fztgjj: '废止通过/拒绝',
-  ysy: '已审阅'
+  ysy: '已审阅',
+  sybhbm: '试验编号/部门',
+  sywzmc: '试验物质名称',
+  xynd: '需要浓度',
+  xysj: '需要时间',
 }

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

@@ -11,8 +11,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
-                <el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable
+              <el-form-item :label="$t('page.business.study.studyFormApply.sywzmc')" prop="sn">
+                <el-input v-model="searchForm.sywzmc" :placeholder="$t('form.placeholderInput')" clearable
                   style="width: 200px" />
               </el-form-item>
             </el-col>
@@ -22,42 +22,56 @@
                   @change="userChange" />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
-              <el-form-item>
-                <div style="margin-left: 100px;">
-                  <el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
-                  <el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
-                </div>
+              <el-col :span="6">
+              <el-form-item :label="$t('page.business.study.studyFormApply.xysj')">
+                <el-date-picker v-model="daterange" clearable type="daterange" @change="search" range-separator="-"
+                  :start-placeholder="$t('page.business.form.startDate')"
+                  :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="6">
-              <el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName">
-                <el-input v-model="searchForm.templateMc" :placeholder="$t('form.placeholderInput')" clearable
+              <el-form-item :label="$t('page.business.study.studyFormApply.xynd')" prop="templateName">
+                <el-input v-model="searchForm.xynd" :placeholder="$t('form.placeholderInput')" clearable
                   style="width: 200px" />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
-              <el-form-item :label="$t('page.business.form.cjsj')">
-                <el-date-picker v-model="daterange" clearable type="daterange" range-separator="-"
-                  :start-placeholder="$t('page.business.form.startDate')"
-                  :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
+          <el-col :span="6">
+              <el-form-item :label="$t('page.business.study.studyFormApply.sybhbm')" prop="templateName">
+                <el-input v-model="searchForm.sybhbm" :placeholder="$t('form.placeholderInput')" clearable
+                  style="width: 200px" />
+              </el-form-item>
+            </el-col>
+             <el-col :span="6">
+              <el-form-item :label="$t('page.business.study.studyFormApply.sfbl')">
+                <el-select v-model="searchForm.sfbl" :placeholder="$t('form.placeholderSelect')" clearable
+                  @change="search">
+                  <el-option :label="$t('page.business.study.studyFormApply.yes')" value="是" />
+                  <el-option :label="$t('page.business.study.studyFormApply.no')" value="否" />
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item :label="$t('page.business.form.tjsj')">
-                <el-date-picker v-model="daterangetj" clearable type="daterange" range-separator="-"
+                <el-date-picker v-model="daterangetj" clearable type="daterange" @change="search" range-separator="-"
                   :start-placeholder="$t('page.business.form.startDate')"
                   :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
-              <el-form-item :label="$t('page.business.study.studyFormApply.sfbl')">
-                <el-select v-model="searchForm.sfbl" :placeholder="$t('form.placeholderSelect')" clearable
+          </el-row>
+          <el-row>
+             <el-col :span="6">
+              <el-form-item :label="$t('page.business.form.status')">
+                <el-select v-model="searchForm.bdzt" :placeholder="$t('form.placeholderSelect')" clearable
                   @change="search">
-                  <el-option :label="$t('page.business.study.studyFormApply.yes')" value="是" />
-                  <el-option :label="$t('page.business.study.studyFormApply.no')" value="否" />
+                  <el-option :label="$t('page.business.study.studyFormApply.tbz')" :value="1" />
+                  <el-option :label="$t('page.business.study.studyFormApply.ytj')" :value="3" />
+                  <el-option :label="$t('page.business.study.studyFormApply.yfh')" :value="5" />
+                  <el-option :label="$t('page.business.study.studyFormApply.wtg')" :value="6" />
+                  <el-option :label="$t('page.business.study.studyFormApply.ywc')" :value="7" />
+                  <el-option :label="$t('page.business.study.studyFormApply.dfz')" :value="9" />
+                  <el-option :label="$t('page.business.study.studyFormApply.yfz')" :value="11" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -66,18 +80,32 @@
       </div>
       <div class="sqbd-content">
         <el-row class="add-box">
-          <el-col>
+          <el-col :span="12">
             <el-button type="primary" icon="el-icon-plus" @click="add()" v-if="searchForm.studyStatus < 5"
               v-hasPermi="['business:drugFormApply:xz']">{{
                 $t('page.business.study.studyFormApply.xzbd') }}</el-button>
           </el-col>
+           <el-col :span="12" style="text-align: right;">
+                  <el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
+                  <el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
+            </el-col>
         </el-row>
 
         <el-table v-loading="loading" :data="list">
           <el-table-column :label="$t('page.business.form.bh')" prop="bdbh" :show-overflow-tooltip="true" />
           <el-table-column :label="$t('page.business.form.bdmc')" prop="bdmc" :show-overflow-tooltip="true" />
           <el-table-column :label="$t('page.business.form.xtmbmc')" prop="templateMc" :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('page.business.form.cjsj')" align="center" prop="createTime" width="140" />
+          <el-table-column :label="$t('page.business.study.studyFormApply.sybhbm')" align="center" 
+            width="140">
+            <template slot-scope="scope">
+              {{ scope.row.sySn||'' }}
+              {{ scope.row.bmName||'' }}
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('page.business.study.studyFormApply.sywzmc')" prop="sywzmc" :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.study.studyFormApply.xynd')" prop="xynd" :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.study.studyFormApply.xysj')" prop="xysj" :show-overflow-tooltip="true" />
+          <!-- <el-table-column :label="$t('page.business.form.cjsj')" align="center" prop="createTime" width="140" /> -->
           <el-table-column :label="$t('page.business.form.gsr')" align="center" prop="userMc" width="100" />
           <el-table-column :label="$t('page.business.study.studyFormApply.sfbl')" align="center" prop="status"
             width="100">
@@ -246,16 +274,20 @@ export default {
         studyStatus: 5,
         studySn: '',
         studyMc: '',
+        sywzmc: '',
         bdbh: '',
         bdmc: '',
         userId: '',
         userMc: '',
         templateMc: '',
-        cjsjjs: '',
-        cjsjks: '',
+        xysjks: '',
+        xysjjs: '',
         sfbl: null,
         tjsjjs: '',
         tjsjks: '',
+        xynd: '',
+        sybhbm: '',
+        bdzt: '',
       },
       loading: false,
       total: 0,
@@ -302,10 +334,14 @@ export default {
       this.searchForm.userId = ''
       this.searchForm.userMc = ' '
       this.searchForm.templateMc = ''
-      this.searchForm.cjsjks = ''
-      this.searchForm.cjsjjs = ''
+      this.searchForm.sywzmc = ''
+      this.searchForm.xysjks = ''
+      this.searchForm.xysjjs = ''
       this.searchForm.tjsjks = ''
       this.searchForm.tjsjjs = ''
+      this.searchForm.xynd = ''
+      this.searchForm.sybhbm = ''
+      this.searchForm.bdzt = null
       this.searchForm.sfbl = null
       this.daterange = []
       this.daterangetj = []
@@ -313,15 +349,15 @@ export default {
     },
     getList() {
       if (this.daterange != null && this.daterange.length > 0) {
-        this.searchForm.cjsjks = this.daterange[0]
-        this.searchForm.cjsjjs = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
+        this.searchForm.xysjks = this.daterange[0]
+        this.searchForm.xysjjs = moment(this.daterange[1]).add(1, 'days').format('YYYY-MM-DD');
       } else {
-        this.searchForm.cjsjks = ''
-        this.searchForm.cjsjjs = ''
+        this.searchForm.xysjks = ''
+        this.searchForm.xysjjs = ''
       }
       if (this.daterangetj != null && this.daterangetj.length > 0) {
         this.searchForm.tjsjks = this.daterangetj[0]
-        this.searchForm.tjsjjs = moment().add(this.daterangetj[1], 'days').format('YYYY-MM-DD');
+        this.searchForm.tjsjjs = moment(this.daterangetj[1]).add(1, 'days').format('YYYY-MM-DD');
       } else {
         this.searchForm.tjsjks = ''
         this.searchForm.tjsjjs = ''