From 43bdf0cc193703ee212842588fd64530ad579f5d Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 1 Aug 2024 16:34:07 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E9=87=8D=E4=BC=A0bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visit/crc-upload/components/uploadDicomFiles2.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 cbe4b436..b8c700a2 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
@@ -882,7 +882,7 @@ export default {
           modality: this.studyForm.Modality,
           bodyPart: this.studyForm.BodyPart,
         };
-        updateModality(this.data.TrialId, params)
+        updateModality(this.trialId, params)
           .then((res) => {
             this.btnLoading = false;
             if (res.IsSuccess) {

From 3819f5af0bb3b9c9641d2f1f38dedc4b7852734b Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 2 Aug 2024 11:41:50 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=92=8C=E5=BD=B1=E5=83=8F=E6=8C=87=E6=8E=A7=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=A1=E6=A0=B8=E5=AE=8C=E6=88=90=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/visit/crc-upload/index.vue   |  7 ++++
 .../qc-check/components/qualityAssurance.vue  |  4 ++-
 .../trials-panel/visit/qc-check/index.vue     | 33 +++++++++++++++++--
 3 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/src/views/trials/trials-panel/visit/crc-upload/index.vue b/src/views/trials/trials-panel/visit/crc-upload/index.vue
index 8d534a8c..4cc834e9 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/index.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/index.vue
@@ -308,6 +308,13 @@
             <el-tag v-else-if="scope.row.AuditState*1 === 8" type="primary">{{ $fd('AuditStateRC', scope.row.AuditState*1) }}</el-tag>
           </template>
         </el-table-column>
+        <!-- 审核完成时间 -->
+        <el-table-column
+          prop="AuditTime"
+          :label="$t('trials:crcUpload:table:auditTime')"
+          show-overflow-tooltip
+          width="170"
+        />
         <el-table-column
           v-if="hasPermi(['trials:trials-panel:visit:crc-upload:upload', 'trials:trials-panel:visit:crc-upload:submit','trials:trials-panel:visit:crc-upload:edit','trials:trials-panel:visit:crc-upload:delete'], '||')"
           :label="$t('common:action:action')"
diff --git a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
index 3b1dc947..dc2bce1b 100644
--- a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
@@ -1998,7 +1998,9 @@ export default {
                     this.$emit("getList");
                     this.$emit("nextTask", res.Result.VisitId);
                   });
-                });
+                }).catch(()=>{
+                  this.$emit("getList")
+                })
               } else {
                 // 没有后续质控任务
                 this.$emit("getList");
diff --git a/src/views/trials/trials-panel/visit/qc-check/index.vue b/src/views/trials/trials-panel/visit/qc-check/index.vue
index 0cdb906b..5fbd6f6d 100644
--- a/src/views/trials/trials-panel/visit/qc-check/index.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/index.vue
@@ -80,7 +80,16 @@
             </el-option>
           </el-select>
         </el-form-item>
-
+        <!-- 分配时间 -->
+        <el-form-item :label="$t('trials:qcCheck:table:auditTime')">
+          <el-date-picker
+            v-model="timeList"
+            value-format="yyyy-MM-dd"
+            format="yyyy-MM-dd"
+            type="daterange"
+            @change="changeTimeList"
+          />
+        </el-form-item>
         <el-form-item>
           <!-- 查询 -->
           <el-button type="primary" icon="el-icon-search" @click="handleSearch">
@@ -309,6 +318,13 @@
             <el-tag v-else-if="scope.row.AuditState*1 === 8" type="primary"> {{ $fd('AuditStateRC', scope.row.AuditState*1) }}</el-tag>
           </template>
         </el-table-column>
+        <!-- 审核完成时间 -->
+        <el-table-column
+          prop="AuditTime"
+          :label="$t('trials:qcCheck:table:auditTime')"
+          show-overflow-tooltip
+          width="170"
+        />
         <!-- 历史审核人 -->
         <el-table-column
           v-show="OtherInfo.QCProcessEnum !== 0"
@@ -652,6 +668,8 @@ const searchDataDefault = () => {
     IsUrgent: null,
     AuditStateArray: [],
     HandleUserId: '',
+    BeginAuditTime: null,
+    EndAuditTime: null,
     PageIndex: 1,
     PageSize: 20
     // SortField: '',
@@ -683,7 +701,8 @@ export default {
       trialCode: this.$route.query.trialCode,
       query: null,
       manualsDialog: { visible: false },
-      isFullscreen: false
+      isFullscreen: false,
+      timeList: []
     }
   },
   watch: {
@@ -822,6 +841,7 @@ export default {
     // 重置
     handleReset() {
       this.searchData = searchDataDefault()
+      this.timeList = []
       this.getList()
       this.$nextTick(() => {
         this.$refs.qcCheckList.clearSort()
@@ -949,6 +969,15 @@ export default {
         this.qcVisible = false
       })
     },
+    changeTimeList() {
+      if (this.timeList) {
+        this.searchData.BeginAuditTime = this.timeList[0]
+        this.searchData.EndAuditTime = this.timeList[1]
+      } else {
+        this.searchData.BeginAuditTime = null
+        this.searchData.EndAuditTime = null
+      }
+    },
     openManuals() {
       this.manualsDialog.visible = true
     }