Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web

src/views/dictionary/checkConfig/index.vue

@@ -142,11 +142,16 @@
                 <el-input v-model="form.Identification" placeholder="请输入标识" />
               </el-form-item>
             </el-col>
-            <el-col v-show="form.ConfigType === 'C' && title !== '复制'" :span="24">
+            <el-col v-show="form.ConfigType === 'C' && title !== '复制'" :span="12">
               <el-form-item label="字段key">
                 <el-input v-model="form.Code" placeholder="请输入字段key" />
               </el-form-item>
             </el-col>
+            <el-col v-show="form.ConfigType === 'C' && title !== '复制'" :span="12">
+              <el-form-item label="字段key英文">
+                <el-input v-model="form.CodeEn" placeholder="请输入字段key英文" />
+              </el-form-item>
+            </el-col>
             <el-col v-show="form.ConfigType === 'C' && title !== '复制'" :span="12">
               <el-form-item label="字段英文">
                 <el-input v-model="form.Value" placeholder="请输入字段英文" />
@@ -686,6 +691,7 @@
             height="100"
           >
             <el-table-column prop="Code" label="字段名" min-width="120px" :show-overflow-tooltip="true" />
+            <el-table-column prop="CodeEn" label="字段名英文" min-width="120px" :show-overflow-tooltip="true" />
             <el-table-column prop="Value" label="字段英文" min-width="120px" :show-overflow-tooltip="true" />
             <el-table-column prop="ValueCN" label="字段中文" min-width="120px" :show-overflow-tooltip="true" />
             <el-table-column
@@ -1143,6 +1149,7 @@ export default {
         IsShowParent: 0,
         Sort: 0,
         Code: null,
+        CodeEn: null,
         Value: null,
         ValueCN: null,
         EnumType: '',

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)"
+                      @blur="limitBlur(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)"
                       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)"
+                      @blur="limitBlur(questionForm, scope.row.QuestionId, scope.row.ValueType)"
-                      @input="limitInput($event, 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))
+          this.$set(questionForm, id, parseFloat(value))
-        } else if (value.split('.')[1].length >= this.digitPlaces) {
+        }else {
-          this.$set(a, b, parseFloat(value).toFixed(this.digitPlaces))
+          this.$set(questionForm, id, 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))
         }
     },
     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() : ''
       })
     },
     // 关闭签名框

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 ? v.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