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

src/lang/en/template/yp.js

@@ -44,6 +44,14 @@ export default {
     f: 'No',
     sfzgdsjwc: 'Complete on Time'
   },
+  yp004: {
+    pztj: 'Preparation Condition',
+    zbxx: 'Preparation Information',
+    zbdx: 'Preparation Object',
+    yjzbs: 'Expected Quantity',
+    sjzbs: 'Actual Quantity',
+    zbbz: ' Preparation Procedure'
+  },
   yp005: {
     qxtj: 'Cleaning Condition',
     ybsm: 'Sample Description',

src/lang/zh/template/yp.js

@@ -44,6 +44,14 @@ export default {
     f: '否',
     sfzgdsjwc: '是否在规定时间完成'
   },
+  yp004: {
+    pztj: '制备条件',
+    zbxx: '制备信息',
+    zbdx: '制备对象',
+    yjzbs: '预计制备数量',
+    sjzbs: '实际制备数',
+    zbbz: ' 制备步骤'
+  },
   yp005: {
     qxtj: '清洗条件',
     ybsm: '样本说明',

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

@@ -71,6 +71,7 @@ import LBA007 from "./comps/lba/LBA007.vue";
 // YP001-使用SP001
 import YP002 from "./comps/yp/YP002.vue";
 import YP003 from "./comps/yp/YP003.vue";
+import YP004 from "./comps/yp/YP004.vue";
 import YP005 from "./comps/yp/YP005.vue";
 
 //毒理
@@ -100,6 +101,7 @@ export default {
     //样品
     YP002,
     YP003,
+    YP004,
     YP005,
   },
   props: {
@@ -187,6 +189,7 @@ export default {
           'YP001': 'SP001',
           'YP002': 'YP002',
           'YP003': 'YP003',
+          'YP004': 'YP004',
           'YP005': 'YP005',
           //毒理
           //DL001-SYWZPZJHB

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

@@ -0,0 +1,208 @@
+<!-- 生物分析生物样品采集管制备表 -->
+<template>
+	<div>
+		<div class="detail-container">
+			<div class="detail-title"><img src="@/assets/images/detail-title.png">{{ formData.bdmc }}<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.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
+					
+					<LineLabel label="template.yp.yp004.zbxx" />
+
+					<CustomTable
+						:ref="`tableRef`"
+						:columns="tableColumns"
+						:formData="formData"
+						:prefixKey = "`table`"
+						fieldItemLabel = "template.common.operationSteps"
+						:showOperation="fillType === 'preFill'"
+					>
+						<template slot="operation" slot-scope="{ row, rowIndex, columns }">
+							<TableOpertaionDelete  :row="row" :rowIndex="rowIndex" :columns="columns"  @deleteRow="deleteRow" ></TableOpertaionDelete>
+						</template>
+					</CustomTable>
+					
+					<LineLabel label="template.yp.yp004.zbbz" />
+					<Step ref="stepRef" :formData="formData.stepData"></Step>
+					
+					<BaseInfoFormPackage fieldItemLabel="template.common.remark" label="template.common.remark"
+						ref="remarkRef" :formConfig="remarkConig" :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 { EventBus } from "@/utils/eventBus";
+import { uniqeResource } from "@/utils/calUnitTools";
+import { debounce } from 'lodash-es'
+import TableOpertaionDelete from "@/components/Template/operation/TableOpertaionDelete.vue"
+
+export default {
+	name: "YP004",
+	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable,TableOpertaionDelete },
+	mixins: [templateMixin],
+	props: {
+		fillType: {
+			type: String,
+			default: 'preFill',
+		},
+	},
+	computed: {
+		// 备注表单配置
+		remarkConig() {
+			return [
+				{
+					type: "cellItem",
+					config: {
+						remark: {
+							label: "",
+							type: "textarea",
+							fillType: "actFill",
+							span: 1,
+							placeholder: 'template.common.remarkPlaceholder',
+							maxlength: 1000,
+							rows: 5
+						}
+					}
+				}
+			]
+		},
+		// 试验基本信息表单配置
+		baseInfoFormConfig() {
+			return [
+				{
+					type: "cardItem",
+					config: {
+						studyMc: {
+							label: 'template.common.testName',
+							type: "input",
+							disabled: true,
+						},
+						studySn: {
+							label: 'template.common.testNumber',
+							type: "input",
+							disabled: true,
+						},
+					}
+				},
+				{
+					type: "conditionItem",
+					label: 'template.yp.yp004.pztj',
+					config: {
+						pre: {
+							label: 'template.common.preFill',
+							type: "select",
+							multiple: true,
+							fillType: "preFill",
+							options: this.getDictOptions('business_pztj'),
+							otherCode: "preOther",
+						},
+						act: {
+							label: 'template.common.actualFill',
+							type: "select",
+							fillType: "actFill",
+							otherCode: "actOther",
+							multiple: true,
+							compareTo: "pre",
+							options: this.getDictOptions('business_pztj')
+						}
+					}
+				},
+				{
+					type: "cellItem",
+					label: 'template.lba.lba002.czsj',
+					config: {
+						startDate: {
+							label: 'template.common.startTime',
+							type: "input",
+						},
+						endDate: {
+							label: 'template.common.endTime',
+							type: "input",
+						},
+					}
+				}
+			]
+		},
+		// 制备信息
+		tableColumns() {
+			return [{
+				label: 'template.yp.yp004.zbdx',
+				prop: 'zbdx',
+				bodyType: 'input',
+				bodyFillType: 'preFill',
+				width: 280,
+				bodyMaxlength: 50,
+			},{
+				label: 'template.yp.yp004.yjzbs',
+				prop: 'yjzbs',
+				bodyType: 'inputNumber',
+				bodyFillType: 'preFill',
+				width: 280,
+				bodyMaxlength: 10,
+			},{
+				label: 'template.yp.yp004.sjzbs',
+				prop: 'sjzbs',
+				bodyType: 'inputNumber',
+				bodyFillType: 'actFill',
+				width: 280,
+				bodyMaxlength: 10,
+				copyFrom:'yjzbs',
+				compareTo:'yjzbs'
+			}]
+		},
+	},
+	data() {
+		return {
+			formData: {},
+		};
+	},
+	mounted() {
+	},
+	methods: {
+		//获取已填写的表单数据
+		getFilledFormData() {
+			return this.getFilledFormDataByRefs(["baseInfoRef",  "tableRef", "stepRef", "remarkRef"])
+		},
+		//获取填写完成的表单数据
+		async getFormData() {
+			let content = await this.validFormFields(["baseInfoRef",  "tableRef", "stepRef", "remarkRef"]);
+			return content;
+		},
+		getResource() {
+			//使用的试剂、仪器
+			const stepResource = this.$refs.stepRef.getStepResource()
+			this.resourceTmp = stepResource.sjResource || []
+			this.yqResourceTmp = stepResource.yqResource || []
+			return this.resourceTmp;
+		},
+		//保存
+		async onSave() {
+			let content = await this.$refs.stepRef.getFormData();
+			console.log(content);
+		},
+		// 删除表格行
+		deleteRow(rowIndex) {
+			const tableRef = this.$refs['tableRef'];
+			if (tableRef) {
+				tableRef.deleteRow(rowIndex);
+			}
+		},
+	}
+};
+</script>
+<style rel="stylesheet/scss" lang="scss">
+</style>

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

@@ -110,7 +110,7 @@
                 @click="edit(scope.row)" v-hasPermi="['business:drugFormFill:bj']">{{
                   $t('form.edit') }}</el-button>
               <!-- 复核 -->
-              <el-button type="text" v-if="scope.row.bdzt === 3&&(id!=scope.row.userId||id<=103)" @click="fh(scope.row)"
+              <el-button type="text" v-if="scope.row.bdzt === 3&&(id!=scope.row.userId||id<=103 || id==118 || id==119 || id==120)" @click="fh(scope.row)"
                 v-hasPermi="['business:drugFormFill:fh']">{{
                   $t('page.business.study.studyFormFill.fh') }}</el-button>
               <!-- 加签 -->

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

@@ -96,13 +96,13 @@
                 <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||id<=103)">{{ $t('page.business.form.audit') }}</el-button>
+                    v-if="scope.row.bdzt === 3&&(id!=scope.row.userId||id<=103 || id==118 || id==119 || id==120)">{{ $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||id<=103)">{{ $t('page.business.form.audit') }}</el-button>
+                  v-if="scope.row.bdzt === 3&&(id!=scope.row.userId||id<=103 || id==118 || id==119 || id==120)">{{ $t('page.business.form.audit') }}</el-button>
               </template>
                <template v-if="scope.row.bdzt === 5&&id==scope.row.userId">
                  <el-button type="text" @click="gb(scope.row)">{{ $t('page.business.study.studyFormPre.guanbi') }}</el-button>

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

@@ -116,7 +116,7 @@
                 @click="edit(scope.row)" v-hasPermi="['business:studyFormFill:bj']">{{
                   $t('form.edit') }}</el-button>
               <!-- 复核 -->
-              <el-button type="text" v-if="scope.row.bdzt === 3 && isMatchSubject && (id != scope.row.userId||id<=103)"
+              <el-button type="text" v-if="scope.row.bdzt === 3 && isMatchSubject && (id != scope.row.userId||id<=103 || id==118 || id==119 || id==120)"
                 @click="fh(scope.row)" v-hasPermi="['business:studyFormFill:fh']">{{
                   $t('page.business.study.studyFormFill.fh') }}</el-button>
               <!-- 加签 -->

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

@@ -99,14 +99,14 @@
                 <template v-else>
                   <!-- 有权限审核 -->
                   <el-button type="text" @click="audit(scope.row)" v-hasPermi="['business:studyFormPre:sh']"
-                    v-if="scope.row.bdzt === 3 && isMatchSubject && (id != scope.row.userId||id<=103)">{{
+                    v-if="scope.row.bdzt === 3 && isMatchSubject && (id != scope.row.userId||id<=103 || id==118 || id==119 || id==120)">{{
                       $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 && isMatchSubject && (id != scope.row.userId||id<=103)">{{
+                  v-if="scope.row.bdzt === 3 && isMatchSubject && (id != scope.row.userId||id<=103 || id==118 || id==119 || id==120)">{{
                     $t('page.business.form.audit')
                   }}</el-button>
               </template>