From df2457cfbf2cd3cbb464c7b4afb64be8169bdbdc Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Thu, 2 Apr 2026 10:15:58 +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=9E3=E4=B8=AA=E6=BA=B6=E6=B6=B2?= =?UTF-8?q?=E6=AD=A5=E9=AA=A4=EF=BC=8C=E5=88=86=E8=A3=85=E6=96=B0=E5=A2=9E?= =?UTF-8?q?3=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Template/Step.vue | 12 +++ src/components/Template/StepComponents/ry/csqx.vue | 93 ++++++++++++++++++ src/components/Template/StepComponents/ry/rj.vue | 109 +++++++++++++++++++++ 3 files changed, 214 insertions(+) create mode 100644 src/components/Template/StepComponents/ry/csqx.vue create mode 100644 src/components/Template/StepComponents/ry/rj.vue diff --git a/src/components/Template/Step.vue b/src/components/Template/Step.vue index e39c44e..2401b1a 100644 --- a/src/components/Template/Step.vue +++ b/src/components/Template/Step.vue @@ -82,6 +82,11 @@ import kbsjgsp from "./StepComponents/ry/kbsjgsp.vue";//溶液-空白（试剂/ import kb from "./StepComponents/ry/kb.vue";//溶液-空白 import jr from "./StepComponents/ry/jr.vue";//溶液-加热 import fz from "./StepComponents/ry/fz.vue";//溶液-分装 +//溶液-样品分装：使用溶液-分装 +//溶液-给药制剂分装：使用溶液-分装 +//溶液-供试品样品分装：使用溶液-分装 +import csqx from "./StepComponents/ry/csqx.vue";//溶液-超声清洗 +import rj from "./StepComponents/ry/rj.vue";//溶液-融解 //罗开凡新增 //表配制 @@ -445,6 +450,8 @@ export default { kb, jr, fz, + csqx, + rj, //罗开凡新增 //表配制 @@ -644,6 +651,11 @@ export default { 'kb': 'kb', 'jr': 'jr', 'fz': 'fz', + 'ypfz': 'fz', + 'gyzjfz': 'fz', + 'gspypfz': 'fz', + 'csqx': 'csqx', + 'rj': 'rj', //罗开凡新增 //标配配制 diff --git a/src/components/Template/StepComponents/ry/csqx.vue b/src/components/Template/StepComponents/ry/csqx.vue new file mode 100644 index 0000000..d340eb1 --- /dev/null +++ b/src/components/Template/StepComponents/ry/csqx.vue @@ -0,0 +1,93 @@ + + + + + + \ No newline at end of file diff --git a/src/components/Template/StepComponents/ry/rj.vue b/src/components/Template/StepComponents/ry/rj.vue new file mode 100644 index 0000000..e1431e9 --- /dev/null +++ b/src/components/Template/StepComponents/ry/rj.vue @@ -0,0 +1,109 @@ + + + + + + \ No newline at end of file From 0402b3648fa7c9bc0f9bb24dd02843568e67da47 Mon Sep 17 00:00:00 2001 From: HanLong <404402223@qq.com> Date: Thu, 2 Apr 2026 15:16:48 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:[=E8=B5=84=E6=BA=90=E5=BA=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86][=E4=BE=9B=E8=AF=95=E5=93=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/resource/gsp/comps/ffjl/Gd.vue | 2 ++ src/views/business/resource/gsp/comps/ffjl/Jd.vue | 2 ++ src/views/business/resource/gsp/comps/ffjl/Jq.vue | 1 + src/views/business/resource/gsp/comps/ffjl/Js.vue | 1 + src/views/business/resource/gsp/comps/ffjl/Jy.vue | 1 + src/views/business/resource/gsp/comps/ffjl/Sd.vue | 2 ++ src/views/business/resource/gsp/comps/gsp/Cc.vue | 1 + src/views/business/resource/gsp/comps/gsp/Cz.vue | 1 + .../business/resource/gsp/comps/gsp/CzBatch.vue | 1 + src/views/business/resource/gsp/comps/gsp/Ff.vue | 6 +++--- src/views/business/resource/gsp/comps/gsp/Gd.vue | 2 ++ src/views/business/resource/gsp/comps/gsp/Gh.vue | 25 ++++++++-------------- src/views/business/resource/gsp/comps/gsp/Js.vue | 1 + src/views/business/resource/gsp/comps/gsp/Jy.vue | 1 + src/views/business/resource/gsp/comps/gsp/Sd.vue | 2 ++ src/views/business/resource/gsp/comps/gsp/Xz.vue | 1 + src/views/business/resource/gsp/comps/gsp/Ysff.vue | 1 + src/views/business/resource/gsp/comps/rkjl/Bj.vue | 1 + src/views/business/resource/gsp/comps/rkjl/Gd.vue | 2 ++ src/views/business/resource/gsp/comps/rkjl/Jd.vue | 2 ++ src/views/business/resource/gsp/comps/rkjl/Js.vue | 1 + src/views/business/resource/gsp/comps/rkjl/Jy.vue | 1 + .../resource/gsp/comps/rkjl/RkjlImport.vue | 4 +++- src/views/business/resource/gsp/comps/rkjl/Sd.vue | 2 ++ src/views/business/resource/gsp/comps/rkjl/Xz.vue | 1 + .../comps/StorageLocationImport.vue | 4 +++- 26 files changed, 48 insertions(+), 21 deletions(-) diff --git a/src/views/business/resource/gsp/comps/ffjl/Gd.vue b/src/views/business/resource/gsp/comps/ffjl/Gd.vue index ad59156..e00e4d4 100644 --- a/src/views/business/resource/gsp/comps/ffjl/Gd.vue +++ b/src/views/business/resource/gsp/comps/ffjl/Gd.vue @@ -141,11 +141,13 @@ export default { if (this.isBatch) { plgd(this.form).then(response => { this.open = false + this.$modal.msgSuccess(this.$t('form.operationSuccess')) this.$emit('callback') }) } else { gd(this.form).then(response => { this.open = false + this.$modal.msgSuccess(this.$t('form.operationSuccess')) this.$emit('callback') }) } diff --git a/src/views/business/resource/gsp/comps/ffjl/Jd.vue b/src/views/business/resource/gsp/comps/ffjl/Jd.vue index 27b5e7e..e3875c4 100644 --- a/src/views/business/resource/gsp/comps/ffjl/Jd.vue +++ b/src/views/business/resource/gsp/comps/ffjl/Jd.vue @@ -130,11 +130,13 @@ export default { if (this.isBatch) { jdBatch(this.form).then(response => { this.open = false + this.$modal.msgSuccess(this.$t('form.operationSuccess')) this.$emit('callback') }) } else { jd(this.form).then(response => { this.open = false + this.$modal.msgSuccess(this.$t('form.operationSuccess')) this.$emit('callback') }) } diff --git a/src/views/business/resource/gsp/comps/ffjl/Jq.vue b/src/views/business/resource/gsp/comps/ffjl/Jq.vue index 2b980d3..b96db6c 100644 --- a/src/views/business/resource/gsp/comps/ffjl/Jq.vue +++ b/src/views/business/resource/gsp/comps/ffjl/Jq.vue @@ -114,6 +114,7 @@ export default { if (valid) { jq(this.form).then(response => { this.open = false + this.$modal.msgSuccess(this.$t('form.operationSuccess')) this.$emit('callback') }) } diff --git a/src/views/business/resource/gsp/comps/ffjl/Js.vue b/src/views/business/resource/gsp/comps/ffjl/Js.vue index 4cc1e2b..e91411f 100644 --- a/src/views/business/resource/gsp/comps/ffjl/Js.vue +++ b/src/views/business/resource/gsp/comps/ffjl/Js.vue @@ -117,6 +117,7 @@ export default { if (valid) { js(this.form).then(response => { this.open = false + this.$modal.msgSuccess(this.$t('form.operationSuccess')) this.$emit('callback') }) } diff --git a/src/views/business/resource/gsp/comps/ffjl/Jy.vue b/src/views/business/resource/gsp/comps/ffjl/Jy.vue index 4528292..bc106a6 100644 --- a/src/views/business/resource/gsp/comps/ffjl/Jy.vue +++ b/src/views/business/resource/gsp/comps/ffjl/Jy.vue @@ -149,6 +149,7 @@ export default { jy(this.form).then(response => { this.open = false + this.$modal.msgSuccess(this.$t('form.operationSuccess')) this.$emit('callback') }) } diff --git a/src/views/business/resource/gsp/comps/ffjl/Sd.vue b/src/views/business/resource/gsp/comps/ffjl/Sd.vue index f55513c..6bc62ff 100644 --- a/src/views/business/resource/gsp/comps/ffjl/Sd.vue +++ b/src/views/business/resource/gsp/comps/ffjl/Sd.vue @@ -141,11 +141,13 @@ export default { if (this.isBatch) { plsd(this.form).then(response => { this.open = false + this.$modal.msgSuccess(this.$t('form.operationSuccess')) this.$emit('callback') }) } else { sd(this.form).then(response => { this.open = false + this.$modal.msgSuccess(this.$t('form.operationSuccess')) this.$emit('callback') }) } diff --git a/src/views/business/resource/gsp/comps/gsp/Cc.vue b/src/views/business/resource/gsp/comps/gsp/Cc.vue index 62cb895..ef0df4b 100644 --- a/src/views/business/resource/gsp/comps/gsp/Cc.vue +++ b/src/views/business/resource/gsp/comps/gsp/Cc.vue @@ -176,6 +176,7 @@ export default { cc(this.form).then(response => { this.open = false this.$emit('callback') + this.$modal.msgSuccess(this.$t('form.operationSuccess')) this.$modal.closeLoading() }).finally(() => { this.$modal.closeLoading() diff --git a/src/views/business/resource/gsp/comps/gsp/Cz.vue b/src/views/business/resource/gsp/comps/gsp/Cz.vue index 09cdcde..5dcac6e 100644 --- a/src/views/business/resource/gsp/comps/gsp/Cz.vue +++ b/src/views/business/resource/gsp/comps/gsp/Cz.vue @@ -152,6 +152,7 @@ export default { if (valid) { cz(this.form).then(response => { this.open = false + this.$modal.msgSuccess(this.$t('form.operationSuccess')) this.$emit('callback') }) } diff --git a/src/views/business/resource/gsp/comps/gsp/CzBatch.vue b/src/views/business/resource/gsp/comps/gsp/CzBatch.vue index ab4f552..b5750c7 100644 --- a/src/views/business/resource/gsp/comps/gsp/CzBatch.vue +++ b/src/views/business/resource/gsp/comps/gsp/CzBatch.vue @@ -172,6 +172,7 @@ export default { plcz(params).then(response => { this.open = false this.$emit('callback') + this.$modal.msgSuccess(this.$t('form.operationSuccess')) this.$modal.closeLoading() }).finally(() => { this.$modal.closeLoading() diff --git a/src/views/business/resource/gsp/comps/gsp/Ff.vue b/src/views/business/resource/gsp/comps/gsp/Ff.vue index 9cf7967..cb8f9c7 100644 --- a/src/views/business/resource/gsp/comps/gsp/Ff.vue +++ b/src/views/business/resource/gsp/comps/gsp/Ff.vue @@ -30,11 +30,10 @@ + width="130px" :show-overflow-tooltip="true"/> @@ -427,6 +426,7 @@ export default { } else { ff(params).then(response => { this.open = false + this.$modal.msgSuccess(this.$t('form.operationSuccess')) this.$emit('callback') }) } diff --git a/src/views/business/resource/gsp/comps/gsp/Gd.vue b/src/views/business/resource/gsp/comps/gsp/Gd.vue index f83eae9..275629e 100644 --- a/src/views/business/resource/gsp/comps/gsp/Gd.vue +++ b/src/views/business/resource/gsp/comps/gsp/Gd.vue @@ -117,11 +117,13 @@ export default { if (this.isBatch) { plgd(this.form).then(response => { this.open = false + this.$modal.msgSuccess(this.$t('form.operationSuccess')) this.$emit('callback') }) } else { gd(this.form).then(response => { this.open = false + this.$modal.msgSuccess(this.$t('form.operationSuccess')) this.$emit('callback') }) } diff --git a/src/views/business/resource/gsp/comps/gsp/Gh.vue b/src/views/business/resource/gsp/comps/gsp/Gh.vue index b9a705f..dfa39f3 100644 --- a/src/views/business/resource/gsp/comps/gsp/Gh.vue +++ b/src/views/business/resource/gsp/comps/gsp/Gh.vue @@ -68,7 +68,7 @@ - + @@ -172,10 +172,11 @@ import { gh, info } from "@/api/business/gsp/gsp" import { mapGetters } from 'vuex' import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser'; +import BusinessSelect from '@/views/business/comps/select/BusinessSelect'; export default { name: "GspGh", - components: { SelectDeptUser }, + components: { SelectDeptUser, BusinessSelect }, data() { return { isBatch: false, @@ -275,20 +276,12 @@ export default { }, show(row) { this.reset() - this.form.id = row.id - this.form.mc = row.mc - this.form.bh = row.bh - this.form.ph = row.ph - this.form.gg = row.gg - this.form.ggdw = row.ggdw - this.form.yxq = row.yxq - this.form.jsrq = row.jsrq - this.form.ffrq = row.ffrq - this.form.cctj = row.cctj - this.form.kc = row.kc - this.form.kcdw = row.kcdw - this.form.zysx = row.zysx - this.open = true + info({id: row.id}).then(response => { + this.form = response.data + this.open = true + }) + + }, save() { this.$refs["form"].validate(valid => { diff --git a/src/views/business/resource/gsp/comps/gsp/Js.vue b/src/views/business/resource/gsp/comps/gsp/Js.vue index 68ae9a1..bbc7d1d 100644 --- a/src/views/business/resource/gsp/comps/gsp/Js.vue +++ b/src/views/business/resource/gsp/comps/gsp/Js.vue @@ -117,6 +117,7 @@ export default { if (valid) { js(this.form).then(response => { this.open = false + this.$modal.msgSuccess(this.$t('form.operationSuccess')) this.$emit('callback') }) } diff --git a/src/views/business/resource/gsp/comps/gsp/Jy.vue b/src/views/business/resource/gsp/comps/gsp/Jy.vue index 6bcd292..483c5c0 100644 --- a/src/views/business/resource/gsp/comps/gsp/Jy.vue +++ b/src/views/business/resource/gsp/comps/gsp/Jy.vue @@ -175,6 +175,7 @@ export default { if (valid) { jy(this.form).then(response => { this.open = false + this.$modal.msgSuccess(this.$t('form.operationSuccess')) this.$emit('callback') }) diff --git a/src/views/business/resource/gsp/comps/gsp/Sd.vue b/src/views/business/resource/gsp/comps/gsp/Sd.vue index 526a2cb..2ec60f3 100644 --- a/src/views/business/resource/gsp/comps/gsp/Sd.vue +++ b/src/views/business/resource/gsp/comps/gsp/Sd.vue @@ -116,11 +116,13 @@ export default { if (this.isBatch) { plsd(this.form).then(response => { this.open = false + this.$modal.msgSuccess(this.$t('form.operationSuccess')) this.$emit('callback') }) } else { sd(this.form).then(response => { this.open = false + this.$modal.msgSuccess(this.$t('form.operationSuccess')) this.$emit('callback') }) } diff --git a/src/views/business/resource/gsp/comps/gsp/Xz.vue b/src/views/business/resource/gsp/comps/gsp/Xz.vue index 9802c38..3336ad1 100644 --- a/src/views/business/resource/gsp/comps/gsp/Xz.vue +++ b/src/views/business/resource/gsp/comps/gsp/Xz.vue @@ -226,6 +226,7 @@ export default { if (valid) { save(this.form).then(response => { this.open = false + this.$modal.msgSuccess(this.$t('form.operationSuccess')) this.$emit('callback') }) } diff --git a/src/views/business/resource/gsp/comps/gsp/Ysff.vue b/src/views/business/resource/gsp/comps/gsp/Ysff.vue index 568997f..1e71361 100644 --- a/src/views/business/resource/gsp/comps/gsp/Ysff.vue +++ b/src/views/business/resource/gsp/comps/gsp/Ysff.vue @@ -207,6 +207,7 @@ export default { params.list = this.selectList ysff(params).then(response => { this.open = false + this.$modal.msgSuccess(this.$t('form.operationSuccess')) this.$emit('callback') }) } diff --git a/src/views/business/resource/gsp/comps/rkjl/Bj.vue b/src/views/business/resource/gsp/comps/rkjl/Bj.vue index 6aa3efc..cd553b1 100644 --- a/src/views/business/resource/gsp/comps/rkjl/Bj.vue +++ b/src/views/business/resource/gsp/comps/rkjl/Bj.vue @@ -214,6 +214,7 @@ export default { if (valid) { bj(this.form).then(response => { this.open = false + this.$modal.msgSuccess(this.$t('form.operationSuccess')) this.$emit('callback') }) } diff --git a/src/views/business/resource/gsp/comps/rkjl/Gd.vue b/src/views/business/resource/gsp/comps/rkjl/Gd.vue index e6aba73..78c629a 100644 --- a/src/views/business/resource/gsp/comps/rkjl/Gd.vue +++ b/src/views/business/resource/gsp/comps/rkjl/Gd.vue @@ -141,11 +141,13 @@ export default { if (this.isBatch) { plgd(this.form).then(response => { this.open = false + this.$modal.msgSuccess(this.$t('form.operationSuccess')) this.$emit('callback') }) } else { gd(this.form).then(response => { this.open = false + this.$modal.msgSuccess(this.$t('form.operationSuccess')) this.$emit('callback') }) } diff --git a/src/views/business/resource/gsp/comps/rkjl/Jd.vue b/src/views/business/resource/gsp/comps/rkjl/Jd.vue index b973659..314a39e 100644 --- a/src/views/business/resource/gsp/comps/rkjl/Jd.vue +++ b/src/views/business/resource/gsp/comps/rkjl/Jd.vue @@ -131,11 +131,13 @@ export default { if (this.isBatch) { jdBatch(this.form).then(response => { this.open = false + this.$modal.msgSuccess(this.$t('form.operationSuccess')) this.$emit('callback') }) } else { jd(this.form).then(response => { this.open = false + this.$modal.msgSuccess(this.$t('form.operationSuccess')) this.$emit('callback') }) } diff --git a/src/views/business/resource/gsp/comps/rkjl/Js.vue b/src/views/business/resource/gsp/comps/rkjl/Js.vue index b195366..1737d35 100644 --- a/src/views/business/resource/gsp/comps/rkjl/Js.vue +++ b/src/views/business/resource/gsp/comps/rkjl/Js.vue @@ -117,6 +117,7 @@ export default { if (valid) { js(this.form).then(response => { this.open = false + this.$modal.msgSuccess(this.$t('form.operationSuccess')) this.$emit('callback') }) } diff --git a/src/views/business/resource/gsp/comps/rkjl/Jy.vue b/src/views/business/resource/gsp/comps/rkjl/Jy.vue index f985c18..186bb3f 100644 --- a/src/views/business/resource/gsp/comps/rkjl/Jy.vue +++ b/src/views/business/resource/gsp/comps/rkjl/Jy.vue @@ -149,6 +149,7 @@ export default { jy(this.form).then(response => { this.open = false + this.$modal.msgSuccess(this.$t('form.operationSuccess')) this.$emit('callback') }) } diff --git a/src/views/business/resource/gsp/comps/rkjl/RkjlImport.vue b/src/views/business/resource/gsp/comps/rkjl/RkjlImport.vue index b287bd7..98e5531 100644 --- a/src/views/business/resource/gsp/comps/rkjl/RkjlImport.vue +++ b/src/views/business/resource/gsp/comps/rkjl/RkjlImport.vue @@ -118,10 +118,12 @@ export default { this.upload.open = false this.upload.isUploading = false this.$refs.upload.clearFiles() - this.$alert("
" + response.msg + "
", "导入结果", { dangerouslyUseHTMLString: true }) if(response.code == 200) { + this.$modal.msgSuccess("导入成功"); this.$emit('callback') this.cancel() + } else { + this.$modal.alertError(response.msg); } }, // 提交上传文件 diff --git a/src/views/business/resource/gsp/comps/rkjl/Sd.vue b/src/views/business/resource/gsp/comps/rkjl/Sd.vue index 78a4d0d..4e4ecd4 100644 --- a/src/views/business/resource/gsp/comps/rkjl/Sd.vue +++ b/src/views/business/resource/gsp/comps/rkjl/Sd.vue @@ -141,11 +141,13 @@ export default { if (this.isBatch) { plsd(this.form).then(response => { this.open = false + this.$modal.msgSuccess(this.$t('form.operationSuccess')) this.$emit('callback') }) } else { sd(this.form).then(response => { this.open = false + this.$modal.msgSuccess(this.$t('form.operationSuccess')) this.$emit('callback') }) } diff --git a/src/views/business/resource/gsp/comps/rkjl/Xz.vue b/src/views/business/resource/gsp/comps/rkjl/Xz.vue index 3c6a9d7..f6d4f80 100644 --- a/src/views/business/resource/gsp/comps/rkjl/Xz.vue +++ b/src/views/business/resource/gsp/comps/rkjl/Xz.vue @@ -221,6 +221,7 @@ export default { if (valid) { xz(this.form).then(response => { this.open = false + this.$modal.msgSuccess(this.$t('form.operationSuccess')) this.$emit('callback') }) } diff --git a/src/views/business/storageLocation/comps/StorageLocationImport.vue b/src/views/business/storageLocation/comps/StorageLocationImport.vue index ca6e1b3..3e0ce0b 100644 --- a/src/views/business/storageLocation/comps/StorageLocationImport.vue +++ b/src/views/business/storageLocation/comps/StorageLocationImport.vue @@ -118,10 +118,12 @@ export default { this.upload.open = false this.upload.isUploading = false this.$refs.upload.clearFiles() - this.$alert("
" + response.msg + "
", "导入结果", { dangerouslyUseHTMLString: true }) if(response.code == 200) { + this.$modal.msgSuccess("导入成功"); this.$emit('callback') this.cancel() + } else { + this.$modal.alertError(response.msg); } }, // 提交上传文件 From 103f5099541cf640b6b041db940fd2b47a216097 Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Thu, 2 Apr 2026 15:53:06 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20[=E6=A8=A1=E6=9D=BF=E7=AE=A1?= =?UTF-8?q?=E7=90=86]=20dl016+dl017?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/comps/template/comps/dl/DL016.vue | 52 ++----------- .../business/comps/template/comps/dl/DL017.vue | 85 ++++------------------ 2 files changed, 18 insertions(+), 119 deletions(-) diff --git a/src/views/business/comps/template/comps/dl/DL016.vue b/src/views/business/comps/template/comps/dl/DL016.vue index 564c9de..80da083 100644 --- a/src/views/business/comps/template/comps/dl/DL016.vue +++ b/src/views/business/comps/template/comps/dl/DL016.vue @@ -17,11 +17,9 @@ + ref="qcxjjyqkTableRef" :columns="stepColumns" :formData="formData"> @@ -61,13 +59,6 @@ export default { }, }, computed: { - // 表格数据 - tableFormData() { - return { - stepTableFormData: this.formData.stepTableFormData || [], - headerSelectFields: {} - } - }, // 备注表单配制 remarkConig() { return [ @@ -189,14 +180,12 @@ export default { // bodyType: 'inputNumber', label: "template.dl.dl016.qsxjjrl", prop: 'qsxjjrl', - width: 280, + width: 180, headerSelectKey: 'qsxjjrldw', fillType: "preFill", headerOptions: this.getDictOptions('business_tjdw'), bodyType: 'inputNumber', bodyFillType: 'actFill', - copyFrom: 'ysqyl', - compareTo: 'ysqyl', } ] }, @@ -217,51 +206,20 @@ export default { // 获取剂量组列表数据 const stepTableFormData = bdnr.jlzTableData || [] - if (stepTableFormData.length === 0) { - // 清空当前的换液情况列表数据 - this.$set(this.formData, 'stepTableFormData', []) - this.$message.warning('前序表单中没有剂量组数据') - return - } - // 从剂量组数据中提取剂量组别和悬液编号 const itemData = stepTableFormData.map(item => ({ jlzb: item.jlzb || '', // 剂量组别 xybh: item.xybh || '', // 悬液编号 qsxjjrl: '', // + id:this.getuuid(), })) - // 使用 $set 更新 formData，触发 CustomTable 的响应式更新 - this.$set(this.formData, 'stepTableFormData', itemData) - - this.$message.success(`已从前序表单加载 ${itemData.length} 条剂量组数据`) + this.$refs.qcxjjyqkTableRef.updateDataSource(itemData); } catch (error) { 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(); - const params = { - subTargetStartSolution, - headerSelectFields - } - this.batchUpdateTargetStartSolutionVolume(dataSource,targetStartSolution,params) - } - }, - beforeSaveRecord(data){ - const formFields = this.$refs.swypyjInfoRef?.getFilledFormData(); - this.onCommonVerifyNdException(formFields,data); - }, //获取已填写的表单数据 getFilledFormData() { return this.getFilledFormDataByRefs(["baseInfoRef", "swypyjInfoRef", "qcxjjyqkTableRef", "stepRef","remarkRef"]) diff --git a/src/views/business/comps/template/comps/dl/DL017.vue b/src/views/business/comps/template/comps/dl/DL017.vue index 8b79c72..b321f7d 100644 --- a/src/views/business/comps/template/comps/dl/DL017.vue +++ b/src/views/business/comps/template/comps/dl/DL017.vue @@ -17,11 +17,9 @@ + ref="stepTableRef" :columns="stepColumns" :formData="formData"> @@ -62,13 +60,6 @@ export default { }, }, computed: { - // 表格数据 - tableFormData() { - return { - stepTableFormData: this.formData.stepTableFormData, - headerSelectFields: {} - } - }, // 备注表单配制 remarkConig() { return [ @@ -206,56 +197,56 @@ export default { },{ label: "template.dl.dl017.ddpyy", prop: "ddpyy", - width: 180, + width: 100, bodyType: "checkbox", bodyFillType: "actFill", bodyMaxlength: 10, },{ label: "template.dl.dl017.xd", prop: "xd", - width: 180, + width: 100, bodyType: "checkbox", bodyFillType: "actFill", bodyMaxlength: 10, },{ label: "template.dl.dl017.sj", prop: "sj", - width: 180, + width: 100, bodyType: "checkbox", bodyFillType: "actFill", bodyMaxlength: 10, },{ label: "template.dl.dl017.ds", prop: "ds", - width: 180, + width: 100, bodyType: "checkbox", bodyFillType: "actFill", bodyMaxlength: 10, },{ label: "template.dl.dl017.dy1gd", prop: "dy1gd", - width: 180, + width: 100, bodyType: "checkbox", bodyFillType: "actFill", bodyMaxlength: 10, },{ label: "template.dl.dl017.dy2gd", prop: "dy2gd", - width: 180, + width: 100, bodyType: "checkbox", bodyFillType: "actFill", bodyMaxlength: 10, },{ label: "template.dl.dl017.dy3gd", prop: "dy3gd", - width: 180, + width: 100, bodyType: "checkbox", bodyFillType: "actFill", bodyMaxlength: 10, },{ label: "template.dl.dl017.dy4gd", prop: "dy4gd", - width: 180, + width: 100, bodyType: "checkbox", bodyFillType: "actFill", bodyMaxlength: 10, @@ -282,13 +273,6 @@ export default { // 获取剂量组列表数据 const stepTableFormData = bdnr.jlzTableData || [] - if (stepTableFormData.length === 0) { - // 清空当前的细胞操作情况列表数据 - this.$set(this.formData, 'stepTableFormData', []) - this.$message.warning('前序表单中没有剂量组数据') - return - } - // 从剂量组数据中提取剂量组别和悬液编号 const itemData = stepTableFormData.map(item => ({ jlzb: item.jlzb || '', @@ -303,60 +287,17 @@ export default { dy1gd: '', dy2gd: '', dy3gd: '', - dy4gd: '' + dy4gd: '', + id:this.getuuid(), })) - // 使用 $set 更新 formData，触发 CustomTable 的响应式更新 - this.$set(this.formData, 'stepTableFormData', itemData) - - this.$message.success(`已从前序表单加载 ${itemData.length} 条剂量组数据`) + this.$refs.stepTableRef.updateDataSource(itemData); } 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(); - 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); - }, - //获取已填写的表单数据 getFilledFormData() { return this.getFilledFormDataByRefs(["baseInfoRef", "swypyjInfoRef", "stepTableRef", "stepRef","remarkRef"]) From 71cc7c5151146e365d21666c9bd0cc662fa690bc Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Thu, 2 Apr 2026 16:41:32 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20[=E6=A8=A1=E6=9D=BF=E7=AE=A1?= =?UTF-8?q?=E7=90=86]=20dl018?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lang/en/template/dl.js | 2 +- src/lang/zh/template/dl.js | 2 +- .../business/comps/template/comps/dl/DL018.vue | 51 ++++------------------ 3 files changed, 10 insertions(+), 45 deletions(-) diff --git a/src/lang/en/template/dl.js b/src/lang/en/template/dl.js index 87f08d8..ce4ba9a 100644 --- a/src/lang/en/template/dl.js +++ b/src/lang/en/template/dl.js @@ -288,7 +288,7 @@ export default { }, dl018: { xbxx: '细胞信息', - sydd: '试验地点', + sydd: '测定地点', czsj: '操作时间', qxbd: '前序表单', dlbz: '备注', diff --git a/src/lang/zh/template/dl.js b/src/lang/zh/template/dl.js index 665ec07..c1eae5f 100644 --- a/src/lang/zh/template/dl.js +++ b/src/lang/zh/template/dl.js @@ -282,7 +282,7 @@ export default { }, dl018: { xbxx: '细胞信息', - sydd: '试验地点', + sydd: '测定地点', czsj: '操作时间', qxbd: '前序表单', dlbz: '备注', diff --git a/src/views/business/comps/template/comps/dl/DL018.vue b/src/views/business/comps/template/comps/dl/DL018.vue index 957c9c8..f839b30 100644 --- a/src/views/business/comps/template/comps/dl/DL018.vue +++ b/src/views/business/comps/template/comps/dl/DL018.vue @@ -17,10 +17,10 @@ + ref="stepTableRef" :prefixKey = "`tableSecond`" :columns="stepColumns" :formData="formData"> @@ -65,13 +65,6 @@ export default { }, }, computed: { - // 表格数据 - tableFormData() { - return { - stepTableFormData: this.formData.stepTableFormData || [], - headerSelectFields: {} - } - }, // 备注表单配制 remarkConig() { return [ @@ -193,6 +186,7 @@ export default { bodySubFillType: 'actFill', bodyFillType: 'actFill', bodyDisabled: true, + bodySubDisabled:this.fillType !== 'actFill', width: 280, bodyMaxlength: 50, }, @@ -205,6 +199,7 @@ export default { bodySubKey: 'rsjs1', bodySubFillType: 'actFill', bodyFillType: 'actFill', + bodySubDisabled:this.fillType !== 'actFill', bodyDisabled: true, width: 280, bodyMaxlength: 50, @@ -256,11 +251,10 @@ export default { }, methods: { //开始介绍按钮回调 - handleClickButton(e, rowIndex) { + handleClickButton(e, rowIndex,colIndex,key,data) { const arrStr = typeof e === 'string' ? e.slice(0, -1) : ''; const updateData = { [arrStr]: moment().format('YYYY/MM/DD HH:mm') }; - this.$refs.stepTableRef?.updateDataSourceByRowIndex(rowIndex, updateData); - // console.log(this.getFilledFormData()) + this.$refs.stepTableRef?.updateDataSourceByRowIndex(rowIndex, updateData,{signData:data,updateFields:[arrStr]}); }, onRegentSubmit(e) { const { selectInfo, key, rowIndex } = e @@ -272,13 +266,6 @@ export default { // 获取剂量组列表数据 const stepTableFormData = bdnr.jlzTableData || [] - if (stepTableFormData.length === 0) { - // 清空当前的换液情况列表数据 - this.$set(this.formData, 'stepTableFormData', []) - this.$message.warning('前序表单中没有剂量组数据') - return - } - // 从剂量组数据中提取剂量组别和悬液编号 const itemData = stepTableFormData.map(item => ({ jlzb: item.jlzb || '', // 剂量组别 @@ -290,37 +277,15 @@ export default { zy: '', // yx: '', // tj: '', // + id:this.getuuid(), })) - // 使用 $set 更新 formData，触发 CustomTable 的响应式更新 - this.$set(this.formData, 'stepTableFormData', itemData) - - this.$message.success(`已从前序表单加载 ${itemData.length} 条剂量组数据`) + this.$refs.stepTableRef.updateDataSource(itemData); } 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(); - const params = { - subTargetStartSolution, - headerSelectFields - } - this.batchUpdateTargetStartSolutionVolume(dataSource,targetStartSolution,params) - } - }, - //获取已填写的表单数据 getFilledFormData() { return this.getFilledFormDataByRefs(["baseInfoRef", "swypyjInfoRef", "stepTableRef", "stepRef","remarkRef"])