From 88901426bb470c68fcc43fa811c4102eb7203742 Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Thu, 26 Mar 2026 21:44:13 +0800 Subject: [PATCH 1/9] =?UTF-8?q?faet:=20[=E6=A8=A1=E6=9D=BF=E7=AE=A1?= =?UTF-8?q?=E7=90=86]=20=E8=AF=95=E5=89=82=E4=BF=A1=E6=81=AF=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lang/en/template/lba.js | 2 +- src/lang/zh/template/lba.js | 2 +- src/views/business/comps/select/SelectDept.vue | 27 ++++++++++++++++++---- .../business/comps/template/comps/dl/DL006.vue | 2 +- .../business/comps/template/comps/dl/DL014.vue | 2 +- .../business/comps/template/comps/dl/DL016.vue | 2 +- .../business/comps/template/comps/dl/DL017.vue | 2 +- .../business/comps/template/comps/dl/DL018.vue | 2 +- .../business/comps/template/comps/dl/DL019.vue | 2 +- .../business/comps/template/comps/dl/DL020.vue | 2 +- .../business/comps/template/comps/lba/LBA002.vue | 2 +- .../business/comps/template/comps/lba/LBA003.vue | 2 +- .../business/comps/template/comps/lba/LBA004.vue | 2 +- .../business/comps/template/comps/lba/LBA008.vue | 2 +- .../business/comps/template/comps/pcr/PCR005.vue | 2 +- .../business/comps/template/comps/pcr/PCR007.vue | 2 +- .../business/comps/template/comps/pcr/PCR008.vue | 2 +- .../business/comps/template/comps/pcr/PCR009.vue | 2 +- .../business/comps/template/comps/pcr/PCR010.vue | 2 +- .../business/comps/template/comps/pcr/PCR011.vue | 2 +- .../business/comps/template/comps/pcr/PCR012.vue | 2 +- .../business/comps/template/comps/sp/SP007.vue | 2 +- .../business/comps/template/comps/sp/SP008.vue | 2 +- .../business/comps/template/comps/sp/SP009.vue | 2 +- .../business/comps/template/comps/xb/XB001.vue | 2 +- .../business/comps/template/comps/yp/YP003.vue | 2 +- .../business/comps/template/comps/yp/YP004.vue | 2 +- .../business/comps/template/comps/yp/YP005.vue | 2 +- src/views/business/template/list.vue | 2 +- 29 files changed, 51 insertions(+), 32 deletions(-) diff --git a/src/lang/en/template/lba.js b/src/lang/en/template/lba.js index 8409285..770dd52 100644 --- a/src/lang/en/template/lba.js +++ b/src/lang/en/template/lba.js @@ -27,7 +27,7 @@ export default { sjjzjrz: 'Actual Blank Matrix Volume' }, lba005: { - bzqxpz: 'Calibration Standards', + bzqxpz: 'Calibration Standards Preparation', zkpz: 'Quality Control Preparation' }, lba006: { diff --git a/src/lang/zh/template/lba.js b/src/lang/zh/template/lba.js index 7d70a12..0df0810 100644 --- a/src/lang/zh/template/lba.js +++ b/src/lang/zh/template/lba.js @@ -27,7 +27,7 @@ export default { sjjzjrz: '实际基质加入值' }, lba005: { - bzqxpz: '校正标样', + bzqxpz: '校正标样配制', zkpz: '质控配制' }, lba006: { diff --git a/src/views/business/comps/select/SelectDept.vue b/src/views/business/comps/select/SelectDept.vue index 37e0cd3..082ef42 100644 --- a/src/views/business/comps/select/SelectDept.vue +++ b/src/views/business/comps/select/SelectDept.vue @@ -1,6 +1,6 @@ From 905c99eb89cc11843e5fc5c6f9d4df68653d4f23 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Fri, 27 Mar 2026 11:44:09 +0800 Subject: [PATCH 3/9] =?UTF-8?q?fic:[=E9=9D=9E=E5=AE=9E=E9=AA=8C=E8=A1=A8?= =?UTF-8?q?=E5=8D=95]=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lang/zh/business/study/studyFormFill.js | 2 +- src/lang/zh/business/study/studyFormPre.js | 2 +- src/views/business/comps/template/comps/bl/BL002.vue | 4 ++-- src/views/business/form/drug/comp/ytbdList.vue | 6 ++++-- src/views/business/form/nonTrial/comp/ytbdList.vue | 4 +++- src/views/business/study/comp/tbbd/Blxjsh.vue | 2 +- 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/lang/zh/business/study/studyFormFill.js b/src/lang/zh/business/study/studyFormFill.js index 61d1744..e340efe 100644 --- a/src/lang/zh/business/study/studyFormFill.js +++ b/src/lang/zh/business/study/studyFormFill.js @@ -66,7 +66,7 @@ export default { fhtg: '复核通过', tongguo: '通过', txbtjjl: '填写并提交记录', - zztjyzbd: '制作提交预制表单', + zztjyzbd: '制作并提交预制表单', mfhtg: '免复核通过', lianghao: '良好', zhong: '中', diff --git a/src/lang/zh/business/study/studyFormPre.js b/src/lang/zh/business/study/studyFormPre.js index 207d91a..41b353f 100644 --- a/src/lang/zh/business/study/studyFormPre.js +++ b/src/lang/zh/business/study/studyFormPre.js @@ -36,7 +36,7 @@ export default { fzyybd: '复制已有表单', yes: '是', no: '否', - zztjyzbd: '制作提交预制表单', + zztjyzbd: '制作并提交预制表单', sqgb: '申请关闭', qrgb: '确认关闭', gbtgjj:'关闭通过/拒绝', diff --git a/src/views/business/comps/template/comps/bl/BL002.vue b/src/views/business/comps/template/comps/bl/BL002.vue index 930d04e..118a9a4 100644 --- a/src/views/business/comps/template/comps/bl/BL002.vue +++ b/src/views/business/comps/template/comps/bl/BL002.vue @@ -130,7 +130,7 @@ export default { ztblxjRemark: { label: '', type: 'textarea', - fillType: 'actFill', + fillType: 'blxjsh', span: 1, placeholder: 'template.bl.bl002.ztblxjbz', maxlength: 1000, @@ -204,7 +204,7 @@ export default { prop: "ztblxjqrxx", isNeedCheck: true, bodyType: 'checkbox', - bodyFillType: 'actFill', + bodyFillType: 'blxjsh', checkboxLabel: 'template.bl.bl002.txwzqx' }, ] diff --git a/src/views/business/form/drug/comp/ytbdList.vue b/src/views/business/form/drug/comp/ytbdList.vue index d6e4d29..4668f52 100644 --- a/src/views/business/form/drug/comp/ytbdList.vue +++ b/src/views/business/form/drug/comp/ytbdList.vue @@ -51,15 +51,17 @@ diff --git a/src/views/business/form/nonTrial/comp/ytbdList.vue b/src/views/business/form/nonTrial/comp/ytbdList.vue index 1f838fc..4120d80 100644 --- a/src/views/business/form/nonTrial/comp/ytbdList.vue +++ b/src/views/business/form/nonTrial/comp/ytbdList.vue @@ -56,9 +56,11 @@ $t('page.business.form.statusYtj') }} {{ $t('page.business.form.statusYtg') }} + {{ + $t('page.business.form.statusWtg') }} {{ $t('page.business.form.statusDgb') }} - {{ + {{ $t('page.business.form.statusYgb') }} diff --git a/src/views/business/study/comp/tbbd/Blxjsh.vue b/src/views/business/study/comp/tbbd/Blxjsh.vue index 32f9f42..0b43306 100644 --- a/src/views/business/study/comp/tbbd/Blxjsh.vue +++ b/src/views/business/study/comp/tbbd/Blxjsh.vue @@ -19,7 +19,7 @@
+ :sn="form.templateSn" :templateData="form" fillType="blxjsh" />
{{ $t('page.business.study.studyFormFill.qmxx') }}
From b1963a95bbb483b9e8dab87aa8c639159c451bc6 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Fri, 27 Mar 2026 11:59:57 +0800 Subject: [PATCH 4/9] =?UTF-8?q?fix:[=E9=9D=9E=E5=AE=9E=E9=AA=8C=E8=A1=A8?= =?UTF-8?q?=E5=8D=95]=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/index.scss | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 40f35e0..ee30bab 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -212,7 +212,10 @@ aside { background: #409EFF; } &.ytj { - background: #F78B07; + background: #2AC663; + } + &.wtg { + background: #f73f07; } &.ytg { background: #2AC663; From bd9b7f6461f9ea699d3fc6cce14b03b31ea6e827 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Fri, 27 Mar 2026 12:09:10 +0800 Subject: [PATCH 5/9] =?UTF-8?q?fix:[=E9=9D=9E=E5=AE=9E=E9=AA=8C=E8=A1=A8?= =?UTF-8?q?=E5=8D=95]=E5=BA=9F=E6=AD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/form/drug/comp/sqbdList.vue | 2 +- src/views/business/form/drug/comp/tbbdList.vue | 2 +- src/views/business/form/nonTrial/comp/tbbdList.vue | 2 +- src/views/business/study/comp/tbbdList.vue | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/business/form/drug/comp/sqbdList.vue b/src/views/business/form/drug/comp/sqbdList.vue index 9ad7354..f7946f9 100644 --- a/src/views/business/form/drug/comp/sqbdList.vue +++ b/src/views/business/form/drug/comp/sqbdList.vue @@ -174,7 +174,7 @@ $t('page.business.study.studyFormApply.sh') }} {{ + >{{ $t('page.business.study.studyFormApply.fz') }} {{ + >{{ $t('page.business.study.studyFormFill.fz') }} {{ + >{{ $t('page.business.study.studyFormFill.fz') }} {{ + >{{ $t('page.business.study.studyFormFill.fz') }} Date: Fri, 27 Mar 2026 12:15:30 +0800 Subject: [PATCH 6/9] =?UTF-8?q?fix:[=E8=A1=A8=E5=8D=95=E7=AE=A1=E7=90=86]?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/form/drug/comp/sqbdList.vue | 42 ++++++++------------------ src/views/business/form/drug/comp/tbbdList.vue | 2 +- 2 files changed, 13 insertions(+), 31 deletions(-) diff --git a/src/views/business/form/drug/comp/sqbdList.vue b/src/views/business/form/drug/comp/sqbdList.vue index f7946f9..380e17f 100644 --- a/src/views/business/form/drug/comp/sqbdList.vue +++ b/src/views/business/form/drug/comp/sqbdList.vue @@ -2,48 +2,37 @@
- + {{ $t('page.business.study.studyFormApply.xzbd') }} - - {{ $t('form.search') }} - {{ $t('form.reset') }} -