From 615c91b1970fae7fe4e0049f30ec489b44c44572 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 4 Sep 2024 09:32:31 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E9=9D=9Edicom=E6=8A=A5=E5=91=8A=E9=A1=B5?=
=?UTF-8?q?=E6=95=B0=E5=80=BC=E7=B1=BB=E5=9E=8B=E9=97=AE=E9=A2=98=E7=B2=BE?=
=?UTF-8?q?=E5=BA=A6bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../reading/none-dicoms/components/Report.vue | 32 ++++++-------------
1 file changed, 9 insertions(+), 23 deletions(-)
diff --git a/src/views/trials/trials-panel/reading/none-dicoms/components/Report.vue b/src/views/trials/trials-panel/reading/none-dicoms/components/Report.vue
index 4c5b56b6..b0631b66 100644
--- a/src/views/trials/trials-panel/reading/none-dicoms/components/Report.vue
+++ b/src/views/trials/trials-panel/reading/none-dicoms/components/Report.vue
@@ -142,8 +142,7 @@
v-else-if="scope.row.DataSource !== 1 && questionForm[scope.row.QuestionId] instanceof Array && scope.row.Type==='number' && (scope.row.xfIndex || scope.row.xfIndex === 0) && !scope.row.IsShowInDicom && ((task.IsBaseLine && scope.row.LimitEdit === 1) || (!task.IsBaseLine && scope.row.LimitEdit === 2) || scope.row.LimitEdit === 0)"
v-model="questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId]"
:disabled="scope.row.DataSource === 1"
- @onblur="limitBlur($event, questionForm[scope.row.QuestionId][scope.row.xfIndex], scope.row.TableQuestionId, scope.row.ValueType)"
- @input="limitInput($event, questionForm[scope.row.QuestionId][scope.row.xfIndex], scope.row.TableQuestionId, scope.row.ValueType)"
+ @blur="limitBlur(questionForm[scope.row.QuestionId][scope.row.xfIndex], scope.row.TableQuestionId, scope.row.ValueType)"
size="mini"
@focus="() => {questionId = scope.row.QuestionId}"
>
@@ -165,8 +164,7 @@
v-else-if="scope.row.DataSource !== 1 && scope.row.Type==='number' && !scope.row.IsShowInDicom && ((task.IsBaseLine && scope.row.LimitEdit === 1) || (!task.IsBaseLine && scope.row.LimitEdit === 2) || scope.row.LimitEdit === 0)"
v-model="questionForm[scope.row.QuestionId]"
:disabled="scope.row.DataSource === 1"
- @onblur="limitBlur($event, questionForm, scope.row.QuestionId, scope.row.ValueType)"
- @input="limitInput($event, questionForm, scope.row.QuestionId, scope.row.ValueType)"
+ @blur="limitBlur(questionForm, scope.row.QuestionId, scope.row.ValueType)"
size="mini"
@focus="() => {questionId = scope.row.QuestionId}"
>
@@ -368,26 +366,14 @@ export default {
DicomEvent.$off('getReportInfo')
},
methods: {
- limitInput(value, a, b, valueType) {
+ limitBlur(questionForm,id,valueType) {
+ let value = questionForm[id]
if (valueType === 0) {
- this.$set(a, b, parseInt(value))
+ this.$set(questionForm, id, parseInt(value))
} else if (valueType === 3) {
- this.$set(a, b, parseFloat(value))
- } else if (value.split('.')[1].length >= this.digitPlaces) {
- this.$set(a, b, parseFloat(value).toFixed(this.digitPlaces))
- } else {
- this.$set(a, b, parseFloat(value))
- }
- },
- limitBlur(value,a,b,valueType) {
- if (valueType === 0) {
- this.$set(a, b, parseInt(value))
- } else if (valueType === 3) {
- this.$set(a, b, parseFloat(value))
- }else if (value.split('.')[1].length >= this.digitPlaces) {
- this.$set(a, b, parseFloat(value).toFixed(this.digitPlaces))
- } else {
- this.$set(a, b, parseFloat(value))
+ this.$set(questionForm, id, parseFloat(value))
+ }else {
+ this.$set(questionForm, id, parseFloat(value).toFixed(this.digitPlaces))
}
},
setImageUrl(qid, index, tqid, url, RowId) {
@@ -777,7 +763,7 @@ export default {
},
handleResize() {
this.$nextTick(() => {
- this.$refs.reportList.doLayout()
+ this.$refs.reportList ? this.$refs.reportList.doLayout() : ''
})
},
// 关闭签名框
From 9d8bd9c9108c81ab268dacdcfdc3b80331bb5ed6 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 4 Sep 2024 09:36:56 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=A8=BD=E6=9F=A5?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/dictionary/checkConfig/index.vue | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/views/dictionary/checkConfig/index.vue b/src/views/dictionary/checkConfig/index.vue
index e12c104e..0890a531 100644
--- a/src/views/dictionary/checkConfig/index.vue
+++ b/src/views/dictionary/checkConfig/index.vue
@@ -142,11 +142,16 @@
-
+
+
+
+
+
+
@@ -686,6 +691,7 @@
height="100"
>
+
Date: Wed, 4 Sep 2024 09:39:05 +0800
Subject: [PATCH 3/5] 1
---
src/views/dictionary/checkConfig/index.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/dictionary/checkConfig/index.vue b/src/views/dictionary/checkConfig/index.vue
index 0890a531..8b03f800 100644
--- a/src/views/dictionary/checkConfig/index.vue
+++ b/src/views/dictionary/checkConfig/index.vue
@@ -148,8 +148,8 @@
-
-
+
+
From 324bc1a536d10ee632256fbe3adc8fc3a912ad79 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 4 Sep 2024 10:14:14 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E7=A8=BD=E6=9F=A5=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../trials-panel/trial-summary/audit-record/index.vue | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
index df893644..76fdc045 100644
--- a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
@@ -978,6 +978,8 @@ export default {
this.tableListData = []
this[auditData] = []
config.forEach(v => {
+ v.Code = this.$i18n.locale === 'zh' ? v.Code : v.CodeEn ? CodeEn : v.Code
+
var item
if (!v.IsEnable) return
if (v.IsShowByTrialConfig) {
@@ -1084,7 +1086,7 @@ export default {
a = getToken()
}
return v.UrlParameterName + '=' + a + '&'
- }).toString().replaceAll(',', '') : v.UrlConfig.RoutePath,
+ }).toString().replaceAll(',', '') + 'zh='+this.$i18n.locale : v.UrlConfig.RoutePath,
newValue: v.UrlConfig.IsHaveParameters ? v.UrlConfig.RoutePath + '?' +
v.UrlConfig.ParameterList.map((v) => {
let a = obj[v.UrlParameterValueName] ? obj[v.UrlParameterValueName] : parentRow[v.UrlParameterValueName]
@@ -1092,7 +1094,7 @@ export default {
a = getToken()
}
return v.UrlParameterName + '=' + a + '&'
- }).toString().replaceAll(',', '') : v.UrlConfig.RoutePath
+ }).toString().replaceAll(',', '') + 'zh='+this.$i18n.locale : v.UrlConfig.RoutePath
}
console.log(item)
item.IsTableFiled = v.IsTableFiled
From 5de6a69bc8e3c1a04ef7945f4b49a311d29ab337 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 4 Sep 2024 10:24:44 +0800
Subject: [PATCH 5/5] 1
---
.../trials/trials-panel/trial-summary/audit-record/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
index 76fdc045..f1e92f7c 100644
--- a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
@@ -978,7 +978,7 @@ export default {
this.tableListData = []
this[auditData] = []
config.forEach(v => {
- v.Code = this.$i18n.locale === 'zh' ? v.Code : v.CodeEn ? CodeEn : v.Code
+ v.Code = this.$i18n.locale === 'zh' ? v.Code : v.CodeEn ? v.CodeEn : v.Code
var item
if (!v.IsEnable) return