From 958f4fc089a4e9bb85c1827280e8952f1d284890 Mon Sep 17 00:00:00 2001
From: lslaiwy <1209768238@qq.com>
Date: Fri, 6 Mar 2026 23:00:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86]DL024?=
=?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=8CDL016-DL021=E5=AF=B9=E6=AF=94?=
=?UTF-8?q?=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/lang/en/template/dl.js | 14 +++
src/lang/zh/template/dl.js | 14 +++
.../business/comps/template/comps/dl/DL016.vue | 21 ++--
.../business/comps/template/comps/dl/DL017.vue | 20 ++--
.../business/comps/template/comps/dl/DL018.vue | 43 ++++---
.../business/comps/template/comps/dl/DL019.vue | 22 +++-
.../business/comps/template/comps/dl/DL024.vue | 123 +++++++++++----------
7 files changed, 159 insertions(+), 98 deletions(-)
diff --git a/src/lang/en/template/dl.js b/src/lang/en/template/dl.js
index bacd2b4..9bf994a 100644
--- a/src/lang/en/template/dl.js
+++ b/src/lang/en/template/dl.js
@@ -211,6 +211,8 @@ export default {
xybh:'悬液编号',
rsks:'染色开始',
rsjs:'染色结束',
+ ksButton:'开始',
+ jsButton:'结束',
zs:'左上（个）',
ys:'右上（个）',
zy:'左下（个）',
@@ -291,4 +293,16 @@ export default {
ksButton:'开始',
jsButton:'结束',
},
+ dl024: {
+ sydd:'实验地点',
+ czsj:'操作时间',
+ dlbz: '备注',
+ xbpyxx: '细胞培养信息',
+
+ qxbd:'前序表单',
+ pykssj:'培养开始时间',
+ pyjssj:'培养结束时间',
+ jsButton:'培养结束时间',
+ xbbh:'细胞编号',
+ },
}
diff --git a/src/lang/zh/template/dl.js b/src/lang/zh/template/dl.js
index c63f69c..bdc2575 100644
--- a/src/lang/zh/template/dl.js
+++ b/src/lang/zh/template/dl.js
@@ -212,6 +212,8 @@ export default {
xybh:'悬液编号',
rsks:'染色开始',
rsjs:'染色结束',
+ ksButton:'开始',
+ jsButton:'结束',
zs:'左上（个）',
ys:'右上（个）',
zy:'左下（个）',
@@ -291,4 +293,16 @@ export default {
ksButton:'开始',
jsButton:'结束',
},
+ dl024: {
+ sydd:'实验地点',
+ czsj:'操作时间',
+ dlbz: '备注',
+ xbpyxx: '细胞培养信息',
+
+ qxbd:'前序表单',
+ pykssj:'培养开始时间',
+ pyjssj:'培养结束时间',
+ jsButton:'培养结束时间',
+ xbbh:'细胞编号',
+ },
}
diff --git a/src/views/business/comps/template/comps/dl/DL016.vue b/src/views/business/comps/template/comps/dl/DL016.vue
index 2cbb005..8953cae 100644
--- a/src/views/business/comps/template/comps/dl/DL016.vue
+++ b/src/views/business/comps/template/comps/dl/DL016.vue
@@ -21,7 +21,7 @@
fieldItemLabel="template.common.operationSteps" @blur="onHandleTableBlur"
@beforeSaveRecord = "beforeSaveRecord" @onRegentSubmit="(e) => onRegentSubmit"
:showAddRow="false" :showOperation="false"
- ref="stepTableRef" :columns="stepColumns" :formData="formData">
+ ref="qcxjjyqkTableRef" :columns="stepColumns" :formData="formData">
@@ -160,6 +160,7 @@ export default {
bodyType: "input",
bodyFillType: "actFill",
width: 180,
+ disabled:true
},
{
label: "template.dl.dl016.xybh",
@@ -168,7 +169,7 @@ export default {
bodyType: "input",
bodyFillType: "actFill",
bodyMaxlength: 10,
- // bodyDisabled: true,
+ disabled:true
},
{
label: "template.dl.dl016.qsxjjrl",
@@ -193,14 +194,14 @@ export default {
onRegentSubmit(e) {
const { selectInfo, key, rowIndex } = e
const { row } = selectInfo
-
- if (key === 'yqbh') {
+ console.log('selectInfo==============',selectInfo)
+ if (key === 'qxbd') {
const params = {
- yqmc: row.mc,
- yqxh: row.xh,
- xccsjzjdrq: row.jzrq
+ jlzb: row.mc,
+ xybh: row.xh,
+ xccsjzjdrq: ''
}
- // this.$refs.yqsyTableRef.updateDataSourceByRowIndex(rowIndex, params)
+ this.$refs.qcxjjyqkTableRef.updateDataSourceByRowIndex(rowIndex, params)
}
},
//选择table header下拉框也要更新体积
@@ -269,11 +270,11 @@ export default {
},
//获取已填写的表单数据
getFilledFormData() {
- return this.getFilledFormDataByRefs(["baseInfoRef", "swypyjInfoRef", "stepTableRef", "stepRef","remarkRef"])
+ return this.getFilledFormDataByRefs(["baseInfoRef", "swypyjInfoRef", "qcxjjyqkTableRef", "stepRef","remarkRef"])
},
//获取填写完成的表单数据
async getFormData() {
- let content = await this.validFormFields(["baseInfoRef", "swypyjInfoRef", "stepTableRef", "stepRef","remarkRef"]);
+ let content = await this.validFormFields(["baseInfoRef", "swypyjInfoRef", "qcxjjyqkTableRef", "stepRef","remarkRef"]);
return content;
},
getResource() {
diff --git a/src/views/business/comps/template/comps/dl/DL017.vue b/src/views/business/comps/template/comps/dl/DL017.vue
index 8025b07..0c2ddef 100644
--- a/src/views/business/comps/template/comps/dl/DL017.vue
+++ b/src/views/business/comps/template/comps/dl/DL017.vue
@@ -57,7 +57,7 @@ import TableOpertaionDelete from "@/components/Template/operation/TableOpertaion
export default {
name: "DL017",
dicts: [
- 'business_dl_qsxjbltj','business_tjdw','business_dl_sjqszqk','business_dl_sjqcdqk','business_dl_sjqqtqk'
+ 'business_dl_qsxjbltj','business_tjdw','business_dl_sjqszqk','business_dl_sjqcdqk','business_dl_sjqqtqk','business_dl_xbmc'
],
components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable,TableOpertaionDelete },
mixins: [templateMixin],
@@ -111,8 +111,11 @@ export default {
config: {
sydd: {
label: 'template.dl.dl017.sydd',
- type: "input",
- fillType: "actFill",
+ type: 'select',
+ fillType: 'actFill',
+ options: this.getDictOptions('business_dl_xbmc'),
+ otherCode: 'xbmcOther',
+ showOtherLabel:false
},
}
},
@@ -158,7 +161,7 @@ export default {
}
]
},
- // 秋水仙碱加液情况
+ // 细胞操作情况
stepColumns() {
return [
{
@@ -278,14 +281,13 @@ export default {
onRegentSubmit(e) {
const { selectInfo, key, rowIndex } = e
const { row } = selectInfo
-
+ console.log('selectInfo==============',selectInfo)
if (key === 'yqbh') {
const params = {
- yqmc: row.mc,
- yqxh: row.xh,
- xccsjzjdrq: row.jzrq
+ jlzb: row.mc,
+ xybh: row.xh,
}
- // this.$refs.yqsyTableRef.updateDataSourceByRowIndex(rowIndex, params)
+ this.$refs.yqsyTableRef.updateDataSourceByRowIndex(rowIndex, params)
}
},
//选择table header下拉框也要更新体积
diff --git a/src/views/business/comps/template/comps/dl/DL018.vue b/src/views/business/comps/template/comps/dl/DL018.vue
index 4691f20..4a245a3 100644
--- a/src/views/business/comps/template/comps/dl/DL018.vue
+++ b/src/views/business/comps/template/comps/dl/DL018.vue
@@ -19,7 +19,7 @@
+
-
-
+
+
-
-
-
+
@@ -57,7 +54,7 @@ import { debounce } from 'lodash-es'
import TableOpertaionDelete from "@/components/Template/operation/TableOpertaionDelete.vue"
export default {
- name: "DL024",
+ name: "dl024",
dicts: [
'business_dl_xbmc'
],
@@ -106,10 +103,23 @@ export default {
disabled: true,
},
}
+ },{
+ type: "cellItem",
+ label: 'template.dl.dl024.sydd',
+ config: {
+ sydd: {
+ label: 'template.dl.dl024.sydd',
+ type: 'select',
+ fillType: 'actFill',
+ options: this.getDictOptions('business_dl_xbmc'),
+ otherCode: 'xbmcOther',
+ showOtherLabel:false
+ },
+ }
},
- {
+ {
type: "cellItem",
- label: 'template.dl.dl021.czsj',
+ label: 'template.dl.dl024.czsj',
config: {
startDate: {
label: 'template.common.startTime',
@@ -124,55 +134,50 @@ export default {
]
},
- // 观察情况
- tableColumns() {
- return [{
- label: 'template.dl.dl021.bpbh',
- prop: 'bpbh',
- bodyType: 'input',
- bodyFillType: 'actFill',
- width: 100,
- bodyMaxlength: 50,
- },{
- label: 'template.dl.dl021.gcxps',
- prop: 'gcxps',
- bodyType: 'input',
- bodyFillType: 'actFill',
- width: 100,
- bodyMaxlength: 50,
- },{
- label: 'template.dl.dl021.zqxxbs',
- prop: 'zqxxbs',
- bodyType: 'input',
- bodyFillType: 'actFill',
- width: 80,
- bodyMaxlength: 50,
- }]
- },
- // 观察情况
- stepFormConfig() {
- return [
+ // 细胞培养信息
+ stepFormConfig(){
+ return [
{
- type: "step",
+ type: "cellItem",
config: {
- xbmc: {
- label: 'template.dl.dl021.xbmc',
- type: 'select',
- fillType: 'actFill',
- options: this.getDictOptions('business_dl_xbmc'),
- otherCode: 'xbmcOther',
- showOtherLabel:false
- },
- xwj: {
+ qxbd: {
// span:1,
- label: 'template.dl.dl021.xwj',
+ label: 'template.dl.dl024.qxbd',
type: 'qxbd',
fillType: 'actFill',
filledCodes:['bdmc','bdbh'],
},
+ pykssj:{
+ label: 'template.dl.dl024.pykssj',
+ type: 'input',
+ fillType: 'actFill',
+ subType: 'button',
+ subKey: 'pyjssj',
+ buttonName: 'template.dl.dl024.jsButton',
+ },
+ pyjssj: {
+ label: 'template.dl.dl024.pyjssj',
+ type: 'input',
+ fillType: 'actFill',
+ subType: 'button',
+ subKey: 'pyjssj',
+ buttonName: 'template.dl.dl024.jsButton',
+ },
}
}
]
+ },
+ tableColumns() {
+ return [
+ {
+ label: 'template.dl.dl024.xbbh',
+ prop: 'xbbh',
+ bodyType: 'input',
+ bodyFillType: 'actFill',
+ width: 100,
+ bodyMaxlength: 50,
+ }
+ ]
},
},
data() {
@@ -183,11 +188,11 @@ export default {
mounted() {
},
methods: {
- // 选择显微镜预留
+ // 选择仪器编号预留
onRegentSubmit(e) {
const { selectInfo, key, rowIndex } = e
const { row } = selectInfo
- console.log('选择显微镜预留===',row)
+ console.log('选择仪器编号预留===',row)
// if (key === 'yqbh' && this.$refs.yqsyTableRef) {
// const params = {
// yqmc: row.mc,