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

src/lang/zh/template/lba copy.js

@@ -1,9 +0,0 @@
-//LBA
-export default {
-  lba001: {}, //用的SP001
-  lba002: {
-    cztj: '操作条件',
-    czsj: '操作时间',
-    jcbmc: '检测板名称'
-  }
-}

src/views/business/comps/template/TemplateTable.vue

@@ -54,11 +54,15 @@ import PCR002 from "./comps/pcr/PCR002.vue";
 //LBA
 // LBA001-使用SP001
 import LBA002 from "./comps/lba/LBA002.vue";
+import LBA003 from "./comps/lba/LBA003.vue";
 
 //ADA
 // ADA001-使用SP001
 // ADA002-使用LBA002
 
+//样品
+// YP001-使用SP001
+
 export default {
   name: "TemplateTable",
   components: {
@@ -71,8 +75,9 @@ export default {
     SP001, SP003, SP00456,SP007, SP008, SP009, SP010, SP011, SP012, SP013, SP014, SP015, SP016, SP017, SP018,
     // PCR
     PCR002,
-    // PCR
-    LBA002
+    //LBA
+    LBA002,
+    LBA003
   },
   props: {
     sn: {
@@ -127,11 +132,12 @@ export default {
           //LBA
           'LBA001': 'SP001',
           'LBA002': 'LBA002',
-          //样品
-          'YP001': 'SP001',
+          'LBA003': 'LBA003',
           //ADA
           'ADA001': 'SP001',
           'ADA002': 'LBA002',
+          //样品
+          'YP001': 'SP001',
         }
       }
       return this.componentMap || "Demo"

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

@@ -0,0 +1,127 @@
+<!-- 配体结合分析处理记录表 -->
+<template>
+	<div>
+		<div class="detail-container">
+			<div class="detail-title"><img src="@/assets/images/detail-title.png">{{ formData.bdmc ||
+				$t('template.sp.sp007.title') }}<img src="@/assets/images/detail-title.png" /></div>
+			<div class="detail-content">
+				<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.wzInfo" :columns="sywzColumns" :dataSource="resourceWz" v-if="resourceWz.length>0"/>
+					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
+					<BaseInfoFormPackage fieldItemLabel="template.common.storageCondition"
+						label="template.common.storageCondition" ref="storageConditionRef"
+						:formConfig="storageFormConfig" :formData="formData" />
+					<BaseInfoFormPackage fieldItemLabel="样本说明" label="样本说明"
+						ref="ybRef" :formConfig="ybFormConfig" :formData="formData" />
+					<LineLabel label="template.common.operationSteps" />
+					<Step ref="stepRef" :formData="formData.stepData"></Step>
+					<BaseInfoFormPackage fieldItemLabel="template.common.remark" label="template.common.remark"
+						ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
+					<BaseInfoFormPackage fieldItemLabel="附件" label="附件"
+						ref="fjRef" :formConfig="getFjFormConfig" :formData="formData" />
+				
+				</div>
+			</div>
+		</div>
+		<button @click="onSave">保存</button>
+	</div>
+</template>
+
+<script>
+import BaseInfoFormPackage from "@/components/Template/BaseInfoFormPackage";
+import LineLabel from "@/components/Template/LineLabel";
+import TableList from "@/components/Template/Table";
+import Step from "@/components/Template/Step";
+import templateMixin from "../../mixins/templateMixin";
+import CustomTable from '@/components/Template/CustomTable.vue';
+import { getLatestSn } from '@/api/template';
+import { EventBus } from "@/utils/eventBus";
+import { uniqeResource } from "@/utils/calUnitTools";
+import { debounce } from 'lodash-es';
+import {getBaseInfoFormConfig, getRemarkFormConfig,getStorageFormConfig,getYbFormConfig,getfjFormConfig} from "../../formConfig/sp/SP007";
+
+export default {
+	name: "LBA003",
+	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable },
+	mixins: [templateMixin],
+	props: {
+		fillType: {
+			type: String,
+			default: 'preFill',
+		},
+	},
+	computed: {
+		// 配置条件
+		storageFormConfig() {
+			return getStorageFormConfig(this);
+		},
+		// 备注表单配置
+		remarkConig() {
+			return getRemarkFormConfig();
+		},
+		// 样本说明
+		ybFormConfig() {
+			return getYbFormConfig();
+		},
+		// 试验基本信息表单配置
+		baseInfoFormConfig() {
+			return getBaseInfoFormConfig(this);
+		},
+		// 附件表单配置
+		getFjFormConfig() {
+			return getfjFormConfig(this);
+		},
+		
+	},
+	data() {
+		return {
+			formData: {}
+		};
+	},
+	mounted() {
+	},
+	methods: {
+		//打印标签
+		printTag() {
+			const printConfig = this.getBasePrintConfig();
+			const { storageCondition, targetCodeSn } = this.formData;
+			printConfig["存储条件"] = storageCondition;
+			printConfig["编号"] = targetCodeSn;
+
+			EventBus.$emit('showTagPrintDialog', { printConfig })
+		},
+	
+		//获取已填写的表单数据
+		getFilledFormData() {
+			return this.getFilledFormDataByRefs(["baseInfoRef", "storageConditionRef", "ybRef","stepRef", "remarkRef","fjRef"])
+		},
+		//获取填写完成的表单数据
+		async getFormData() {
+			let content = await this.validFormFields(["baseInfoRef", "storageConditionRef", "ybRef","stepRef", "remarkRef","fjRef"]);
+			return content;
+		},
+		getResource() {
+			let content = this.getFilledFormData();
+			return this.resourceTmp;
+		},
+		//保存
+		async onSave() {
+			let content =await this.$refs.fjRef.getFormData();
+			console.log(content);
+			
+		},
+	}
+};
+</script>
+<style rel="stylesheet/scss" lang="scss">
+.mt-20 {
+	margin-top: 20px;
+}
+
+.print-btn {
+	margin-bottom: 20px;
+}
+</style>

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

@@ -39,14 +39,14 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.gyzj.cctj')" prop="cctj">
-              <BusinessSelect v-model="form.cctj" dictType="business_cctj"></BusinessSelect>
+            <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.ccwz')" prop="ccwz">
+              <BusinessSelect v-model="form.ccwz" dictType="business_ccwz"  @change="ccwzChange"></BusinessSelect>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.gyzj.ccwz')" prop="ccwz">
-              <BusinessSelect v-model="form.ccwz" dictType="business_ccwz"></BusinessSelect>
+            <el-form-item :label="$t('page.business.resource.gyzj.cctj')" prop="cctj">
+              <BusinessSelect v-model="form.cctj" dictType="business_cctj"></BusinessSelect>
             </el-form-item>
           </el-col>
         </el-row>
@@ -155,6 +155,9 @@ export default {
   created() {
   },
   methods: {
+      ccwzChange(val){
+      this.form.cctj=val.wc
+    },
     cancel() {
       this.open = false
     },

src/views/business/resource/gyzj/comps/gyzjList.vue

@@ -414,7 +414,7 @@ export default {
         a.href = uri + window.btoa(unescape(encodeURIComponent(exportTemplate)))
         a.click()
         that.$modal.closeLoading()
-         that.saveSimpleLog({name:'',nameEn:'',jcmc:'给药制剂导出',jcmcEn:'Formulation Export'})
+        that.saveSimpleLog({name:'',nameEn:'',jcmc:'给药制剂导出',jcmcEn:'Formulation Export'})
       }).finally(() => {
         that.$modal.closeLoading()
       })

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

@@ -39,16 +39,17 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.cctj')" prop="cctj">
-              <BusinessSelect v-model="form.cctj" dictType="business_cctj"></BusinessSelect>
+            <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.mjy.ccwz')" prop="ccwz">
+              <BusinessSelect v-model="form.ccwz" dictType="business_ccwz" @change="ccwzChange"></BusinessSelect>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.ccwz')" prop="ccwz">
-              <BusinessSelect v-model="form.ccwz" dictType="business_ccwz"></BusinessSelect>
+            <el-form-item :label="$t('page.business.resource.mjy.cctj')" prop="cctj">
+              <BusinessSelect v-model="form.cctj" dictType="business_cctj"></BusinessSelect>
             </el-form-item>
           </el-col>
+        
         </el-row>
         <el-row>
           <el-col :span="12">
@@ -155,6 +156,9 @@ export default {
   created() {
   },
   methods: {
+   ccwzChange(val){
+      this.form.cctj=val.wc
+    },
     cancel() {
       this.open = false
     },

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

@@ -276,6 +276,7 @@ export default {
         studyFormPlan_info({ id: row.id }).then(response => {
           this.form = response.data
           this.templateData = deepClone(this.form)
+          this.saveSimpleLog({ jcmc: '计划表单编辑', jcmcEn: 'Plan Table Edit', name: this.form.bdmc + '（' + this.form.bdbh + '）', nameEn: this.form.bdmc + '（' + this.form.bdbh + '）' })
           this.open = true
         }).finally(() => {
           this.$modal.closeLoading()
@@ -284,6 +285,9 @@ export default {
         this.showIndex = 1
         this.form = _.merge({}, this.form, row)
         this.templateData = deepClone(this.form)
+        let name=this.studyType==1?'试验':(this.studyType==5?'非试验表单':'麻精药表单')
+        let nameEn=this.studyType==1?'Study':(this.studyType==5?'Non-study':'ontrolled Drug')
+        this.saveSimpleLog({jcmc:'计划表单新增',jcmcEn:'Plan Table Create',name:name,nameEn:nameEn})
         this.open = true
       }
     },

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

@@ -222,6 +222,7 @@ export default {
         this.form = response.data
         this.getQmxxList()
         this.getJjcgjList()
+        this.saveSimpleLog({ jcmc: '计划表单复核', jcmcEn: 'Plan Table QC', name: this.form.bdmc + '（' + this.form.bdbh + '）', nameEn: this.form.bdmc + '（' + this.form.bdbh + '）' })
         this.open = true
       }).finally(() => {
         this.$modal.closeLoading()

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

@@ -178,6 +178,7 @@ export default {
         this.form = response.data
         this.getQmxxList()
         this.getJjcgjList()
+        this.saveSimpleLog({ jcmc: '计划表单审阅', jcmcEn: 'Plan Table Review', name: this.form.bdmc + '（' + this.form.bdbh + '）', nameEn: this.form.bdmc + '（' + this.form.bdbh + '）' })
         this.open = true
       }).finally(() => {
         this.$modal.closeLoading()

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

@@ -388,6 +388,7 @@ export default {
         this.form = response.data
         this.getQmxxList()
         this.getJjcgjList()
+        this.saveSimpleLog({ jcmc: '计划表单详情', jcmcEn: 'Plan Table Detail', name: this.form.bdmc + '（' + this.form.bdbh + '）', nameEn: this.form.bdmc + '（' + this.form.bdbh + '）' })
         this.open = true
       }).finally(() => {
         this.$modal.closeLoading()

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

@@ -278,6 +278,7 @@ export default {
         studyFormApply_info({ id: row.id }).then(response => {
           this.form = _.merge({}, this.form, response.data)
           this.templateData = deepClone(this.form)
+          this.saveSimpleLog({ jcmc: '领取申请单编辑', jcmcEn: 'Material Application Table Edit', name: this.form.bdmc + '（' + this.form.bdbh + '）', nameEn: this.form.bdmc + '（' + this.form.bdbh + '）' })
           this.open = true
         }).finally(() => {
           this.$modal.closeLoading()
@@ -286,6 +287,9 @@ export default {
         this.showIndex = 1
         this.form = _.merge({}, this.form, row)
         this.templateData = deepClone(this.form)
+        let name=this.studyType==1?'试验':(this.studyType==5?'非试验表单':'麻精药表单')
+        let nameEn=this.studyType==1?'Study':(this.studyType==5?'Non-study':'ontrolled Drug')
+        this.saveSimpleLog({jcmc:'领取申请单新增',jcmcEn:'Material Application Table Create',name:name,nameEn:nameEn})
         this.open = true
       }
     },

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

@@ -224,6 +224,7 @@ export default {
         this.form = response.data
         this.getQmxxList()
         this.getJjcgjList()
+        this.saveSimpleLog({ jcmc: '领取申请单复核', jcmcEn: 'Material Application Table QC', name: this.form.bdmc + '（' + this.form.bdbh + '）', nameEn: this.form.bdmc + '（' + this.form.bdbh + '）' })
         this.open = true
       }).finally(() => {
         this.$modal.closeLoading()

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

@@ -198,6 +198,7 @@ export default {
         this.form = response.data
         this.getQmxxList()
         this.getJjcgjList()
+        this.saveSimpleLog({ jcmc: '领取申请单审核', jcmcEn: 'Material Application Table Audit', name: this.form.bdmc + '（' + this.form.bdbh + '）', nameEn: this.form.bdmc + '（' + this.form.bdbh + '）' })
         this.open = true
       }).finally(() => {
         this.$modal.closeLoading()

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

@@ -181,6 +181,7 @@ export default {
         this.form = response.data
         this.getQmxxList()
         this.getJjcgjList()
+         this.saveSimpleLog({ jcmc: '领取申请单审核', jcmcEn: 'Material Application Table Review', name: this.form.bdmc + '（' + this.form.bdbh + '）', nameEn: this.form.bdmc + '（' + this.form.bdbh + '）' })
         this.open = true
       }).finally(() => {
         this.$modal.closeLoading()

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

@@ -390,6 +390,7 @@ export default {
         this.getQmxxList()
         this.getJjcgjList()
         this.open = true
+        this.saveSimpleLog({ jcmc: '领取申请单详情', jcmcEn: 'Material Application Table Detail', name: this.form.bdmc + '（' + this.form.bdbh + '）', nameEn: this.form.bdmc + '（' + this.form.bdbh + '）' })
       }).finally(() => {
         this.$modal.closeLoading()
       })

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

@@ -597,6 +597,7 @@ export default {
               this.templateData = deepClone(this.form)
               const obj = Object.assign({}, this.$route, { title: this.form.bdmc })
               this.$tab.updatePage(obj);
+              this.saveSimpleLog({ jcmc: '填报表单编辑', jcmcEn: 'Record Edit', name: this.form.bdmc + '（' + this.form.bdbh + '）', nameEn: this.form.bdmc + '（' + this.form.bdbh + '）' })
               this.$modal.closeLoading()
             })
           } else {
@@ -605,8 +606,11 @@ export default {
             study_info({ id: params.studyId }).then(response => {
               this.form = _.merge({}, this.form, { stydyId: params.studyId, resourceStudy: response.data.resource, sftb: 1 })
               this.templateData = deepClone(this.form)
-              const obj = Object.assign({}, this.$route, { title: this.form.bdmc })
+              const obj = Object.assign({}, this.$route, { title: this.$t('page.business.study.studyFormFill.xzbd') })
               this.$tab.updatePage(obj);
+              let name=this.studyType==1?'试验':(this.studyType==5?'非试验表单':'麻精药表单')
+              let nameEn=this.studyType==1?'Study':(this.studyType==5?'Non-study':'ontrolled Drug')
+              this.saveSimpleLog({jcmc:'填报表单新增',jcmcEn:'Record Create',name:name,nameEn:nameEn})
               this.$modal.closeLoading()
             })
           }

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

@@ -224,6 +224,7 @@ export default {
         this.form = response.data
         this.getQmxxList()
         this.getJjcgjList()
+        this.saveSimpleLog({ jcmc: '填报表单复核', jcmcEn: 'Record QC', name: this.form.bdmc + '（' + this.form.bdbh + '）', nameEn: this.form.bdmc + '（' + this.form.bdbh + '）' })
         this.open = true
       }).finally(() => {
         this.$modal.closeLoading()

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

@@ -181,6 +181,7 @@ export default {
         this.getQmxxList()
         this.getJjcgjList()
         this.open = true
+        this.saveSimpleLog({ jcmc: '填报表单审阅', jcmcEn: 'Record Review', name: this.form.bdmc + '（' + this.form.bdbh + '）', nameEn: this.form.bdmc + '（' + this.form.bdbh + '）' })
       }).finally(() => {
         this.$modal.closeLoading()
       })

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

@@ -278,6 +278,7 @@ export default {
             },
           })
         }, 200);
+        this.saveSimpleLog({jcmc:'填报表单详情导出',jcmcEn:'Record Detail Export',name:this.form.bdmc+'（'+this.form.bdbh+'）',nameEn:this.form.bdmc+'（'+this.form.bdbh+'）'})
       })
     },
     //添加水印
@@ -305,7 +306,7 @@ export default {
         ctx.save()
         ctx.translate(canvas.width / 2, canvas.height / 2)
         ctx.rotate(-Math.PI / 4) // 45度倾斜
-        let time=moment().format("YYYY-MM-DD HH:mm:ss")
+        let time = moment().format("YYYY-MM-DD HH:mm:ss")
         for (let x = -canvas.width; x < canvas.width * 2; x += stepX) {
           for (let y = -canvas.height; y < canvas.height * 2; y += stepY) {
             // 动态水印内容
@@ -395,6 +396,7 @@ export default {
         this.getQmxxList()
         this.getJjcgjList()
         this.open = true
+        this.saveSimpleLog({ jcmc: '填报详情', jcmcEn: 'Record Detail', name: this.form.bdmc + '（' + this.form.bdbh + '）', nameEn: this.form.bdmc + '（' + this.form.bdbh + '）' })
       }).finally(() => {
         this.$modal.closeLoading()
       })

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

@@ -277,6 +277,7 @@ export default {
           this.form.qmyy = this.$t('page.business.study.studyFormPre.zztjyzbd')
           this.templateData = deepClone(this.form)
           this.open = true
+          this.saveSimpleLog({ jcmc: '预填表单编辑', jcmcEn: 'Preset Edit', name: this.form.bdmc + '（' + this.form.bdbh + '）', nameEn: this.form.bdmc + '（' + this.form.bdbh + '）' })
           this.$modal.closeLoading()
         }).finally(() => {
           this.$modal.closeLoading()
@@ -285,6 +286,11 @@ export default {
         this.showIndex = 1
         this.form = _.merge({}, this.form, row)
         this.templateData = deepClone(this.form)
+        const obj = Object.assign({}, this.$route, { title: this.$t('page.business.study.studyFormFill.xzbd') })
+        this.$tab.updatePage(obj);
+        let name=this.studyType==1?'试验':(this.studyType==5?'非试验表单':'麻精药表单')
+        let nameEn=this.studyType==1?'Study':(this.studyType==5?'Non-study':'ontrolled Drug')
+        this.saveSimpleLog({jcmc:'预填表单新增',jcmcEn:'Preset Create',name:name,nameEn:nameEn})
         this.open = true
       }
     },

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

@@ -200,6 +200,7 @@ export default {
       studyFormPre_info({ id: row.id }).then(response => {
         this.form = response.data
         this.open = true
+        this.saveSimpleLog({ jcmc: '预填表单审核', jcmcEn: 'Preset Audit', name: this.form.bdmc + '（' + this.form.bdbh + '）', nameEn: this.form.bdmc + '（' + this.form.bdbh + '）' })
         this.$modal.closeLoading()
       }).finally(() => {
         this.$modal.closeLoading()

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

@@ -227,6 +227,7 @@ export default {
         this.getJjcgjList()
         this.getIsMatchSubject()
         this.open = true
+        this.saveSimpleLog({jcmc:'预填详情',jcmcEn:'Preset Detail',name:this.form.bdmc+'（'+this.form.bdbh+'）',nameEn:this.form.bdmc+'（'+this.form.bdbh+'）'})
       }).finally(() => {
         this.$modal.closeLoading()
       })