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

src/assets/styles/index.scss

@@ -212,7 +212,10 @@ aside {
     background: #409EFF;
   }
   &.ytj {
-    background: #F78B07;
+    background: #2AC663;
+  }
+  &.wtg {
+    background: #f73f07;
   }
   &.ytg {
     background: #2AC663;

src/lang/en/business/resource/sj.js

@@ -27,6 +27,7 @@ export default {
 
   cz: 'Dispose',
   sjczfs: 'Dispose Method',
+  czfs: 'Dispose Method',
   czl: 'Amount',
   yuanyin: 'Reason',
   lock: 'Lock',

src/lang/en/template/lba.js

@@ -27,7 +27,7 @@ export default {
     sjjzjrz: 'Actual Blank Matrix Volume'
   },
   lba005: {
-    bzqxpz: 'Calibration Standards',
+    bzqxpz: 'Calibration Standards Preparation',
     zkpz: 'Quality Control Preparation'
   },
   lba006: {

src/lang/zh/business/resource/sj.js

@@ -27,6 +27,7 @@ export default {
 
   cz: '处置',
   sjczfs: '试剂处置方式',
+  czfs: '处置方式',
   czl: '处置量',
   yuanyin: '原因',
   lock: '锁定',

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

@@ -66,7 +66,7 @@ export default {
   fhtg: '复核通过',
   tongguo: '通过',
   txbtjjl: '填写并提交记录',
-  zztjyzbd: '制作提交预制表单',
+  zztjyzbd: '制作并提交预制表单',
   mfhtg: '免复核通过',
   lianghao: '良好',
   zhong: '中',

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

@@ -36,7 +36,7 @@ export default {
   fzyybd: '复制已有表单',
   yes: '是',
   no: '否',
-  zztjyzbd: '制作提交预制表单',
+  zztjyzbd: '制作并提交预制表单',
   sqgb: '申请关闭',
   qrgb: '确认关闭',
   gbtgjj:'关闭通过/拒绝',

src/lang/zh/template/lba.js

@@ -27,7 +27,7 @@ export default {
     sjjzjrz: '实际基质加入值'
   },
   lba005: {
-    bzqxpz: '校正标样',
+    bzqxpz: '校正标样配制',
     zkpz: '质控配制'
   },
   lba006: {

src/views/business/comps/select/SelectDept.vue

@@ -1,6 +1,6 @@
 <!-- 选择部门 -->
 <template>
-  <treeselect v-model="selected" :options="list" :show-count="true" :disabled="readonly" :placeholder="$t('form.placeholderSelect')" @input="handleChange" />
+  <treeselect v-model="selected" :options="list" :show-count="true" :disabled="readonly" :multiple="multiple" :placeholder="$t('form.placeholderSelect')" @input="handleChange" />
 </template>
 
 <script>
@@ -19,12 +19,31 @@ export default {
       type: Boolean,
       default: false
     },
+    multiple: {
+      type: Boolean,
+      default: false
+    },
   },
   watch: {
     value: {
       immediate: true,
       handler(v) {
-        this.selected = v ? parseInt(v) : null
+        if (!this.multiple) {
+          this.selected = v ? parseInt(v) : null
+        } else {
+          if (v) {
+            //默认传的,分割的字符串，有传数组再改造
+            debugger
+            let arr = (v+'').split(',')
+            let s = []
+            _.forEach(arr, a => {
+              s.push(parseInt(a))
+            })
+            this.selected = s
+          } else {
+            this.selected = []
+          }
+        }
       }
     },
   },
@@ -57,8 +76,8 @@ export default {
       })
     },
     handleChange(val) {
-      this.$emit('input', val || '')
-      this.$emit('change', val || '')
+      this.$emit('input', this.multiple ? (val && val.length > 0 ? val.join(',') : '') : (val || ''))
+      this.$emit('change', this.multiple ? (val && val.length > 0 ? val.join(',') : '') : (val || ''))
     },
   }
 };

src/views/business/comps/template/comps/bl/BL002.vue

@@ -130,7 +130,7 @@ export default {
             ztblxjRemark: {
               label: '',
               type: 'textarea',
-              fillType: 'actFill',
+              fillType: 'blxjsh',
               span: 1,
               placeholder: 'template.bl.bl002.ztblxjbz',
               maxlength: 1000,  
@@ -204,7 +204,7 @@ export default {
           prop: "ztblxjqrxx",
           isNeedCheck: true,
           bodyType: 'checkbox',
-          bodyFillType: 'actFill',
+          bodyFillType: 'blxjsh',
           checkboxLabel: 'template.bl.bl002.txwzqx'
         },
       ]

src/views/business/comps/template/comps/dl/DL006.vue

@@ -18,7 +18,7 @@
 
           
           <TableList label="template.common.gyzjInfo" :columns="gyzjColumns" :dataSource="resourceGyzj" />
-          <TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resource" />
+          <TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resourceSj" />
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 
 					<LineLabel label="template.common.operationSteps" />

src/views/business/comps/template/comps/dl/DL014.vue

@@ -12,7 +12,7 @@
             :ref="refConf.base" :formConfig="baseInfoFormConfig" :formData="formData" />
 
           <TableList label="template.common.gyzjInfo" :columns="gyzjColumns" :dataSource="resourceGyzj" />
-          <TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resource" />
+          <TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resourceSj" />
 
           <LineLabel label="template.dl.dl007.yqsyxx" />
           <CustomTable :columns="yqsyColumns" :ref="refConf.yqsy" @onRegentSubmit="(e) => onRegentSubmit(e)"

src/views/business/comps/template/comps/dl/DL016.vue

@@ -8,7 +8,7 @@
 				<div class="content">
 					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
 						ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
-					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resource" />
+					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resourceSj" />
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 
           <BaseInfoFormPackage fieldItemLabel="template.dl.dl016.xbxx" label="template.dl.dl016.xbxx"

src/views/business/comps/template/comps/dl/DL017.vue

@@ -8,7 +8,7 @@
 				<div class="content">
 					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
 						ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
-					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resource" />
+					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resourceSj" />
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 
           <BaseInfoFormPackage fieldItemLabel="template.dl.dl017.xbxx" label="template.dl.dl017.xbxx"

src/views/business/comps/template/comps/dl/DL018.vue

@@ -8,7 +8,7 @@
 				<div class="content">
 					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
 						ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
-					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resource" />
+					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resourceSj" />
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 
           <BaseInfoFormPackage fieldItemLabel="template.dl.dl018.xbxx" label="template.dl.dl018.xbxx"

src/views/business/comps/template/comps/dl/DL019.vue

@@ -8,7 +8,7 @@
 				<div class="content">
 					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
 						ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
-					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resource" />
+					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resourceSj" />
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 
           <BaseInfoFormPackage fieldItemLabel="template.dl.dl019.xbxx" label="template.dl.dl019.xbxx"

src/views/business/comps/template/comps/dl/DL020.vue

@@ -8,7 +8,7 @@
 					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
 						ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
 
-          <TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resource" />
+          <TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resourceSj" />
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 
 					<BaseInfoFormPackage fieldItemLabel="template.dl.dl020.xbxx" label="template.dl.dl020.xbxx"

src/views/business/comps/template/comps/lba/LBA002.vue

@@ -8,7 +8,7 @@
 				<div class="content">
 					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
 						ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
-					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resource" />
+					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resourceSj" />
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 					
 					<LineLabel label="template.common.operationSteps" />

src/views/business/comps/template/comps/lba/LBA003.vue

@@ -7,7 +7,7 @@
 				<div class="content">
 					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
 						ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
-					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resource" />
+					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resourceSj" />
 					<!-- <TableList label="template.common.wzInfo" :columns="sywzColumns" :dataSource="resourceWz" v-if="resourceWz.length>0"/> -->
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 					

src/views/business/comps/template/comps/lba/LBA004.vue

@@ -7,7 +7,7 @@
 				<div class="content">
 					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
 						ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
-					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resource" />
+					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resourceSj" />
 					<!-- <TableList label="template.common.wzInfo" :columns="sywzColumns" :dataSource="resourceWz" v-if="resourceWz.length>0"/> -->
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 

src/views/business/comps/template/comps/lba/LBA008.vue

@@ -8,7 +8,7 @@
 				<div class="content">
 					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
 						ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
-					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resource" />
+					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resourceSj" />
 					<!-- <TableList label="template.common.wzInfo" :columns="sywzColumns" :dataSource="resourceWz" /> -->
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 

src/views/business/comps/template/comps/pcr/PCR005.vue

@@ -8,7 +8,7 @@
 				<div class="content">
 					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
 						ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
-					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resource" />
+					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resourceSj" />
 
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 

src/views/business/comps/template/comps/pcr/PCR007.vue

@@ -8,7 +8,7 @@
 				<div class="content">
 					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
 						ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
-					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resource" />
+					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resourceSj" />
 
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 

src/views/business/comps/template/comps/pcr/PCR008.vue

@@ -8,7 +8,7 @@
 				<div class="content">
 					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
 						ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
-					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resource" />
+					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resourceSj" />
 
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 

src/views/business/comps/template/comps/pcr/PCR009.vue

@@ -8,7 +8,7 @@
 				<div class="content">
 					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
 						ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
-					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resource" />
+					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resourceSj" />
 
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 

src/views/business/comps/template/comps/pcr/PCR010.vue

@@ -8,7 +8,7 @@
 				<div class="content">
 					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
 						ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
-					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resource" />
+					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resourceSj" />
 
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 

src/views/business/comps/template/comps/pcr/PCR011.vue

@@ -8,7 +8,7 @@
 				<div class="content">
 					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
 						ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
-					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resource" />
+					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resourceSj" />
 
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 

src/views/business/comps/template/comps/pcr/PCR012.vue

@@ -8,7 +8,7 @@
 				<div class="content">
 					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
 						ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
-					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resource" />
+					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resourceSj" />
 
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 

src/views/business/comps/template/comps/sp/SP007.vue

@@ -8,7 +8,7 @@
 				<div class="content">
 					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
 						ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
-					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resource" />
+					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resourceSj" />
 					<TableList label="template.common.wzInfo" :columns="sywzColumns" :dataSource="resourceWz" v-if="resourceWz.length>0"/>
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 					<BaseInfoFormPackage fieldItemLabel="template.common.storageCondition"

src/views/business/comps/template/comps/sp/SP008.vue

@@ -8,7 +8,7 @@
 					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo" ref="baseInfoRef"
 						:formConfig="baseInfoFormConfig" :formData="formData" />
 					<TableList label="template.common.reagentInfo" :columns="sysjColumns"
-						:dataSource="resource" />
+						:dataSource="resourceSj" />
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns"
 						:dataSource="yqResource" />
 					<BaseInfoFormPackage fieldItemLabel="template.common.storageCondition" label="template.common.storageCondition" ref="storageConditionRef"

src/views/business/comps/template/comps/sp/SP009.vue

@@ -7,7 +7,7 @@
 				<div class="content">
 					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
 						ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
-					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resource" />
+					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resourceSj" />
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 					<BaseInfoFormPackage fieldItemLabel="template.common.storageCondition"
 						label="template.common.storageCondition" ref="storageConditionRef"

src/views/business/comps/template/comps/xb/XB001.vue

@@ -9,7 +9,7 @@
 					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
 						ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
 
-					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resource" />
+					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resourceSj" />
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 
 					<!-- 操作步骤 -->

src/views/business/comps/template/comps/yp/YP003.vue

@@ -8,7 +8,7 @@
 				<div class="content">
 					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
 						ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
-					<!-- <TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resource" /> -->
+					<!-- <TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resourceSj" /> -->
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 
 					<LineLabel label="template.yp.yp003.ybxx" />

src/views/business/comps/template/comps/yp/YP004.vue

@@ -8,7 +8,7 @@
 				<div class="content">
 					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
 						ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
-					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resource" />
+					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resourceSj" />
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 					
 					<LineLabel label="template.yp.yp004.zbxx" />

src/views/business/comps/template/comps/yp/YP005.vue

@@ -8,7 +8,7 @@
 				<div class="content">
 					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
 						ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
-					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resource" />
+					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resourceSj" />
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 					
 					<LineLabel label="template.yp.yp005.ybsm" />

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

@@ -2,48 +2,37 @@
   <div>
     <div class="sqbd-list" v-show="!showDetail && !showEdit && !showAudit && !showFh && !showSh">
       <div class="sqbd-search">
-        <el-form :model="searchForm" ref="searchForm" :inline="true" label-width="110px">
-          <el-row>
-            <el-col :span="6">
+        <el-form :model="searchForm" ref="searchForm" :inline="true">
               <el-form-item :label="$t('page.business.form.bdmc')" prop="name">
                 <el-input v-model="searchForm.bdmc" :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.sywzmc')" prop="sn">
                 <el-input v-model="searchForm.sywzmc" :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.gsr')" prop="userId">
                 <SelectDeptUser v-model="searchForm.userId" style="width: 200px" :name="searchForm.userMc" key="userId"
                   @change="userChange" />
               </el-form-item>
-            </el-col>
-            <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.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.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">
@@ -51,17 +40,14 @@
                   <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" @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.status')">
                 <el-select v-model="searchForm.bdzt" :placeholder="$t('form.placeholderSelect')" clearable
                   @change="search">
@@ -74,21 +60,17 @@
                   <el-option :label="$t('page.business.study.studyFormApply.yfz')" :value="11" />
                 </el-select>
               </el-form-item>
-            </el-col>
-          </el-row>
+            <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-form>
       </div>
       <div class="sqbd-content">
         <el-row class="add-box">
-          <el-col :span="12">
+          <el-col :span="24">
             <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" :default-sort="{ prop: 'tjsj', order: 'descending' }"
@@ -174,7 +156,7 @@
                     $t('page.business.study.studyFormApply.sh') }}</el-button>
                 <!-- 废止 -->
                 <el-button type="text" v-if="scope.row.bdzt === 1 && id == scope.row.userId" @click="fz(scope.row)"
-                  v-hasPermi="['business:drugFormApply:fz']">{{
+                  >{{
                     $t('page.business.study.studyFormApply.fz') }}</el-button>
                 <!-- 确认废止 -->
                 <el-button type="text" v-if="scope.row.bdzt === 9 && checkRole(['bz'])" @click="qrfz(scope.row)"
@@ -192,13 +174,13 @@
     <!-- 编辑 -->
     <Bj v-show="showEdit" key="Bj" ref="Bj" @close="bjClose" />
     <!-- 详情 -->
-    <Xq v-if="showDetail" key="Xq" ref="Xq" @close="xqClose" />
+    <Xq v-show="showDetail" key="Xq" ref="Xq" @close="xqClose" />
     <!-- 审阅 -->
-    <Sy v-if="showAudit" key="Sy" ref="Sy" @close="syClose" />
+    <Sy v-show="showAudit" key="Sy" ref="Sy" @close="syClose" />
     <!-- 复核 -->
-    <Fh v-if="showFh" key="Fh" ref="Fh" @close="fhClose" />
+    <Fh v-show="showFh" key="Fh" ref="Fh" @close="fhClose" />
     <!-- 审核 -->
-    <Sh v-if="showSh" key="Sh" ref="Sh" @close="shClose" />
+    <Sh v-show="showSh" key="Sh" ref="Sh" @close="shClose" />
     <!-- 废止 -->
     <Fz key="Fz" ref="Fz" @callback="search" />
     <!-- 确认废止 -->

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

@@ -2,7 +2,7 @@
   <div>
     <div class="tbbd-list" v-show="!showDetail && !showEdit && !showAudit && !showFh">
       <div class="tbbd-search">
-        <el-form :model="searchForm" ref="searchForm" :inline="true" label-width="110px">
+        <el-form :model="searchForm" ref="searchForm" :inline="true">
 
           <el-form-item :label="$t('page.business.form.bdmc')" prop="name">
             <el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable
@@ -117,7 +117,7 @@
                     $t('page.business.study.studyFormFill.sy') }}</el-button>
                 <!-- 废止 -->
                 <el-button type="text" v-if="scope.row.bdzt === 1 && id == scope.row.userId" @click="fz(scope.row)"
-                  v-hasPermi="['business:drugFormFill:fz']">{{
+                  >{{
                     $t('page.business.study.studyFormFill.fz') }}</el-button>
                 <!-- 确认废止 -->
                 <el-button type="text" v-if="scope.row.bdzt === 9 && checkRole(['bz'])" @click="qrfz(scope.row)"

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

@@ -51,15 +51,17 @@
 
           <el-table-column :label="$t('page.business.form.status')" prop="status" width="100">
             <template slot-scope="scope">
-              <span v-if="scope.row.bdzt === 1"><span class="status-circle tbz"></span>{{
+               <span v-if="scope.row.bdzt === 1"><span class="status-circle tbz"></span>{{
                 $t('page.business.form.statusTbz') }}</span>
               <span v-if="scope.row.bdzt === 3"><span class="status-circle ytj"></span>{{
                 $t('page.business.form.statusYtj') }}</span>
               <span v-if="scope.row.bdzt === 5"><span class="status-circle ytg"></span>{{
                 $t('page.business.form.statusYtg') }}</span>
+              <span v-if="scope.row.bdzt === 7"><span class="status-circle wtg"></span>{{
+                $t('page.business.form.statusWtg') }}</span>
               <span v-if="scope.row.bdzt === 9"><span class="status-circle dgb"></span>{{
                 $t('page.business.form.statusDgb') }}</span>
-              <span v-if="scope.row.bdzt === 11"><span class="status-circle ygb"></span>{{
+              <span v-if="scope.row.bdzt === 11"><span class="status-circle tgb"></span>{{
                 $t('page.business.form.statusYgb') }}</span>
             </template>
           </el-table-column>

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

@@ -115,7 +115,7 @@
                     $t('page.business.study.studyFormFill.sy') }}</el-button>
                 <!-- 废止 -->
                 <el-button type="text" v-if="scope.row.bdzt === 1 && id == scope.row.userId" @click="fz(scope.row)"
-                  v-hasPermi="['business:nonTrialFormFill:fz']">{{
+                  >{{
                     $t('page.business.study.studyFormFill.fz') }}</el-button>
                 <!-- 确认废止 -->
                 <el-button type="text" v-if="scope.row.bdzt === 9 && checkRole(['bz'])" @click="qrfz(scope.row)"

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

@@ -56,9 +56,11 @@
                 $t('page.business.form.statusYtj') }}</span>
               <span v-if="scope.row.bdzt === 5"><span class="status-circle ytg"></span>{{
                 $t('page.business.form.statusYtg') }}</span>
+              <span v-if="scope.row.bdzt === 7"><span class="status-circle wtg"></span>{{
+                $t('page.business.form.statusWtg') }}</span>
               <span v-if="scope.row.bdzt === 9"><span class="status-circle dgb"></span>{{
                 $t('page.business.form.statusDgb') }}</span>
-              <span v-if="scope.row.bdzt === 11"><span class="status-circle ygb"></span>{{
+              <span v-if="scope.row.bdzt === 11"><span class="status-circle tgb"></span>{{
                 $t('page.business.form.statusYgb') }}</span>
             </template>
           </el-table-column>

src/views/business/resource/gsp/comps/gsp/Bj.vue

@@ -49,7 +49,7 @@
           <!-- 存储条件 -->
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gsp.cctj')" prop="cctj">
-              <BusinessSelect v-model="form.cctj" dictType="system_business_cctj" :multiple="true"></BusinessSelect>
+              <BusinessSelect v-model="form.cctj" dictType="business_cctj" :multiple="true"></BusinessSelect>
             </el-form-item>
           </el-col>
         </el-row>

src/views/business/resource/gsp/comps/gsp/Cz.vue

@@ -25,7 +25,7 @@
           <el-row>
             <el-col :span="24">
               <el-form-item :label="$t('page.business.resource.gsp.czfs')" prop="czfs">
-                <BusinessSelect v-model="form.czfs" dictType="system_business_czfs"></BusinessSelect>
+                <BusinessSelect v-model="form.czfs" dictType="business_czfs"></BusinessSelect>
               </el-form-item>
             </el-col>
           </el-row>

src/views/business/resource/gsp/comps/gsp/CzBatch.vue

@@ -12,9 +12,9 @@
                 :show-overflow-tooltip="true" width="120px" />
               <el-table-column :label="$t('page.business.resource.sj.bh')" align="left" prop="bh"
                 :show-overflow-tooltip="true" width="120px" />
-              <el-table-column :label="$t('page.business.resource.sj.sjczfs')" align="center" width="250px">
+              <el-table-column :label="$t('page.business.resource.sj.czfs')" align="center" width="250px">
                 <template slot-scope="scope">
-                  <BusinessSelect v-model="scope.row.czfs" dictType="system_business_czfs"></BusinessSelect>
+                  <BusinessSelect v-model="scope.row.czfs" dictType="business_czfs"></BusinessSelect>
                 </template>
               </el-table-column>
               <el-table-column :label="$t('page.business.resource.sj.yuanyin')" align="center">
@@ -72,7 +72,7 @@
 </template>
 
 <script>
-import { sj_plcz } from "@/api/business/sj/sj"
+import { plcz } from "@/api/business/gsp/gsp"
 import { mapGetters } from 'vuex'
 import SelectList from "./SelectList";
 import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
@@ -147,10 +147,36 @@ export default {
     save() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          sj_plcz(this.form).then(response => {
-            this.open = false
-            this.$emit('callback')
-          })
+          let params = this.form
+          params.list = this.selectList
+          if (this.selectList.length <= 0) {
+            this.$modal.msgError("请选择要操作的试剂")
+          } else {
+            for (var i = 0; i < params.list.length; i++) {
+              if (!params.list[i].czfs || params.list[i].czfs == '') {
+                this.$modal.msgError(params.list[i].mc + "处置方式不能为空")
+                return
+              }
+              if (!params.list[i].czyy || params.list[i].czyy == '') {
+                this.$modal.msgError(params.list[i].mc + "处置原因不能为空")
+                return
+              } else {
+                params.list[i].remark = params.list[i].czyy
+              }
+              if (!params.list[i].czl || params.list[i].czl == '') {
+                this.$modal.msgError(params.list[i].mc + "处置量不能为空")
+                return
+              }
+            }
+            this.$modal.loading()
+            plcz(params).then(response => {
+              this.open = false
+              this.$emit('callback')
+              this.$modal.closeLoading()
+            }).finally(() => {
+              this.$modal.closeLoading()
+            })
+          }
         }
       })
     }

src/views/business/resource/gsp/comps/gsp/Xz.vue

@@ -61,7 +61,7 @@
           <!-- 存储条件 -->
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gsp.cctj')" prop="cctj">
-              <BusinessSelect v-model="form.cctj" dictType="system_business_cctj" :multiple="true"></BusinessSelect>
+              <BusinessSelect v-model="form.cctj" dictType="business_cctj" :multiple="true"></BusinessSelect>
             </el-form-item>
           </el-col>
           <!-- 接收日期 -->

src/views/business/resource/sj/comps/CzBatch.vue

@@ -56,7 +56,8 @@
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
               <div class="sbzdtcma"> <input type="text"></div>
-              <el-input type="password" @contextmenu.native.prevent @copy.native.prevent @cut.native.prevent v-model="form.qmrmm" maxlength="20"  autocomplete="off" auto-complete="new-password" show-password
+              <el-input type="password" @contextmenu.native.prevent @copy.native.prevent @cut.native.prevent
+                v-model="form.qmrmm" maxlength="20" autocomplete="off" auto-complete="new-password" show-password
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
@@ -104,7 +105,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName','name'
+      'nickName', 'name'
     ]),
   },
   created() {
@@ -146,13 +147,39 @@ export default {
     save() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          sj_plcz(this.form).then(response => {
-            this.open = false
-            this.$emit('callback')
-          })
+          let params = this.form
+          params.list = this.selectList
+          if (this.selectList.length <= 0) {
+            this.$modal.msgError("请选择要操作的试剂")
+          } else {
+            for (var i = 0; i < params.list.length; i++) {
+              if (!params.list[i].czfs || params.list[i].czfs == '') {
+                this.$modal.msgError(params.list[i].mc + "处置方式不能为空")
+                return
+              }
+              if (!params.list[i].czyy || params.list[i].czyy == '') {
+                this.$modal.msgError(params.list[i].mc + "处置原因不能为空")
+                return
+              } else {
+                params.list[i].remark = params.list[i].czyy
+              }
+              if (!params.list[i].czl || params.list[i].czl == '') {
+                this.$modal.msgError(params.list[i].mc + "处置量不能为空")
+                return
+              }
+            }
+            this.$modal.loading()
+            sj_plcz(params).then(response => {
+              this.open = false
+              this.$emit('callback')
+              this.$modal.closeLoading()
+            }).finally(() => {
+              this.$modal.closeLoading()
+            })
+          }
         }
       })
-    }
   }
 }
+}
 </script>

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

@@ -19,7 +19,7 @@
       <div class="edit-content">
         <div class="content-left">
           <TemplateTable emitName="onFillFhCallback" @onFillFhCallback="onFillFhCallback" ref="templateTable"
-            :sn="form.templateSn" :templateData="form" fillType="blxj" />
+            :sn="form.templateSn" :templateData="form" fillType="blxjsh" />
           <div class="content-title">
             <div class="line"></div>
             <div class="subtitle"> {{ $t('page.business.study.studyFormFill.qmxx') }}</div>

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

@@ -120,7 +120,7 @@
                     $t('page.business.study.studyFormFill.sy') }}</el-button>
                 <!-- 废止 -->
                 <el-button type="text" v-if="scope.row.bdzt === 1 && id == scope.row.userId&&((scope.row.blxjshzt != 3 && scope.row.showBlxjsh == 10)||scope.row.showBlxjsh==1)" @click="fz(scope.row)"
-                  v-hasPermi="['business:studyFormFill:fz']">{{
+                  >{{
                     $t('page.business.study.studyFormFill.fz') }}</el-button>
                 <!-- 确认废止 -->
                 <el-button type="text" v-if="scope.row.bdzt === 9 && id == leader" @click="qrfz(scope.row)"

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

@@ -192,6 +192,25 @@ export default {
         this.openApprove = true
       }
     },
+    toRead(data) {
+      this.$alert(data.ffmc, '', {
+        confirmButtonText: this.$t('page.business.study.studyMethod.qyd'),
+        callback: action => {
+          if (this.$route.path === data.toUrl) {
+            this.$emit('changeTab', { key: 'syff' })
+          } else {
+            let index = _.findIndex(this.$store.state.tagsView.visitedViews, (tab) => {
+              return tab.path === data.toUrl
+            })
+            if (index > -1) {
+              this.$tab.refreshPage(this.$store.state.tagsView.visitedViews[index]);
+            } else {
+              this.$tab.openPage("loading", data.toUrl)
+            }
+          }
+        }
+      });
+    },
     getIsMatchSubject() {
       studySubject_isMatchSubject({ studySubjectId: this.form.studySubjectId }).then(response => {
         this.isMatchSubject = response.data

src/views/business/template/list.vue

@@ -94,7 +94,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="部门/学科：" prop="deptId">
-              <select-dept v-model="infoDialog.formData.deptId" />
+              <select-dept v-model="infoDialog.formData.deptId" :multiple="true" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -191,7 +191,7 @@
           <el-col :span="24">
             <el-form-item label="步骤库：" prop="stepGroupIds">
               <el-select multiple v-model="stepGroupIdArr" :placeholder="$t('form.placeholderSelect')"
-                style="width:100%" @change="changeStepGroup">
+                style="width:100%" @change="changeStepGroup" filterable>
                 <el-option v-for="item in stepGroupList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -282,9 +282,9 @@ export default {
           // nameEn: [
           //   { required: true, message: '请输入', trigger: "blur" }
           // ],
-          deptId: [
-            { required: true, message: '请选择', trigger: "change" }
-          ],
+          // deptId: [
+          //   { required: true, message: '请选择', trigger: "change" }
+          // ],
           status: [
             { required: true, message: '请选择', trigger: "change" }
           ],