src/store/modules/reading.js

@@ -887,12 +887,6 @@ const actions = {
                       const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${i}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}`
                       imageIds.push(imageId)
                     })
-                  } else if (study.IsCriticalSequence && instance.KeyFramesList.length === 0) {
-                    // 兼容保存标记数据未存NumberOfFrames的情况，按序列展示
-                    for (let i = 0; i < instance.NumberOfFrames; i++) {
-                      const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${i}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}`
-                      imageIds.push(imageId)
-                    }
                   } else {
                     for (let i = 0; i < instance.NumberOfFrames; i++) {
                       const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${i}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}`

src/views/dictionary/attachment/components/SignatureTemplate/TemplateForm.vue

@@ -3,16 +3,13 @@
     ref="sysAttachmentFrom"
     v-loading="loading"
     :model="form"
-    label-width="190px"
+    label-width="170px"
     size="small"
     :rules="rules"
     class="upload-temporary-file"
   >
     <div class="base-dialog-body">
-      <el-form-item
+      <el-form-item label="文件类型: " prop="FileTypeId">
-        :label="$t('dictionary:signature:form:FileTypeId')"
-        prop="FileTypeId"
-      >
         <el-select
           v-model="form.FileTypeId"
           style="width: 100%"
@@ -28,7 +25,7 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item :label="$t('dictionary:signature:form:File')">
+      <el-form-item label="文件: ">
         <div class="upload-container">
           <el-upload
             class="upload-demo"
@@ -49,16 +46,16 @@
               type="primary"
               :disabled="form.FileTypeId === ''"
               :loading="btnLoading"
-              >{{ $t('common:button:check') }}</el-button
+              >Select</el-button
             >
             <span slot="tip" style="margin-left: 10px" class="el-upload__tip">
-              ({{ $t('trials:signature:label:mustBepdf') }})
+              (must be in pdf format)
             </span>
           </el-upload>
         </div>
       </el-form-item>
       <el-form-item
-        :label="$t('dictionary:signature:form:NeedConfirmedUserTypeIdList')"
+        label="需要签署的用户类型: "
         prop="NeedConfirmedUserTypeIdList"
       >
         <el-select
@@ -74,10 +71,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item
+      <el-form-item label="是否仅内部签署: " prop="DocUserSignType">
-        :label="$t('dictionary:signature:form:DocUserSignType')"
-        prop="DocUserSignType"
-      >
         <el-switch
           v-model="form.DocUserSignType"
           :active-value="1"
@@ -86,7 +80,7 @@
         </el-switch>
       </el-form-item>
       <el-form-item
-        :label="$t('dictionary:signature:form:SignViewMinimumMinutes')"
+        label="查看最短时间（分钟）: "
         prop="SignViewMinimumMinutes"
       >
         <el-input-number
@@ -111,7 +105,7 @@
           :disabled="form.FileTypeId === '' || form.Name === ''"
           :loading="saveBtnLoading"
           @click="handleSave"
-          >{{ $t('common:button:save') }}</el-button
+          >Save</el-button
         >
       </el-form-item>
     </div>
@@ -144,25 +138,13 @@ export default {
       },
       rules: {
         FileTypeId: [
-          {
+          { required: true, message: 'Please select', trigger: ['blur'] },
-            required: true,
-            message: this.$t('common:ruleMessage:select'),
-            trigger: ['blur'],
-          },
         ],
         SignViewMinimumMinutes: [
-          {
+          { required: true, message: 'Please specify', trigger: ['change'] },
-            required: true,
-            message: this.$t('common:ruleMessage:specify'),
-            trigger: ['change'],
-          },
         ],
         NeedConfirmedUserTypeIdList: [
-          {
+          { required: true, message: 'Please select', trigger: ['blur'] },
-            required: true,
-            message: this.$t('common:ruleMessage:select'),
-            trigger: ['blur'],
-          },
         ],
       },
       fileList: [],
@@ -229,7 +211,7 @@ export default {
         this.fileList = []
         return true
       } else {
-        this.$alert(this.$t('trials:signature:label:mustBepdf'))
+        this.$alert('must be in pdf format')
 
         return false
       }
@@ -254,7 +236,7 @@ export default {
       this.$refs.sysAttachmentFrom.validate((valid) => {
         if (!valid) return
         if (!this.form.Name) {
-          this.$alert(this.$t('trials:signature:message:selectFile'))
+          this.$alert('Please select file.')
           return
         }
         this.saveBtnLoading = true
@@ -263,7 +245,7 @@ export default {
             this.saveBtnLoading = false
             this.$emit('closeDialog')
             this.$emit('getList')
-            this.$message.success(this.$t('common:message:updatedSuccessfully'))
+            this.$message.success('Uploaded successfully')
           })
           .catch(() => {
             this.saveBtnLoading = false
@@ -281,7 +263,7 @@ export default {
       }
     },
     handleExceed(files, fileList) {
-      this.$message.warning(this.$t('upload:rule:maxFile1'))
+      this.$message.warning(`Upload is currently limited to 1 file`)
     },
     checkFileSuffix(fileName) {
       var typeArr = ['pdf']

src/views/dictionary/attachment/components/SignatureTemplate/index.vue

@@ -34,7 +34,7 @@
       <el-button
         type="primary"
         icon="el-icon-plus"
-        style="margin-left: auto; margin-bottom: 10px"
+        style="margin-left: auto"
         size="small"
         @click="handleAdd"
       >
@@ -69,7 +69,6 @@
           :label="$t('dictionary:signature:table:SignViewMinimumMinutes')"
           show-overflow-tooltip
           sortable="custom"
-          min-width="110"
         />
         <el-table-column
           prop="NeedConfirmedUserTypes"
@@ -104,7 +103,6 @@
           :label="$t('dictionary:signature:table:DocUserSignType')"
           show-overflow-tooltip
           sortable="custom"
-          min-width="90"
         >
           <template slot-scope="scope">
             {{ $fd('ReadingYesOrNo', Number(scope.row.DocUserSignType)) }}
@@ -117,7 +115,7 @@
           sortable="custom"
         />
 
-        <el-table-column :label="$t('common:action:action')" min-width="100">
+        <el-table-column :label="$t('common:action:action')">
           <template slot-scope="scope">
             <el-button type="text" @click="handlePreview(scope.row)">
               {{ $t('common:button:preview') }}