diff --git a/src/views/business/comps/template/comps/dl/DL022.vue b/src/views/business/comps/template/comps/dl/DL022.vue
index 6891ae9..ac8240a 100644
--- a/src/views/business/comps/template/comps/dl/DL022.vue
+++ b/src/views/business/comps/template/comps/dl/DL022.vue
@@ -13,7 +13,7 @@
-
diff --git a/src/views/business/comps/template/comps/dl/DL023.vue b/src/views/business/comps/template/comps/dl/DL023.vue
index 7232e25..c921e06 100644
--- a/src/views/business/comps/template/comps/dl/DL023.vue
+++ b/src/views/business/comps/template/comps/dl/DL023.vue
@@ -22,9 +22,9 @@
-
+ :formData="formData" />
@@ -250,73 +250,6 @@ export default {
this.$refs.tableRef.updateDataSourceByRowIndex(rowIndex, params)
}
},
- onFormSelect(fields) {
- this.onHandleBlur(fields)
- },
- //选择table header下拉框也要更新体积
- onHeaderSelectChange(data) {
- const { key, headerSelectFields, dataSource = [] } = data;
- const keys = [
- 'targetStartSolutionVolumeUnit',
- 'targetDiluentVolumeUnit',
- 'targetSolutionConcentrationUnit',
- 'targetSolutionVolumeUnit',
- ]
- if (keys.includes(key)) {
- const { targetStartSolution, subTargetStartSolution } = this.$refs.swypyjInfoRef?.getFilledFormData();
- const params = {
- subTargetStartSolution,
- headerSelectFields
- }
- this.batchUpdateTargetStartSolutionVolume(dataSource, targetStartSolution, params)
- }
- },
- beforeSaveRecord(data) {
- const formFields = this.$refs.swypyjInfoRef?.getFilledFormData();
- this.onCommonVerifyNdException(formFields, data);
- },
- configComplete(val) {
- const { rowData, headerSelectFields } = val;
- //计算实际目标溶液体积(实际起始溶液体积+实际稀释液体积)
- const { total, unit } = addTj([rowData.actStartSolutionVolume, rowData.actDiluentVolume], [headerSelectFields.actStartSolutionVolumeUnit, headerSelectFields.actDiluentVolumeUnit])
- let postData = {
- mc: null,
- bh: rowData.targetSolutionCode + rowData.subTargetSolutionCode,
- nd: rowData.actSolutionConcentration,//实际目标溶液浓度
- nddw: headerSelectFields.actSolutionConcentrationUnit,
- studySubjectId: this.formData.studySubjectId,
- studyFormId: this.formData.id,
- studyId: this.formData.studyId,
- kc: total,
- kcdw: unit,
- }
- this.configCompleteRequest(postData);
- },
- //分装回调
- subPackageSubmit(data) {
- const { fzsj, rowData, headerSelectFields } = data;
- const { fzList = [], dw = "", mybh } = fzsj;
- if (fzList && fzList.length > 0) {
- const list = fzList.map((item) => {
- return {
- bh: mybh + item.preCode + item.subCode,
- kc: item.num,
- kcdw: dw,
- }
- })
- let postData = {
- studyId: this.formData.studyId,
- studyFormId: this.formData.id,
- bh: mybh,
- nd: rowData.actSolutionConcentration || 0,
- nddw: headerSelectFields.actSolutionConcentrationUnit,
- studySubjectId: this.formData.studySubjectId,
- studyFormId: this.formData.id,
- list: list
- }
- this.subPackageRequest(postData);
- }
- },
//获取已填写的表单数据
getFilledFormData() {
return this.getFilledFormDataByRefs(["baseInfoRef", "swypyjInfoRef", "remarkRef", "tableRef"])
diff --git a/src/views/business/comps/template/comps/dl/DL024.vue b/src/views/business/comps/template/comps/dl/DL024.vue
index a7177d2..d88d88b 100644
--- a/src/views/business/comps/template/comps/dl/DL024.vue
+++ b/src/views/business/comps/template/comps/dl/DL024.vue
@@ -14,9 +14,8 @@
-
@@ -26,7 +25,7 @@
:formData="tableFormData"
operationWidth = "80px"
:prefixKey = "`table`"
- fieldItemLabel = "template.dl.dl024.gcqk"
+ fieldItemLabel = "template.dl.dl024.xbpyxx"
:showAddRow="false"
:showOperation="false"
>
@@ -213,33 +212,18 @@ export default {
const bdnr = JSON.parse(row.bdnr)
// 获取剂量组列表数据
const stepTableFormData = bdnr.stepTableFormData || []
-
- if (stepTableFormData.length === 0) {
- // 清空当前的换液情况列表数据
- this.$set(this.formData, 'stepTableFormData', [])
- this.$message.warning('前序表单中没有细胞编号数据')
- return
- }
// 从剂量组数据中提取细胞编号
const itemData = stepTableFormData.map(item => ({
xbbh: item.targetSolutionCode+item.subTargetSolutionCode, // 细胞编号
+ id:this.getuuid(),
}))
- // 使用 $set 更新 formData,触发 CustomTable 的响应式更新
- this.$set(this.formData, 'stepTableFormData', itemData)
-
-
+ this.$refs.tableRef.updateDataSource(itemData);
this.$refs.swypyjInfoRef.updateFormData('pykssj', bdnr.pykssj);
-
- this.$message.success(`已从前序表单加载 ${itemData.length} 条细胞编号数据`)
} catch (error) {
- this.$set(this.formData, 'stepTableFormData', [])
console.error('解析前序表单数据失败:', error)
this.$message.error('解析前序表单数据失败')
}
},
- onFormSelect(fields){
- this.onHandleBlur(fields)
- },
//获取已填写的表单数据
getFilledFormData() {
return this.getFilledFormDataByRefs(["baseInfoRef", "swypyjInfoRef","remarkRef","tableRef"])