diff --git a/src/lang/en.js b/src/lang/en.js
index 61a87c2..7f79283 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -27,6 +27,8 @@ import lba from './en/template/lba'
import yp from './en/template/yp'
//ADA模板
import ada from './en/template/ada'
+//毒理模板
+import dl from './en/template/dl'
// 试验管理
import study from './en/business/study/study'
@@ -199,6 +201,7 @@ export default {
pcr: pcr,
lba: lba,
yp: yp,
- ada: ada
+ ada: ada,
+ dl: dl
}
}
diff --git a/src/lang/en/template/dl.js b/src/lang/en/template/dl.js
new file mode 100644
index 0000000..34e72c6
--- /dev/null
+++ b/src/lang/en/template/dl.js
@@ -0,0 +1,4 @@
+//毒理
+export default {
+ dl001: {}
+}
diff --git a/src/lang/en/template/lba.js b/src/lang/en/template/lba.js
index 606f06a..03dc355 100644
--- a/src/lang/en/template/lba.js
+++ b/src/lang/en/template/lba.js
@@ -15,16 +15,16 @@ export default {
lba004: {
xbxx: 'Analysis Plate Information',
ypxx: 'Sample Information',
- xszj: '稀释组件',
+ xszj: 'Dilution Component',
xz: 'Add',
sc: 'Delete',
- jzmc: '基质名称',
- xh: '序号',
- xsbs: '稀释倍数',
- ysypjrz: '预设样品加入值',
- sjypjrz: '实际样品加入值',
- ysjzjrz: '预设基质加入值',
- sjjzjrz: '实际基质加入值'
+ jzmc: 'Blank Matrix Name',
+ xh: 'Serial Number',
+ xsbs: 'Dilution Factor',
+ ysypjrz: 'Expected Sample Volume',
+ sjypjrz: 'Actual Sample Volume',
+ ysjzjrz: 'Expected Blank Matrix Volume',
+ sjjzjrz: 'Actual Blank Matrix Volume'
},
lba005: {
bzqxpz: 'Standard Curve Preparation',
diff --git a/src/lang/en/template/yp.js b/src/lang/en/template/yp.js
index 5c59d6c..a4486f8 100644
--- a/src/lang/en/template/yp.js
+++ b/src/lang/en/template/yp.js
@@ -34,7 +34,7 @@ export default {
yplx: 'Sample Type',
ybxx: 'Sample Information',
cyd: 'Sampling Location',
- dwbh: '动物编号',
+ dwbh: 'Animal ID',
dr: 'Import',
ypsl: 'Sample Quantity',
fqxx: 'Extraction Information',
@@ -43,5 +43,12 @@ export default {
s: 'Yes',
f: 'No',
sfzgdsjwc: 'Complete on Time'
+ },
+ yp005: {
+ qxtj: 'Cleaning Condition',
+ ybsm: 'Sample Description',
+ zz: 'Tissue',
+ qxsj: 'Cleaning time',
+ qxbz: 'Cleaning Procedure'
}
}
diff --git a/src/lang/zh.js b/src/lang/zh.js
index 6e68051..9bac231 100644
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -27,6 +27,8 @@ import lba from './zh/template/lba'
import yp from './zh/template/yp'
//ADA模板
import ada from './zh/template/ada'
+//毒理模板
+import dl from './zh/template/dl'
// 试验管理
import study from './zh/business/study/study'
@@ -194,6 +196,7 @@ export default {
pcr: pcr,
lba: lba,
yp: yp,
- ada: ada
+ ada: ada,
+ dl: dl
}
}
diff --git a/src/lang/zh/template/dl.js b/src/lang/zh/template/dl.js
new file mode 100644
index 0000000..34e72c6
--- /dev/null
+++ b/src/lang/zh/template/dl.js
@@ -0,0 +1,4 @@
+//毒理
+export default {
+ dl001: {}
+}
diff --git a/src/lang/zh/template/yp.js b/src/lang/zh/template/yp.js
index 410c2ab..5be7c29 100644
--- a/src/lang/zh/template/yp.js
+++ b/src/lang/zh/template/yp.js
@@ -43,5 +43,12 @@ export default {
s: '是',
f: '否',
sfzgdsjwc: '是否在规定时间完成'
+ },
+ yp005: {
+ qxtj: '清洗条件',
+ ybsm: '样本说明',
+ zz: '组织',
+ qxsj: '清洗时间',
+ qxbz: '清洗步骤'
}
}
diff --git a/src/views/business/comps/template/TemplateTable.vue b/src/views/business/comps/template/TemplateTable.vue
index 2de3a63..4e78e90 100644
--- a/src/views/business/comps/template/TemplateTable.vue
+++ b/src/views/business/comps/template/TemplateTable.vue
@@ -71,6 +71,11 @@ import LBA007 from "./comps/lba/LBA007.vue";
// YP001-使用SP001
import YP002 from "./comps/yp/YP002.vue";
import YP003 from "./comps/yp/YP003.vue";
+import YP005 from "./comps/yp/YP005.vue";
+
+//毒理
+// DL001-SYWZPZJHB
+// DL002-使用SP001
export default {
name: "TemplateTable",
@@ -94,7 +99,8 @@ export default {
LBA007,
//样品
YP002,
- YP003
+ YP003,
+ YP005,
},
props: {
sn: {
@@ -181,6 +187,10 @@ export default {
'YP001': 'SP001',
'YP002': 'YP002',
'YP003': 'YP003',
+ 'YP005': 'YP005',
+ //毒理
+ //DL001-SYWZPZJHB
+ 'DL002': 'SP001',
}
}
return this.componentMap || "Demo"
diff --git a/src/views/business/comps/template/comps/sp/SP001.vue b/src/views/business/comps/template/comps/sp/SP001.vue
index d169343..fabb77a 100644
--- a/src/views/business/comps/template/comps/sp/SP001.vue
+++ b/src/views/business/comps/template/comps/sp/SP001.vue
@@ -53,6 +53,10 @@ export default {
type: String,
default: 'preFill',
},
+ sn: {
+ type: String,
+ default: '',
+ },
},
computed: {
// 配置条件
@@ -93,35 +97,50 @@ export default {
},
// 试验基本信息表单配置
baseInfoFormConfig() {
+ //毒理002没得方法编号和版本号
+ let baseConfig = this.sn=='DL002'?
+ {
+ studyMc: {
+ label: 'template.common.testName',
+ type: "input",
+ disabled: true,
+ },
+ studySn: {
+ label: 'template.common.testNumber',
+ type: "input",
+ disabled: true,
+ }
+ }:
+ {
+ studyMc: {
+ label: 'template.common.testName',
+ type: "input",
+ disabled: true,
+ },
+ studySn: {
+ label: 'template.common.testNumber',
+ type: "input",
+ disabled: true,
+ },
+ methodCode: {
+ label: 'template.common.methodCode',
+ type: "input",
+ fillType: "preFill",
+ maxlength: 50
+ },
+ versionNum: {
+ label: 'template.common.versionNumber',
+ type: "inputNumber",
+ fillType: "actFill",
+ prepend: "V",
+ maxlength: 50
+ },
+ }
+
return [
{
type: "cardItem",
- config: {
- studyMc: {
- label: 'template.common.testName',
- type: "input",
- disabled: true,
- },
- studySn: {
- label: 'template.common.testNumber',
- type: "input",
- disabled: true,
- },
- methodCode: {
- label: 'template.common.methodCode',
- type: "input",
- fillType: "preFill",
- maxlength: 50
- },
- versionNum: {
- label: 'template.common.versionNumber',
- type: "inputNumber",
- fillType: "actFill",
- prepend: "V",
- maxlength: 50
- },
-
- }
+ config: baseConfig
},
{
type: "conditionItem",
diff --git a/src/views/business/comps/template/comps/yp/YP003.vue b/src/views/business/comps/template/comps/yp/YP003.vue
index bec86b0..605d9a5 100644
--- a/src/views/business/comps/template/comps/yp/YP003.vue
+++ b/src/views/business/comps/template/comps/yp/YP003.vue
@@ -129,7 +129,7 @@ export default {
type: "select",
fillType: "preFill",
options: this.getDictOptions('business_yplx'),
- otherCode: "preOther",
+ otherCode: "yplxOther",
},
}
},
diff --git a/src/views/business/comps/template/comps/yp/YP005.vue b/src/views/business/comps/template/comps/yp/YP005.vue
new file mode 100644
index 0000000..82372af
--- /dev/null
+++ b/src/views/business/comps/template/comps/yp/YP005.vue
@@ -0,0 +1,202 @@
+
+
+
+
+

{{ formData.bdmc }}

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file