From d3a88c0f55cd8be039189d626ce544f4ed0e2c5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Wed, 28 Feb 2024 16:59:57 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  2 +-
 .../components/EvaluationOfOncologyConfig.vue | 28 +++++++++++++------
 .../reading-unit/components/ReadingRules.vue  |  3 +-
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/.env.development b/.env.development
index 0819ca53..ad322b0d 100644
--- a/.env.development
+++ b/.env.development
@@ -33,7 +33,7 @@ VUE_APP_PASSWORD_FOR_PERMISSION = false
 VUE_APP_PASSWORD_FOR_REGULAR = ^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[-_.@^+\$!%#*?&\$~])[A-Za-z0-9-~_.@^+\$~!%#*?&]{8,32}$
 
 # 是否开启文档签署验证 true:是 false:否
-VUE_APP_WORD_FOR_PERMISSION = false
+VUE_APP_WORD_FOR_PERMISSION = true
 
 
 # dicom文件地址
diff --git a/src/views/dictionary/template/components/EvaluationOfOncologyConfig.vue b/src/views/dictionary/template/components/EvaluationOfOncologyConfig.vue
index e3e73313..f95ef251 100644
--- a/src/views/dictionary/template/components/EvaluationOfOncologyConfig.vue
+++ b/src/views/dictionary/template/components/EvaluationOfOncologyConfig.vue
@@ -72,7 +72,7 @@
             v-loading="loading"
             style="width: 100%"
             ref="multipleTable"
-            :data="$d.OncologyAssessType"
+            :data="OncologyAssessType"
             stripe
             @selection-change="handleSelectionChange"
           >
@@ -81,13 +81,13 @@
               width="55">
             </el-table-column>
             <el-table-column
-              prop="raw.ValueCN"
+              prop="ValueCN"
               label="中文值"
               show-overflow-tooltip
             >
             </el-table-column>
             <el-table-column
-              prop="raw.Value"
+              prop="Value"
               label="英文值"
               show-overflow-tooltip
             >
@@ -105,7 +105,7 @@
 
 <script>
 import BaseModel from '@/components/BaseModel'
-import { getSystemOncologyInfo, setSystemOncologyInfo } from '@/api/dictionary'
+import { getSystemOncologyInfo, setSystemOncologyInfo, getCriterionDictionary } from '@/api/dictionary'
 export default {
   props: {
     data: {
@@ -132,13 +132,23 @@ export default {
       preview: { visible: false, title: 'eCRF预览' },
       config: { visible: false, title: '肿瘤学阅片结果', appendToBody: true, width: '600px', configType: 0 },
       selectedList: [],
+      OncologyAssessType: [],
       IsOncologyReading: true
     }
   },
   mounted() {
     this.getList()
+    this.getCriterionDictionary()
   },
   methods: {
+    getCriterionDictionary() {
+      getCriterionDictionary({
+        ReadingCriterionId: this.criterionId,
+        DictionaryCode: 'OncologyAssessType'
+      }).then(res => {
+        this.OncologyAssessType = res.Result.OncologyAssessType
+      })
+    },
     toggleSelection(rows) {
       console.log(this.$refs.multipleTable)
       if (rows) {
@@ -173,9 +183,9 @@ export default {
         this.config.title = '肿瘤学阅片结果'
         this.config.visible = true
         this.$nextTick(() => {
-          var a = this.$d.OncologyAssessType.filter(v => {
+          var a = this.OncologyAssessType.filter(v => {
             return !!this.list.find(v1 => {
-              return v1.DictionaryId === v.id
+              return v1.DictionaryId === v.Id
             })
           })
           this.toggleSelection(a)
@@ -184,15 +194,15 @@ export default {
     },
     handleSave() {
       this.loading = true
-      var a = this.$d.OncologyAssessType.filter(v => {
+      var a = this.OncologyAssessType.filter(v => {
         return !!this.list.find(v1 => {
-          return v1.DictionaryId === v.id
+          return v1.DictionaryId === v.Id
         })
       })
       var params = {
         SystemCriterionId: this.criterionId,
         ParentCode: 'OncologyAssessType',
-        DictionaryIds: this.config.configType === 1 ? a.map(v => v.id) : this.selectedList.map(v => v.id),
+        DictionaryIds: this.config.configType === 1 ? a.map(v => v.Id) : this.selectedList.map(v => v.Id),
         IsSystemCriterion: true,
         IsOncologyReading: this.form.IsOncologyReading
       }
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue b/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue
index 0d16339a..ea094e29 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue
@@ -184,7 +184,7 @@
       >
         <el-radio-group
           v-model="form.IsOncologyReading"
-          :disabled="!form.IsReadingPeriod || form.IsSystemCriterion || isConfirm || !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])"
+          :disabled="!form.IsReadingPeriod || !form.IsSystemSetOncology || isConfirm || !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])"
         >
           <el-radio
             v-for="item of $d.YesOrNo"
@@ -379,6 +379,7 @@ export default {
         IsOncologyReading: 0,
         IsReadingTaskViewInOrder: false,
         IsReadingPeriod: false,
+        IsSystemSetOncology: false,
         // IsReadingTaskViewInOrder: null,
         ArbitrationRule: null,
         GlobalUpdateType: null,