Merge branch 'uat' into uat_us

src/views/login/index.vue

@@ -262,7 +262,7 @@ export default {
       this.setLanguage("en");
       this.$updateDictionary();
     } else {
-      if (this.location === "USA") {
+      if (this.location === "USA" || this.NODE_ENV === "usa") {
         this.$i18n.locale = "en";
         this.setLanguage("en");
         this.$updateDictionary();

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) {

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')"

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");

src/views/trials/trials-panel/visit/qc-check/index.vue

@@ -80,7 +80,17 @@
             </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 HH:mm:ss"
+            format="yyyy-MM-dd"
+            type="datetimerange"
+            :default-time="['00:00:00', '23:59:59']"
+            @change="changeTimeList"
+          />
+        </el-form-item>
         <el-form-item>
           <!-- 查询 -->
           <el-button type="primary" icon="el-icon-search" @click="handleSearch">
@@ -309,6 +319,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 +669,8 @@ const searchDataDefault = () => {
     IsUrgent: null,
     AuditStateArray: [],
     HandleUserId: '',
+    BeginAuditTime: null,
+    EndAuditTime: null,
     PageIndex: 1,
     PageSize: 20
     // SortField: '',
@@ -683,7 +702,8 @@ export default {
       trialCode: this.$route.query.trialCode,
       query: null,
       manualsDialog: { visible: false },
-      isFullscreen: false
+      isFullscreen: false,
+      timeList: []
     }
   },
   watch: {
@@ -822,6 +842,7 @@ export default {
     // 重置
     handleReset() {
       this.searchData = searchDataDefault()
+      this.timeList = []
       this.getList()
       this.$nextTick(() => {
         this.$refs.qcCheckList.clearSort()
@@ -949,6 +970,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
     }