From 8b6bd5a3ae884c7662fd900106ec2af5c5c1cc73 Mon Sep 17 00:00:00 2001
From: luojie <125330818@qq.com>
Date: Thu, 29 Jan 2026 14:40:03 +0800
Subject: [PATCH] =?UTF-8?q?feat:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86][upd?=
=?UTF-8?q?ate]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/business/public/public.js | 8 +++
src/components/Template/HandleFormItem.vue | 48 ++++++++++++++++-
src/components/Template/StepComponents/ry/cs.vue | 5 ++
src/components/Template/StepComponents/ry/fs.vue | 10 ++++
src/components/Template/StepComponents/ry/fy.vue | 10 ++++
src/components/Template/StepComponents/ry/hwhy.vue | 10 ++++
src/components/Template/StepComponents/ry/jb.vue | 10 ++++
src/components/Template/StepComponents/ry/jd.vue | 10 ++++
src/components/Template/StepComponents/ry/jrjb.vue | 10 ++++
src/components/Template/StepComponents/ry/jz.vue | 10 ++++
src/components/Template/StepComponents/ry/lx.vue | 5 ++
src/components/Template/StepComponents/ry/sy.vue | 10 ++++
src/components/Template/StepComponents/ry/ym.vue | 10 ++++
src/components/Template/StepComponents/ry/zyhy.vue | 5 ++
src/components/Template/StepFormPackage.vue | 38 +++++++++++--
src/components/Template/mixins/stepMixins.js | 8 ++-
.../template/dialog/SelectMixReagentDialog.vue | 62 +++++++++++++---------
.../comps/template/formConfig/formConfig.js | 43 +++++++++++++++
18 files changed, 280 insertions(+), 32 deletions(-)
diff --git a/src/api/business/public/public.js b/src/api/business/public/public.js
index a36be0e..b344790 100644
--- a/src/api/business/public/public.js
+++ b/src/api/business/public/public.js
@@ -99,6 +99,14 @@ export function public_gspList(query) {
params: query
})
}
+// 细胞列表
+export function public_xbList(query) {
+ return request({
+ url: '/system/business/public/xbList',
+ method: 'get',
+ params: query
+ })
+}
// 模板的可选步骤列表
export function public_templateStepList(query) {
return request({
diff --git a/src/components/Template/HandleFormItem.vue b/src/components/Template/HandleFormItem.vue
index 202fd7e..223a7b6 100644
--- a/src/components/Template/HandleFormItem.vue
+++ b/src/components/Template/HandleFormItem.vue
@@ -35,6 +35,14 @@
:disabled="getDisabled()" format="yyyy/MM/dd"
:placeholder="getPlaceholder()" @change="(val)=>onDateChange(val,'yyyy/MM/DD')">
+
+ {{ item.buttonName }}
+
+
@@ -182,7 +190,6 @@ export default {
watch: {
value(newVal) {
this.inputValue = newVal;
-
// 当type为clickable时,值变化时调用保存记录方法
if (this.item.type === 'clickable') {
this.$nextTick(() => {
@@ -198,6 +205,10 @@ export default {
mounted() {
},
methods: {
+ // 点击按钮
+ handleClickButton(item){
+ this.$emit('clickButton', item);
+ },
onDateChange(val,format){
this.inputValue = moment(val).format(format);
console.log(this.inputValue,"inputValue")
@@ -752,6 +763,41 @@ export default {
.el-checkbox__inner{
border-color: #f9c588 !important;
}
+
+}
+.el-button--primary{
+ &.orange-border{
+ background-color: #f79b31 !important;
+ border-color: #f79b31 !important;
+ &:hover {
+ background-color: #f79b31 !important;
+ }
+ &:disabled {
+ background-color: rgba(#f79b31,.8) !important;
+ border-color: rgba(#f79b31,.8) !important;
+ }
+ &:active {
+ background-color: rgba(#f79b31,.8) !important;
+ border-color: rgba(#f79b31,.8) !important;
+
+ }
+ }
+ &.blue-border {
+ background-color: #4ea2ff !important;
+ border-color: #4ea2ff !important;
+ &:hover {
+ background-color: #4ea2ff !important;
+ }
+ &:disabled {
+ background-color: rgba(#4ea2ff,.8) !important;
+ border-color: rgba(#4ea2ff,.8) !important;
+ }
+ &:active {
+ background-color: rgba(#4ea2ff,.8) !important;
+ border-color: rgba(#4ea2ff,.8) !important;
+ }
+ }
+
}
.green-border {
diff --git a/src/components/Template/StepComponents/ry/cs.vue b/src/components/Template/StepComponents/ry/cs.vue
index ed607d7..2f94e67 100644
--- a/src/components/Template/StepComponents/ry/cs.vue
+++ b/src/components/Template/StepComponents/ry/cs.vue
@@ -84,6 +84,11 @@ export default {
label: "超声,超声",
type: "text",
},
+ startDate: {
+ type: "input",
+ fillType: "actFill",
+ disabled: true,
+ },
button1: {
type: "button",
buttonName: "开始"
diff --git a/src/components/Template/StepComponents/ry/fs.vue b/src/components/Template/StepComponents/ry/fs.vue
index eff20d4..b7fdb33 100644
--- a/src/components/Template/StepComponents/ry/fs.vue
+++ b/src/components/Template/StepComponents/ry/fs.vue
@@ -55,6 +55,11 @@ export default {
label: "复苏",
type: "text",
},
+ startDate: {
+ type: "input",
+ fillType: "actFill",
+ disabled: true,
+ },
button1: {
type: "button",
buttonName: "开始",
@@ -63,6 +68,11 @@ export default {
label: ",复苏",
type: "text",
},
+ endDate: {
+ type: "input",
+ fillType: "actFill",
+ disabled: true,
+ },
button2: {
type: "button",
buttonName: "结束",
diff --git a/src/components/Template/StepComponents/ry/fy.vue b/src/components/Template/StepComponents/ry/fy.vue
index 7c233df..a49363d 100644
--- a/src/components/Template/StepComponents/ry/fy.vue
+++ b/src/components/Template/StepComponents/ry/fy.vue
@@ -55,6 +55,11 @@ export default {
label: ",孵育",
type: "text",
},
+ startDate: {
+ type: "input",
+ fillType: "actFill",
+ disabled: true,
+ },
button1: {
type: "button",
buttonName: "开始",
@@ -63,6 +68,11 @@ export default {
type: "text",
label: ",孵育",
},
+ endDate: {
+ type: "input",
+ fillType: "actFill",
+ disabled: true,
+ },
button2: {
type: "button",
buttonName: "结束",
diff --git a/src/components/Template/StepComponents/ry/hwhy.vue b/src/components/Template/StepComponents/ry/hwhy.vue
index 7e897ec..39d02ae 100644
--- a/src/components/Template/StepComponents/ry/hwhy.vue
+++ b/src/components/Template/StepComponents/ry/hwhy.vue
@@ -105,6 +105,16 @@ export default {
label: ",进行恒温混匀,混匀",
type: "text",
},
+ startDate: {
+ type: "input",
+ fillType: "actFill",
+ disabled: true,
+ },
+ startDate: {
+ type: "input",
+ fillType: "actFill",
+ disabled: true,
+ },
button1: {
type: "button",
buttonName: "开始"
diff --git a/src/components/Template/StepComponents/ry/jb.vue b/src/components/Template/StepComponents/ry/jb.vue
index 97d3f0e..0227a6f 100644
--- a/src/components/Template/StepComponents/ry/jb.vue
+++ b/src/components/Template/StepComponents/ry/jb.vue
@@ -58,6 +58,11 @@ export default {
label: "进行搅拌,搅拌",
type: "text",
},
+ startDate: {
+ type: "input",
+ fillType: "actFill",
+ disabled: true,
+ },
button1: {
type: "button",
buttonName: "开始",
@@ -66,6 +71,11 @@ export default {
label: "搅拌",
type: "text",
},
+ endDate: {
+ type: "input",
+ fillType: "actFill",
+ disabled: true,
+ },
button2: {
type: "button",
buttonName: "结束",
diff --git a/src/components/Template/StepComponents/ry/jd.vue b/src/components/Template/StepComponents/ry/jd.vue
index 620d9c9..619ac74 100644
--- a/src/components/Template/StepComponents/ry/jd.vue
+++ b/src/components/Template/StepComponents/ry/jd.vue
@@ -94,6 +94,11 @@ export default {
type:"text",
label:",解冻",
},
+ startDate: {
+ type: "input",
+ fillType: "actFill",
+ disabled: true,
+ },
button1:{
type:"button",
buttonName:"开始",
@@ -102,6 +107,11 @@ export default {
type:"text",
label:",解冻",
},
+ endDate: {
+ type: "input",
+ fillType: "actFill",
+ disabled: true,
+ },
button2:{
type:"button",
buttonName:"结束",
diff --git a/src/components/Template/StepComponents/ry/jrjb.vue b/src/components/Template/StepComponents/ry/jrjb.vue
index 321e66c..da0be80 100644
--- a/src/components/Template/StepComponents/ry/jrjb.vue
+++ b/src/components/Template/StepComponents/ry/jrjb.vue
@@ -75,6 +75,11 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
label:"进行搅拌,搅拌",
type:"text",
},
+ startDate: {
+ type: "input",
+ fillType: "actFill",
+ disabled: true,
+ },
button1:{
type:"button",
buttonName:"开始",
@@ -83,6 +88,11 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
label:"搅拌",
type:"text",
},
+ endDate: {
+ type: "input",
+ fillType: "actFill",
+ disabled: true,
+ },
button2:{
type:"button",
buttonName:"结束",
diff --git a/src/components/Template/StepComponents/ry/jz.vue b/src/components/Template/StepComponents/ry/jz.vue
index e45c925..8487099 100644
--- a/src/components/Template/StepComponents/ry/jz.vue
+++ b/src/components/Template/StepComponents/ry/jz.vue
@@ -50,6 +50,11 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
type:"text",
label:"静置",
},
+ startDate: {
+ type: "input",
+ fillType: "actFill",
+ disabled: true,
+ },
button1:{
type:"button",
buttonName:"开始",
@@ -58,6 +63,11 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
type:"text",
label:",静置",
},
+ endDate: {
+ type: "input",
+ fillType: "actFill",
+ disabled: true,
+ },
button2:{
type:"button",
buttonName:"结束",
diff --git a/src/components/Template/StepComponents/ry/lx.vue b/src/components/Template/StepComponents/ry/lx.vue
index 2d5ea34..73dd1a8 100644
--- a/src/components/Template/StepComponents/ry/lx.vue
+++ b/src/components/Template/StepComponents/ry/lx.vue
@@ -107,6 +107,11 @@ export default {
label: ",进行离心。离心",
type: "text",
},
+ startDate: {
+ type: "input",
+ fillType: "actFill",
+ disabled: true,
+ },
button1: {
type: "button",
buttonName: "开始",
diff --git a/src/components/Template/StepComponents/ry/sy.vue b/src/components/Template/StepComponents/ry/sy.vue
index 7fca675..83a3b82 100644
--- a/src/components/Template/StepComponents/ry/sy.vue
+++ b/src/components/Template/StepComponents/ry/sy.vue
@@ -46,6 +46,11 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
label:"°C,进行水浴,水浴",
type:"text",
},
+ startDate: {
+ type: "input",
+ fillType: "actFill",
+ disabled: true,
+ },
button1:{
type:"button",
buttonName:"开始"
@@ -54,6 +59,11 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
label:"水浴",
type:"text",
},
+ endDate: {
+ type: "input",
+ fillType: "actFill",
+ disabled: true,
+ },
button2:{
type:"button",
buttonName:"结束"
diff --git a/src/components/Template/StepComponents/ry/ym.vue b/src/components/Template/StepComponents/ry/ym.vue
index c62b860..746f0ad 100644
--- a/src/components/Template/StepComponents/ry/ym.vue
+++ b/src/components/Template/StepComponents/ry/ym.vue
@@ -89,6 +89,11 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
label:"。研磨",
type:"text",
},
+ startDate: {
+ type: "input",
+ fillType: "actFill",
+ disabled: true,
+ },
button1:{
type:"button",
buttonName:"开始"
@@ -97,6 +102,11 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
label:"研磨",
type:"text",
},
+ endDate: {
+ type: "input",
+ fillType: "actFill",
+ disabled: true,
+ },
button2:{
type:"button",
buttonName:"结束"
diff --git a/src/components/Template/StepComponents/ry/zyhy.vue b/src/components/Template/StepComponents/ry/zyhy.vue
index 9107d8c..5dd2b15 100644
--- a/src/components/Template/StepComponents/ry/zyhy.vue
+++ b/src/components/Template/StepComponents/ry/zyhy.vue
@@ -90,6 +90,11 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
label:",对上表进行混匀,混匀",
type:"text",
},
+ startDate: {
+ type: "input",
+ fillType: "actFill",
+ disabled: true,
+ },
button1:{
type:"button",
buttonName:"开始"
diff --git a/src/components/Template/StepFormPackage.vue b/src/components/Template/StepFormPackage.vue
index 6fb7feb..cf984e2 100644
--- a/src/components/Template/StepFormPackage.vue
+++ b/src/components/Template/StepFormPackage.vue
@@ -28,6 +28,12 @@
@copy="onCopy(sItem, key)" :error="errors[key]" @update:error="errors[key] = false"
:orange-bg="orangeBgFields[key]" />
+
+ handleClickButton(e,item)" />
+
{{ formFields[key] }}
-
- {{ sItem.buttonName }}
-
+
{{sItem.otherLabel ? $t(sItem.otherLabel) : $t("template.common.other") }}
-
+
试剂列表
供试品列表
给药制剂列表
-
-
-
+
+
+
其他
@@ -25,26 +25,35 @@