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

src/components/Template/SelectTable.vue

@@ -68,7 +68,7 @@ export default {
             default: () => {},
         },
         studyFormId: {
-            type: String,
+            type: [String,Number],
             default: "",
         },
     },

src/lang/en/template/sp.js

@@ -73,7 +73,8 @@ export default {
   //生物样品分析方法学样品制备表(Dilution Integrity)- 生物样品分析方法学样品制备表（稀释可靠性）
   sp016: {
     title:
-      'Bioanalytical Methods Sample Preparation Record (Dilution Integrity)'
+      'Bioanalytical Methods Sample Preparation Record (Dilution Integrity)',
+    bs: 'Multiple'
   },
   //生物样品分析方法学样品制备表(Stock solution comparison)- 生物样品分析方法学样品制备表（储备液对比）
   sp017: {

src/lang/zh/template/sp.js

@@ -68,7 +68,8 @@ export default {
   },
   //生物样品分析方法学样品制备表(Dilution Integrity)- 生物样品分析方法学样品制备表（稀释可靠性）
   sp016: {
-    title: '生物样品分析方法学样品制备表（稀释可靠性）'
+    title: '生物样品分析方法学样品制备表（稀释可靠性）',
+    bs: '倍数'
   },
   //生物样品分析方法学样品制备表(Stock solution comparison)- 生物样品分析方法学样品制备表（储备液对比）
   sp017: {

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

@@ -15,6 +15,7 @@ export const getSWYPFXFFXYPZBBTableConfig = (
       bodyType: 'select',
       bodyOptions: $this.getDictOptions(selectKey),
       otherCode: 'bhOther',
+      otherLabel: 'template.sp.sp016.bs',
       bodySubType: 'span',
       bodySubKey: 'bhCode',
       bodyFillType: 'preFill',

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

@@ -84,8 +84,8 @@
             <template slot-scope="scope">
               <span v-if="scope.row.bdzt === 1"><span class="status-circle tbz"></span>{{ $t('page.business.study.studyFormFill.tbz') }}</span>
               <span v-if="scope.row.bdzt === 3"><span class="status-circle ytj"></span>{{ $t('page.business.study.studyFormFill.ytj') }}</span>
-              <span v-if="scope.row.bdzt === 5"><span class="status-circle ywc"></span>{{ $t('page.business.study.studyFormFill.ywc') }}</span>
-              <span v-if="scope.row.bdzt === 7"><span class="status-circle ywcfh"></span>{{ $t('page.business.study.studyFormFill.ywcfh') }}</span>
+              <span v-if="scope.row.bdzt === 5"><span class="status-circle ywcfh"></span>{{ $t('page.business.study.studyFormFill.ywcfh') }}</span>
+              <span v-if="scope.row.bdzt === 7"><span class="status-circle ywc"></span>{{ $t('page.business.study.studyFormFill.ywc') }}</span>
               <span v-if="scope.row.bdzt === 9"><span class="status-circle dfz"></span>{{ $t('page.business.study.studyFormFill.dfz') }}</span>
               <span v-if="scope.row.bdzt === 11"><span class="status-circle yfz"></span>{{ $t('page.business.study.studyFormFill.yfz') }}</span>
             </template>

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

@@ -85,8 +85,8 @@
             <template slot-scope="scope">
               <span v-if="scope.row.bdzt === 1"><span class="status-circle tbz"></span>{{ $t('page.business.study.studyFormFill.tbz') }}</span>
               <span v-if="scope.row.bdzt === 3"><span class="status-circle ytj"></span>{{ $t('page.business.study.studyFormFill.ytj') }}</span>
-              <span v-if="scope.row.bdzt === 5"><span class="status-circle ywc"></span>{{ $t('page.business.study.studyFormFill.ywc') }}</span>
-              <span v-if="scope.row.bdzt === 7"><span class="status-circle ywcfh"></span>{{ $t('page.business.study.studyFormFill.ywcfh') }}</span>
+              <span v-if="scope.row.bdzt === 5"><span class="status-circle ywcfh"></span>{{ $t('page.business.study.studyFormFill.ywcfh') }}</span>
+              <span v-if="scope.row.bdzt === 7"><span class="status-circle ywc"></span>{{ $t('page.business.study.studyFormFill.ywc') }}</span>
               <span v-if="scope.row.bdzt === 9"><span class="status-circle dfz"></span>{{ $t('page.business.study.studyFormFill.dfz') }}</span>
               <span v-if="scope.row.bdzt === 11"><span class="status-circle yfz"></span>{{ $t('page.business.study.studyFormFill.yfz') }}</span>
             </template>

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

@@ -81,12 +81,12 @@
           <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.form.gsr')" align="center" prop="userMc" width="100" />
-          <el-table-column :label="$t('page.business.form.status')" prop="status" align="center" width="100">
+          <el-table-column :label="$t('page.business.form.status')" prop="status" align="center" width="150">
             <template slot-scope="scope">
               <span v-if="scope.row.bdzt === 1"><span class="status-circle tbz"></span>{{ $t('page.business.study.studyFormFill.tbz') }}</span>
               <span v-if="scope.row.bdzt === 3"><span class="status-circle ytj"></span>{{ $t('page.business.study.studyFormFill.ytj') }}</span>
-              <span v-if="scope.row.bdzt === 5"><span class="status-circle ywc"></span>{{ $t('page.business.study.studyFormFill.ywc') }}</span>
-              <span v-if="scope.row.bdzt === 7"><span class="status-circle ywcfh"></span>{{ $t('page.business.study.studyFormFill.ywcfh') }}</span>
+              <span v-if="scope.row.bdzt === 5"><span class="status-circle ywcfh"></span>{{ $t('page.business.study.studyFormFill.ywcfh') }}</span>
+              <span v-if="scope.row.bdzt === 7"><span class="status-circle ywc"></span>{{ $t('page.business.study.studyFormFill.ywc') }}</span>
               <span v-if="scope.row.bdzt === 9"><span class="status-circle dfz"></span>{{ $t('page.business.study.studyFormFill.dfz') }}</span>
               <span v-if="scope.row.bdzt === 11"><span class="status-circle yfz"></span>{{ $t('page.business.study.studyFormFill.yfz') }}</span>
             </template>
@@ -136,7 +136,7 @@
                 v-hasPermi="['business:studyFormFill:qrfz']">{{
                   $t('page.business.study.studyFormFill.qrfz') }}</el-button>
               <!-- 观察 todo 观察按钮只在系统模板为细胞复苏记录表才展示) -->
-              <el-button type="text" v-if="scope.row.bdzt === 1" @click="gc(scope.row)"
+              <el-button type="text" v-if="scope.row.bdzt === 1&&scope.row.showGc==10" @click="gc(scope.row)"
                 v-hasPermi="['business:studyFormFill:gc']">{{
                   $t('page.business.study.studyFormFill.gc') }}</el-button>
             </template>

src/views/business/template/list.vue

@@ -30,9 +30,9 @@
     </el-form>
 
     <el-table v-loading="loading" :data="list">
-      <el-table-column :label="$t('page.system.template.sn')" align="center" prop="sn" />
-      <el-table-column :label="$t('page.system.template.sn')" align="center" prop="showSn" />
-      <el-table-column :label="$t('page.system.template.name')" align="center" prop="name" />
+      <el-table-column :label="$t('page.system.template.sn')" align="center" prop="sn" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('page.system.template.sn')" align="center" prop="showSn" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('page.system.template.name')" align="center" prop="name" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('page.system.template.department')" align="center" prop="deptName" />
       <el-table-column :label="$t('page.system.template.status')" prop="status" align="center" width="100">
         <template slot-scope="scope">
@@ -46,6 +46,14 @@
           <span v-if="scope.row.needPre === 1">否</span>
         </template>
       </el-table-column>
+       <el-table-column label="产物" prop="product" align="center" width="100">
+        <template slot-scope="scope">
+          <span v-if="scope.row.product == 1">试剂</span>
+          <span v-if="scope.row.product == 3">给药制剂</span>
+          <span v-if="scope.row.product == 5">麻精药</span>
+          <span v-if="scope.row.product == 7">无</span>
+        </template>
+      </el-table-column>
       <!-- <el-table-column label="模板类型" prop="type" align="center" width="100">
         <template slot-scope="scope">
           <span v-if="scope.row.type === 10">高风险表单</span>
@@ -63,9 +71,9 @@
     <pagination v-show="total > 0" :total="total" :page.sync="searchForm.pageNum" :limit.sync="searchForm.pageSize"
       @pagination="getList" />
 
-    <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :title="infoDialog.title" :visible.sync="infoDialog.visible" width="600px"
+    <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :title="infoDialog.title" :visible.sync="infoDialog.visible" width="800px"
       append-to-body>
-      <el-form ref="infoDialogForm" :model="infoDialog.formData" :rules="infoDialog.rules" label-width="120px">
+      <el-form ref="infoDialogForm" :model="infoDialog.formData" :rules="infoDialog.rules" label-width="180px">
         <el-row>
           <el-col :span="24">
             <el-form-item label="编号：" prop="sn">
@@ -102,9 +110,17 @@
             <el-form-item label="产物：" prop="product">
               <el-select v-model="infoDialog.formData.product" :placeholder="$t('form.placeholderSelect')" style="width:100%">
                 <el-option label="试剂" :value="1" />
-                <el-option label="给药制剂" :value="5" />
-                <el-option label="麻精药" :value="7" />
-                <el-option label="无" :value="9" />
+                <el-option label="给药制剂" :value="3" />
+                <el-option label="麻精药" :value="5" />
+                <el-option label="无" :value="7" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+           <el-col :span="24">
+            <el-form-item label="填报是否显示观察按钮：" prop="showGc">
+              <el-select v-model="infoDialog.formData.showGc" :placeholder="$t('form.placeholderSelect')" style="width:100%">
+                <el-option label="否" :value="1" />
+                <el-option label="是" :value="10" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -126,7 +142,7 @@
     </el-dialog>
     <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :title="$t('page.system.template.bdpz')" :visible.sync="tableDialog.visible"
       width="90%" append-to-body>
-      <TemplateTable ref = "templateTable" :sn="tableDialog.sn" fillType="preFill" />
+      <TemplateTable ref = "templateTable" :sn="tableDialog.sn"  v-if="tableDialog.visible" fillType="preFill" />
     </el-dialog>
   </div>
 </template>
@@ -177,6 +193,9 @@ export default {
         formData: {},
 
         rules: {
+          showGc: [
+            { required: true, message:'请选择', trigger: "blur" }
+          ],
           sn: [
             { required: true, message:'请输入', trigger: "blur" }
           ],