From c29b60cbbecc3095bf9698e0a9397714f27d01d4 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 10 Apr 2024 16:45:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=B1=E5=83=8F=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E9=A1=B5=E9=9D=A2=E6=9D=83=E9=99=90=E7=BB=91=E5=AE=9A?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/uploadClinicalData.vue                 |  8 +++-----
 .../trials/trials-panel/setting/attachment/index.vue  |  5 +++--
 .../visit/crc-upload/components/studyInfo.vue         |  6 +++---
 .../visit/crc-upload/components/uploadDicomFiles.vue  |  2 +-
 .../visit/crc-upload/components/uploadDicomFiles2.vue |  2 +-
 .../crc-upload/components/uploadNonDicomFiles.vue     | 11 ++++++-----
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/components/clinicalDataQuestions/components/uploadClinicalData.vue b/src/components/clinicalDataQuestions/components/uploadClinicalData.vue
index 69ab47d4..86819648 100644
--- a/src/components/clinicalDataQuestions/components/uploadClinicalData.vue
+++ b/src/components/clinicalDataQuestions/components/uploadClinicalData.vue
@@ -64,7 +64,7 @@
               </template>
             </el-table-column>
             <el-table-column
-              v-if="hasPermi(['trials:trials-panel:visit:crc-upload:upload']) && allowAddOrEdit"
+              v-if="hasPermi(['trials:trials-panel:visit:crc-upload:edit']) && allowAddOrEdit"
               :label="$t('common:action:action')"
               min-width="120"
             >
@@ -81,7 +81,6 @@
                 <!-- 移除 -->
                 <el-button
                   v-if="(data.SubmitState*1 < 2 || (data.SubmitState === 2 && data.IsQCConfirmedReupload))"
-                  v-hasPermi="['trials:trials-panel:visit:crc-upload:upload']"
                   icon="el-icon-delete"
                   circle
                   :title="$t('common:button:delete')"
@@ -127,7 +126,7 @@
             </el-table-column>
 
             <el-table-column
-              v-if="hasPermi(['trials:trials-panel:visit:crc-upload:upload']) && allowAddOrEdit"
+              v-if="hasPermi(['trials:trials-panel:visit:crc-upload:edit']) && allowAddOrEdit"
               :label="$t('common:action:action')"
               min-width="200"
             >
@@ -144,7 +143,6 @@
                 <!-- 移除 -->
                 <el-button
                   v-if="data.SubmitState*1 < 2 || (data.SubmitState === 2 && data.IsQCConfirmedReupload)"
-                  v-hasPermi="['trials:trials-panel:visit:crc-upload:upload']"
                   icon="el-icon-delete"
                   circle
                   :title="$t('common:button:delete')"
@@ -200,7 +198,7 @@
             </el-table-column>
 
             <el-table-column
-              v-if="hasPermi(['trials:trials-panel:visit:crc-upload:upload']) && allowAddOrEdit"
+              v-if="hasPermi(['trials:trials-panel:visit:crc-upload:edit']) && allowAddOrEdit"
               :label="$t('common:action:action')"
               min-width="200"
             >
diff --git a/src/views/trials/trials-panel/setting/attachment/index.vue b/src/views/trials/trials-panel/setting/attachment/index.vue
index 205f01ef..43b3be99 100644
--- a/src/views/trials/trials-panel/setting/attachment/index.vue
+++ b/src/views/trials/trials-panel/setting/attachment/index.vue
@@ -11,9 +11,9 @@
           >
             <el-option
               v-for="item of $d.Trial_Document"
-              :key="item.value"
+              :key="item.id"
               :label="item.label"
-              :value="item.value"
+              :value="item.id"
             />
           </el-select>
         </el-form-item>
@@ -238,6 +238,7 @@ export default {
     }
   },
   mounted() {
+    console.log(this.$d.Trial_Document)
     this.trialId = this.$route.query.trialId
     this.getList()
   },
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/studyInfo.vue b/src/views/trials/trials-panel/visit/crc-upload/components/studyInfo.vue
index d16d646b..f7ab1997 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/studyInfo.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/studyInfo.vue
@@ -4,7 +4,7 @@
       <!-- 删除 -->
       <el-button
         v-if="(data.SubmitState*1 < 2 || (data.SubmitState === 2 && data.IsQCConfirmedReupload))"
-        v-hasPermi="['trials:trials-panel:visit:crc-upload:upload']"
+        v-hasPermi="['trials:trials-panel:visit:crc-upload:delete']"
         :disabled="deleteArr.length === 0"
         type="primary"
         size="small"
@@ -111,7 +111,7 @@
           <el-button
             icon="el-icon-edit-outline"
             v-if=" (data.SubmitState*1 < 2 || (data.SubmitState === 2 && data.IsQCConfirmedReupload))"
-            v-hasPermi="['trials:trials-panel:visit:crc-upload:upload']"
+            v-hasPermi="['trials:trials-panel:visit:crc-upload:edit']"
             title="编辑"
             circle
             :disabled="scope.row.IsDeleted"
@@ -120,7 +120,7 @@
           <!-- 删除 -->
           <el-button
             v-if=" (data.SubmitState*1 < 2 || (data.SubmitState === 2 && data.IsQCConfirmedReupload))"
-            v-hasPermi="['trials:trials-panel:visit:crc-upload:upload']"
+            v-hasPermi="['trials:trials-panel:visit:crc-upload:delete']"
             icon="el-icon-delete"
             :title="$t('trials:uploadedDicoms:action:delete')"
             circle
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles.vue
index 06176b12..b6f8b694 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles.vue
@@ -108,7 +108,7 @@
           <!-- 编辑 -->
           <el-button
             icon="el-icon-edit-outline"
-            v-hasPermi="['trials:trials-panel:visit:crc-upload:upload']"
+            v-hasPermi="['trials:trials-panel:visit:crc-upload:edit']"
             :title="$t('common:button:edit')"
             circle
             :disabled="scope.row.IsDeleted"
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
index ed20b0c1..e73af7d0 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
@@ -135,7 +135,7 @@
           <!-- 编辑 -->
           <el-button
             icon="el-icon-edit-outline"
-            v-hasPermi="['trials:trials-panel:visit:crc-upload:upload2']"
+            v-hasPermi="['trials:trials-panel:visit:crc-upload:edit']"
             :title="$t('common:button:edit')"
             circle
             :disabled="scope.row.IsDeleted"
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue
index b3abd3d2..d94586c3 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue
@@ -2,7 +2,7 @@
   <div v-loading="loading" class="non-dicom-wrapper">
     <!-- <h4 class="box-title">既往放疗史</h4> -->
     <div style="text-align:right">
-      <el-button v-if="(allowAddOrEdit)" icon="el-icon-plus" type="primary" size="small" @click.native.prevent="handleAdd">
+      <el-button v-if="(allowAddOrEdit)" v-hasPermi="['trials:trials-panel:visit:crc-upload:edit']" icon="el-icon-plus" type="primary" size="small" @click.native.prevent="handleAdd">
         {{ $t('common:button:new') }}
       </el-button>
       <el-button
@@ -65,8 +65,8 @@
                   />
                   <!-- 删除 -->
                   <el-button
-                    v-if="(data.SubmitState*1 < 2 || (data.SubmitState === 2 && data.IsQCConfirmedReupload))"
-                    v-hasPermi="['trials:trials-panel:visit:crc-upload:upload']"
+                    v-if="allowAddOrEdit"
+                    v-hasPermi="['trials:trials-panel:visit:crc-upload:delete']"
                     icon="el-icon-delete"
                     circle
                     :title="$t('trials:uploadNonDicoms:action:delete')"
@@ -135,6 +135,7 @@
           <!-- 编辑 -->
           <el-button
             v-if="(allowAddOrEdit)"
+            v-hasPermi="['trials:trials-panel:visit:crc-upload:edit']"
             icon="el-icon-edit-outline"
             circle
             :title="$t('trials:uploadNonDicoms:action:edit')"
@@ -142,8 +143,8 @@
           />
           <!-- 删除 -->
           <el-button
-            v-if="(data.SubmitState*1 < 2 || (data.SubmitState === 2 && data.IsQCConfirmedReupload))"
-            v-hasPermi="['trials:trials-panel:visit:crc-upload:upload']"
+            v-if="allowAddOrEdit"
+            v-hasPermi="['trials:trials-panel:visit:crc-upload:delete']"
             icon="el-icon-delete"
             circle
             :title="$t('trials:uploadNonDicoms:action:delete')"