畸变类型以代号填写：断片(b)、裂隙(g)、互换及射体(t)、环状染色体(r)、多倍体(p)、双着丝点染色体(d)、内复制(e)、染色体碎化(z)、缺失(l)、粘着(s)、微小体(m)。
@@ -26,9 +26,9 @@
-
+
+
@@ -154,42 +154,42 @@ export default {
prop: 'bpbh',
bodyType: 'input',
bodyFillType: 'actFill',
- width: 100,
+ width: 200,
bodyMaxlength: 50,
}, {
label: 'template.dl.dl022.gcxps',
prop: 'gcxps',
bodyType: 'inputNumber',
bodyFillType: 'actFill',
- width: 100,
+ width: 200,
bodyMaxlength: 10,
}, {
label: 'template.dl.dl022.jgjxjbs',
prop: 'jgjxjbs',
bodyType: 'inputNumber',
bodyFillType: 'actFill',
- width: 80,
+ width: 200,
disabled: true
}, {
label: 'template.dl.dl022.lxjbs',
prop: 'lxjbs',
bodyType: 'inputNumber',
bodyFillType: 'actFill',
- width: 100,
+ width: 200,
disabled: true
}, {
label: 'template.dl.dl022.dbtjbs',
prop: 'dbtjbs',
bodyType: 'inputNumber',
bodyFillType: 'actFill',
- width: 100,
+ width: 200,
disabled: true
}, {
label: 'template.dl.dl022.nfzjbs',
prop: 'nfzjbs',
bodyType: 'inputNumber',
bodyFillType: 'actFill',
- width: 80,
+ width: 200,
disabled: true
}, {
label: 'template.dl.dl022.jblx',
@@ -223,8 +223,6 @@ export default {
},
handleEdit(){
const {currentItem, currentRowIndex} = this;
-
-
currentItem.isComplete = !currentItem.isComplete;
this.$refs.tableRef.updateDataSourceByRowIndex(currentRowIndex, currentItem)
},
@@ -240,7 +238,7 @@ export default {
EventBus.$emit('showEditSignDialog', { uuid: this.uuid });
this.currentItem = item;
this.currentRowIndex = rowIndex;
-
+
},
// 新增行
onAddRow() {
@@ -248,20 +246,6 @@ export default {
jblx: [{value: undefined}],
})
},
- // 选择显微镜预留
- onRegentSubmit(e) {
- const { selectInfo, key, rowIndex } = e
- const { row } = selectInfo
- console.log('选择显微镜预留===', row)
- // if (key === 'yqbh' && this.$refs.yqsyTableRef) {
- // const params = {
- // yqmc: row.mc,
- // yqxh: row.xh,
- // xccsjzjdrq: row.jzrq
- // }
- // this.$refs.yqsyTableRef.updateDataSourceByRowIndex(rowIndex, params)
- // }
- },
onFormSelect(fields) {
this.onHandleBlur(fields)
},
@@ -363,7 +347,12 @@ export default {
diff --git a/src/views/business/comps/template/comps/dl/DL023.vue b/src/views/business/comps/template/comps/dl/DL023.vue
index 431893c..d92c87f 100644
--- a/src/views/business/comps/template/comps/dl/DL023.vue
+++ b/src/views/business/comps/template/comps/dl/DL023.vue
@@ -47,7 +47,7 @@ import TableOpertaionDelete from "@/components/Template/operation/TableOpertaion
export default {
name: "dl023",
dicts: [
- 'business_dl_xbmc'
+ 'business_dl_xbmc',"business_sydd"
],
components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable, TableOpertaionDelete },
mixins: [templateMixin],
@@ -100,13 +100,11 @@ export default {
//yqsyxxColumns仪器使用信息
yqsyxxColumns() {
return [{
- label: 'template.dl.dl023.yqbh',
- prop: 'yqbh',
- bodyType: 'input',
- bodyFillType: 'actFill',
- bodyDisabled: true,
- disabled: true
- }, {
+ label: 'template.dl.dl023.yqbh',
+ prop: 'yqbh',
+ bodyType: 'yq',
+ bodyFillType: 'actFill'
+ }, {
label: 'template.dl.dl023.yqmc',
prop: 'yqmc',
bodyType: 'input',
@@ -153,7 +151,7 @@ export default {
label: 'template.dl.dl023.sydd',
type: 'select',
fillType: 'actFill',
- options: this.getDictOptions('business_dl_sydd'),
+ options: this.getDictOptions('business_sydd'),
otherCode: 'syddOther',
showOtherLabel: false
},
@@ -226,15 +224,14 @@ export default {
onRegentSubmit(e) {
const { selectInfo, key, rowIndex } = e
const { row } = selectInfo
- console.log('选择仪器编号预留===', row)
- // if (key === 'yqbh' && this.$refs.yqsyTableRef) {
- // const params = {
- // yqmc: row.mc,
- // yqxh: row.xh,
- // xccsjzjdrq: row.jzrq
- // }
- // this.$refs.yqsyTableRef.updateDataSourceByRowIndex(rowIndex, params)
- // }
+ if (key === 'yqbh' && this.$refs.tableRef) {
+ const params = {
+ yqmc: row.mc,
+ yqxh: row.xh,
+ xcrq: row.jzrq,
+ }
+ this.$refs.tableRef.updateDataSourceByRowIndex(rowIndex, params)
+ }
},
onFormSelect(fields) {
this.onHandleBlur(fields)
diff --git a/src/views/business/comps/template/comps/dl/DL024.vue b/src/views/business/comps/template/comps/dl/DL024.vue
index 228d265..06f4d26 100644
--- a/src/views/business/comps/template/comps/dl/DL024.vue
+++ b/src/views/business/comps/template/comps/dl/DL024.vue
@@ -15,7 +15,7 @@
({
+ xbbh: item.jlzb || '', // 细胞编号
+ }))
+ // 使用 $set 更新 formData，触发 CustomTable 的响应式更新
+ this.$set(this.formData, 'stepTableFormData', itemData)
+
+ this.$message.success(`已从前序表单加载 ${itemData.length} 条细胞编号数据`)
+ } catch (error) {
+ this.$set(this.formData, 'stepTableFormData', [])
+ console.error('解析前序表单数据失败:', error)
+ this.$message.error('解析前序表单数据失败')
+ }
+ // if (key === 'qxbd' && this.$refs.tableRef) {
// const params = {
- // yqmc: row.mc,
+ // yqmc: row.xbbh,
// yqxh: row.xh,
// xccsjzjdrq: row.jzrq
// }
- // this.$refs.yqsyTableRef.updateDataSourceByRowIndex(rowIndex, params)
+ // 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"])
@@ -280,9 +250,18 @@ export default {
},
getResource() {
//使用的试剂、仪器
- // stepRef不存在，直接返回空数组
- this.resourceTmp = []
- this.yqResourceTmp = []
+ const stepResource = this.$refs.stepRef.getStepResource()
+ const tableList = this.$refs.qcxjjyqkTableRef?.getFilledFormData()?.stepTableFormData || []
+ // 从操作步骤中提取试剂和仪器资源
+ this.resourceTmp = stepResource.sjResource || []
+ const tableFromHyqk = tableList
+ .filter(item => item.xybh)
+ .map(item => ({
+ bh: item.xybh,
+ type: 'cell'
+ }))
+
+ this.resourceTmp = [...this.resourceTmp, ...tableFromHyqk]
return this.resourceTmp;
},
//保存
From cb1a56e958737cc89c0890f2adab276ce8f786bd Mon Sep 17 00:00:00 2001
From: luojie <125330818@qq.com>
Date: Fri, 13 Mar 2026 09:18:03 +0800
Subject: [PATCH 2/7] =?UTF-8?q?feat:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86]?=
=?UTF-8?q?[update]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../business/comps/template/comps/dl/DL018.vue | 203 ++++++++++-----------
1 file changed, 101 insertions(+), 102 deletions(-)
diff --git a/src/views/business/comps/template/comps/dl/DL018.vue b/src/views/business/comps/template/comps/dl/DL018.vue
index 0353d8f..e1442fe 100644
--- a/src/views/business/comps/template/comps/dl/DL018.vue
+++ b/src/views/business/comps/template/comps/dl/DL018.vue
@@ -11,24 +11,22 @@
-
+
-
-
-
-
+
@@ -56,10 +54,10 @@ import TableOpertaionDelete from "@/components/Template/operation/TableOpertaion
export default {
name: "DL018",
- dicts: [
- 'business_dl_qsxjbltj','business_tjdw'
- ],
- components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable,TableOpertaionDelete },
+ dicts: [
+ 'business_dl_qsxjbltj', 'business_tjdw'
+ ],
+ components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable, TableOpertaionDelete },
mixins: [templateMixin],
props: {
fillType: {
@@ -68,13 +66,13 @@ export default {
},
},
computed: {
- // 表格数据
- tableFormData() {
- return {
- stepTableFormData: this.formData.stepTableFormData || [],
- headerSelectFields: {}
- }
- },
+ // 表格数据
+ tableFormData() {
+ return {
+ stepTableFormData: this.formData.stepTableFormData || [],
+ headerSelectFields: {}
+ }
+ },
// 备注表单配置
remarkConig() {
return [
@@ -139,7 +137,7 @@ export default {
}
]
},
- // 细胞信息
+ // 细胞信息
swypyjInfoFormConfig() {
return [
{
@@ -150,16 +148,16 @@ export default {
label: 'template.dl.dl018.qxbd',
type: 'qxbd',
fillType: 'actFill',
- qxbdType:'DL014',
- filledCodes:['bdmc','bdbh'],
+ qxbdType: 'DL014',
+ filledCodes: ['bdmc', 'bdbh'],
},
- bltj: {
+ bltj: {
label: 'template.dl.dl018.bltj',
type: 'select',
fillType: 'preFill',
options: this.getDictOptions('business_dl_qsxjbltj'),
otherCode: 'bltjOther',
- showOtherLabel:false
+ showOtherLabel: false
},
}
}
@@ -174,7 +172,7 @@ export default {
width: 180,
bodyType: "input",
bodyFillType: "actFill",
- disabled: true,
+ disabled: true,
bodyDisabled: true,
},
{
@@ -183,7 +181,7 @@ export default {
width: 180,
bodyType: "input",
bodyFillType: "actFill",
- disabled: true,
+ disabled: true,
bodyDisabled: true,
},
{
@@ -192,13 +190,14 @@ export default {
width: 180,
bodyType: "input",
bodyFillType: "actFill",
- // disabled: true,
- // showOtherLabel: false,
+ // disabled: true,
+ // showOtherLabel: false,
- bodySubType: 'button',
- subodySubKeybKey: 'rsks',
- bodySubButtonName: 'template.dl.dl018.ksButton',
- showBodySub:this.fillType === "actFill",
+ bodySubType: 'button',
+ bodySubFillType: 'actFill',
+ subodySubKeybKey: 'rsks',
+ bodySubButtonName: 'template.dl.dl018.ksButton',
+ showBodySub: this.fillType === "actFill",
},
{
label: "template.dl.dl018.rsjs",
@@ -206,13 +205,14 @@ export default {
width: 180,
bodyType: "input",
bodyFillType: "actFill",
- // disabled: true,
- // showOtherLabel: false,
+ // disabled: true,
+ // showOtherLabel: false,
- bodySubType: 'button',
- subodySubKeybKey: 'rsjs',
- bodySubButtonName: 'template.dl.dl018.jsButton',
- showBodySub:this.fillType === "actFill",
+ bodySubType: 'button',
+ bodySubFillType: 'actFill',
+ subodySubKeybKey: 'rsjs',
+ bodySubButtonName: 'template.dl.dl018.jsButton',
+ showBodySub: this.fillType === "actFill",
},
{
label: "template.dl.dl018.zs",
@@ -260,69 +260,69 @@ export default {
mounted() {
},
methods: {
- onRegentSubmit(e) {
- const { selectInfo, key, rowIndex } = e
- const { row } = selectInfo
- if (key === 'qxbd') {
- try {
- // 解析前序表单的内容
- const bdnr = JSON.parse(row.bdnr)
- // 获取剂量组列表数据
- const stepTableFormData = bdnr.jlzTableData || []
+ onRegentSubmit(e) {
+ const { selectInfo, key, rowIndex } = e
+ const { row } = selectInfo
+ if (key === 'qxbd') {
+ try {
+ // 解析前序表单的内容
+ const bdnr = JSON.parse(row.bdnr)
+ // 获取剂量组列表数据
+ const stepTableFormData = bdnr.jlzTableData || []
- if (stepTableFormData.length === 0) {
- // 清空当前的换液情况列表数据
- this.$set(this.formData, 'stepTableFormData', [])
- this.$message.warning('前序表单中没有剂量组数据')
- return
- }
+ if (stepTableFormData.length === 0) {
+ // 清空当前的换液情况列表数据
+ this.$set(this.formData, 'stepTableFormData', [])
+ this.$message.warning('前序表单中没有剂量组数据')
+ return
+ }
- // 从剂量组数据中提取剂量组别和悬液编号
- const itemData = stepTableFormData.map(item => ({
- jlzb: item.jlzb || '', // 剂量组别
- xybh: item.xybh || '', // 悬液编号
- rsks: '', //
- rsjs: '', //
- zs: '', //
- ys: '', //
- zy: '', //
- yx: '', //
- tj: '', //
- }))
- // 使用 $set 更新 formData，触发 CustomTable 的响应式更新
- this.$set(this.formData, 'stepTableFormData', itemData)
+ // 从剂量组数据中提取剂量组别和悬液编号
+ const itemData = stepTableFormData.map(item => ({
+ jlzb: item.jlzb || '', // 剂量组别
+ xybh: item.xybh || '', // 悬液编号
+ rsks: '', //
+ rsjs: '', //
+ zs: '', //
+ ys: '', //
+ zy: '', //
+ yx: '', //
+ tj: '', //
+ }))
+ // 使用 $set 更新 formData，触发 CustomTable 的响应式更新
+ this.$set(this.formData, 'stepTableFormData', itemData)
- this.$message.success(`已从前序表单加载 ${itemData.length} 条剂量组数据`)
- } catch (error) {
- this.$set(this.formData, 'stepTableFormData', [])
- console.error('解析前序表单数据失败:', error)
- this.$message.error('解析前序表单数据失败')
- }
- }
- },
- //选择table header下拉框也要更新体积
- onHeaderSelectChange(data){
- const {key, headerSelectFields,dataSource=[]} = data;
+ this.$message.success(`已从前序表单加载 ${itemData.length} 条剂量组数据`)
+ } catch (error) {
+ this.$set(this.formData, 'stepTableFormData', [])
+ console.error('解析前序表单数据失败:', error)
+ this.$message.error('解析前序表单数据失败')
+ }
+ }
+ },
+ //选择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();
+ if (keys.includes(key)) {
+ const { targetStartSolution, subTargetStartSolution } = this.$refs.swypyjInfoRef?.getFilledFormData();
const params = {
subTargetStartSolution,
headerSelectFields
}
- this.batchUpdateTargetStartSolutionVolume(dataSource,targetStartSolution,params)
+ this.batchUpdateTargetStartSolutionVolume(dataSource, targetStartSolution, params)
}
},
- beforeSaveRecord(data){
+ beforeSaveRecord(data) {
const formFields = this.$refs.swypyjInfoRef?.getFilledFormData();
- this.onCommonVerifyNdException(formFields,data);
+ this.onCommonVerifyNdException(formFields, data);
},
- configComplete(val) {
+ configComplete(val) {
const { rowData, headerSelectFields } = val;
//计算实际目标溶液体积(实际起始溶液体积+实际稀释液体积)
const { total, unit } = addTj([rowData.actStartSolutionVolume, rowData.actDiluentVolume], [headerSelectFields.actStartSolutionVolumeUnit, headerSelectFields.actDiluentVolumeUnit])
@@ -332,8 +332,8 @@ export default {
nd: rowData.actSolutionConcentration,//实际目标溶液浓度
nddw: headerSelectFields.actSolutionConcentrationUnit,
studySubjectId: this.formData.studySubjectId,
- studyFormId:this.formData.id,
- studyId:this.formData.studyId,
+ studyFormId: this.formData.id,
+ studyId: this.formData.studyId,
kc: total,
kcdw: unit,
}
@@ -342,30 +342,30 @@ export default {
//获取已填写的表单数据
getFilledFormData() {
- return this.getFilledFormDataByRefs(["baseInfoRef", "swypyjInfoRef", "stepTableRef", "stepRef","remarkRef"])
+ return this.getFilledFormDataByRefs(["baseInfoRef", "swypyjInfoRef", "stepTableRef", "stepRef", "remarkRef"])
},
//获取填写完成的表单数据
async getFormData() {
- let content = await this.validFormFields(["baseInfoRef", "swypyjInfoRef", "stepTableRef", "stepRef","remarkRef"]);
+ let content = await this.validFormFields(["baseInfoRef", "swypyjInfoRef", "stepTableRef", "stepRef", "remarkRef"]);
return content;
},
getResource() {
//使用的试剂、仪器
const stepResource = this.$refs.stepRef.getStepResource()
- const tableList = this.$refs.qcxjjyqkTableRef?.getFilledFormData()?.stepTableFormData || []
+ const tableList = this.$refs.qcxjjyqkTableRef?.getFilledFormData()?.stepTableFormData || []
// 从操作步骤中提取试剂和仪器资源
this.resourceTmp = stepResource.sjResource || []
this.yqResourceTmp = stepResource.yqResource || []
- const tableFromHyqk = tableList
- .filter(item => item.xybh)
- .map(item => ({
- bh: item.xybh,
- type: 'cell'
- }))
+ const tableFromHyqk = tableList
+ .filter(item => item.xybh)
+ .map(item => ({
+ bh: item.xybh,
+ type: 'cell'
+ }))
- this.resourceTmp = [...this.resourceTmp, ...tableFromHyqk]
+ this.resourceTmp = [...this.resourceTmp, ...tableFromHyqk]
return this.resourceTmp;
},
//保存
@@ -383,5 +383,4 @@ export default {
}
};
-
+
From 5c234efe51a8ffc08151714142e3cf01d9ee99d9 Mon Sep 17 00:00:00 2001
From: luojie <125330818@qq.com>
Date: Fri, 13 Mar 2026 09:22:36 +0800
Subject: [PATCH 3/7] =?UTF-8?q?feat:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86]?=
=?UTF-8?q?[update]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/business/comps/template/comps/dl/DL018.vue | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/views/business/comps/template/comps/dl/DL018.vue b/src/views/business/comps/template/comps/dl/DL018.vue
index e1442fe..39704e3 100644
--- a/src/views/business/comps/template/comps/dl/DL018.vue
+++ b/src/views/business/comps/template/comps/dl/DL018.vue
@@ -19,6 +19,7 @@
-
用户名称
@@ -45,9 +45,9 @@
基本资料
-
+
@@ -72,7 +72,7 @@ export default {
user: {},
roleGroup: {},
postGroup: {},
- selectedTab: "userinfo"
+ selectedTab: "resetPwd"
}
},
created() {
diff --git a/src/views/system/user/profile/resetPwd.vue b/src/views/system/user/profile/resetPwd.vue
index 2614e31..399783c 100644
--- a/src/views/system/user/profile/resetPwd.vue
+++ b/src/views/system/user/profile/resetPwd.vue
@@ -57,6 +57,9 @@ export default {
if (valid) {
updateUserPwd(this.user.oldPassword, this.user.newPassword).then(response => {
this.$modal.msgSuccess("修改成功")
+ this.$store.dispatch('LogOut').then(() => {
+ location.href = '/'
+ })
})
}
})
From 718a2d80ad470bb15bcbe8b87562661ba0c83d61 Mon Sep 17 00:00:00 2001
From: luojie <125330818@qq.com>
Date: Fri, 13 Mar 2026 10:13:20 +0800
Subject: [PATCH 6/7] =?UTF-8?q?feat:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86]?=
=?UTF-8?q?[update]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/Template/CustomTable.vue | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/components/Template/CustomTable.vue b/src/components/Template/CustomTable.vue
index 09cfc06..8b512d9 100644
--- a/src/components/Template/CustomTable.vue
+++ b/src/components/Template/CustomTable.vue
@@ -106,6 +106,14 @@
+