diff --git a/src/lang/en/template/yp.js b/src/lang/en/template/yp.js
index 29d1349..5c59d6c 100644
--- a/src/lang/en/template/yp.js
+++ b/src/lang/en/template/yp.js
@@ -29,5 +29,19 @@ export default {
gyzyzh: 'Dosing Group Box',
qt: 'other',
jsbz: 'Comment on Receiving'
+ },
+ yp003: {
+ yplx: 'Sample Type',
+ ybxx: 'Sample Information',
+ cyd: 'Sampling Location',
+ dwbh: '动物编号',
+ dr: 'Import',
+ ypsl: 'Sample Quantity',
+ fqxx: 'Extraction Information',
+ fqyq: 'Extraction Requirement',
+ sfyfzyq: 'Portion Requirement',
+ s: 'Yes',
+ f: 'No',
+ sfzgdsjwc: 'Complete on Time'
}
}
diff --git a/src/lang/zh/template/yp.js b/src/lang/zh/template/yp.js
index fcaab6f..410c2ab 100644
--- a/src/lang/zh/template/yp.js
+++ b/src/lang/zh/template/yp.js
@@ -29,5 +29,19 @@ export default {
gyzyzh: '给药组转运盒',
qt: '其他',
jsbz: '接收备注'
+ },
+ yp003: {
+ yplx: '样品类型',
+ ybxx: '样本信息',
+ cyd: '采样点',
+ dwbh: '动物编号',
+ dr: '导入',
+ ypsl: '样品数量',
+ fqxx: '分取信息',
+ fqyq: '分取要求',
+ sfyfzyq: '是否有分装要求',
+ s: '是',
+ f: '否',
+ sfzgdsjwc: '是否在规定时间完成'
}
}
diff --git a/src/views/business/comps/template/TemplateTable.vue b/src/views/business/comps/template/TemplateTable.vue
index 26b7828..2de3a63 100644
--- a/src/views/business/comps/template/TemplateTable.vue
+++ b/src/views/business/comps/template/TemplateTable.vue
@@ -70,6 +70,7 @@ import LBA007 from "./comps/lba/LBA007.vue";
//样品
// YP001-使用SP001
import YP002 from "./comps/yp/YP002.vue";
+import YP003 from "./comps/yp/YP003.vue";
export default {
name: "TemplateTable",
@@ -92,7 +93,8 @@ export default {
LBA006,
LBA007,
//样品
- YP002
+ YP002,
+ YP003
},
props: {
sn: {
@@ -178,6 +180,7 @@ export default {
//样品
'YP001': 'SP001',
'YP002': 'YP002',
+ 'YP003': 'YP003',
}
}
return this.componentMap || "Demo"
diff --git a/src/views/business/comps/template/comps/yp/YP003.vue b/src/views/business/comps/template/comps/yp/YP003.vue
new file mode 100644
index 0000000..bec86b0
--- /dev/null
+++ b/src/views/business/comps/template/comps/yp/YP003.vue
@@ -0,0 +1,216 @@
+
+
+
+
+

{{ formData.bdmc }}

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/business/comps/template/mixins/templateMixin.js b/src/views/business/comps/template/mixins/templateMixin.js
index 7e6945f..9c03997 100644
--- a/src/views/business/comps/template/mixins/templateMixin.js
+++ b/src/views/business/comps/template/mixins/templateMixin.js
@@ -31,7 +31,8 @@ export default {
'business_pcr_gzy', // PCR-编号-工作液
'business_lba_jg', // LBA006-结果
- 'business_cftj' // 存放条件
+ 'business_cftj', // 存放条件
+ 'business_yplx', // 样品类型
],
props: {
templateData: {
diff --git a/src/views/business/form/drug/comp/ytbdList.vue b/src/views/business/form/drug/comp/ytbdList.vue
index 2e5c495..fdf093c 100644
--- a/src/views/business/form/drug/comp/ytbdList.vue
+++ b/src/views/business/form/drug/comp/ytbdList.vue
@@ -463,7 +463,8 @@ export default {
sign: sign
}).then(() => {
this.$refs.fsySignRef.cancel()
- this.studyStatus = 5
+ // this.studyStatus = 5
+ this.$tab.refreshPage();
}).finally(() => {
this.$modal.closeLoading()
})
diff --git a/src/views/business/form/nonTrial/comp/ytbdList.vue b/src/views/business/form/nonTrial/comp/ytbdList.vue
index ff0e50d..93be25c 100644
--- a/src/views/business/form/nonTrial/comp/ytbdList.vue
+++ b/src/views/business/form/nonTrial/comp/ytbdList.vue
@@ -527,7 +527,7 @@ export default {
sign: sign
}).then(() => {
this.$refs.fsySignRef.cancel()
- this.studyStatus = 5
+ this.$tab.refreshPage();
}).finally(() => {
this.$modal.closeLoading()
})
diff --git a/src/views/business/study/comp/suject.vue b/src/views/business/study/comp/suject.vue
index 978e7cf..2981858 100644
--- a/src/views/business/study/comp/suject.vue
+++ b/src/views/business/study/comp/suject.vue
@@ -10,13 +10,13 @@
{{$t('page.business.study.studyEnter.syxkxx')}}
-
+
{{item.deptName}}({{$i18n.locale === 'zh_CN'?item.leaderName:item.leaderNameEn}})
-
+
{{$t('page.business.study.studyEnter.yq')}}
diff --git a/src/views/business/study/comp/syxx.vue b/src/views/business/study/comp/syxx.vue
index 90a5155..81b0942 100644
--- a/src/views/business/study/comp/syxx.vue
+++ b/src/views/business/study/comp/syxx.vue
@@ -139,7 +139,8 @@ export default {
sign:sign
}).then(() => {
this.$refs.syxxSignRef.cancel()
- this.getStudyInfo()
+ // this.getStudyInfo()
+ this.$tab.refreshPage();
}).finally(() => {
this.$modal.closeLoading()
})
diff --git a/src/views/business/template/list.vue b/src/views/business/template/list.vue
index 0d9ceb1..80ab658 100644
--- a/src/views/business/template/list.vue
+++ b/src/views/business/template/list.vue
@@ -85,6 +85,11 @@
+
+
+
+
+
@@ -256,6 +261,9 @@ export default {
name: [
{ required: true, message: '请输入', trigger: "blur" }
],
+ nameEn: [
+ { required: true, message: '请输入', trigger: "blur" }
+ ],
deptId: [
{ required: true, message: '请选择', trigger: "change" }
],