From 0924888464844cdca767e0bb0ad2e7bb5f4dc268 Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Sat, 28 Feb 2026 15:17:41 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20[=E6=AD=A5=E9=AA=A4=E7=AE=A1?= =?UTF-8?q?=E7=90=86]=20=E6=96=B0=E5=A2=9E=E6=AD=A5=E9=AA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Template/HandleFormItem.vue | 2 +- src/components/Template/Step.vue | 129 ++++++++++++++------- src/components/Template/StepComponents/ry/jr.vue | 36 ++++++ src/components/Template/StepComponents/ry/kb.vue | 36 ++++++ .../Template/StepComponents/ry/kbsjgsp.vue | 52 +++++++++ src/components/Template/StepComponents/ry/kbyq.vue | 52 +++++++++ src/views/business/template/list.vue | 1 + 7 files changed, 262 insertions(+), 46 deletions(-) create mode 100644 src/components/Template/StepComponents/ry/jr.vue create mode 100644 src/components/Template/StepComponents/ry/kb.vue create mode 100644 src/components/Template/StepComponents/ry/kbsjgsp.vue create mode 100644 src/components/Template/StepComponents/ry/kbyq.vue diff --git a/src/components/Template/HandleFormItem.vue b/src/components/Template/HandleFormItem.vue index 7ebe2d8..45edc07 100644 --- a/src/components/Template/HandleFormItem.vue +++ b/src/components/Template/HandleFormItem.vue @@ -16,7 +16,7 @@ + @visible-change="onSelectBlur" @change="onInputChange" filterable> diff --git a/src/components/Template/Step.vue b/src/components/Template/Step.vue index b378158..fcaac4e 100644 --- a/src/components/Template/Step.vue +++ b/src/components/Template/Step.vue @@ -56,6 +56,7 @@ import Jb from "./StepComponents/ry/jb.vue";//溶液-搅拌 import Jrjb from "./StepComponents/ry/jrjb.vue";//溶液-加热搅拌 import Cs from "./StepComponents/ry/cs.vue";//溶液-超声 import Sy from "./StepComponents/ry/sy.vue";//溶液-水浴 +import Zy from "./StepComponents/ry/zy.vue";//溶液-正压 import Dc from "./StepComponents/ry/dc.vue";//溶液-氮吹 import Jd from "./StepComponents/ry/jd.vue";//溶液-解冻 import Jz from "./StepComponents/ry/jz.vue";//溶液-静置 @@ -73,53 +74,63 @@ import Fs from "./StepComponents/ry/fs.vue";//溶液-复苏 import Fb from "./StepComponents/ry/fb.vue";//溶液-封板 import Zlfz from "./StepComponents/ry/zlfz.vue";//溶液-质量分装 - - -const stepTypes = [ - { label: '操作地点', value: 'czdd' }, - { label: '操作方法', value: 'czhj' }, - { label: '选择容器', value: 'xzrq' }, - { label: '加入溶液', value: 'jrry' }, - { label: '天平校验(单点)', value: 'tpjydd' }, - { label: '天平校验(双点)', value: 'tpjysd' }, - { label: '取用物质', value: 'qywz' }, - { label: '称量(非传值)', value: 'clfcz' }, - { label: '称量(传值)', value: 'clcz' }, - { label: '标定(体积)', value: 'bdtj' }, - { label: '标定(质量)', value: 'bdzl' }, - { label: '调节PH(传值)', value: 'tjphcz' }, - { label: '调节PH(非传值)', value: 'tjphfcz' }, - { label: '离心', value: 'lx' }, - { label: '恒温混匀', value: 'hwhy' }, - { label: '振摇混匀', value: 'zyhy' }, - { label: '涡旋混匀', value: 'wxhy' }, - { label: '颠倒混匀', value: 'ddhy' }, - { label: '研磨', value: 'ym' }, - { label: '搅拌', value: 'jb' }, - { label: '加热搅拌', value: 'jrjb' }, - { label: '超声', value: 'cs' }, - { label: '水浴', value: 'sy' }, - { label: '氮吹', value: 'dc' }, - { label: '解冻', value: 'jd' }, - { label: '静置', value: 'jz' }, - { label: '过滤(自动)', value: 'glzd' }, - { label: '过滤(手动)', value: 'glsd' }, - { label: '孵育', value: 'fy' }, - { label: '取出原药', value: 'qcyy' }, - { label: '复溶(多容器)', value: 'frdrq' }, - { label: '复溶', value: 'fr' }, - { label: '合并', value: 'hb' }, - { label: '染色', value: 'rs' }, - { label: '计数', value: 'js' }, - { label: '灭菌', value: 'mj' }, - { label: '复苏', value: 'fs' }, - { label: '封板', value: 'fb' }, - // { label: '质量分装', value: 'zlfz' }, +//罗开凡新增 +import kbyq from "./StepComponents/ry/kbyq.vue";//溶液-空白仪器 +import kbsjgsp from "./StepComponents/ry/kbsjgsp.vue";//溶液-空白(试剂/供试品) +import kb from "./StepComponents/ry/kb.vue";//溶液-空白 +import jr from "./StepComponents/ry/jr.vue";//溶液-加热 +//罗开凡新增 + + +import { public_templateStepList } from '@/api/business/public/public'; + + +// const stepTypes = [ +// { label: '操作地点', value: 'czdd' }, +// { label: '操作方法', value: 'czhj' }, +// { label: '选择容器', value: 'xzrq' }, +// { label: '加入溶液', value: 'jrry' }, +// { label: '天平校验(单点)', value: 'tpjydd' }, +// { label: '天平校验(双点)', value: 'tpjysd' }, +// { label: '取用物质', value: 'qywz' }, +// { label: '称量(非传值)', value: 'clfcz' }, +// { label: '称量(传值)', value: 'clcz' }, +// { label: '标定(体积)', value: 'bdtj' }, +// { label: '标定(质量)', value: 'bdzl' }, +// { label: '调节PH(传值)', value: 'tjphcz' }, +// { label: '调节PH(非传值)', value: 'tjphfcz' }, +// { label: '离心', value: 'lx' }, +// { label: '恒温混匀', value: 'hwhy' }, +// { label: '振摇混匀', value: 'zyhy' }, +// { label: '涡旋混匀', value: 'wxhy' }, +// { label: '颠倒混匀', value: 'ddhy' }, +// { label: '研磨', value: 'ym' }, +// { label: '搅拌', value: 'jb' }, +// { label: '加热搅拌', value: 'jrjb' }, +// { label: '超声', value: 'cs' }, +// { label: '水浴', value: 'sy' }, +// { label: '正压', value: 'zy' }, +// { label: '氮吹', value: 'dc' }, +// { label: '解冻', value: 'jd' }, +// { label: '静置', value: 'jz' }, +// { label: '过滤(自动)', value: 'glzd' }, +// { label: '过滤(手动)', value: 'glsd' }, +// { label: '孵育', value: 'fy' }, +// { label: '取出原药', value: 'qcyy' }, +// { label: '复溶(多容器)', value: 'frdrq' }, +// { label: '复溶', value: 'fr' }, +// { label: '合并', value: 'hb' }, +// { label: '染色', value: 'rs' }, +// { label: '计数', value: 'js' }, +// { label: '灭菌', value: 'mj' }, +// { label: '复苏', value: 'fs' }, +// { label: '封板', value: 'fb' }, +// { label: '质量分装', value: 'zlfz' }, -]; +// ]; export default { - inject: ['templateFillType'], + inject: ['templateFillType','templateData'], name: 'Step', props: { formData: { @@ -130,7 +141,7 @@ export default { data() { return { stepSelectConfig: { - options: stepTypes, + options: [], fillType: "preFill", placeholder: "请选择步骤类型" }, @@ -164,6 +175,7 @@ export default { Jrjb, Cs, Sy, + Zy, Dc, Jd, Jz, @@ -180,6 +192,12 @@ export default { Fs, Fb, Zlfz, + //罗开凡新增 + kbyq, + kbsjgsp, + kb, + jr + //罗开凡新增 }, computed: { stepComponentMap() { @@ -207,6 +225,7 @@ export default { 'jb': 'Jb', 'jrjb': 'Jrjb', 'sy': 'Sy', + 'zy': 'Zy', 'cs': 'Cs', 'dc': 'Dc', 'jd': 'Jd', @@ -224,6 +243,14 @@ export default { 'fs': 'Fs', 'fb': 'Fb', 'zlfz': 'Zlfz', + + //罗开凡新增 + 'kbyq': 'kbyq', + 'kbsjgsp': 'kbsjgsp', + 'kb': 'kb', + 'jr': 'jr', + // 'fz': 'fz', + //罗开凡新增 } } return this.componentMap @@ -242,6 +269,7 @@ export default { // // 默认添加一个步骤 // this.addStep() // } + this.getStepList() }, watch: { // steps: { @@ -263,6 +291,17 @@ export default { } }, methods: { + getStepList(){ + debugger + public_templateStepList({templateId:this.templateData.templateId}).then(response => { + let options = [] + _.forEach(response.data,(item)=>{ + options.push({ label: item.name, value: item.sn }) + }) + debugger + this.stepSelectConfig.options = options + }); + }, isShowAddStep() { return this.templateFillType === 'preFill'; }, diff --git a/src/components/Template/StepComponents/ry/jr.vue b/src/components/Template/StepComponents/ry/jr.vue new file mode 100644 index 0000000..5cdb4c9 --- /dev/null +++ b/src/components/Template/StepComponents/ry/jr.vue @@ -0,0 +1,36 @@ + + + + + + \ No newline at end of file diff --git a/src/components/Template/StepComponents/ry/kb.vue b/src/components/Template/StepComponents/ry/kb.vue new file mode 100644 index 0000000..a1545c9 --- /dev/null +++ b/src/components/Template/StepComponents/ry/kb.vue @@ -0,0 +1,36 @@ + + + + + + \ No newline at end of file diff --git a/src/components/Template/StepComponents/ry/kbsjgsp.vue b/src/components/Template/StepComponents/ry/kbsjgsp.vue new file mode 100644 index 0000000..4f938e5 --- /dev/null +++ b/src/components/Template/StepComponents/ry/kbsjgsp.vue @@ -0,0 +1,52 @@ + + + + + + \ No newline at end of file diff --git a/src/components/Template/StepComponents/ry/kbyq.vue b/src/components/Template/StepComponents/ry/kbyq.vue new file mode 100644 index 0000000..40f25ff --- /dev/null +++ b/src/components/Template/StepComponents/ry/kbyq.vue @@ -0,0 +1,52 @@ + + + + + + \ No newline at end of file diff --git a/src/views/business/template/list.vue b/src/views/business/template/list.vue index 80ab658..5b017a6 100644 --- a/src/views/business/template/list.vue +++ b/src/views/business/template/list.vue @@ -317,6 +317,7 @@ export default { this.tableDialog.title = '表单配置' this.tableDialog.sn = row.sn this.tableDialog.templateData.bdmc =this.$i18n.locale === 'zh_CN'? row.name:row.nameEn + this.tableDialog.templateData.templateId = row.id this.tableDialog.visible = true }, getList() { From c36c1f86e7e4b9007c077a2aace55192678adce5 Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Sat, 28 Feb 2026 16:48:07 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20[=E6=AD=A5=E9=AA=A4=E7=AE=A1?= =?UTF-8?q?=E7=90=86]=20=E8=A1=A8=E9=85=8D=E7=BD=AE=E6=AD=A5=E9=AA=A4?= =?UTF-8?q?=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Template/Step.vue | 10 ++++- .../Template/StepComponents/b/jrry_b.vue | 46 ++++++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 src/components/Template/StepComponents/b/jrry_b.vue diff --git a/src/components/Template/Step.vue b/src/components/Template/Step.vue index fcaac4e..b0638a8 100644 --- a/src/components/Template/Step.vue +++ b/src/components/Template/Step.vue @@ -81,6 +81,8 @@ import kb from "./StepComponents/ry/kb.vue";//溶液-空白 import jr from "./StepComponents/ry/jr.vue";//溶液-加热 //罗开凡新增 +//表配置 +import jrry_b from './StepComponents/b/jrry_b.vue';//表配置-加入溶液 import { public_templateStepList } from '@/api/business/public/public'; @@ -196,8 +198,11 @@ export default { kbyq, kbsjgsp, kb, - jr + jr, //罗开凡新增 + + //表配置 + jrry_b, }, computed: { stepComponentMap() { @@ -251,6 +256,9 @@ export default { 'jr': 'jr', // 'fz': 'fz', //罗开凡新增 + + //标配配置 + 'jrry_b': 'jrry_b', } } return this.componentMap diff --git a/src/components/Template/StepComponents/b/jrry_b.vue b/src/components/Template/StepComponents/b/jrry_b.vue new file mode 100644 index 0000000..b991793 --- /dev/null +++ b/src/components/Template/StepComponents/b/jrry_b.vue @@ -0,0 +1,46 @@ + + + + + + \ No newline at end of file From 048eddbbe53164da71fe7b1633e24fab19fad299 Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Mon, 2 Mar 2026 16:05:47 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20[=E6=AD=A5=E9=AA=A4=E7=AE=A1?= =?UTF-8?q?=E7=90=86]=20=E8=A1=A8=E9=85=8D=E7=BD=AE=E7=A6=BB=E5=BF=83-?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=BA=B6=E6=B6=B2=E7=A6=BB=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Template/Step.vue | 4 +++- src/components/Template/StepComponents/ry/lx.vue | 23 ++++++++++++++++++----- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/src/components/Template/Step.vue b/src/components/Template/Step.vue index b0638a8..3e9c0e7 100644 --- a/src/components/Template/Step.vue +++ b/src/components/Template/Step.vue @@ -12,7 +12,7 @@ -
@@ -83,6 +83,7 @@ import jr from "./StepComponents/ry/jr.vue";//溶液-加热 //表配置 import jrry_b from './StepComponents/b/jrry_b.vue';//表配置-加入溶液 +//表配置-离心:使用溶液离心 import { public_templateStepList } from '@/api/business/public/public'; @@ -259,6 +260,7 @@ export default { //标配配置 'jrry_b': 'jrry_b', + 'lx_b': 'lx', } } return this.componentMap diff --git a/src/components/Template/StepComponents/ry/lx.vue b/src/components/Template/StepComponents/ry/lx.vue index 2253e91..4bb113d 100644 --- a/src/components/Template/StepComponents/ry/lx.vue +++ b/src/components/Template/StepComponents/ry/lx.vue @@ -9,12 +9,18 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js'; export default { mixins: [stepMixins], + props: { + sn: { + type: String, + default: 'lx', + }, + }, components: { StepFormPackage }, computed: { formConfig() { - return [{ + let config = [{ config: { text1: { label: "使用离心机", @@ -116,12 +122,19 @@ export default { type: "button", buttonName: "开始", }, - text9: { - type: "text", - label: "。", - }, } }] + if(this.sn==='lx_b'){ + config[0].config.remark = { + type: "input", + fillType: "actFill", + } + } + config[0].config.text9 = { + type: "text", + label: "。", + } + return config } }, } From 1100e83788f46af07f4f905a34cd91f0187e5107 Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Mon, 2 Mar 2026 16:07:31 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=20[=E6=AD=A5=E9=AA=A4=E7=AE=A1?= =?UTF-8?q?=E7=90=86]=20=E5=88=A0=E9=99=A4debugger?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Template/Step.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/components/Template/Step.vue b/src/components/Template/Step.vue index 3e9c0e7..dcabb2a 100644 --- a/src/components/Template/Step.vue +++ b/src/components/Template/Step.vue @@ -302,13 +302,11 @@ export default { }, methods: { getStepList(){ - debugger public_templateStepList({templateId:this.templateData.templateId}).then(response => { let options = [] _.forEach(response.data,(item)=>{ options.push({ label: item.name, value: item.sn }) }) - debugger this.stepSelectConfig.options = options }); },