国际化修改

.eslintrc.js

@@ -1,48 +1,58 @@
 module.exports = {
   root: true,
   parserOptions: {
-    parser: 'babel-eslint',
+    parser: '@babel/eslint-parser',
     sourceType: 'module'
   },
   globals: {
-    "zzSessionStorage": true
+    'zzSessionStorage': true
   },
   env: {
     browser: true,
     node: true,
     es6: true
   },
-  extends: ["plugin:vue/recommended"],
+  extends: ['plugin:vue/recommended'],
 
   // add your custom rules here
-  //it is base on https://github.com/vuejs/eslint-config-vue
+  // it is base on https://github.com/vuejs/eslint-config-vue
   rules: {
-    "vue/max-attributes-per-line": [
+    // "rule-name": "off"
-      2,
+    // "vue/max-attributes-per-line": [
+    //   2,
+    //   {
+    //     singleline: 10,
+    //     multiline: {
+    //       max: 1,
+    //       allowFirstLine: false
+    //     }
+    //   }
+    // ],
+    'vue/max-attributes-per-line': [
+      'error',
       {
         singleline: 10,
         multiline: {
-          max: 1,
+          max: 1
-          allowFirstLine: false
         }
       }
     ],
-    "vue/singleline-html-element-content-newline": "off",
+    'vue/singleline-html-element-content-newline': 'off',
-    "vue/multiline-html-element-content-newline": "off",
+    'vue/multiline-html-element-content-newline': 'off',
-    "vue/name-property-casing": ["error", "PascalCase"],
+    'vue/name-property-casing': ['error', 'PascalCase'],
-    "vue/no-v-html": "off",
+    'vue/no-v-html': 'off',
-    "accessor-pairs": 2,
+    'accessor-pairs': 2,
-    "arrow-spacing": [
+    'arrow-spacing': [
       2,
       {
         before: true,
         after: true
       }
     ],
-    "block-spacing": [2, "always"],
+    'block-spacing': [2, 'always'],
-    "brace-style": [
+    'brace-style': [
       2,
-      "1tbs",
+      '1tbs',
       {
         allowSingleLine: true
       }
@@ -50,31 +60,31 @@ module.exports = {
     camelcase: [
       0,
       {
-        properties: "always"
+        properties: 'always'
       }
     ],
-    "comma-dangle": [2, "never"],
+    'comma-dangle': [2, 'never'],
-    "comma-spacing": [
+    'comma-spacing': [
       2,
       {
         before: false,
         after: true
       }
     ],
-    "comma-style": [2, "last"],
+    'comma-style': [2, 'last'],
-    "constructor-super": 2,
+    'constructor-super': 2,
-    curly: [2, "multi-line"],
+    curly: [2, 'multi-line'],
-    "dot-location": [2, "property"],
+    'dot-location': [2, 'property'],
-    "eol-last": 2,
+    'eol-last': 2,
-    eqeqeq: ["error", "always", { null: "ignore" }],
+    eqeqeq: ['error', 'always', { null: 'ignore' }],
-    "generator-star-spacing": [
+    'generator-star-spacing': [
       2,
       {
         before: true,
         after: true
       }
     ],
-    "handle-callback-err": [2, "^(err|error)$"],
+    'handle-callback-err': [2, '^(err|error)$'],
     indent: [
       2,
       2,
@@ -82,197 +92,197 @@ module.exports = {
         SwitchCase: 1
       }
     ],
-    "jsx-quotes": [2, "prefer-single"],
+    'jsx-quotes': [2, 'prefer-single'],
-    "key-spacing": [
+    'key-spacing': [
       2,
       {
         beforeColon: false,
         afterColon: true
       }
     ],
-    "keyword-spacing": [
+    'keyword-spacing': [
       2,
       {
         before: true,
         after: true
       }
     ],
-    "new-cap": [
+    'new-cap': [
       2,
       {
         newIsCap: true,
         capIsNew: false
       }
     ],
-    "new-parens": 2,
+    'new-parens': 2,
-    "no-array-constructor": 2,
+    'no-array-constructor': 2,
-    "no-caller": 2,
+    'no-caller': 2,
-    "no-console": "off",
+    'no-console': 'off',
-    "no-class-assign": 2,
+    'no-class-assign': 2,
-    "no-cond-assign": 2,
+    'no-cond-assign': 2,
-    "no-const-assign": 2,
+    'no-const-assign': 2,
-    "no-control-regex": 0,
+    'no-control-regex': 0,
-    "no-delete-var": 2,
+    'no-delete-var': 2,
-    "no-dupe-args": 2,
+    'no-dupe-args': 2,
-    "no-dupe-class-members": 2,
+    'no-dupe-class-members': 2,
-    "no-dupe-keys": 2,
+    'no-dupe-keys': 2,
-    "no-duplicate-case": 2,
+    'no-duplicate-case': 2,
-    "no-empty-character-class": 2,
+    'no-empty-character-class': 2,
-    "no-empty-pattern": 2,
+    'no-empty-pattern': 2,
-    "no-eval": 2,
+    'no-eval': 2,
-    "no-ex-assign": 2,
+    'no-ex-assign': 2,
-    "no-extend-native": 2,
+    'no-extend-native': 2,
-    "no-extra-bind": 2,
+    'no-extra-bind': 2,
-    "no-extra-boolean-cast": 2,
+    'no-extra-boolean-cast': 2,
-    "no-extra-parens": [2, "functions"],
+    'no-extra-parens': [2, 'functions'],
-    "no-fallthrough": 2,
+    'no-fallthrough': 2,
-    "no-floating-decimal": 2,
+    'no-floating-decimal': 2,
-    "no-func-assign": 2,
+    'no-func-assign': 2,
-    "no-implied-eval": 2,
+    'no-implied-eval': 2,
-    "no-inner-declarations": [2, "functions"],
+    'no-inner-declarations': [2, 'functions'],
-    "no-invalid-regexp": 2,
+    'no-invalid-regexp': 2,
-    "no-irregular-whitespace": 2,
+    'no-irregular-whitespace': 2,
-    "no-iterator": 2,
+    'no-iterator': 2,
-    "no-label-var": 2,
+    'no-label-var': 2,
-    "no-labels": [
+    'no-labels': [
       2,
       {
         allowLoop: false,
         allowSwitch: false
       }
     ],
-    "no-lone-blocks": 2,
+    'no-lone-blocks': 2,
-    "no-mixed-spaces-and-tabs": 2,
+    'no-mixed-spaces-and-tabs': 2,
-    "no-multi-spaces": 2,
+    'no-multi-spaces': 2,
-    "no-multi-str": 2,
+    'no-multi-str': 2,
-    "no-multiple-empty-lines": [
+    'no-multiple-empty-lines': [
       2,
       {
         max: 1
       }
     ],
-    "no-native-reassign": 2,
+    'no-native-reassign': 2,
-    "no-negated-in-lhs": 2,
+    'no-negated-in-lhs': 2,
-    "no-new-object": 2,
+    'no-new-object': 2,
-    "no-new-require": 2,
+    'no-new-require': 2,
-    "no-new-symbol": 2,
+    'no-new-symbol': 2,
-    "no-new-wrappers": 2,
+    'no-new-wrappers': 2,
-    "no-obj-calls": 2,
+    'no-obj-calls': 2,
-    "no-octal": 2,
+    'no-octal': 2,
-    "no-octal-escape": 2,
+    'no-octal-escape': 2,
-    "no-path-concat": 2,
+    'no-path-concat': 2,
-    "no-proto": 2,
+    'no-proto': 2,
-    "no-redeclare": 2,
+    'no-redeclare': 2,
-    "no-regex-spaces": 2,
+    'no-regex-spaces': 2,
-    "no-return-assign": [2, "except-parens"],
+    'no-return-assign': [2, 'except-parens'],
-    "no-self-assign": 2,
+    'no-self-assign': 2,
-    "no-self-compare": 2,
+    'no-self-compare': 2,
-    "no-sequences": 2,
+    'no-sequences': 2,
-    "no-shadow-restricted-names": 2,
+    'no-shadow-restricted-names': 2,
-    "no-spaced-func": 2,
+    'no-spaced-func': 2,
-    "no-sparse-arrays": 2,
+    'no-sparse-arrays': 2,
-    "no-this-before-super": 2,
+    'no-this-before-super': 2,
-    "no-throw-literal": 2,
+    'no-throw-literal': 2,
-    "no-trailing-spaces": 2,
+    'no-trailing-spaces': 2,
-    "no-undef": 2,
+    'no-undef': 2,
-    "no-undef-init": 2,
+    'no-undef-init': 2,
-    "no-unexpected-multiline": 2,
+    'no-unexpected-multiline': 2,
-    "no-unmodified-loop-condition": 2,
+    'no-unmodified-loop-condition': 2,
-    "no-unneeded-ternary": [
+    'no-unneeded-ternary': [
       2,
       {
         defaultAssignment: false
       }
     ],
-    "no-unreachable": 2,
+    'no-unreachable': 2,
-    "no-unsafe-finally": 2,
+    'no-unsafe-finally': 2,
-    "no-unused-vars": [
+    'no-unused-vars': [
       2,
       {
-        vars: "all",
+        vars: 'all',
-        args: "none"
+        args: 'none'
       }
     ],
-    "no-useless-call": 2,
+    'no-useless-call': 2,
-    "no-useless-computed-key": 2,
+    'no-useless-computed-key': 2,
-    "no-useless-constructor": 2,
+    'no-useless-constructor': 2,
-    "no-useless-escape": 0,
+    'no-useless-escape': 0,
-    "no-whitespace-before-property": 2,
+    'no-whitespace-before-property': 2,
-    "no-with": 2,
+    'no-with': 2,
-    "one-var": [
+    'one-var': [
       2,
       {
-        initialized: "never"
+        initialized: 'never'
       }
     ],
-    "operator-linebreak": [
+    'operator-linebreak': [
       2,
-      "after",
+      'after',
       {
         overrides: {
-          "?": "before",
+          '?': 'before',
-          ":": "before"
+          ':': 'before'
         }
       }
     ],
-    "padded-blocks": [2, "never"],
+    'padded-blocks': [2, 'never'],
     quotes: [
       2,
-      "single",
+      'single',
       {
         avoidEscape: true,
         allowTemplateLiterals: true
       }
     ],
-    semi: [2, "never"],
+    semi: [2, 'never'],
-    "semi-spacing": [
+    'semi-spacing': [
       2,
       {
         before: false,
         after: true
       }
     ],
-    "space-before-blocks": [2, "always"],
+    'space-before-blocks': [2, 'always'],
-    "space-before-function-paren": [2, "never"],
+    'space-before-function-paren': [2, 'never'],
-    "space-in-parens": [2, "never"],
+    'space-in-parens': [2, 'never'],
-    "space-infix-ops": 2,
+    'space-infix-ops': 2,
-    "space-unary-ops": [
+    'space-unary-ops': [
       2,
       {
         words: true,
         nonwords: false
       }
     ],
-    "spaced-comment": [
+    'spaced-comment': [
       2,
-      "always",
+      'always',
       {
         markers: [
-          "global",
+          'global',
-          "globals",
+          'globals',
-          "eslint",
+          'eslint',
-          "eslint-disable",
+          'eslint-disable',
-          "*package",
+          '*package',
-          "!",
+          '!',
-          ","
+          ','
         ]
       }
     ],
-    "template-curly-spacing": [2, "never"],
+    'template-curly-spacing': [2, 'never'],
-    "use-isnan": 2,
+    'use-isnan': 2,
-    "valid-typeof": 2,
+    'valid-typeof': 2,
-    "wrap-iife": [2, "any"],
+    'wrap-iife': [2, 'any'],
-    "yield-star-spacing": [2, "both"],
+    'yield-star-spacing': [2, 'both'],
-    yoda: [2, "never"],
+    yoda: [2, 'never'],
-    "prefer-const": 2,
+    'prefer-const': 2,
-    //"no-debugger": process.env.NODE_ENV === "production" ? 2 : 0,
+    // "no-debugger": process.env.NODE_ENV === "production" ? 2 : 0,
-    "object-curly-spacing": [
+    'object-curly-spacing': [
       2,
-      "always",
+      'always',
       {
         objectsInObjects: false
       }
     ],
-    "array-bracket-spacing": [2, "never"]
+    'array-bracket-spacing': [2, 'never']
   }
-};
+}

babel.config.js

@@ -1,10 +1,12 @@
 module.exports = {
   presets: [
-    '@vue/cli-plugin-babel/preset',
+    // '@vue/cli-plugin-babel/preset',
+    // ["@babel/preset-env", { "modules": false }]
     '@babel/preset-env'
   ],
   plugins: [
-    '@babel/plugin-proposal-optional-chaining',
+    '@vue/babel-plugin-transform-vue-jsx'
-    '@babel/plugin-proposal-nullish-coalescing-operator'
+    // '@babel/plugin-proposal-optional-chaining',
+    // '@babel/plugin-proposal-nullish-coalescing-operator'
   ]
 }

package.json

@@ -14,23 +14,20 @@
     "i18n:en": "node i18nGenerate.js lang=en keyCol=5 valCol=7"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.370.0",
+    "@aws-sdk/client-s3": "^3.701.0",
+    "@cornerstonejs/adapters": "^2.19.7",
     "@cornerstonejs/calculate-suv": "^1.1.0",
-    "@cornerstonejs/core": "^1.27.4",
+    "@cornerstonejs/core": "^2.19.7",
-    "@cornerstonejs/dicom-image-loader": "^1.27.4",
+    "@cornerstonejs/dicom-image-loader": "^2.19.7",
-    "@cornerstonejs/streaming-image-volume-loader": "1.23.2",
+    "@cornerstonejs/tools": "^2.19.7",
-    "@cornerstonejs/tools": "^1.27.4",
+    "@icr/polyseg-wasm": "^0.4.0",
-    "@ffmpeg/core": "^0.10.0",
+    "@microsoft/signalr": "^8.0.7",
-    "@ffmpeg/ffmpeg": "^0.10.1",
+    "@riophae/vue-treeselect": "^0.4.0",
-    "@microsoft/signalr": "^6.0.8",
-    "@riophae/vue-treeselect": "0.4.0",
     "@vue-office/docx": "^1.6.2",
     "@vue-office/excel": "^1.7.11",
     "@vue/composition-api": "^1.7.2",
     "ali-oss": "^6.17.1",
-    "axios": "0.18.1",
+    "axios": "^0.18.1",
-    "babel-eslint": "7.2.3",
-    "copy-webpack-plugin": "^4.5.2",
     "core-js": "^3.8.3",
     "cornerstone-core": "^2.6.1",
     "cornerstone-math": "^0.1.10",
@@ -41,67 +38,68 @@
     "dicom-parser": "^1.8.9",
     "dicomedit": "^0.1.0",
     "echarts": "^4.8.0",
-    "element-ui": "^2.15.8",
+    "element-ui": "^2.15.14",
-    "exceljs": "^4.1.0",
+    "exceljs": "^4.4.0",
     "file-saver": "^2.0.5",
     "hammerjs": "^2.0.8",
     "html2canvas": "^1.4.1",
-    "js-md5": "^0.7.3",
+    "js-md5": "^0.8.3",
     "jsencrypt": "^3.3.2",
-    "jszip": "^3.7.1",
+    "jszip": "^3.10.1",
-    "moment": "^2.27.0",
+    "minio": "^7.1.3",
-    "node-polyfill-webpack-plugin": "^2.0.1",
+    "moment": "^2.30.1",
-    "node-sass": "^4.14.1",
+    "moment-timezone": "^0.5.46",
-    "normalize.css": "7.0.0",
+    "node-xlsx": "^0.24.0",
-    "nprogress": "0.2.0",
+    "normalize.css": "^8.0.1",
-    "path-to-regexp": "2.4.0",
+    "nprogress": "^0.2.0",
-    "pdfobject": "^2.2.8",
+    "path-to-regexp": "^0.1.10",
-    "popper.js": "^1.16.1",
+    "pdfobject": "^2.3.0",
-    "qrcodejs2": "0.0.2",
+    "qrcodejs2": "^0.0.2",
-    "sass-loader": "^8.0.0",
+    "screenfull": "^6.0.2",
-    "screenfull": "^4.2.0",
+    "sortablejs": "^1.15.5",
-    "sortablejs": "^1.15.0",
     "streamsaver": "^2.0.6",
-    "v-viewer": "^1.6.4",
+    "svg-sprite-loader": "^4.1.3",
+    "svgo": "^1.2.2",
+    "v-viewer": "^1.7.4",
     "vcrontab": "^0.3.5",
-    "vue": "^2.6.11",
+    "vue": "^2.6.14",
-    "vue-clipboard2": "^0.3.1",
+    "vue-clipboard2": "^0.3.3",
-    "vue-contextmenujs": "^1.3.13",
+    "vue-contextmenujs": "^1.4.11",
     "vue-count-to": "^1.0.13",
-    "vue-demi": "^0.14.6",
+    "vue-demi": "^0.14.10",
-    "vue-i18n": "^8.7.0",
+    "vue-i18n": "^8.28.2",
-    "vue-pdf": "^4.3.0",
     "vue-puzzle-vcode": "^1.1.10",
-    "vue-router": "3.0.6",
+    "vue-router": "^3.0.6",
-    "vue-seamless-scroll": "^1.1.21",
+    "vue-seamless-scroll": "^1.1.23",
     "vuedraggable": "^2.24.3",
-    "vuex": "3.1.0",
+    "vuex": "^3.1.0",
-    "webpack-aliyun-oss": "^0.4.9"
+    "webpack-aliyun-oss": "^0.3.13"
   },
   "devDependencies": {
-    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
+    "@babel/core": "^7.12.16",
-    "@babel/plugin-proposal-optional-chaining": "^7.21.0",
+    "@babel/eslint-parser": "^7.12.16",
-    "@vue/cli-plugin-babel": "~4.5.4",
+    "@babel/plugin-transform-class-static-block": "^7.26.0",
-    "@vue/cli-plugin-eslint": "~4.5.4",
+    "@vue/babel-plugin-transform-vue-jsx": "^1.4.0",
-    "@vue/cli-service": "~4.5.4",
+    "@vue/cli-plugin-babel": "~5.0.0",
-    "autoprefixer": "^9.5.1",
+    "@vue/cli-plugin-eslint": "~5.0.0",
-    "aws-sdk": "^2.1532.0",
+    "@vue/cli-service": "~5.0.0",
-    "babel-eslint": "^10.1.0",
+    "autoprefixer": "^10.4.20",
-    "chalk": "2.4.2",
+    "clean-webpack-plugin": "^4.0.0",
-    "connect": "3.6.6",
+    "copy-webpack-plugin": "^12.0.2",
-    "eslint": "^6.7.2",
+    "css-minimizer-webpack-plugin": "^7.0.0",
-    "eslint-plugin-vue": "^6.2.2",
+    "eslint": "^7.32.0",
-    "html-webpack-plugin": "3.2.0",
+    "eslint-plugin-vue": "^8.0.3",
-    "minio": "^7.1.3",
+    "html-webpack-plugin": "^5.6.3",
-    "moment-timezone": "^0.5.45",
+    "mini-css-extract-plugin": "^2.9.2",
-    "node-xlsx": "^0.21.0",
+    "node-polyfill-webpack-plugin": "^4.0.0",
-    "runjs": "^4.3.2",
+    "path-browserify": "^1.0.1",
-    "script-ext-html-webpack-plugin": "2.1.3",
+    "process": "^0.11.10",
-    "script-loader": "0.7.2",
+    "sass": "^1.63.2",
-    "serve-static": "^1.13.2",
+    "sass-loader": "^10.4.1",
-    "svg-sprite-loader": "4.1.3",
+    "terser-webpack-plugin": "^5.3.10",
-    "svgo": "1.2.2",
+    "vue-template-compiler": "^2.6.14",
-    "vue-template-compiler": "^2.6.11"
+    "webpack": "^5.96.1",
+    "webpack-bundle-analyzer": "^4.10.2"
   },
   "eslintConfig": {
     "root": true,
@@ -109,19 +107,19 @@
       "node": true
     },
     "extends": [
-      "plugin:vue/essential"
+      "plugin:vue/essential",
+      "eslint:recommended"
     ],
     "parserOptions": {
-      "parser": "babel-eslint"
+      "parser": "@babel/eslint-parser",
+      "requireConfigFile": false
     },
     "rules": {}
   },
-  "engines": {
-    "node": ">=8.9",
-    "npm": ">= 3.0.0"
-  },
   "browserslist": [
     "> 1%",
-    "last 2 versions"
+    "last 2 versions",
+    "not dead",
+    "not op_mini all"
   ]
 }

src/App.vue

@@ -23,12 +23,38 @@
     >
       i18n
     </div>
-    <el-drawer title="国际化" :visible.sync="drawer" direction="rtl" size="80%">
+    <el-drawer
-      <div style="width: 320px">
+      :title="$t('il8n:title')"
-        <el-form label-width="100px" @submit.native.prevent size="small">
+      :visible.sync="drawer"
-          <el-form-item label="关键字">
+      direction="rtl"
+      size="80%"
+    >
+      <div style="width: 620px">
+        <el-form
+          label-width="100px"
+          @submit.native.prevent
+          size="small"
+          :inline="true"
+          class="demo-form-inline"
+        >
+          <el-form-item :label="$t('il8n:search:keyword')">
             <el-input v-model="key" @input="keyChange" />
           </el-form-item>
+          <el-form-item :label="$t('il8n:search:state')">
+            <el-select
+              v-model="State"
+              clearable
+              filterable
+              @change="handleStateChange"
+            >
+              <el-option
+                v-for="item of $d.InternationalizationKeyState"
+                :key="'InternationalizationKeyState' + item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
         </el-form>
       </div>
       <el-table
@@ -39,7 +65,7 @@
       >
         <el-table-column
           prop="Code"
-          label="标签"
+          :label="$t('il8n:table:label')"
           width="300"
           show-overflow-tooltip
         >
@@ -53,7 +79,7 @@
         <!--            {{scope.row.Description}}-->
         <!--          </template>-->
         <!--        </el-table-column>-->
-        <el-table-column prop="Value" label="英文">
+        <el-table-column prop="Value" :label="$t('il8n:table:en')">
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.Value"
@@ -66,7 +92,7 @@
             ></el-input>
           </template>
         </el-table-column>
-        <el-table-column prop="ValueCN" label="中文">
+        <el-table-column prop="ValueCN" :label="$t('il8n:table:cn')">
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.ValueCN"
@@ -79,12 +105,33 @@
             ></el-input>
           </template>
         </el-table-column>
+        <el-table-column prop="ValueCN" :label="$t('il8n:table:state')">
+          <template slot-scope="scope">
+            <el-select
+              v-model="scope.row.State"
+              clearable
+              filterable
+              size="mini"
+            >
+              <el-option
+                v-for="item of $d.InternationalizationKeyState"
+                :key="'InternationalizationKeyState' + item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column prop="Version" :label="$t('il8n:table:Version')">
+        </el-table-column>
       </el-table>
       <div style="text-align: right; padding-top: 10px; padding-right: 10px">
-        <el-button size="mini" @click="drawer = false">取消 </el-button>
+        <el-button size="mini" @click="drawer = false"
-        <el-button size="mini" type="primary" @click="handleSave"
+          >{{ $t('common:button:cancel') }}
-          >保存</el-button
+        </el-button>
-        >
+        <el-button size="mini" type="primary" @click="handleSave">{{
+          $t('common:button:save')
+        }}</el-button>
       </div>
     </el-drawer>
     <feedBack v-if="$route.matched.length > 0" />
@@ -110,10 +157,13 @@ export default {
       show: false,
       key: null,
       arr: [],
+      il8nExternal: false,
+      State: null,
     }
   },
   mounted() {
     this.show = process.env.VUE_APP_OSS_PATH === '/test/dist'
+    Vue.prototype.$openI18n = this.openI18n
   },
   // watch: {
   //   '$route.query': {
@@ -145,6 +195,11 @@ export default {
   //   },
   // },
   methods: {
+    handleStateChange() {
+      this.tableData.forEach((item) => {
+        item.State = this.State
+      })
+    },
     changeValue(target, attr, e) {
       this.$set(target, attr, e)
     },
@@ -154,9 +209,9 @@ export default {
           [],
           this.arr.filter(
             (v) =>
-              ~v.Code.indexOf(this.key) ||
+              ~v.Code.toLowerCase().indexOf(this.key.toLowerCase()) ||
-              ~v.Value.indexOf(this.key) ||
+              ~v.Value.toLowerCase().indexOf(this.key.toLowerCase()) ||
-              ~v.ValueCN.indexOf(this.key)
+              ~v.ValueCN.toLowerCase().indexOf(this.key.toLowerCase())
           )
         )
       } else {
@@ -164,39 +219,75 @@ export default {
       }
     },
     handleSave() {
-      this.$confirm('确定修改当前页面国际化内容？').then(() => {
+      this.$confirm('确定修改当前页面国际化内容？')
-        batchAddOrUpdateFrontInternationalization(this.tableData).then(
+        .then(() => {
-          async (res) => {
+          batchAddOrUpdateFrontInternationalization(this.tableData).then(
-            var zhMessages = {},
+            async (res) => {
-              enMessages = {}
+              var zhMessages = {},
-            var Internationalization = await getFrontInternationalizationList()
+                enMessages = {}
-            Vue.prototype.$tl = Internationalization.Result
+              var Internationalization =
-            this.tableData.forEach((v) => {
+                await getFrontInternationalizationList()
-              // zhMessages[v.Description + '_' + v.Code] = v.ValueCN
+              Vue.prototype.$tl = Internationalization.Result
-              // enMessages[v.Description + '_' + v.Code] = v.Value
+              this.tableData.forEach((v) => {
-              zhMessages[v.Code] = v.ValueCN
+                // zhMessages[v.Description + '_' + v.Code] = v.ValueCN
-              enMessages[v.Code] = v.Value
+                // enMessages[v.Description + '_' + v.Code] = v.Value
-            })
+                zhMessages[v.Code] = v.ValueCN
-            i18n.mergeLocaleMessage('zh', zhMessages)
+                enMessages[v.Code] = v.Value
-            i18n.mergeLocaleMessage('en', enMessages)
+              })
-            this.drawer = false
+              i18n.mergeLocaleMessage('zh', zhMessages)
-            this.$message.success('国际化修改成功')
+              i18n.mergeLocaleMessage('en', enMessages)
-          }
+              this.drawer = false
-        )
+              this.$message.success('国际化修改成功')
-      })
+              if (this.il8nExternal) {
+                this.$EventBus.$emit('il8nUpdate')
+              }
+            }
+          )
+        })
+        .catch((err) => {
+          console.log(err)
+        })
     },
-    openI18n() {
+    openI18n(ARRAY) {
       this.tableData = []
+      this.il8nExternal = false
+      this.State = null
       this.key = null
       this.drawer = true
       let arr = []
-      let tableData = this.$tl.map((v) => {
+      let tableData = []
-        let a = { ...v }
+      if (ARRAY && Array.isArray(ARRAY)) {
-        // if (!a.Description) {
+        this.il8nExternal = true
-        //   a.Description = this.$route.path
+        let data = ARRAY.map((v) => {
-        // }
+          let a = { ...v }
-        return a
+
-      })
+          return a
+        })
+        tableData = data.map((item) => {
+          return {
+            Code: item.Code,
+            Description: item.Description,
+            FrontType: item.FrontType,
+            Module: item.Module,
+            Value: item.Value,
+            ValueCN: item.ValueCN,
+            State: item.State,
+            Version: item.Version,
+            InternationalizationType: item.InternationalizationType,
+          }
+        })
+        this.tableData = Object.assign([], tableData)
+        this.arr = Object.assign([], tableData)
+        return false
+      } else {
+        tableData = this.$tl.map((v) => {
+          let a = { ...v }
+          // if (!a.Description) {
+          //   a.Description = this.$route.path
+          // }
+          return a
+        })
+      }
       tableData = tableData.filter((v) => {
         // return  ~this.$path.indexOf(v.Description + '_' + v.Code)
         return ~this.$path.indexOf(v.Code)
@@ -213,6 +304,9 @@ export default {
             Description: null,
             Value: null,
             ValueCN: null,
+            State: 0,
+            Version: this.$version.Version,
+            InternationalizationType: 0,
           })
         }
       })

src/api/admin.js

@@ -334,3 +334,11 @@ export function updateUserRoleInfo(data) {
     data
   })
 }
+// 管理端新增用户发送邮件
+export function addNewUserSendEmail(data) {
+  return request({
+    url: `/User/addNewUserSendEmail`,
+    method: 'post',
+    data
+  })
+}

src/api/reading.js

@@ -252,10 +252,36 @@ export function uploadOCTLipidAngleTemplate(param) {
   })
 }
 
-export function saveTableQuestionMark(param) {
+export function saveTableQuestionMark(param, type) {
   return request({
-    url: `/ReadingImageTask/saveTableQuestionMark`,
+    url: `/saveTableQuestionMark/${type}`,
     method: 'post',
     data: param
   })
 }
+
+export function deleteTableQuestionMark(param, type) {
+  return request({
+    url: `/deleteTableQuestionMark/${type}`,
+    method: 'post',
+    data: param
+  })
+}
+
+export function submitTaskRowInfo(param, type) {
+  return request({
+    url: `/SubmitTaskRowInfo/${type}`,
+    method: 'post',
+    data: param
+  })
+}
+
+export function deleteSingleTableQuestionMark(param, type) {
+  return request({
+    url: `/DeleteSingleTableQuestionMark/${type}`,
+    method: 'post',
+    data: param
+  })
+}
+
+

src/api/trials.js

@@ -1081,6 +1081,13 @@ export function setSeriesStatus(trialId, subjectVisitId, studyId, seriesId, stat
   })
 }
 
+export function setInstanceStatus(trialId, subjectVisitId, seriesId, instanceId, state) {
+  return request({
+    url: `/QCOperation/setInstanceState/${trialId}/${subjectVisitId}/${seriesId}/${instanceId}/${state}`,
+    method: 'put'
+  })
+}
+
 export function getVisitQCStudyAndSeriesList(subjectVisitId) {
   return request({
     url: `/QCList/getVisitQCStudyAndSeriesList/${subjectVisitId}`,
@@ -3931,4 +3938,31 @@ export function updateTrialUserRole(data) {
     method: 'put',
     data
   })
+}
+
+
+
+// 获取报表配置
+export function getTrialQuestionExportResult(data) {
+  return request({
+    url: `/ReadingQuestion/getTrialQuestionExportResult`,
+    method: 'post',
+    data
+  })
+}
+// 修改报表配置
+export function setTrialQuestionExportResult(data) {
+  return request({
+    url: `/ReadingQuestion/SetTrialQuestionExportResult`,
+    method: 'post',
+    data
+  })
+}
+// 项目加入人员发送邮件
+export function trialUserSendJoinEmail(data) {
+  return request({
+    url: `/TrialMaintenance/trialUserSendJoinEmail`,
+    method: 'post',
+    data
+  })
 }

src/api/user.js

@@ -179,11 +179,11 @@ export function verifyMFACode(params) {
 }
 
 // 发送MFA邮件
-export function sendMFAEmail(params) {
+export function sendMFAEmail(data) {
   return request({
     url: `/User/sendMFAEmail`,
     method: 'post',
-    params
+    data
   })
 }
 // 获取公钥

src/components/BaseForm/search-form.vue

@@ -13,6 +13,7 @@
           v-model="searchData[item.prop]"
           :placeholder="item.placeholder"
           size="mini"
+          clearable
           :style="{ width: item.width }"
           :readonly="item.readonly"
         />
@@ -22,6 +23,7 @@
           v-model="searchData[item.prop]"
           :placeholder="item.placeholder"
           size="mini"
+          clearable
           :style="{ width: item.width }"
           @change="item.change && item.change(that, searchData[item.prop])"
         >
@@ -37,6 +39,7 @@
           v-model="searchData[item.prop]"
           :placeholder="item.placeholder"
           size="mini"
+          clearable
           :style="{ width: item.width }"
           @change="item.change && item.change(that, searchData[item.prop])"
         >
@@ -96,6 +99,7 @@
           value-format="yyyy-MM-dd"
           format="yyyy-MM-dd"
           :picker-options="item.pickerOption"
+          clearable
         />
         <!-- 时间 -->
         <el-time-select
@@ -104,6 +108,7 @@
           :placeholder="item.placeholder"
           type=""
           :style="{ width: item.width }"
+          clearable
         />
         <!-- 日期时间 -->
         <el-date-picker
@@ -114,12 +119,14 @@
           value-format="yyyy-MM-dd HH:mm:ss"
           :disabled="item.disable && item.disable(searchData[item.prop])"
           :style="{ width: item.width }"
+          clearable
         />
         <!-- 日期时间段 -->
         <el-date-picker
           v-if="item.type === 'Daterange'"
           v-model="searchData[item.prop]"
           type="datetimerange"
+          :default-time="['00:00:00', '23:59:59']"
           :range-separator="$t('baseForm:daterange:rangeSeparator')"
           :start-placeholder="$t('baseForm:daterange:startPlaceholder')"
           :end-placeholder="$t('baseForm:daterange:startendPlaceholder')"

src/components/BaseTable/index.vue

@@ -48,6 +48,7 @@
             :show-overflow-tooltip="column.showOverflowTooltip || false"
             :sortable="column.sortable || false"
             :prop="column.prop"
+            :fixed="column.fixed"
           >
             <template slot-scope="scope">
               <!-- 仅仅显示文字 -->
@@ -63,6 +64,10 @@
                     <el-button
                       :size="operate.size || 'mini'"
                       :type="operate.type || 'primary'"
+                      v-if="
+                        (operate.show && scope.row[operate.show]) ||
+                        !operate.show
+                      "
                       style="margin-right: 5px"
                       @click="handleClick(operate, scope.row)"
                       >{{ operate.name }}</el-button

src/components/MFA/index.vue

@@ -21,7 +21,7 @@
       label-width="100px"
     >
       <!-- 邮箱 -->
-      <p class="tip">
+      <p class="tip_mfa">
         <i class="el-icon-warning" style="color: #409eff"></i>
         <span>{{ tip }}</span>
       </p>
@@ -83,7 +83,7 @@ export default {
       second: 60,
       form: {
         Code: null,
-        UserId: null,
+        IdentityUserId: null,
         EMail: null,
         username: null,
       },
@@ -115,7 +115,7 @@ export default {
   methods: {
     open(data) {
       let { UserId, status, username, EMail } = data;
-      this.form.UserId = UserId;
+      this.form.IdentityUserId = UserId;
       this.status = status ? status : "login";
       this.form.username = username;
       this.form.EMail = EMail;
@@ -134,10 +134,10 @@ export default {
         let res = await verifyMFACode(this.form);
         this.loading = false;
         if (res.IsSuccess) {
-          if (this.status === "login") {
+          // if (this.status === "login") {
-            this.$message.success(this.$t("mfa:message:verifySuccess"));
+          //   this.$message.success(this.$t("mfa:message:verifySuccess"));
-          }
+          // }
-          this.$emit("success", this.form.UserId);
+          this.$emit("success", this.form.IdentityUserId);
           this.cancel();
         }
       } catch (err) {
@@ -154,7 +154,7 @@ export default {
           this.timer = null;
         }
         let data = {
-          UserId: this.form.UserId,
+          IdentityUserId: this.form.IdentityUserId,
         };
         if (this.status === "lock") {
           data.MfaType = 1;
@@ -189,7 +189,7 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.tip {
+.tip_mfa {
   width: 86%;
   margin: auto;
   margin-bottom: 20px;

src/components/TrialsTab/index.vue

@@ -3,7 +3,7 @@
   <div class="trialsTab">
     <el-tabs v-model="trialsTab" @tab-click="clickTab">
       <el-tab-pane v-for="item of trialsRouter.children.find(v => {return v.name == 'TrialsPanel'}).children" :key="`tab${item.path}`" :disabled="TotalNeedSignTrialDocCount !== 0 && item.path !== '/trials/trials-panel/attachments'" :label="$t(item.LanguageMark)" :name="item.path">
-        <el-tabs v-if="!item.tabHiddn" v-model="trialsTabChild" @tab-click="clickTab">
+        <el-tabs v-if="!item.tabHiddn" v-model="trialsTabChild" @tab-click="clickTab" style="background-color: #f5f7fa;">
           <template v-for="item1 of item.children">
             <el-tab-pane
               v-if="TrialConfig && isShow(item1.path)"
@@ -22,11 +22,14 @@
         <i class="iconfont" style="font-size: 30px;color:#ccc">&#xe680;</i>
       </div>
       <!-- 返回项目列表 -->
-      <div class="my_icon_box" :title="$t('trials:trials:title:backTrialList')" @click="goBack">
+      <el-button type="primary" size="small" @click="goBack">
         <i class="iconfont">&#xe670;</i>
-        <!-- 返回 -->
         <span>{{ $t('trials:trials:title:back') }}</span>
-      </div>
+      </el-button>
+      <!-- <div class="my_icon_box" :title="$t('trials:trials:title:backTrialList')" @click="goBack">
+        <i class="iconfont">&#xe670;</i>
+        <span>{{ $t('trials:trials:title:back') }}</span>
+      </div> -->
     </div>
   </div>
 </template>
@@ -146,6 +149,7 @@ export default {
       return isShow
     },
     goBack() {
+      zzSessionStorage.removeItem('lastWorkbench')
       this.$router.push({ path: '/trials/trials-list' })
     },
     selectTrials(v) {
@@ -221,6 +225,9 @@ export default {
     .el-tabs__header{
       margin-bottom: 3px;
     }
+    .el-tabs__item.is-active{
+      font-weight: bold;
+    }
     position: relative;
     .el-input--medium .el-input__inner{
       height: 44px;line-height: 44px;width: 280px;

src/components/clinicalDataQuestions/components/QuestionFormItem.vue

@@ -193,7 +193,7 @@
     </el-col>
     <!-- eslint-disable vue/no-use-v-if-with-v-for -->
     <!-- eslint-disable vue/valid-v-for -->
-    <el-col v-for="(item) in question.Childrens" v-if="question.Childrens && question.Childrens.length>0 && question.ClinicalQuestionType !== 'table'" :span="['group', 'summary', 'table'].includes(item.ClinicalQuestionType) || item.Childrens.length > 0 ? 24 : 12">
+    <el-col v-for="(item) in question.Childrens" :key="item.Id" v-if="question.Childrens && question.Childrens.length>0 && question.ClinicalQuestionType !== 'table'" :span="['group', 'summary', 'table'].includes(item.ClinicalQuestionType) || item.Childrens.length > 0 ? 24 : 12">
       <QuestionFormItem
         :key="item.Id"
         :question="item"
@@ -593,7 +593,7 @@ export default {
 <style lang="scss" scoped>
 .my_dialog{
   .criterion-form-item{
-    >>>.el-form-item__content{
+    ::v-deep .el-form-item__content{
       width: auto;
     }
   }
@@ -614,7 +614,7 @@ export default {
     margin-bottom: 0px;
   }
   .disabled{
-    >>>.el-upload--picture-card {
+    ::v-deep .el-upload--picture-card {
       display: none;
     }
   }

src/components/clinicalDataQuestions/components/QuestionTableFormItem.vue

@@ -222,7 +222,7 @@ export default {
 <style lang="scss" scoped>
 .my_dialog{
   .criterion-form-item{
-    >>>.el-form-item__content{
+    ::v-deep .el-form-item__content{
       width: auto;
     }
   }
@@ -233,7 +233,7 @@ export default {
     flex-direction: row;
     align-items: flex-start;
   }
-  >>>.el-form-item__content{
+  ::v-deep .el-form-item__content{
     width: 500px;
   }
   .el-input{
@@ -243,7 +243,7 @@ export default {
     margin-bottom: 0px;
   }
   .disabled{
-    >>>.el-upload--picture-card {
+    ::v-deep .el-upload--picture-card {
       display: none;
     }
   }

src/components/toggleRole/index.vue

@@ -19,7 +19,7 @@
           v-for="item in roles"
           :key="item.Id"
           :label="item.Id"
-          :disabled="item.isUserRoleDisabled"
+          :disabled="item.IsUserRoleDisabled"
           style="margin-bottom: 10px"
         >
           {{ item.UserTypeShortName }}
@@ -40,6 +40,7 @@
         type="primary"
         size="small"
         @click="save"
+        :disabled="saveDisabled"
         :loading="loading"
         v-if="hasRole"
       >
@@ -78,6 +79,9 @@ export default {
     hasRole() {
       return this.roles && this.roles.length > 0
     },
+    saveDisabled() {
+      return this.form.userRoleId === zzSessionStorage.getItem('userId')
+    },
   },
   methods: {
     cancel() {
@@ -88,6 +92,7 @@ export default {
       try {
         if (!this.form.userRoleId)
           return this.$message.warning(this.$t('toggleRole:ruleMessage:select'))
+          zzSessionStorage.removeItem('lastWorkbench')
         this.$emit('save', this.form.userRoleId)
       } catch (err) {
         console.log(err)
@@ -98,19 +103,24 @@ export default {
 </script>
 <style lang="scss" scoped>
 .roles {
-  width: 100%;
+  max-width: 365px;
+  width: fit-content;
   display: flex;
   align-content: center;
-  justify-content: center;
+  // justify-content: center;
   flex-wrap: wrap;
+  margin: auto;
 }
 
-/deep/ .el-radio__original {
+::v-deep .el-radio__original {
   display: none !important; /* 隐藏原生 radio 输入，但仍然允许交互 */
 }
 
-/deep/.el-radio:focus:not(.is-focus):not(:active):not(.is-disabled)
+::v-deep.el-radio:focus:not(.is-focus):not(:active):not(.is-disabled)
   .el-radio__inner {
   box-shadow: none !important;
 }
+.el-radio {
+  width: 60px;
+}
 </style>

src/directive/dialogDrag.js

@@ -10,7 +10,7 @@ const dialogDrag = Vue.directive('dialogDrag', {
     dragDom.style.cssText += ';top:0px;'
 
     // 获取原有属性 ie dom元素.currentStyle 火狐谷歌 window.getComputedStyle(dom元素, null);
-    const sty = (function() {
+    const sty = (function () {
       if (window.document.currentStyle) {
         return (dom, attr) => dom.currentStyle[attr]
       } else {
@@ -47,8 +47,10 @@ const dialogDrag = Vue.directive('dialogDrag', {
         styL = +styL.replace(/\px/g, '')
         styT = +styT.replace(/\px/g, '')
       }
+      const oldMousemove = document.onmousemove
 
-      document.onmousemove = function(e) {
+      document.onmousemove = function (e) {
+        oldMousemove(e)
         // 通过事件委托，计算移动的距离
         let left = e.clientX - disX
         const top = e.clientY - disY
@@ -70,8 +72,8 @@ const dialogDrag = Vue.directive('dialogDrag', {
         dragDom.style.cssText += `;left:${left + styL}px;top:${top + styT}px;`
       }
 
-      document.onmouseup = function(e) {
+      document.onmouseup = function (e) {
-        document.onmousemove = null
+        document.onmousemove = oldMousemove
         document.onmouseup = null
       }
     }

src/layout/components/Navbar.vue

@@ -14,13 +14,13 @@
 
     <div class="right-menu">
       <div class="navbar-flex-wrapper">
-        <template v-if="device!=='mobile'">
+        <template v-if="device !== 'mobile'">
           <screenfull id="screenfull" class="right-menu-item hover-effect" />
         </template>
         <!-- <div class="avatar-container">
         <img src="@/assets/avatar.png" class="user-avatar">
       </div> -->
-        <div style="margin-left:20px;">
+        <div style="margin-left: 20px">
           <el-dropdown class="dropdown-container" trigger="click">
             <span class="el-dropdown-link">
               {{ `${name} (${userTypeShortName})` }}
@@ -30,10 +30,20 @@
             </span>
             <el-dropdown-menu slot="dropdown" class="user-dropdown">
               <el-dropdown-item v-if="!isReviewer">
-                <span style="display:block;" @click="editInfo">{{$t('system:navbar:button:Profile')}}</span>
+                <span style="display: block" @click="editInfo">{{
+                  $t('system:navbar:button:Profile')
+                }}</span>
+              </el-dropdown-item>
+              <!-- 切换角色 -->
+              <el-dropdown-item divided v-if="hasRole">
+                <span style="display: block" @click="openToggleRole">{{
+                  $t('system:navbar:button:toggleRole')
+                }}</span>
               </el-dropdown-item>
               <el-dropdown-item divided>
-                <span style="display:block;" @click="logout">{{$t('system:navbar:button:Log Out')}}</span>
+                <span style="display: block" @click="logout">{{
+                  $t('system:navbar:button:Log Out')
+                }}</span>
               </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
@@ -41,38 +51,119 @@
         <TopLang></TopLang>
       </div>
     </div>
+    <toggleRole
+      v-if="toggleRoleVisible"
+      :visible.sync="toggleRoleVisible"
+      :loading="toggleRoleLoading"
+      @save="loginByRole"
+    />
   </div>
 </template>
 
 <script>
-import {mapGetters, mapMutations} from 'vuex'
+import { mapGetters, mapMutations } from 'vuex'
 import Breadcrumb from '@/components/Breadcrumb'
 import Hamburger from '@/components/Hamburger'
 import Screenfull from '@/components/Screenfull'
 import TopLang from './topLang'
-
+import toggleRole from '@/components/toggleRole'
-
+import { resetRouter } from '@/router'
 export default {
   components: {
     Breadcrumb,
     Hamburger,
     Screenfull,
-    TopLang
+    TopLang,
+    toggleRole,
   },
   data() {
     return {
       isReviewer: false,
-      userTypeShortName: zzSessionStorage.getItem('userTypeShortName')
+      toggleRoleVisible: false,
+      toggleRoleLoading: false,
     }
   },
   computed: {
-    ...mapGetters(['sidebar', 'name', 'device'])
+    ...mapGetters(['sidebar', 'name', 'device', 'userTypeShortName']),
+    roles() {
+      return this.$store.state.user.roles
+    },
+    hasRole() {
+      return this.roles && this.roles.length > 1
+    },
   },
   created() {
     // this.isReviewer = JSON.parse(zzSessionStorage.getItem('IsReviewer'))
   },
   methods: {
     ...mapMutations({ setLanguage: 'lang/setLanguage' }),
+    openToggleRole() {
+      this.$store.dispatch('user/getUserInfo').then((res) => {
+        this.toggleRoleVisible = true
+      })
+    },
+    loginByRole(userRoleId) {
+      if (this.$store.state.user.userId === userRoleId) {
+        this.toggleRoleVisible = false
+        this.toggleRoleLoading = false
+        return false
+      }
+      this.toggleRoleLoading = true
+      this.$store
+        .dispatch('user/loginByRole', { userRoleId })
+        .then((res) => {
+          if (res) {
+            this.$store
+              .dispatch('permission/generateRoutes')
+              .then(async (res) => {
+                if (res && res.length > 0) {
+                  resetRouter()
+                  await this.$store.dispatch('global/getNoticeList')
+                  this.$router.addRoutes(res)
+                  this.toggleRoleLoading = false
+                  if (this.loginType === 'DevOps') {
+                    this.$router.replace({ path: res[0].path })
+                    return
+                  }
+                  if (this.hasPermi(['role:radmin'])) {
+                    this.$router.replace({ path: res[0].path })
+                    return
+                  }
+                  if (
+                    this.hasPermi([
+                      'role:air',
+                      'role:rpm',
+                      'role:rcrc',
+                      'role:rir',
+                    ])
+                  ) {
+                    history.replaceState(null, null, '/trials/trials-list')
+                    history.go(0)
+                  } else {
+                    history.replaceState(null, null, '/trials/trials-workbench')
+                    history.go(0)
+                  }
+                  this.toggleRoleVisible = false
+                  this.toggleRoleLoading = false
+                  this.$EventBus.$emit('reload')
+                } else {
+                  // 此账户暂未配置菜单权限，请联系管理员处理后再登录。
+                  this.toggleRoleLoading = false
+                  this.$message.warning(this.$t('login:message:login2'))
+                }
+              })
+              .catch((err) => {
+                console.log(err)
+                this.toggleRoleLoading = false
+              })
+          } else {
+            this.toggleRoleLoading = false
+          }
+        })
+        .catch(() => {
+          this.toggleRoleLoading = false
+        })
+    },
     toggleSideBar() {
       this.$store.dispatch('app/toggleSideBar')
     },
@@ -84,23 +175,23 @@ export default {
       } else {
         this.$router.push(`/login`)
       }
-      this.$i18n.locale = 'zh'
+      // //this.$i18n.locale = 'zh'
-      this.setLanguage('zh')
+      // //this.setLanguage('zh')
       this.$updateDictionary()
     },
     editInfo() {
       this.$router.push({ name: 'BaiscInfo' })
     },
-  }
+  },
 }
 </script>
 
 <style lang="scss" scoped>
-.navbar-flex-wrapper{
+.navbar-flex-wrapper {
-    display: flex;
+  display: flex;
-    flex-direction: row;
+  flex-direction: row;
-    justify-content: space-between;
+  justify-content: space-between;
-  }
+}
 .navbar {
   height: 50px;
   overflow: hidden;

src/layout/components/Sidebar/index.vue

@@ -22,7 +22,7 @@
 import { mapGetters } from 'vuex'
 import Logo from './Logo'
 import SidebarItem from './SidebarItem'
-import variables from '@/styles/variables.scss'
+import variables from '@/styles/variables.module.scss'
 
 export default {
   components: { SidebarItem, Logo },

src/layout/components/TagsView/ScrollPane.vue

@@ -73,7 +73,7 @@ export default {
   position: relative;
   overflow: hidden;
   width: 100%;
-  /deep/ {
+  ::v-deep {
     .el-scrollbar__bar {
       bottom: 0px;
     }

src/layout/index.vue

@@ -57,7 +57,7 @@ export default {
 
 <style lang="scss" scoped>
 @import "~@/styles/mixin.scss";
-@import "~@/styles/variables.scss";
+@import "~@/styles/variables.module.scss";
 
 .app-wrapper {
   @include clearfix;

src/main.js

@@ -174,7 +174,7 @@ var _vm
 async function VueInit() {
   var params
   var res
-  if (~window.location.href.indexOf('/readingDicoms') || ~window.location.href.indexOf('/noneDicomReading') || ~window.location.href.indexOf('/criterionquestions') || ~window.location.href.indexOf('/petct')) {
+  if (~window.location.href.indexOf('/readingDicoms') || ~window.location.href.indexOf('/noneDicomReading') || ~window.location.href.indexOf('/criterionquestions') || ~window.location.href.indexOf('/petct') || ~window.location.href.indexOf('/fusion')) {
     params = $q('TrialReadingCriterionId')
     res = await getBasicDataAllSelect(params)
   } else if (~window.location.href.indexOf('/ecrfPreview')) {
@@ -293,6 +293,7 @@ async function VueInit() {
     }()
     _vm.$forceUpdate()
   }
+  Vue.prototype.$EventBus = new Vue()
   Vue.prototype.$path = []
   var t = function (key) {
     if (!~Vue.prototype.$path.indexOf(key)) {
@@ -402,8 +403,12 @@ async function VueInit() {
     }
     _vm.$store.dispatch('user/logout').then(res => {
       // window.location.href = `/login`
-      if (_vm.$msgbox) {
+      try {
-        _vm.$msgbox.close();
+        if (_vm.$msgbox && _vm.$msgbox.close) {
+          _vm.$msgbox.close();
+        }
+      } catch (err) {
+        console.log(err)
       }
       _vm.$FB.close();
       _vm.$FBT.close();

src/permission.js

@@ -4,7 +4,7 @@ import store from './store'
 // import { Message } from 'element-ui'
 import NProgress from 'nprogress'
 import 'nprogress/nprogress.css'
-import { getToken } from '@/utils/auth'
+import { getToken, removeToken } from '@/utils/auth'
 import Vue from 'vue'
 import { OSSclient } from './utils/oss'
 import WHITELIST from "./utils/whiteList"
@@ -70,6 +70,16 @@ router.beforeEach(async (to, from, next) => {
       }
       next()
       NProgress.done()
+    } else if (from.path === '/researchForm') {
+      removeToken()
+      let lang = to.query.lang || zzSessionStorage.getItem('lang')
+      next(`/researchLogin?trialId=${to.query.trialId}&lang=${lang}`)
+      NProgress.done()
+    } else if (from.path === '/researchDetail_m') {
+      removeToken()
+      let lang = to.query.lang || zzSessionStorage.getItem('lang')
+      next(`/researchLogin_m?trialId=${to.query.trialId}&lang=${lang}`)
+      NProgress.done()
     } else {
       await OSSclient()
       const hasGetUserInfo = store.getters.userId
@@ -85,6 +95,7 @@ router.beforeEach(async (to, from, next) => {
           router.addRoutes(accessRoutes)
           next({ ...to, replace: true })
         } catch (error) {
+          console.log(error)
           // 删除token并进入登录页面以重新登录
           await store.dispatch('user/resetToken')
           next(`/login?redirect=${to.path}`)
@@ -96,9 +107,10 @@ router.beforeEach(async (to, from, next) => {
     /* has no token*/
     if (whiteList.indexOf(to.path) !== -1) {
       if (to.path === '/researchLogin') {
+        let lang = to.query.lang || zzSessionStorage.getItem('lang')
         const flag = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i)
         if (flag) {
-          next(`/researchLogin_m?trialId=${to.query.trialId}&lang=${to.query.lang}`)
+          next(`/researchLogin_m?trialId=${to.query.trialId}&lang=${lang}`)
         } else {
           next()
         }
@@ -111,10 +123,12 @@ router.beforeEach(async (to, from, next) => {
       }
     } else {
       if (to.path === '/researchForm') {
-        next(`/researchLogin?`)
+        let lang = to.query.lang || zzSessionStorage.getItem('lang')
+        next(`/researchLogin?trialId=${to.query.trialId}&lang=${lang}`)
         NProgress.done()
       } else if (to.path === '/researchDetail_m') {
-        next(`/researchLogin_m?`)
+        let lang = to.query.lang || zzSessionStorage.getItem('lang')
+        next(`/researchLogin_m?trialId=${to.query.trialId}&lang=${lang}`)
         NProgress.done()
       } else if (to.path === '/ReviewersResearchForm') {
         next(`/ReviewersResearch?`)

src/router/index.js

@@ -50,6 +50,11 @@ export const constantRoutes = [
     component: () => import('@/views/login/index'),
     hidden: true
   },
+  {
+    path: '/test',
+    component: () => import('@/views/test/index'),
+    hidden: true
+  },
   {
     path: '/resetpassword',
     component: () => import('@/views/forgetpassword/index'),
@@ -139,6 +144,12 @@ export const constantRoutes = [
     hidden: true,
     component: () => import('@/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt')
   },
+  {
+    path: '/fusion',
+    name: 'fusion',
+    hidden: true,
+    component: () => import('@/views/trials/trials-panel/reading/dicoms/components/Fusion/demo/index')
+  },
 
   {
     path: '/historyScreenshot',

src/store/getters.js

@@ -47,6 +47,7 @@ const getters = {
   language: state => state.lang.language,
   TotalNeedSignSystemDocCount: state => state.user.TotalNeedSignSystemDocCount,
   TotalNeedSignTrialDocCount: state => state.user.TotalNeedSignTrialDocCount,
+  IsFirstSysDocNeedSign: state => state.user.IsFirstSysDocNeedSign,
   TrialStatusStr: state => state.user.TrialStatusStr
 }
 export default getters

src/store/modules/reading.js

@@ -75,7 +75,7 @@ function getQuestions(questions) {
             let isMeasurable = getQuestionAnswer(item.TableQuestions.Questions, 1105, answerObj)
             answerObj.isMeasurable = isMeasurable
             answerObj.mean = getQuestionAnswer(item.TableQuestions.Questions, 1104, answerObj)
-            answerObj.saveTypeEnum = isNaN(parseFloat(isMeasurable)) ? 1 : 2
+            answerObj.saveTypeEnum = parseInt(isMeasurable) === 1 && isNaN(parseFloat(answerObj.mean)) ? 1 : 2
           } else {
             answerObj.lesionPart = getQuestionAnswer(item.TableQuestions.Questions, 8, answerObj)
             answerObj.loctation = getQuestionAnswer(item.TableQuestions.Questions, 6, answerObj)
@@ -887,6 +887,12 @@ 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/store/modules/user.js

@@ -18,6 +18,7 @@ const getDefaultState = () => {
     /* eslint-disable */
     TotalNeedSignSystemDocCount: eval(process.env.VUE_APP_WORD_FOR_PERMISSION) ? null : 0,
     TotalNeedSignTrialDocCount: eval(process.env.VUE_APP_WORD_FOR_PERMISSION) ? null : 0,
+    IsFirstSysDocNeedSign: false,
     TrialStatusStr: null,
     isTestUser: false,
     roles: []
@@ -65,6 +66,10 @@ const mutations = {
   SET_ISTESTUSER: (state, isTestUser) => {
     state.isTestUser = eval(isTestUser)
   },
+  SET_IS_FIRST_SYSTEM_DOC_SIGN: (state, IsFirstSysDocNeedSign) => {
+    zzSessionStorage.setItem('IsFirstSysDocNeedSign', IsFirstSysDocNeedSign)
+    state.IsFirstSysDocNeedSign = IsFirstSysDocNeedSign
+  },
   SET_NEED_SIGN_SYSTEM_DOC_COUNT: (state, TotalNeedSignSystemDocCount) => {
     /* eslint-disable */
     if (eval(process.env.VUE_APP_WORD_FOR_PERMISSION) && !state.isTestUser) {
@@ -135,15 +140,14 @@ const actions = {
               zzSessionStorage.setItem('isTestUser', data.BasicInfo.IsTestUser)
               commit('SET_ISTESTUSER', data.BasicInfo.IsTestUser)
               commit('SET_USERNAME', data.BasicInfo.UserName)
-              commit('SET_USERID', data.BasicInfo.IdentityUserId)
               setToken(data.JWTStr)
               // setName(data.BasicInfo.RealName)
-              const userString = decodeURIComponent(escape(window.atob(data.JWTStr.split('.')[1].replace(/-/g, '+').replace(/_/g, '/'))))
+              // const userString = decodeURIComponent(escape(window.atob(data.JWTStr.split('.')[1].replace(/-/g, '+').replace(/_/g, '/'))))
-              const user = JSON.parse(userString)
+              // const user = JSON.parse(userString)
               // zzSessionStorage.setItem('userId', user.identityUserId)
-              commit('SET_IDENTITYUSERID', user.identityUserId)
+              // commit('SET_IDENTITYUSERID', user.identityUserId)
-              zzSessionStorage.setItem('identityUserId', user.identityUserId)
+              // zzSessionStorage.setItem('identityUserId', user.identityUserId)
-              zzSessionStorage.setItem('userTypeEnumInt', user.userTypeEnumInt)
+              // zzSessionStorage.setItem('userTypeEnumInt', user.userTypeEnumInt)
               // var permissions = await getUserPermissions()
               // var menuTree = await getUserMenuTree()
               // commit('SET_TREE', menuTree.Result)
@@ -177,18 +181,24 @@ const actions = {
           try {
             commit('SET_TOKEN', data)
             setToken(data)
+            commit('SET_USERID', userRoleId)
+            zzSessionStorage.setItem('userId', userRoleId)
             const userString = decodeURIComponent(escape(window.atob(data.split('.')[1].replace(/-/g, '+').replace(/_/g, '/'))))
             const user = JSON.parse(userString)
             zzSessionStorage.setItem('userTypeShortName', user.userTypeShortName)
             commit('SET_USERTYPESHORTNAME', user.userTypeShortName)
             commit('SET_NAME', user.fullName)
             setName(user.fullName)
+            commit('SET_IDENTITYUSERID', user.identityUserId)
+            zzSessionStorage.setItem('identityUserId', user.identityUserId)
+            zzSessionStorage.setItem('userTypeEnumInt', user.userTypeEnumInt)
             var permissions = await getUserPermissions()
             var menuTree = await getUserMenuTree()
             commit('SET_TREE', menuTree.Result)
             commit('SET_PERMISSIONS', permissions.Result)
             zzSessionStorage.setItem('newTree', JSON.stringify(menuTree.Result))
             zzSessionStorage.setItem('permissions', JSON.stringify(permissions.Result))
+            zzSessionStorage.removeItem('lastWorkbench')
           } catch (e) {
             console.log(e)
           }
@@ -211,6 +221,9 @@ const actions = {
   setTotalNeedSignSystemDocCount({ commit }, TotalNeedSignSystemDocCount) {
     commit('SET_NEED_SIGN_SYSTEM_DOC_COUNT', TotalNeedSignSystemDocCount)
   },
+  setIsFirstSysDocNeedSign({ commit }, IsFirstSysDocNeedSign) {
+    commit('SET_IS_FIRST_SYSTEM_DOC_SIGN', IsFirstSysDocNeedSign)
+  },
   setTotalNeedSignTrialDocCount({ commit }, TotalNeedSignTrialDocCount) {
     commit('SET_NEED_SIGN_TRIALS_DOC_COUNT', TotalNeedSignTrialDocCount)
   },
@@ -233,6 +246,7 @@ const actions = {
     commit('SET_USERNAME', zzSessionStorage.getItem('userName'))
     commit('SET_NEED_SIGN_SYSTEM_DOC_COUNT', parseInt(zzSessionStorage.getItem('TotalNeedSignSystemDocCount')))
     commit('SET_NEED_SIGN_TRIALS_DOC_COUNT', parseInt(zzSessionStorage.getItem('TotalNeedSignTrialDocCount')))
+    commit('SET_IS_FIRST_SYSTEM_DOC_SIGN', zzSessionStorage.getItem('IsFirstSysDocNeedSign'))
     // console.log(zzSessionStorage.getItem('TotalNeedSignSystemDocCount'))
     // console.log(zzSessionStorage.getItem('TotalNeedSignTrialDocCount'))
     zzSessionStorage.setItem('userName', user.name)
@@ -249,7 +263,9 @@ const actions = {
   getUserInfo({ commit, state }) {
     return new Promise((resolve, reject) => {
       getUser().then(res => {
-        commit('SET_ROLES', res.Result.AccountList)
+        if (res.Result) {
+          commit('SET_ROLES', res.Result.AccountList)
+        }
         resolve(res.Result)
       }).catch(err => {
         reject(err)
@@ -266,7 +282,26 @@ const actions = {
       })
       resetRouter()
       removeName()
+      let lang = zzSessionStorage.getItem('lang')
       zzSessionStorage.clear()
+      zzSessionStorage.setItem('lang', lang)
+      commit('RESET_STATE')
+    } catch (e) {
+      console.log(e)
+    }
+  },
+  async resetData({ commit, state }) {
+    try {
+      removeToken() // must remove  token  first
+      // await loginOut({
+      //   UserRoleId: zzSessionStorage.getItem('userId'),
+      //   IdentityUserId: zzSessionStorage.getItem('identityUserId'),
+      // })
+      resetRouter()
+      removeName()
+      let lang = zzSessionStorage.getItem('lang')
+      zzSessionStorage.clear()
+      zzSessionStorage.setItem('lang', lang)
       commit('RESET_STATE')
     } catch (e) {
       console.log(e)

src/styles/element-ui.scss

@@ -47,3 +47,6 @@
 .el-range-separator {
   box-sizing: content-box;
 }
+.el-select-dropdown__wrap{
+  max-height: 350px;
+}

src/styles/index.scss

@@ -1,4 +1,4 @@
-@import "./variables.scss";
+@import "./variables.module.scss";
 @import "./mixin.scss";
 @import "./transition.scss";
 @import "./element-ui.scss";

src/styles/sidebar.scss

@@ -71,29 +71,49 @@ $sideBarWidth: 200px;
       border: none;
       height: 100%;
       width: 100% !important;
+      background-color: $menuBg;
     }
 
     // menu hover
     .submenu-title-noDropdown,
     .el-submenu__title {
+      color: $menuText !important;
       &:hover {
         background-color: $menuHover !important;
+        color: $menuActiveText !important;
       }
     }
 
     .is-active>.el-submenu__title {
       color: $subMenuActiveText !important;
     }
-
+    .el-menu-item {
-    & .nest-menu .el-submenu>.el-submenu__title,
+      color: $menuText !important;
-    & .el-submenu .el-menu-item {
+    }
+    .el-menu-item:focus, 
+    .el-menu-item:hover {
+      background-color: $subMenuBg !important;
+      color: $menuActiveText !important;
+    }
+    .el-submenu .el-menu-item {
       min-width: $sideBarWidth !important;
       background-color: $subMenuBg !important;
-
+      
       &:hover {
         background-color: $subMenuHover !important;
+        
       }
     }
+    // &.nest-menu .el-submenu>.el-submenu__title,
+    // &.el-submenu .el-menu-item {
+    //   min-width: $sideBarWidth !important;
+    //   background-color: $subMenuBg !important;
+      
+    //   &:hover {
+    //     background-color: $subMenuHover !important;
+        
+    //   }
+    // }
   }
 
   .hideSidebar {

src/utils/dialog.js

@@ -40,8 +40,9 @@ Vue.directive('dialogDrag', {
         styL = +styL.replace(/\px/g, '')
         styT = +styT.replace(/\px/g, '')
       }
-
+      const oldMousemove = document.onmousemove
       document.onmousemove = function(e) {
+        oldMousemove(e)
         // 通过事件委托，计算移动的距离
         let left = e.clientX - disX
         let top = e.clientY - disY
@@ -63,7 +64,7 @@ Vue.directive('dialogDrag', {
       }
 
       document.onmouseup = function(e) {
-        document.onmousemove = null
+        document.onmousemove = oldMousemove
         document.onmouseup = null
       }
       return false

src/utils/request-download.js

@@ -89,9 +89,9 @@ service.interceptors.response.use(
           })
           store.dispatch('user/logout').then(() => {
             router.push(`/login`)
-            this.$i18n.locale = 'zh'
+            //this.$i18n.locale = 'zh'
-            this.setLanguage('zh')
+            //this.setLanguage('zh')
-            this.$updateDictionary()
+            // this.$updateDictionary()
           })
         }
       } else {

src/utils/request.js

@@ -1,11 +1,11 @@
 import axios from 'axios'
-import _vm from '@/main'
 import { Message, MessageBox, Alert } from 'element-ui'
 import store from '@/store'
 import router from '@/router'
 import WHITELIST from "./whiteList"
 import moment from 'moment-timezone';
 import { encryptConfig } from "@/utils/encrypt"
+const ROUTER = require('@/router');
 axios.defaults.withCredentials = false
 const service = axios.create({
   baseURL: '/api',
@@ -91,13 +91,20 @@ service.interceptors.response.use(
       const status = error.response.status
       if (error.response.data && (error.response.data.Code === -1 || error.response.data.Code === -2)) {
         store.dispatch('user/logout').then(() => {
-          if (_vm.$msgbox) {
+          let _vm = ROUTER.default.app
-            _vm.$msgbox.close();
+          try {
+            if (_vm.$msgbox && _vm.$msgbox.close) {
+              _vm.$msgbox.close();
+            }
+          } catch (err) {
+            console.log(err)
           }
           router.push(`/login`)
-          this.$i18n.locale = 'zh'
+          // if (!this.$i18n.locale) {
-          this.setLanguage('zh')
+          //   //this.$i18n.locale = 'zh'
-          this.$updateDictionary()
+          //   //this.setLanguage('zh')
+          // }
+          // this.$updateDictionary()
         })
       }
       switch (status) {
@@ -127,9 +134,9 @@ service.interceptors.response.use(
           }
           store.dispatch('user/logout').then(() => {
             router.push(`/login`)
-            this.$i18n.locale = 'zh'
+            // //this.$i18n.locale = 'zh'
-            this.setLanguage('zh')
+            // //this.setLanguage('zh')
-            this.$updateDictionary()
+            // this.$updateDictionary()
           })
         } else {
           setTimer({
@@ -143,6 +150,7 @@ service.interceptors.response.use(
           setTimer([message, store.state.lang.language === 'en' ? 'Warning' : '警告', {
             type: 'warning',
             showCancelButton: false,
+            confirmButtonText: store.state.lang.language === 'en' ? 'ok' : "确定",
             callback: action => { }
           }], 'confirm')
         }
@@ -153,6 +161,7 @@ service.interceptors.response.use(
         [store.state.lang.language === 'en' ? 'Please check your network，and try again later！' : '请检查网络，稍后重试！', store.state.lang.language === 'en' ? 'Warning' : '警告', {
           type: 'warning',
           showCancelButton: false,
+          confirmButtonText: store.state.lang.language === 'en' ? 'ok' : "确定",
           callback: action => { }
         }], "confirm"
       )
@@ -171,6 +180,8 @@ const setTimer = (obj, type) => {
       Message(obj)
     }
     if (type === 'confirm') {
+      obj[2].closeOnClickModal = false
+      obj[2].closeOnPressEscape = false
       MessageBox.confirm(...obj)
     }
     clearTimeout(timer);

src/views/admin/role/components/RoleForm.vue

@@ -17,7 +17,7 @@
         </el-form-item>
         <el-form-item label="是否内部角色: " prop="IsInternal">
           <el-radio-group v-model="form.IsInternal">
-            <el-radio v-for="item of $d.YesOrNo" :label="item.value">{{ item.label }}</el-radio>
+            <el-radio v-for="item of $d.YesOrNo" :key="`IsInternal${item.value}`" :label="item.value">{{ item.label }}</el-radio>
           </el-radio-group>
         </el-form-item>
 

src/views/blindResumeInfo/index.vue

@@ -27,7 +27,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-/deep/ .el-collapse-item__header{
+::v-deep .el-collapse-item__header{
   background-color: #e9eef1;
   padding: 0 10px;
 }

src/views/blindResumeInfo/info.vue

@@ -195,7 +195,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-/deep/ .el-collapse-item__header{
+::v-deep .el-collapse-item__header{
   background-color: #e9eef1;
   padding: 0 10px;
 }

src/views/dashboard/bigdata.vue

@@ -131,8 +131,8 @@ export default {
         .then(() => {
           this.$store.dispatch('user/logout').then(res => {
             this.$router.push(`/login`)
-            this.$i18n.locale = 'zh'
+            //this.$i18n.locale = 'zh'
-            this.setLanguage('zh')
+            //this.setLanguage('zh')
             this.$updateDictionary()
           })
         })

src/views/dicom-show/dicom-study.vue

@@ -52,10 +52,14 @@
                             </div>
                             <div v-if="item.isExistMutiFrames && item.instanceCount > 1">
                               <el-popover
-                                placement="right"
+                                v-model="item.isShowPopper"
-                                trigger="hover"
+                                placement="right-start"
+                                trigger="manual"
                                 popper-class="instance_frame_wrapper"
                               >
+                                <div style="text-align: right;">
+                                  <i class="el-icon-circle-close" style="font-size: 20px;cursor: pointer;color:#ddd;" @click="item.isShowPopper = false" />
+                                </div>
                                 <div class="frame_list">
                                   <div
                                     v-for="(instance, idx) in item.instanceInfoList"
@@ -66,11 +70,27 @@
                                   >
                                     <div>
                                       <div>{{ instance.InstanceNumber }}</div>
-                                      <div>{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}</div>
+                                      <div>
+                                        {{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}
+                                      </div>
+                                      <div v-if="showDelete">
+                                        <span>{{ $t('trials:audit:table:isDelete') }}</span>
+                                        <el-switch
+                                          v-model="instance.IsDeleted"
+                                          size="mini"
+                                          @change="changeInstanceDeleteStatus($event, item, instance)"
+                                        />
+                                        <span style="margin-left:10px;">{{ $t('trials:audit:table:isReading') }}</span>
+                                        <el-switch
+                                          v-model="instance.IsReading"
+                                          size="mini"
+                                          @change="changeInstanceReadingStatus($event, item, instance)"
+                                        />
+                                      </div>
                                     </div>
                                   </div>
                                 </div>
-                                <i slot="reference" class="el-icon-connection" style="font-size: 15px;cursor: pointer;" />
+                                <i slot="reference" class="el-icon-connection" style="font-size: 15px;cursor: pointer;" @click="popperClick(seriesList, item)" />
                               </el-popover>
                             </div>
                           </div>
@@ -138,13 +158,13 @@ import * as cornerstone from 'cornerstone-core'
 import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
 import dicomViewer from '@/components/Dicom/DicomViewer'
 import { getStudyInfo, getSeriesList } from '@/api/reading'
-import { getInstanceList, getPatientSeriesList, setSeriesStatus } from '@/api/trials'
+import { getInstanceList, getPatientSeriesList, setSeriesStatus, setInstanceStatus } from '@/api/trials'
 
 import requestPoolManager from '@/utils/request-pool'
 import store from '@/store'
 import { changeURLStatic } from '@/utils/history.js'
 import metaDataProvider from '@/utils/metaDataProvider'
-cornerstone.metaData.addProvider(metaDataProvider, { priority: 10 });
+cornerstone.metaData.addProvider(metaDataProvider, { priority: 10 })
 var config = {
   maxWebWorkers: 4,
   startWebWorkersOnDemand: true,
@@ -296,7 +316,8 @@ export default {
               tpCode: this.tpCode,
               loadStatus: false,
               imageloadedArr: [],
-              isExistMutiFrames: item.IsExistMutiFrames
+              isExistMutiFrames: item.IsExistMutiFrames,
+              isShowPopper: false
             })
           })
           this.seriesList = seriesList
@@ -355,7 +376,8 @@ export default {
               tpCode: this.tpCode,
               loadStatus: false,
               imageloadedArr: [],
-              isExistMutiFrames: item.IsExistMutiFrames
+              isExistMutiFrames: item.IsExistMutiFrames,
+              isShowPopper: false
             })
           })
           this.seriesList = seriesList
@@ -384,8 +406,8 @@ export default {
         if (!res.Result || (res.Result && res.Result.length === 0)) return
         var seriesInstanceUid = res.Result[0].SeriesInstanceUid
         var sliceThickness = res.Result[0].SliceThickness
-        var isReading = res.Result[0].IsReading
+        var isReading = res.OtherInfo.IsReading
-        var isDeleted = res.Result[0].IsDeleted
+        var isDeleted = res.OtherInfo.IsDeleted
         var seriesList = []
         var imageIds = []
         let isExistMutiFrames = false
@@ -403,7 +425,7 @@ export default {
             imageIds.push(path)
             imageId = path
           }
-          instanceInfoList.push({ Id: instance.Id, InstanceNumber: instance.InstanceNumber, NumberOfFrames: instance.NumberOfFrames, Path: instance.Path, ImageId: imageId })
+          instanceInfoList.push({ Id: instance.Id, InstanceNumber: instance.InstanceNumber, NumberOfFrames: instance.NumberOfFrames, Path: instance.Path, ImageId: imageId, IsDeleted: instance.IsDeleted, IsReading: instance.IsReading })
         })
         seriesList.push({
           trialId,
@@ -424,7 +446,8 @@ export default {
           prefetchInstanceCount: 0,
           loadStatus: false,
           imageloadedArr: [],
-          isExistMutiFrames: isExistMutiFrames
+          isExistMutiFrames: isExistMutiFrames,
+          isShowPopper: false
         })
         this.seriesList = seriesList
         if (this.seriesList.length > 0) {
@@ -573,7 +596,8 @@ export default {
           hasLabel: seriesInfo.HasLabel,
           keySeries: seriesInfo.KeySeries,
           loadStatus: false,
-          imageloadedArr: []
+          imageloadedArr: [],
+          isShowPopper: false
         })
         this.seriesList = seriesList
         if (this.seriesList.length > 0) {
@@ -671,6 +695,81 @@ export default {
         this.loading = false
       }
     },
+    async changeInstanceReadingStatus(callback, series, instance) {
+      let statusStr = ''
+      if (callback) {
+        statusStr = this.$t('trials:audit:label:setSeriesReading')
+        instance.IsReading = false
+      } else {
+        statusStr = this.$t('trials:audit:label:setSeriesNotReading')
+        instance.IsReading = true
+      }
+      var message = this.$t('trials:audit:message:changeSeriesStatus').replace('xxx', statusStr)
+      message = message.replace('yyy', this.$fd('YesOrNo', !instance.IsReading))
+      const confirm = await this.$confirm(
+        message,
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+      const state = instance.IsReading ? 1 : 2
+      this.loading = true
+      try {
+        const res = await setInstanceStatus(series.trialId, series.subjectVisitId, series.seriesId, instance.Id, state)
+        this.loading = false
+        if (res.IsSuccess) {
+          instance.IsReading = !instance.IsReading
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          window.opener.postMessage({ type: 'refreshSeriesList', data: '' }, window.location)
+        }
+      } catch (e) {
+        this.loading = false
+      }
+    },
+    async changeInstanceDeleteStatus(callback, series, instance) {
+      let statusStr = ''
+      if (callback) {
+        statusStr = this.$t('trials:audit:label:setSeriesDeleted')
+        instance.IsDeleted = false
+      } else {
+        statusStr = this.$t('trials:audit:label:setSeriesNotDelete')
+        instance.IsDeleted = true
+      }
+      var message = this.$t('trials:audit:message:changeSeriesStatus').replace('xxx', statusStr)
+      message = message.replace('yyy', this.$fd('YesOrNo', !instance.IsDeleted))
+      const confirm = await this.$confirm(
+        message,
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+
+      const state = instance.IsDeleted ? 5 : 4
+      this.loading = true
+      try {
+        const res = await setInstanceStatus(series.trialId, series.subjectVisitId, series.seriesId, instance.Id, state)
+        this.loading = false
+        if (res.IsSuccess) {
+          instance.IsDeleted = !instance.IsDeleted
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          window.opener.postMessage({ type: 'refreshSeriesList', data: '' }, window.location)
+        }
+      } catch (e) {
+        this.loading = false
+      }
+    },
+    popperClick(seriesList, series) {
+      for (let i = 0; i < seriesList.length; i++) {
+        if (seriesList[i].isShowPopper) {
+          seriesList[i].isShowPopper = false
+        }
+      }
+      series.isShowPopper = !series.isShowPopper
+    },
     loadAllImages() {
       const seriesIndex = this.seriesList.findIndex(i => i.loadStatus === false)
       if (seriesIndex === -1) return
@@ -948,8 +1047,8 @@ export default {
   background: #d0d0d0;
 }
 .frame_content{
-  height: 50px;
+  /* height: 50px; */
-  padding: 5px;
+  padding: 10px;
   display: flex;
   justify-content: flex-start;
   color: #ddd;

src/views/dicom-show/dicom-visit.vue

@@ -59,34 +59,56 @@
                                 <div>#{{ series.seriesNumber }}</div>
                                 <div v-if="series.isExistMutiFrames && series.instanceCount > 1">
                                   <el-popover
-                                    placement="right"
+                                    v-model="series.isShowPopper"
-                                    trigger="hover"
+                                    placement="right-start"
+                                    trigger="manual"
                                     popper-class="instance_frame_wrapper"
                                   >
-                                    <div
+                                    <div style="text-align: right;">
-                                      v-for="(instance, idx) in series.instanceInfoList"
+                                      <i class="el-icon-circle-close" style="font-size: 20px;cursor: pointer;color:#ddd;" @click="series.isShowPopper = false" />
-                                      :key="instance.Id"
-                                      class="frame_content"
-                                      :style="{'margin-bottom':idx<series.instanceInfoList.length-1? '5px':'0px'}"
-                                      @click="showMultiFrames(index,series, i, instance)"
-                                    >
-                                      <!-- <div>
-                                        <img
-                                          class="image-preview"
-                                          :src="series.previewImageUrl"
-                                          crossorigin="anonymous"
-                                          alt=""
-                                          style="width: 40px;height:40px;"
-                                          fit="fill"
-                                        >
-                                      </div> -->
-                                      <div>
-                                        <div>{{ instance.InstanceNumber }}</div>
-                                        <div>{{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}</div>
-                                      </div>
-
                                     </div>
-                                    <i slot="reference" class="el-icon-connection" style="font-size: 15px;cursor: pointer;" />
+                                    <div class="frame_list">
+                                      <div
+                                        v-for="(instance, idx) in series.instanceInfoList"
+                                        :key="instance.Id"
+                                        class="frame_content"
+                                        :style="{'margin-bottom':idx<series.instanceInfoList.length-1? '5px':'0px'}"
+                                        @click="showMultiFrames(index,series, i, instance)"
+                                      >
+                                        <!-- <div>
+                                          <img
+                                            class="image-preview"
+                                            :src="series.previewImageUrl"
+                                            crossorigin="anonymous"
+                                            alt=""
+                                            style="width: 40px;height:40px;"
+                                            fit="fill"
+                                          >
+                                        </div> -->
+                                        <div>
+                                          <div>{{ instance.InstanceNumber }}</div>
+                                          <div>
+                                            {{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame` }}
+                                          </div>
+                                          <div v-if="showDelete">
+                                            <span>{{ $t('trials:audit:table:isDelete') }}</span>
+                                            <el-switch
+                                              v-model="instance.IsDeleted"
+                                              size="mini"
+                                              @change="changeInstanceDeleteStatus($event, series, instance)"
+                                            />
+                                            <span style="margin-left:10px;">{{ $t('trials:audit:table:isReading') }}</span>
+                                            <el-switch
+                                              v-model="instance.IsReading"
+                                              size="mini"
+                                              @change="changeInstanceReadingStatus($event, series, instance)"
+                                            />
+                                          </div>
+                                        </div>
+
+                                      </div>
+                                    </div>
+                                    <i slot="reference" class="el-icon-connection" style="font-size: 15px;cursor: pointer;" @click="popperClick(studyList, series)" />
                                   </el-popover>
                                 </div>
 
@@ -143,7 +165,7 @@
                   </div>
                 </div>
               </el-tab-pane>
-              <el-tab-pane :label="$t('trials:dicom-show:relatedVisit')" name="relation-study" class="pane-relation-wrapper" v-if="!visitTaskId">
+              <el-tab-pane v-if="!visitTaskId" :label="$t('trials:dicom-show:relatedVisit')" name="relation-study" class="pane-relation-wrapper">
                 <div class="viewerSidethumbinner">
                   <el-collapse v-model="relationActiveName" @change="handelRelationActiveChange">
                     <el-collapse-item v-for="(study,studyIndex) in relationStudyList" :key="`${study.StudyId}`" :name="`${study.StudyId}`">
@@ -196,8 +218,8 @@
                                 <div v-else>#{{ seriesItem.seriesNumber }}</div>
                                 <div v-if="seriesItem.isExistMutiFrames && seriesItem.instanceCount > 1">
                                   <el-popover
-                                    placement="right"
+                                    placement="right-start"
-                                    trigger="hover"
+                                    trigger="click"
                                     popper-class="instance_frame_wrapper"
                                   >
                                     <div class="frame_list">
@@ -260,13 +282,13 @@ import * as cornerstone from 'cornerstone-core'
 import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
 import dicomViewer from '@/components/Dicom/DicomViewer'
 import { getVisitStudyList, getAllRelationStudyList, getSeriesList } from '@/api/reading'
-import { setSeriesStatus } from '@/api/trials'
+import { setSeriesStatus, setInstanceStatus } from '@/api/trials'
 import { getTaskUploadedDicomStudyList } from '@/api/reading'
 import requestPoolManager from '@/utils/request-pool'
 import store from '@/store'
 import { changeURLStatic } from '@/utils/history.js'
 import metaDataProvider from '@/utils/metaDataProvider'
-cornerstone.metaData.addProvider(metaDataProvider, { priority: 10 });
+cornerstone.metaData.addProvider(metaDataProvider, { priority: 10 })
 // import * as cornerstoneTools from 'cornerstone-tools'
 var config = {
   maxWebWorkers: 4,
@@ -348,7 +370,7 @@ export default {
         let res = null
         if (this.page === 'upload') {
           res = await getTaskUploadedDicomStudyList({ visitTaskId: this.visitTaskId })
-        } else if (this.page === 'download'){
+        } else if (this.page === 'download') {
           res = await getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading, this.visitTaskId)
         } else {
           res = await getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading)
@@ -399,7 +421,8 @@ export default {
                 prefetchInstanceCount: 0,
                 loadStatus: false,
                 imageloadedArr: [],
-                isExistMutiFrames: series.IsExistMutiFrames
+                isExistMutiFrames: series.IsExistMutiFrames,
+                isShowPopper: false
               })
             })
             data.SeriesList = seriesList
@@ -595,6 +618,83 @@ export default {
         this.loading = false
       }
     },
+    async changeInstanceReadingStatus(callback, series, instance) {
+      let statusStr = ''
+      if (callback) {
+        statusStr = this.$t('trials:audit:label:setSeriesReading')
+        instance.IsReading = false
+      } else {
+        statusStr = this.$t('trials:audit:label:setSeriesNotReading')
+        instance.IsReading = true
+      }
+      var message = this.$t('trials:audit:message:changeSeriesStatus').replace('xxx', statusStr)
+      message = message.replace('yyy', this.$fd('YesOrNo', !instance.IsReading))
+      const confirm = await this.$confirm(
+        message,
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+      const state = instance.IsReading ? 1 : 2
+      this.loading = true
+      try {
+        const res = await setInstanceStatus(series.trialId, series.subjectVisitId, series.seriesId, instance.Id, state)
+        this.loading = false
+        if (res.IsSuccess) {
+          instance.IsReading = !instance.IsReading
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          window.opener.postMessage({ type: 'refreshSeriesList', data: '' }, window.location)
+        }
+      } catch (e) {
+        this.loading = false
+      }
+    },
+    async changeInstanceDeleteStatus(callback, series, instance) {
+      let statusStr = ''
+      if (callback) {
+        statusStr = this.$t('trials:audit:label:setSeriesDeleted')
+        instance.IsDeleted = false
+      } else {
+        statusStr = this.$t('trials:audit:label:setSeriesNotDelete')
+        instance.IsDeleted = true
+      }
+      var message = this.$t('trials:audit:message:changeSeriesStatus').replace('xxx', statusStr)
+      message = message.replace('yyy', this.$fd('YesOrNo', !instance.IsDeleted))
+      const confirm = await this.$confirm(
+        message,
+        {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }
+      )
+      if (confirm !== 'confirm') return
+
+      const state = instance.IsDeleted ? 5 : 4
+      this.loading = true
+      try {
+        const res = await setInstanceStatus(series.trialId, series.subjectVisitId, series.seriesId, instance.Id, state)
+        this.loading = false
+        if (res.IsSuccess) {
+          instance.IsDeleted = !instance.IsDeleted
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          window.opener.postMessage({ type: 'refreshSeriesList', data: '' }, window.location)
+        }
+      } catch (e) {
+        this.loading = false
+      }
+    },
+    popperClick(studyList, series) {
+      for (let i = 0; i < studyList.length; i++) {
+        for (let j = 0; j < studyList[i].SeriesList.length; j++) {
+          if (studyList[i].SeriesList[j].isShowPopper) {
+            studyList[i].SeriesList[j].isShowPopper = false
+          }
+        }
+      }
+      series.isShowPopper = !series.isShowPopper
+    },
     // 切换关联检查Tab时获取关联检查信息
     async handleTabClick(tab, event) {
       if (tab.name === 'relation-study' && this.relationStudyList.length <= 0) {
@@ -671,7 +771,8 @@ export default {
                 keySeries: item.KeySeries,
                 loadStatus: false,
                 imageloadedArr: [],
-                isExistMutiFrames: item.IsExistMutiFrames
+                isExistMutiFrames: item.IsExistMutiFrames,
+                isShowPopper: false
               })
             })
             scope.relationStudyList[index].seriesCount = seriesList.length
@@ -978,9 +1079,21 @@ export default {
   border: 1px solid #2c2c2c;
   padding: 5px;
 }
+.frame_list{
+  max-height: 500px;
+  overflow-y: auto;
+}
+.instance_frame_wrapper ::-webkit-scrollbar {
+  width: 7px;
+  height: 7px;
+}
+.instance_frame_wrapper  ::-webkit-scrollbar-thumb {
+  border-radius: 10px;
+  background: #d0d0d0;
+}
 .frame_content{
-  height: 50px;
+  /* height: 50px; */
-  padding: 5px;
+  padding: 10px;
   display: flex;
   justify-content: flex-start;
   color: #ddd;

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

@@ -60,7 +60,7 @@
       </el-form-item>
       <el-form-item v-if="form.Id !== ''" label="是否废除: ">
         <el-radio-group v-model="form.IsDeleted">
-          <el-radio v-for="item of $d.YesOrNo" :label="item.value">{{ item.label }}</el-radio>
+          <el-radio v-for="item of $d.YesOrNo" :key="`IsDeleted${item.value}`" :label="item.value">{{ item.label }}</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="描述">

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

@@ -78,7 +78,7 @@
       <el-form-item v-if="form.Id !== ''" label="是否废除: ">
         <el-radio-group v-model="form.IsDeleted">
 
-          <el-radio v-for="item of $d.YesOrNo" :label="item.value">{{ item.label }}</el-radio>
+          <el-radio v-for="item of $d.YesOrNo" :key="`IsDeleted${item.value}`" :label="item.value">{{ item.label }}</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="描述">

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

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

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

@@ -2,7 +2,7 @@
   <BaseContainer>
     <template slot="search-container">
       <el-form :inline="true" size="small">
-        <el-form-item label="文件类型:">
+        <el-form-item :label="$t('dictionary:signature:search:FileTypeId')">
           <el-select v-model="searchData.FileTypeId" style="width: 150px">
             <el-option
               v-for="item of dict.type.Sys_Document"
@@ -12,7 +12,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="文件名称">
+        <el-form-item :label="$t('dictionary:signature:search:Name')">
           <el-input v-model="searchData.Name" style="width: 130px" clearable />
         </el-form-item>
 
@@ -34,7 +34,7 @@
       <el-button
         type="primary"
         icon="el-icon-plus"
-        style="margin-left: auto"
+        style="margin-left: auto; margin-bottom: 10px"
         size="small"
         @click="handleAdd"
       >
@@ -53,26 +53,27 @@
         <el-table-column type="index" width="40" />
         <el-table-column
           prop="FileType"
-          label="文件类型"
+          :label="$t('dictionary:signature:table:FileType')"
           show-overflow-tooltip
           sortable="custom"
         />
         <el-table-column
           prop="Name"
-          label="文件名称"
+          :label="$t('dictionary:signature:table:Name')"
           show-overflow-tooltip
           sortable="custom"
         />
 
         <el-table-column
           prop="SignViewMinimumMinutes"
-          label="查看最短时间(分钟)"
+          :label="$t('dictionary:signature:table:SignViewMinimumMinutes')"
           show-overflow-tooltip
           sortable="custom"
+          min-width="110"
         />
         <el-table-column
           prop="NeedConfirmedUserTypes"
-          label="需要签署的用户类型"
+          :label="$t('dictionary:signature:table:NeedConfirmedUserTypes')"
           show-overflow-tooltip
         >
           <template slot-scope="scope">
@@ -85,19 +86,25 @@
         </el-table-column>
         <el-table-column
           prop="IsDeleted"
-          label="是否废除"
+          :label="$t('dictionary:signature:table:IsDeleted')"
           show-overflow-tooltip
           sortable="custom"
         >
           <template slot-scope="scope">
-            {{ scope.row.IsDeleted ? 'Yes' : 'No' }}
+            <el-tag v-if="scope.row.IsDeleted" type="danger">{{
+              $fd('TrainingStatus', scope.row.IsDeleted)
+            }}</el-tag>
+            <el-tag v-else type="primary">{{
+              $fd('TrainingStatus', scope.row.IsDeleted)
+            }}</el-tag>
           </template>
         </el-table-column>
         <el-table-column
           prop="DocUserSignType"
-          label="是否仅内部签署"
+          :label="$t('dictionary:signature:table:DocUserSignType')"
           show-overflow-tooltip
           sortable="custom"
+          min-width="90"
         >
           <template slot-scope="scope">
             {{ $fd('ReadingYesOrNo', Number(scope.row.DocUserSignType)) }}
@@ -105,28 +112,28 @@
         </el-table-column>
         <el-table-column
           prop="CreateTime"
-          label="创建时间"
+          :label="$t('dictionary:signature:table:CreateTime')"
           show-overflow-tooltip
           sortable="custom"
         />
 
-        <el-table-column label="Action">
+        <el-table-column :label="$t('common:action:action')" min-width="100">
           <template slot-scope="scope">
             <el-button type="text" @click="handlePreview(scope.row)">
-              预览
+              {{ $t('common:button:preview') }}
             </el-button>
             <el-button type="text" @click="handleEdit(scope.row)">
-              编辑
+              {{ $t('common:button:edit') }}
             </el-button>
             <el-button
               :disabled="scope.row.IsDeleted"
               type="text"
               @click="handleRepeal(scope.row)"
             >
-              废除
+              {{ $t('common:button:revoke') }}
             </el-button>
             <el-button type="text" @click="handleDelete(scope.row)">
-              删除
+              {{ $t('common:button:delete') }}
             </el-button>
           </template>
         </el-table-column>
@@ -261,7 +268,7 @@ export default {
     },
     // 废除
     handleRepeal(row) {
-      this.$confirm('是否确认废除此文件?', {
+      this.$confirm(this.$t('dictionary:signature:confirm:delFile'), {
         type: 'warning',
         distinguishCancelAndClose: true,
       })
@@ -298,7 +305,9 @@ export default {
                 this.list.findIndex((item) => item.Id === row.Id),
                 1
               )
-              this.$message.success('删除成功！')
+              this.$message.success(
+                this.$t('common:message:deletedSuccessfully')
+              )
             }
           })
           .catch(() => {

src/views/dictionary/checkConfig/index.vue

@@ -3,7 +3,7 @@
     <el-form :inline="true">
       <el-form-item label="模块">
         <el-select v-model="queryParams.ModuleTypeId" placeholder="模块" clearable size="small">
-          <el-option v-for="item of dict.type.ModuleType" :value="item.value" :label="item.raw.ValueCN" />
+          <el-option v-for="item of dict.type.ModuleType" :key="`ModuleTypeId${item.value}`" :value="item.value" :label="item.raw.ValueCN" />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -169,28 +169,28 @@
             <el-col v-show="form.ConfigType === 'M' && title !== '复制'" :span="12">
               <el-form-item label="功能模块" prop="menuType">
                 <el-select v-model="form.ModuleTypeId" placeholder="模块" clearable size="small" @change="changeModule">
-                  <el-option v-for="item of dict.type.ModuleType" :value="item.value" :label="item.raw.ValueCN" />
+                  <el-option v-for="item of dict.type.ModuleType" :key="`ModuleType${item.value}`" :value="item.value" :label="item.raw.ValueCN" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col v-show="form.ConfigType === 'M' && title !== '复制'" :span="12">
               <el-form-item label="操作类型" prop="menuType">
                 <el-select v-model="form.OptTypeId" placeholder="操作类型" clearable size="small" @change="changeDescription">
-                  <el-option v-for="item of dict.type.OptType" :value="item.value" :label="item.raw.ValueCN" />
+                  <el-option v-for="item of dict.type.OptType" :key="`OptTypeId${item.value}`" :value="item.value" :label="item.raw.ValueCN" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col v-show="form.ConfigType === 'M' && title !== '复制'" :span="12">
               <el-form-item label="对象类型" prop="menuType">
                 <el-select v-model="form.ObjectTypeId" placeholder="对象类型" clearable size="small" @change="changeDescription">
-                  <el-option v-for="item of dict.type.ObjectType" v-if="ChildGroup === item.raw.ChildGroup" :value="item.value" :label="item.raw.ValueCN" />
+                  <el-option v-for="item of dict.type.ObjectType" :key="`ObjectType${item.value}`" v-if="ChildGroup === item.raw.ChildGroup" :value="item.value" :label="item.raw.ValueCN" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col v-show="form.ConfigType === 'M' && title !== '复制'" :span="12">
               <el-form-item label="数据类型" prop="menuType">
                 <el-select v-model="form.ChildrenTypeId" placeholder="操作子类" clearable size="small" @change="changeDescription">
-                  <el-option v-for="item of dict.type.ChildrenType" :value="item.value" :label="item.raw.ValueCN" />
+                  <el-option v-for="item of dict.type.ChildrenType" :key="`ChildrenType${item.value}`" :value="item.value" :label="item.raw.ValueCN" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -295,7 +295,7 @@
                       </el-button>
                     </el-col>
                   </el-row>
-                  <el-row v-show="form.DataType === 'Router'" v-if="form.UrlConfig && form.UrlConfig.IsHaveParameters" v-for="(item,index) of form.UrlConfig ? form.UrlConfig.ParameterList : []">
+                  <el-row v-show="form.DataType === 'Router'" v-if="form.UrlConfig && form.UrlConfig.IsHaveParameters" v-for="(item,index) of form.UrlConfig ? form.UrlConfig.ParameterList : []" :key="`Router${index}`">
                     <el-col :span="10">
                       <el-form-item>
                       <span slot="label">
@@ -671,11 +671,11 @@
       <div style="padding: 0 40px;display: flex;flex-direction: column">
         <div style="text-align: right;height: 50px;">
           <el-select v-model="copeParams.FromItemId" collapse-tags filterable placeholder="完全拷贝对象" clearable size="small">
-            <el-option v-for="item of list" v-if="drawer_cfg.drawerChild && item.ConfigType === 'M' && item.ObjectTypeId === selectRow.ObjectTypeId && item.OptTypeId && item.ChildrenTypeId " :value="item.Id" :label="item.DescriptionCN" />
+            <el-option v-for="item of list" :key="item.Id" v-if="drawer_cfg.drawerChild && item.ConfigType === 'M' && item.ObjectTypeId === selectRow.ObjectTypeId && item.OptTypeId && item.ChildrenTypeId " :value="item.Id" :label="item.DescriptionCN" />
           </el-select>
           <el-button type="primary" size="mini" style="margin-right: 10px" @click="handleOverCope(selectRow)">完全拷贝</el-button>
           <el-select v-model="copeParams.DataSourceGuids" multiple collapse-tags filterable placeholder="拷贝对象" clearable size="small">
-            <el-option v-for="item of list" v-if="drawer_cfg.drawerChild && item.ConfigType === 'M' && item.ObjectTypeId === selectRow.ObjectTypeId && item.OptTypeId && item.ChildrenTypeId " :value="item.Id" :label="item.DescriptionCN" />
+            <el-option v-for="item of list" :key="item.Id" v-if="drawer_cfg.drawerChild && item.ConfigType === 'M' && item.ObjectTypeId === selectRow.ObjectTypeId && item.OptTypeId && item.ChildrenTypeId " :value="item.Id" :label="item.DescriptionCN" />
           </el-select>
           <el-button type="primary" size="mini" @click="handleCope(selectRow)">拷贝</el-button>
           <el-button type="primary" size="mini" @click="handleAdd(selectRow)">新建</el-button>

src/views/dictionary/checkConfig/oldIndex.vue

@@ -1,411 +0,0 @@
-<template>
-  <div class="app-container my_menu">
-    <el-form :inline="true">
-      <el-form-item label="操作名">
-        <el-input
-          v-model="queryParams.menuName"
-          placeholder="请输入操作名"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="模块">
-        <el-select v-model="queryParams.visible" placeholder="模块" clearable size="small" />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
-      </el-form-item>
-    </el-form>
-    <div>
-      <el-button
-        type="info"
-        plain
-        icon="el-icon-sort"
-        size="mini"
-        @click="toggleExpandAll"
-      >展开/折叠</el-button>
-    </div>
-    <el-table
-      v-if="refreshTable"
-      v-loading="loading"
-      :data="menuList"
-      :default-expand-all="isExpandAll"
-      row-key="Id"
-      :tree-props="{children: 'Children', hasChildren: 'hasChildren'}"
-    >
-      <el-table-column prop="ModuleTypeValueCN" label="模块" align="left" min-width="230px" />
-      <el-table-column prop="OptTypeValueCN" label="操作类型" min-width="120px" />
-      <el-table-column prop="ChildrenTypeValueCN" label="操作子类" min-width="120px" show-overflow-tooltip />
-      <el-table-column prop="Description" label="操作名称" :show-overflow-tooltip="true" min-width="200px" />
-      <el-table-column prop="Code" label="字段名" min-width="120px" :show-overflow-tooltip="true" />
-      <el-table-column prop="Value" label="字段英文" min-width="120px" :show-overflow-tooltip="true" />
-      <el-table-column prop="ValueCN" label="字段中文" min-width="120px" :show-overflow-tooltip="true" />
-      <el-table-column label="启用" align="center" prop="CreateTime" min-width="80">
-        <template slot-scope="scope">
-          <el-tag v-if="scope.row.IsEnable" size="success">启用</el-tag>
-          <el-tag v-else size="danger">禁用</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="是否使用父数据" align="center" prop="CreateTime" min-width="130">
-        <template slot-scope="scope">
-          <el-tag v-if="scope.row.IsShowParent" size="success">父数据</el-tag>
-          <el-tag v-else size="danger">子数据</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" min-width="180" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            v-if="scope.row.ConfigType === 'M'"
-            icon="el-icon-plus"
-            @click="handleAdd(scope.row)"
-          >新增</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- 添加或修改菜单对话框 -->
-    <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="680px" append-to-body>
-      <el-form ref="form" :model="form" label-width="100px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="选择操作">
-              <treeselect
-                v-model="form.ParentId"
-                :options="menuOptions"
-                :normalizer="normalizer"
-                :show-count="true"
-                placeholder="选择上级操作"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" v-show="form.ConfigType === 'M'">
-            <el-form-item label="模块" prop="menuType">
-              <el-select v-model="form.ModuleTypeId" placeholder="模块" clearable size="small" @change="changeDescription">
-                <el-option v-for="item of dict.type.ModuleType" :value="item.value" :label="item.raw.ValueCN"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" v-show="form.ConfigType === 'M'">
-            <el-form-item label="操作类型" prop="menuType">
-              <el-select v-model="form.OptTypeId" placeholder="操作类型" clearable size="small" @change="changeDescription">
-                <el-option v-for="item of dict.type.OptType" :value="item.value" :label="item.raw.ValueCN"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" v-show="form.ConfigType === 'M'">
-            <el-form-item label="操作子类" prop="menuType">
-              <el-select v-model="form.ChildrenTypeId" placeholder="操作子类" clearable size="small"  @change="changeDescription">
-                <el-option v-for="item of dict.type.ChildrenType" :value="item.value" :label="item.raw.ValueCN"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" v-show="form.ConfigType == 'M'">
-            <el-form-item label="名称" prop="Description">
-              <el-input v-model="form.Description" placeholder="请输入名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="显示排序" prop="ShowOrder">
-              <el-input-number v-model="form.Sort" controls-position="right" :min="0" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item>
-              <span slot="label">
-                是否启用
-              </span>
-              <el-switch
-                v-model="form.IsEnable"
-                :active-value="true"
-                :inactive-value="false"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" v-show="form.ConfigType === 'C'">
-            <el-form-item>
-              <span slot="label">
-                继承父数据
-              </span>
-              <el-switch
-                v-model="form.IsShowParent"
-                :active-value="true"
-                :inactive-value="false"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24" v-show="form.ConfigType === 'C'">
-            <el-form-item label="字段key">
-              <el-input v-model="form.Code" placeholder="请输入字段key" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" v-show="form.ConfigType === 'C'">
-            <el-form-item label="字段英文">
-              <el-input v-model="form.Value" placeholder="请输入字段英文" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" v-show="form.ConfigType === 'C'">
-            <el-form-item label="字段中文">
-              <el-input v-model="form.ValueCN" placeholder="请输入字段中文" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24" v-show="form.ConfigType === 'C'">
-            <el-form-item label="枚举类型">
-              <el-radio-group v-model="form.EnumType">
-                <el-radio :label="null">无</el-radio>
-                <el-radio label="E">枚举</el-radio>
-                <el-radio label="D">字典</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24" v-show="form.ConfigType === 'C' && form.EnumType === 'E'">
-            <el-form-item label="枚举">
-              <el-input v-model="form.EnumList" placeholder="请输入枚举" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24" v-show="form.ConfigType === 'C' && form.EnumType === 'D'">
-            <el-form-item label="字典code">
-              <el-input v-model="form.dictionaryKey" placeholder="请输入字典code" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-  import { getFrontAuditConfigList, addOrUpdateFrontAuditConfig, deleteFrontAuditConfig } from '@/api/dictionary/checkConfig'
-  import Treeselect from '@riophae/vue-treeselect'
-  import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-  import IconSelect from '@/components/IconSelect'
-
-  export default {
-    name: 'checkConfig',
-    dicts: [ 'OptType', 'ModuleType', 'ChildrenType' ],
-    components: { Treeselect, IconSelect },
-    data() {
-      return {
-        // 遮罩层
-        loading: true,
-        // 菜单表格树数据
-        menuList: [],
-        // 菜单树选项
-        menuOptions: [],
-        // 弹出层标题
-        title: '',
-        // 是否显示弹出层
-        open: false,
-        // 菜单状态数据字典
-        visibleOptions: [],
-        // 查询参数
-        queryParams: {
-          menuName: undefined,
-          visible: undefined,
-        },
-        // 是否展开，默认全部折叠
-        isExpandAll: false,
-        // 重新渲染表格状态
-        refreshTable: true,
-        // 表单参数
-        form: {},
-        // 表单校验
-        rules: {
-          MenuName: [
-            { required: true, message: '菜单名称不能为空', trigger: 'blur' }
-          ],
-          ShowOrder: [
-            { required: true, message: '菜单顺序不能为空', trigger: 'blur' }
-          ]
-        }
-      }
-    },
-    created() {
-      this.getList()
-      // this.getDicts("sys_show_hide").then(response => {
-      //   this.visibleOptions = response.data;
-      // });
-    },
-    methods: {
-      toggleExpandAll() {
-        this.refreshTable = false
-        this.isExpandAll = !this.isExpandAll
-        this.$nextTick(() => {
-          this.refreshTable = true
-        })
-      },
-      normalizer(node) {
-        if (node.Children && !node.Children.length) {
-          delete node.Children
-        }
-        return {
-          id: node.Id,
-          label: node.Description,
-          children: node.Children
-        }
-      },
-      toTree(arr, ParentId) {
-        function loop(ParentId) {
-          const res = []
-          for (let i = 0; i < arr.length; i++) {
-            const item = arr[i]
-            item.hasChildren = false
-            if (item.ParentId !== ParentId) {
-              continue
-            }
-            item.Children = loop(item.Id)
-            res.push(item)
-          }
-          return res
-        }
-        return loop(ParentId)
-      },
-      // 选择图标
-      selected(name) {
-        this.form.MenuIcon = name
-      },
-      /** 查询菜单列表 */
-      getList() {
-        this.loading = true
-        getFrontAuditConfigList(this.queryParams).then(res => {
-          this.menuList = this.toTree(res.Result, '00000000-0000-0000-0000-000000000000')
-          const menu = { Id: '00000000-0000-0000-0000-000000000000', Description: '操作', Children: [] }
-          menu.Children = this.menuList
-          this.menuOptions = Object.assign([], [menu])
-          this.loading = false
-        }).catch(function() {})
-      },
-      /** 查询菜单下拉树结构 */
-      getTreeselect() {
-        this.loading = true
-        getFrontAuditConfigList({}).then(res => {
-          const menu = { Id: '00000000-0000-0000-0000-000000000000', Description: '操作', Children: [] }
-          menu.Children = this.toTree(res.Result, '00000000-0000-0000-0000-000000000000')
-          this.menuOptions = Object.assign([], [menu])
-          this.loading = false
-        }).catch(function() {})
-      },
-      // 菜单显示状态字典翻译
-      visibleFormat(row, column) {
-        if (row.MenuType === 'F') {
-          return ''
-        }
-        return this.selectDictLabel(this.visibleOptions, row.visible)
-      },
-      // 取消按钮
-      cancel() {
-        this.open = false
-        this.reset()
-      },
-      // 表单重置
-      reset() {
-        this.form = {
-          Id: null,
-          ParentId: null,
-          ConfigType: 'M',
-          Description: null,
-          IsEnable: true,
-          ModuleTypeId: null,
-          OptTypeId: null,
-          ChildrenTypeId: null,
-          IsShowParent: false,
-          Sort: 0,
-          Code: null,
-          Value: null,
-          ValueCN: null,
-          EnumType: null
-        }
-        this.resetForm('form')
-      },
-      findName (id, dict, type) {
-        if (id) {
-          return this.dict.type[dict].find(v => {
-            return v.value === id
-          }).raw[type]
-        }
-        return ''
-      },
-      changeDescription () {
-        this.form.Description = this.findName(this.form.OptTypeId, 'OptType', 'ValueCN') + this.findName(this.form.ModuleTypeId, 'ModuleType', 'ValueCN') + this.findName(this.form.ChildrenTypeId, 'ChildrenType', 'ValueCN')
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.getList()
-      },
-      /** 新增按钮操作 */
-      handleAdd(row) {
-        this.reset()
-        this.getTreeselect()
-        if (row != null) {
-          this.form.ParentId = row.Id
-          this.form.ModuleTypeId = row.ModuleTypeId
-          this.form.OptTypeId = row.OptTypeId
-          this.form.ChildrenTypeId = row.ChildrenTypeId
-          if (row.ModuleTypeId && row.OptTypeId && row.ChildrenTypeId) {
-            this.form.ConfigType = 'C'
-          }
-          this.form.Description = row.OptTypeValueCN + row.ModuleTypeValueCN + row.ChildrenTypeValueCN
-        }
-        this.open = true
-        this.title = '添加'
-      },
-      /** 修改按钮操作 */
-      handleUpdate(row) {
-        this.reset()
-        this.getTreeselect()
-        this.form = Object.assign({}, row)
-        this.open = true
-        this.title = '修改'
-      },
-      /** 提交按钮 */
-      submitForm: function() {
-        this.$refs['form'].validate(valid => {
-          if (valid) {
-            addOrUpdateFrontAuditConfig(this.form).then(response => {
-              this.$message.success(this.$t('common:message:savedSuccessfully'))
-              this.open = false
-              this.getList()
-            })
-          }
-        })
-      },
-      /** 删除按钮操作 */
-      handleDelete(row) {
-        this.$confirm('是否确认删除名称为"' + row.Description + '"的数据项?', '警告', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(function() {
-          return deleteFrontAuditConfig(row.Id)
-        }).then(() => {
-          this.getList()
-          this.$message.success('删除成功')
-        }).catch(function() {})
-      }
-    }
-  }
-</script>
-<style lang="scss">
-  .vue-treeselect div{
-    line-height: 40px;
-  }
-</style>

src/views/dictionary/institutions/components/CROs.vue

@@ -73,13 +73,13 @@
           <el-button
             circle
             icon="el-icon-edit-outline"
-            title="编辑"
+            :title="$t('common:button:edit')"
             @click="handleEdit(scope.row)"
           />
           <el-button
             circle
             icon="el-icon-delete"
-            title="删除"
+            :title="$t('common:button:delete')"
             @click="handleDelete(scope.row)"
           />
         </template>

src/views/dictionary/institutions/components/Hospitals.vue

@@ -113,13 +113,13 @@
           <el-button
             circle
             icon="el-icon-edit-outline"
-            title="编辑"
+            :title="$t('common:button:edit')"
             @click="handleEdit(scope.row)"
-          />
+          /> 
           <el-button
             circle
             icon="el-icon-delete"
-            title="删除"
+            :title="$t('common:button:delete')"
             @click="handleDelete(scope.row)"
           />
         </template>

src/views/dictionary/institutions/components/SiteForm.vue

@@ -32,9 +32,9 @@
         <el-input v-model="form.AliasName" />
       </el-form-item>
 
-      <el-form-item label="组织机构代码: ">
+      <!-- <el-form-item label="组织机构代码: ">
         <el-input v-model="form.UniqueCode" />
-      </el-form-item>
+      </el-form-item> -->
 
       <el-form-item label="Country: " prop="Country">
         <el-input v-model="form.Country" />

src/views/dictionary/institutions/components/Sites.vue

@@ -74,13 +74,13 @@
         show-overflow-tooltip
         sortable="custom"
       />
-      <el-table-column
+      <!-- <el-table-column
         prop="UniqueCode"
         label="组织机构代码"
         min-width="130"
         show-overflow-tooltip
         sortable="custom"
-      />
+      /> -->
       <el-table-column
         prop="Country"
         label="Country"
@@ -149,13 +149,13 @@
           <el-button
             circle
             icon="el-icon-edit-outline"
-            title="编辑"
+            :title="$t('common:button:edit')"
             @click="handleEdit(scope.row)"
           />
           <el-button
             circle
             icon="el-icon-delete"
-            title="删除"
+            :title="$t('common:button:delete')"
             @click="handleDelete(scope.row)"
           />
         </template>

src/views/dictionary/institutions/components/Sponsors.vue

@@ -73,13 +73,13 @@
           <el-button
             circle
             icon="el-icon-edit-outline"
-            title="编辑"
+            :title="$t('common:button:edit')"
             @click="handleEdit(scope.row)"
           />
           <el-button
             circle
             icon="el-icon-delete"
-            title="删除"
+            :title="$t('common:button:delete')"
             @click="handleDelete(scope.row)"
           />
         </template>

src/views/dictionary/template/browser/index.vue

@@ -10,12 +10,16 @@
           <el-input v-model="searchData.Version" style="width: 100px" />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleReset">{{
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
-            $t("dictionary:browser:button:reset")
+            {{ $t('common:button:search') }}
-          }}</el-button>
+          </el-button>
-          <el-button type="primary" @click="handleSearch">{{
+          <el-button
-            $t("dictionary:browser:button:search")
+            type="primary"
-          }}</el-button>
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left: auto">

src/views/dictionary/template/browser/tip.vue

@@ -33,7 +33,7 @@ export default {
         let browserType = this.getExplore();
         let type = browserType.split(": ")[0];
         let No = browserType.split(": ")[1].split(".")[0];
-        console.log(type, No);
+        // console.log(type, No);
         if (type !== "Chrome" && type !== "Edge") {
           this.tip = this.$t("browser:tip:changeBorwser");
           return (this.visible = true);

src/views/dictionary/template/components/AddCriterion.vue

@@ -8,13 +8,14 @@
     :rules="rules"
   >
     <div class="base-dialog-body">
-      <el-form-item label="标准名称" prop="CriterionName">
+      <!-- 标准名称 -->
+      <el-form-item :label="$t('trials:auditRecord:table:criterion')" prop="CriterionName">
         <el-input
           v-model="form.CriterionName"
         />
       </el-form-item>
-
+      <!-- 标准类型 -->
-      <el-form-item label="标准类型" prop="CriterionType">
+      <el-form-item :label="$t('dictionary:template:criterionConfig:table:criterionType')" prop="CriterionType">
         <el-select v-model="form.CriterionType">
           <el-option
             v-for="item of $d.CriterionType"
@@ -24,23 +25,37 @@
           />
         </el-select>
       </el-form-item>
-
+      <!-- 标准分组 -->
-      <el-form-item v-if="form.Id !== ''" label="是否配置完成">
+      <el-form-item :label="$t('dictionary:template:criterionConfig:table:criterionGroup')" prop="CriterionGroup">
+        <el-select v-model="form.CriterionGroup">
+          <el-option
+            v-for="item of $d.CriterionGroup"
+            :key="item.id"
+            :value="item.value"
+            :label="item.label"
+          />
+        </el-select>
+      </el-form-item>
+      <!-- 是否配置完成 -->
+      <el-form-item v-if="form.Id !== ''" :label="$t('dictionary:template:criterionConfig:table:isCompleteConfig')">
         <el-switch v-model="form.IsCompleteConfig" />
       </el-form-item>
-      <el-form-item label="描述">
+      <!-- 描述 -->
+      <el-form-item :label="$t('dictionary:template:criterionConfig:table:description')">
         <el-input
           v-model="form.Description"
         />
       </el-form-item>
-
+      <!-- 显示序号 -->
-      <el-form-item label="显示序号: " prop="ShowOrder">
+      <el-form-item :label="$t('dictionary:template:criterionConfig:table:showOrder')" prop="ShowOrder">
         <el-input-number v-model="form.ShowOrder" :min="0"  style="width:100%;" />
       </el-form-item>
-      <el-form-item v-if="form.Id !== ''" label="是否启用">
+      <!-- 是否启用 -->
+      <el-form-item v-if="form.Id !== ''" :label="$t('dictionary:template:criterionConfig:table:isEnable')">
         <el-switch v-model="form.IsEnable" />
       </el-form-item>
-      <el-form-item v-if="form.Id !== ''" label="eCRF是否显示在影像阅片页面">
+      <!-- eICRF仅展示阅片Tab -->
+      <el-form-item v-if="form.Id !== ''" :label="$t('dictionary:template:criterionConfig:table:isECRFShowInDicomReading')">
         <el-switch v-model="form.IseCRFShowInDicomReading" />
       </el-form-item>
     </div>
@@ -72,6 +87,7 @@ export default {
         Id: '',
         CriterionName: '',
         CriterionType: null,
+        CriterionGroup: null,
         IsEnable: true,
         IsCompleteConfig: false,
         ShowOrder: null,
@@ -80,7 +96,8 @@ export default {
       },
       rules: {
         CriterionName: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur'] }],
-        CriterionType: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] }]
+        CriterionType: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] }],
+        CriterionGroup: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] }]
       },
 
       loading: false,

src/views/dictionary/template/components/Anonymization.vue

@@ -16,8 +16,16 @@
           <el-input v-model="searchData.TagDescriptionCN" clearable style="width:120px;" />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleReset">Reset</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
-          <el-button type="primary" @click="handleSearch">Search</el-button>
+            {{ $t('common:button:search') }}
+          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left:auto">

src/views/dictionary/template/components/ClinicalDataConfig.vue

@@ -27,8 +27,16 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleReset">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
-          <el-button type="primary" @click="handleSearch">查询</el-button>
+            {{ $t('common:button:search') }}
+          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left:auto">
@@ -101,6 +109,15 @@
           {{ scope.row.FileName }}
         </template>
       </el-table-column>
+      <el-table-column
+        prop="EnFileName"
+        label="模板英文名称"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">
+          {{ scope.row.EnFileName }}
+        </template>
+      </el-table-column>
       <el-table-column
         prop="IsEnable"
         label="状态"
@@ -128,10 +145,20 @@
             问题配置
           </el-button>
           <el-button
+            v-if="$i18n.locale === 'zh'"
             type="primary"
             size="mini"
             :disabled="!scope.row.FileName"
-            @click="handleDownloadTpl(scope.row)"
+            @click="handleDownloadTpl(scope.row.Path)"
+          >
+            下载
+          </el-button>
+           <el-button
+            v-else
+            type="primary"
+            size="mini"
+            :disabled="!scope.row.EnFileName"
+            @click="handleDownloadTpl(scope.row.EnPath)"
           >
             下载
           </el-button>
@@ -250,8 +277,8 @@ export default {
             }).catch(() => { this.loading = false })
         })
     },
-    handleDownloadTpl(row) {
+    handleDownloadTpl(path) {
-      window.open(this.OSSclientConfig.basePath + row.Path, '_blank')
+      window.open(this.OSSclientConfig.basePath + path, '_blank')
     },
     // 排序
     handleSortByColumn(column) {

src/views/dictionary/template/components/ClinicalDataForm.vue

@@ -113,6 +113,34 @@
         </div>
       </el-form-item>
 
+      <el-form-item v-if="form.ClinicalUploadType === 1" label="英文模板: ">
+        <div class="upload-container">
+          <el-upload
+            class="upload-demo"
+            action
+            accept=".doc,.docx"
+            :before-upload="beforeUploadEnFile"
+            :http-request="handleUploadEnFile"
+            :on-preview="handlePreview"
+            :on-remove="handleRemoveEnFile"
+            :show-file-list="true"
+            :file-list="enFileList"
+            :limit="1"
+            :on-exceed="handleExceed"
+            :disabled="form.Type === ''"
+          >
+            <el-button size="small" type="primary">选择</el-button>
+            <span
+              slot="tip"
+              style="margin-left:10px;"
+              class="el-upload__tip"
+            >
+              (必须是doc/docx格式)
+            </span>
+          </el-upload>
+        </div>
+      </el-form-item>
+
       <el-form-item v-if="form.Id !== ''" label="是否启用">
         <el-switch v-model="form.IsEnable" />
       </el-form-item>
@@ -160,6 +188,8 @@ export default {
         UploadRole: null,
         FileName: '',
         Path: '',
+        EnFileName: '',
+        EnPath: '',
         IsEnable: true,
         CriterionEnumList: []
       },
@@ -173,6 +203,7 @@ export default {
       loading: false,
       btnLoading: false,
       fileList: [],
+      enFileList: [],
       systemCriterionSelectList: []
     }
   },
@@ -195,6 +226,14 @@ export default {
             }
           ]
         }
+        if (this.data.EnPath) {
+          this.enFileList = [
+            {
+              name: this.data.EnFileName,
+              path: this.data.EnPath
+            }
+          ]
+        }
       }
     },
     save() {
@@ -249,6 +288,32 @@ export default {
     handleExceed(files, fileList) {
       this.$message.warning(`只允许上传一个文件`)
     },
+    beforeUploadEnFile(file) {
+      // 检测文件类型是否符合要求
+      if (this.checkFileSuffix(file.name)) {
+        this.enFileList = []
+        return true
+      } else {
+        this.$alert('(必须是doc/docx格式)')
+
+        return false
+      }
+    },
+    async handleUploadEnFile(param) {
+      this.loading = true
+      var fileBlob = await this.fileToBlob(param.file)
+      const res = await this.OSSclient.put(`/System/ClinicalDataTemplate/${param.file.name}`, fileBlob)
+      this.form.EnFileName = res.name
+      this.form.EnPath = this.$getObjectName(res.url)
+      let file = { name: res.name, path: this.$getObjectName(res.url), url:this.$getObjectName(res.url) }
+      this.enFileList.push(file)
+      this.loading = false
+    },
+    handleRemoveEnFile() {
+      this.enFileList = []
+      this.form.EnPath = ''
+      this.form.EnFileName = ''
+    },
     checkFileSuffix(fileName) {
       var typeArr = ['doc', 'docx']
       var extendName = fileName.substring(fileName.lastIndexOf('.') + 1).toLocaleLowerCase()
@@ -275,7 +340,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .upload-container{
-  /deep/ .el-upload {
+  ::v-deep .el-upload {
     width: 100%;
     text-align: left;
   }

src/views/dictionary/template/components/ClinicalQuestionTableForm.vue

@@ -90,7 +90,7 @@
         prop="IsRequired"
       >
         <el-radio-group v-model="form.IsRequired">
-          <el-radio v-for="item of $d.QuestionRequired" :label="item.value">{{ item.label }}</el-radio>
+          <el-radio v-for="item of $d.QuestionRequired" :key="`IsRequired${item.value}`" :label="item.value">{{ item.label }}</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="序号" prop="ShowOrder">

src/views/dictionary/template/components/CriterionDictionary.vue

@@ -265,7 +265,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-/deep/ .el-form-item__content{
+::v-deep .el-form-item__content{
   width: calc(100% - 110px);
 }
 </style>

src/views/dictionary/template/components/CriterionDictionaryConfig.vue

@@ -231,7 +231,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-/deep/ .el-form-item__content{
+::v-deep .el-form-item__content{
   width: calc(100% - 110px);
 }
 </style>

src/views/dictionary/template/components/CriterionFormItem.vue

@@ -25,7 +25,7 @@
         :prop="question.Id"
         :rules="[
           { required: (question.IsRequired === 0 || (question.IsRequired ===1 && question.RelevanceId && question.RelevanceValueList.includes(questionForm[question.RelevanceId]))) && question.Type!=='group' && question.Type!=='summary',
-            message: '请注明', trigger: ['blur', 'change']},
+            message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change']},
         ]"
         :class="[question.Type==='group'?'mb':question.Type==='upload'?'uploadWrapper':'']"
       >
@@ -396,7 +396,7 @@ export default {
     flex-direction: row;
     align-items: flex-start;
   }
-  /deep/ .el-form-item__content{
+  ::v-deep .el-form-item__content{
     width: 500px;
   }
   .el-input{
@@ -406,7 +406,7 @@ export default {
   margin-bottom: 0px;
 }
 .disabled{
-  /deep/ .el-upload--picture-card {
+  ::v-deep .el-upload--picture-card {
     display: none;
   }
 }

src/views/dictionary/template/components/CriterionQuestionForm.vue

@@ -11,7 +11,7 @@
     <div class="base-dialog-body" style="height: 550px; display:flex;flex-direction: column;">
       <div style="height: 150px;">
         <!-- 类型 -->
-        <el-form-item label="类型" prop="Type">
+        <el-form-item :label="$t('trials:readingUnit:qsList:title:type')" prop="Type">
           <el-select
             v-model="form.Type"
             clearable
@@ -33,22 +33,23 @@
         <!-- 分组名称 -->
         <el-form-item
           v-if="form.Type === 'group'"
-          label="分组名称"
+          :label="$t('trials:readingUnit:qsList:title:groupNameEn')"
           prop="GroupName"
         >
           <el-input v-model="form.GroupName" />
         </el-form-item>
-        
+        <!-- 分组名称（EN） -->
         <el-form-item
           v-if="form.Type === 'group'"
-          label="分组名称（EN）"
+          :label="$t('trials:readingUnit:qsList:title:groupNameEn')"
           prop="GroupEnName"
         >
           <el-input v-model="form.GroupEnName" />
         </el-form-item>
+        <!-- 问题名称 -->
         <el-form-item
           v-if="form.Type !== 'group'"
-          label="问题名称"
+          :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
           prop="QuestionName"
           :rules="[
             { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
@@ -57,10 +58,10 @@
         >
           <el-input v-model="form.QuestionName" />
         </el-form-item>
-
+        <!-- 问题名称（EN） -->
         <el-form-item
           v-if="form.Type !== 'group'"
-          label="问题名称（EN）"
+          :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
           prop="QuestionEnName"
           :rules="[
             { max: form.Type === 'summary' ? 300 : 100, message: `${this.$t('common:ruleMessage:maxLength')} ${form.Type === 'summary' ? 300 : 100}` }
@@ -70,10 +71,12 @@
         </el-form-item>
       </div>
       <div style="flex: 1;overflow-y:auto;">
-        <el-divider content-position="left">公有属性</el-divider>
+        <!-- 公有属性 -->
+        <el-divider content-position="left">{{$t('trials:readingUnit:title:publicProperties')}}</el-divider>
+        <!-- 问题分组 -->
         <el-form-item 
           v-if="form.Type !== 'group'" 
-          label="问题分组"
+          :label="$t('trials:readingUnit:qsList:title:qsGroupName')"
           :rules="[
             { required: form.ShowQuestion === 1 ? false : true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
           ]"
@@ -91,9 +94,10 @@
             />
           </el-select>
         </el-form-item>
+        <!-- 是否显示 -->
         <el-form-item
           v-if="form.Type !== 'group'"
-          label="是否显示"
+          :label="$t('trials:readingUnit:qsList:title:isShow')"
           prop="ShowQuestion"
         >
           <el-radio-group
@@ -117,7 +121,7 @@
         <!-- 显示时依赖父问题 -->
         <el-form-item
           v-if="form.Type !== 'group' && form.ShowQuestion === 1"
-          label="显示依赖父问题"
+          :label="$t('trials:readingUnit:qsList:title:parentId')"
           prop="ParentId"
         >
           <el-select
@@ -140,7 +144,7 @@
         <!-- 显示时依赖父问题触发值 -->
         <el-form-item
           v-if="form.ParentId && form.ShowQuestion === 1"
-          label="显示触发值"
+          :label="$t('trials:readingUnit:qsList:title:parentTriggerValueList')" 
           prop="ParentTriggerValueList"
         >
           <el-select v-model="form.ParentTriggerValueList" clearable multiple>
@@ -152,10 +156,10 @@
             />
           </el-select>
         </el-form-item>
+        <!-- 是否必填 -->
         <el-form-item
           v-if="form.Type !== 'group' && form.Type !== 'table' && form.Type !== 'basicTable' && form.Type !== 'summary'"
-          label="是否必填"
+          :label="$t('trials:readingUnit:qsList:title:isRequired')" prop="IsRequired"
-          prop="IsRequired"
         >
           <el-radio-group
             v-model="form.IsRequired"
@@ -176,10 +180,10 @@
           </el-radio-group>
         </el-form-item>
 
-        <!-- 父问题 -->
+        <!-- 必填依赖父问题 -->
         <el-form-item
           v-if="form.Type !== 'group' && form.IsRequired === 1"
-          label="必填依赖父问题"
+          :label="$t('trials:readingUnit:qsList:title:relevanceId')"
           prop="RelevanceId"
         >
           <el-select
@@ -199,10 +203,10 @@
             />
           </el-select>
         </el-form-item>
-        <!-- 必填依赖的父问题触发值 -->
+        <!-- 必填触发值 -->
         <el-form-item
           v-if="form.RelevanceId && form.IsRequired === 1"
-          label="必填触发值"
+          :label="$t('trials:readingUnit:qsList:title:relevanceValueList')"
           prop="RelevanceValueList"
         >
           <el-select v-model="form.RelevanceValueList" clearable multiple>
@@ -214,6 +218,7 @@
             />
           </el-select>
         </el-form-item>
+        <!-- 是否裁判问题 -->
         <el-form-item
           v-if="
             form.Type === 'select' ||
@@ -221,7 +226,7 @@
             form.Type === 'calculation' ||
             form.Type === 'number'
           "
-          label="是否裁判问题"
+          :label="$t('trials:readingUnit:qsList:title:isJudgeQuestion')"
           prop="IsJudgeQuestion"
           :rules="[
             { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
@@ -243,7 +248,7 @@
             >
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="导出标识" 
+        <!-- <el-form-item label="导出标识" 
           prop="ExportIdentification"
           v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'number' || form.Type === 'class' || form.Type === 'calculation'"
         >
@@ -262,8 +267,12 @@
               >{{ item.label }}
             </el-radio>
           </el-radio-group>
-        </el-form-item>
+        </el-form-item> -->
-        <el-form-item label="导出结果" v-if="form.ExportIdentification" prop="ExportResult">
+        <!-- 导出结果 -->
+        <el-form-item 
+          :label="$t('trials:readingUnit:qsList:title:ExportResult')"
+           v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'number' || form.Type === 'class' || form.Type === 'calculation'"
+        >
           <el-select v-model="form.ExportResult" multiple>
             <el-option
               v-for="item in CriterionDictionaryList.ExportResult"
@@ -274,9 +283,9 @@
             </el-option>
           </el-select>
         </el-form-item>
-        
+        <!-- 限制编辑 -->
         <el-form-item 
-          label="限制编辑" 
+          :label="$t('trials:readingUnit:qsList:title:limitEdit')" 
           v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'upload' || form.Type === 'number' || form.Type === 'screenshot'"
           prop="LimitEdit"
           :rules="[
@@ -292,8 +301,9 @@
             >
           </el-radio-group>
         </el-form-item>
+        <!-- 全局阅片是否显示 -->
         <el-form-item 
-          label="全局阅片是否显示"
+          :label="$t('trials:readingUnit:qsList:title:globalReadingShowType')"
           prop="GlobalReadingShowType"
           :rules="[
             { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
@@ -308,8 +318,9 @@
             >
           </el-radio-group>
         </el-form-item>
+        <!-- 问题标识 -->
         <el-form-item
-          label="问题标识"
+          :label="$t('dictionary:template:criterionConfig:table:questionType')"
           v-if="form.Type !== 'group' && form.Type !== 'summary'"
           prop="QuestionType"
         >
@@ -322,8 +333,9 @@
             />
           </el-select>
         </el-form-item>
+        <!-- 是否在阅片页面显示 -->
         <el-form-item 
-          label="是否在阅片页面显示"
+          :label="$t('trials:readingUnit:qsList:title:isShowInDicom')"
           prop="IsShowInDicom"
           :rules="[
             { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
@@ -338,14 +350,16 @@
             >
           </el-radio-group>
         </el-form-item>
+        <!-- 注释 -->
         <el-form-item
-          label="注释"
+          :label="$t('trials:readingUnit:qsList:title:Remark')"
           prop="Remark"
         >
           <el-input v-model="form.Remark" />
         </el-form-item>
+        <!-- 序号 -->
         <el-form-item 
-          label="序号" 
+          :label="$t('trials:readingUnit:qsList:title:order')" 
           prop="ShowOrder"
           :rules="[
             { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
@@ -358,7 +372,8 @@
           />
         </el-form-item>
         <!-- 适用于Lugano 2014标准 -->
-        <el-form-item label="问题分类" v-if="form.Type !== 'group' && criterionType === 2">
+        <!-- 问题分类 -->
+        <el-form-item :label="$t('dictionary:template:criterionConfig:table:questionClassify')" v-if="form.Type !== 'group' && criterionType === 2">
           <el-select v-model="form.QuestionClassify" clearable>
             <el-option
               v-for="item of $d.QuestionClassify"
@@ -369,7 +384,8 @@
           </el-select>
         </el-form-item>
         <!-- 适用于iRECST标准 -->
-        <el-form-item label="转化显示类型" prop="ConvertShowType" v-if="criterionType === 3">
+        <!-- 转化显示类型 -->
+        <el-form-item :label="$t('dictionary:template:criterionConfig:table:convertType')" prop="ConvertShowType" v-if="criterionType === 3">
           <el-radio-group v-model="form.ConvertShowType">
             <el-radio
               v-for="item of $d.ConvertShowType"
@@ -380,16 +396,18 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-divider content-position="left">私有属性</el-divider>
+        <!-- 私有属性 -->
+        <el-divider content-position="left">{{$t('trials:readingUnit:title:privateProperties')}}</el-divider>
+        <!-- 选项类型 -->
         <el-form-item
           v-if="
             form.Type === 'select' ||
             form.Type === 'radio' ||
             form.Type === 'calculation'
           "
-          label="选项类型"
+          :label="$t('trials:readingUnit:label:QuestionGenre')"
           prop="QuestionGenre"
-          :rules="[{ required: form.Type !== 'calculation', message: '请选择' }]"
+          :rules="[{ required: form.Type !== 'calculation', message: this.$t('common:ruleMessage:select') }]"
         >
           <el-radio-group
             v-model="form.QuestionGenre"
@@ -399,7 +417,7 @@
               }
             "
           >
-            <el-radio :label="-1"> 无 </el-radio>
+            <el-radio :label="-1"> {{ this.$t('common:title:none') }} </el-radio>
             <el-radio
               v-for="item of $d.TableQuestionType"
               v-show="item.value === 0 || item.value === 3"
@@ -410,23 +428,23 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
-
+        <!-- 选项 -->
         <el-form-item
           v-if="form.QuestionGenre === 0 || form.Type === 'class'"
-          label="选项"
+          :label="$t('trials:qcCfg:table:typeValue')"
           prop="TypeValue"
         >
           <el-input
             v-model="form.TypeValue"
-            placeholder="选项请用‘|’分割多个选项"
+            :placeholder="$t('trials:qcCfg:message:typeValue')"
             @change="typeValueChange"
           />
         </el-form-item>
         
-        
+        <!-- 关联字典 -->
         <el-form-item
           v-if="form.QuestionGenre === 3"
-          label="关联字典"
+          :label="$t('trials:readingUnit:label:DictionaryCode')"
           prop="DictionaryCode"
         >
           <el-select
@@ -446,18 +464,19 @@
             />
           </el-select>
         </el-form-item>
-        
+        <!-- 默认值 -->
-        <el-form-item v-if="form.QuestionGenre === 3" label="默认值">
+        <el-form-item v-if="form.QuestionGenre === 3" :label="$t('trials:readingUnit:qsList:title:defaultValue')">
           <el-select v-model="form.DefaultValue" clearable>
             <el-option
-              v-for="item of form.DictionaryCode ? $d[form.DictionaryCode] : []"
+              v-for="item of highlightAnswers"
-              :key="item.id"
+              :key="item.Id"
-              :label="item.label"
+              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
-              :value="item.value.toString()"
+              :value="item.Code"
             />
           </el-select>
         </el-form-item>
-        <el-form-item v-if="form.QuestionGenre === 0" label="默认值">
+        <!-- 默认值 -->
+        <el-form-item v-if="form.QuestionGenre === 0" :label="$t('trials:readingUnit:qsList:title:defaultValue')">
           <el-select v-model="form.DefaultValue" clearable>
             <el-option
               v-for="item of form.TypeValue ? form.TypeValue.split('|') : []"
@@ -467,9 +486,10 @@
             />
           </el-select>
         </el-form-item>
+        <!-- 高亮标记值 -->
         <el-form-item
           v-if="form.Type === 'select' || form.Type === 'radio'"
-          label="高亮标记值"
+          :label="$t('trials:readingUnit:qsList:title:highlightAnswers')"
           prop="HighlightAnswerList"
         >
           <el-select v-model="form.HighlightAnswerList" clearable multiple>
@@ -491,8 +511,9 @@
             </template>
           </el-select>
         </el-form-item>
+        <!-- 分组标识 -->
         <el-form-item
-          label="分组标识"
+          :label="$t('dictionary:template:criterionConfig:table:groupClassify')"
           v-if="form.Type === 'group'"
           prop="GroupClassify"
         >
@@ -505,9 +526,10 @@
             />
           </el-select>
         </el-form-item>
+        <!-- 最大长度 -->
         <el-form-item 
           v-if="form.Type === 'input' || form.Type === 'textarea'"
-          label="最大长度"
+          :label="$t('trials:readingUnit:qsList:title:MaxAnswerLength')"
           prop="MaxAnswerLength"
           :rules="[
             { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }
@@ -515,9 +537,10 @@
         >
           <el-input-number v-model="form.MaxAnswerLength" :min="0"></el-input-number>
         </el-form-item>
+        <!-- 最大行数 -->
         <el-form-item 
           v-if="form.Type === 'table' || form.Type === 'basicTable'" 
-          label="最大行数"
+          :label="$t('trials:readingUnit:qsList:title:maxQuestionCount')"
           prop="MaxQuestionCount"
           :rules="[
             { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }
@@ -530,16 +553,16 @@
             :max="10"
           />
         </el-form-item>
-        <el-form-item v-if="form.Type === 'table' || form.Type === 'basicTable'" label="自增序号前缀">
+        <el-form-item v-if="form.Type === 'table' || form.Type === 'basicTable'" :label="$t('trials:readingUnit:qsList:title:orderMark')">
           <el-input v-model="form.OrderMark" />
         </el-form-item>
         
         <!-- 数值类型 -->
         <el-form-item
           v-if="form.Type === 'number' || form.Type === 'calculation'"
-          label="数值类型"
+          :label="$t('trials:readingUnit:qsList:title:valueType')"
           prop="ValueType"
-          :rules="[{ required: true, message: '请选择' }]"
+          :rules="[{ required: true, message: this.$t('common:ruleMessage:select') }]"
         >
           <el-radio-group v-model="form.ValueType">
             <el-radio
@@ -552,10 +575,10 @@
           </el-radio-group>
         </el-form-item>
 
-        <!-- 数值单位 -->
+        <!-- 单位 -->
         <el-form-item
           v-if="form.Type === 'number' || form.Type === 'calculation'"
-          label="单位"
+          :label="$t('trials:readingUnit:qsList:title:unit')"
           prop="Unit"
           :rules="[
             { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
@@ -571,9 +594,10 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
+        <!-- 表格类型标识 -->
         <el-form-item
           v-if="form.Type === 'table'"
-          label="表格类型标识"
+          :label="$t('dictionary:template:criterionConfig:table:tableType')"
           prop="LesionType"
         >
           <el-select v-model="form.LesionType" clearable>
@@ -585,9 +609,10 @@
             />
           </el-select>
         </el-form-item>
+        <!-- 表格类型标识 -->
         <el-form-item
           v-if="form.Type === 'basicTable'"
-          label="表格类型标识"
+          :label="$t('dictionary:template:criterionConfig:table:tableType')"
           prop="LesionType"
         >
           <el-select v-model="form.LesionType" clearable>
@@ -599,9 +624,10 @@
             />
           </el-select>
         </el-form-item>
+        <!-- 关联字典 -->
         <el-form-item
           v-if="form.Type === 'table' || form.Type === 'basicTable'"
-          label="关联字典"
+          :label="$t('dictionary:template:criterionConfig:table:relatedDictionaryCode')"
         >
           <el-select
             v-model="form.DictionaryCode"
@@ -620,9 +646,10 @@
             />
           </el-select>
         </el-form-item>
+        <!-- 最大上传个数 -->
         <el-form-item 
           v-if="form.Type === 'upload'" 
-          label="最大上传个数"
+          :label="$t('trials:readingUnit:qsList:title:imageCount')"
         >
           <el-input-number
             v-model="form.ImageCount"
@@ -634,7 +661,7 @@
         <!-- 文件类型 -->
         <el-form-item 
           v-if="form.Type === 'upload'" 
-          label="文件类型"
+          :label="$t('trials:readingUnit:qsList:title:FileType')"
           prop="FileType"
           :rules="[{ type: 'array', required: true, message: this.$t('common:ruleMessage:specify'), trigger: [ 'change'] }]"
         >
@@ -657,10 +684,10 @@
             </el-checkbox>
           </el-checkbox-group>
         </el-form-item>
-        <!-- 分类 -->
+        <!-- 分类数据来源 -->
         <el-form-item
           v-if="form.Type === 'class'"
-          label="分类数据来源"
+          :label="$t('dictionary:template:criterionConfig:table:classifyQuestion')"
           prop="ClassifyQuestionId"
         >
           <el-select v-model="form.ClassifyQuestionId" clearable>
@@ -668,9 +695,10 @@
                       :value="item.Id"/>
           </el-select>
         </el-form-item>
+        <!-- 分类算法 -->
         <el-form-item
           v-if="form.Type === 'class'"
-          label="分类算法"
+          :label="$t('dictionary:template:criterionConfig:table:classifyAlgorithms')"
           prop="ClassifyAlgorithms"
         >
           <div>
@@ -782,7 +810,7 @@ export default {
       } else {
         var arr = value.split('|')
         if (new Set(arr).size !== arr.length) {
-          callback(new Error('选项不允许存在相同值'))
+          callback(new Error(this.$t('trials:readingUnit:qsList:message:msg0')))
         } else {
           callback()
         }
@@ -829,7 +857,7 @@ export default {
         ConvertShowType: 0,
         QuestionClassify: null,
         HighlightAnswerList: [],
-        ExportIdentification: 0,
+        // ExportIdentification: 0,
         ExportResult: [],
         MaxAnswerLength: null,
         FileType: [],
@@ -837,41 +865,41 @@ export default {
         ClassifyAlgorithms: null,
       },
       rules: {
-        Type: [{ required: true, message: '请选择', trigger: 'blur' }],
+        Type: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
-        LesionType: [{ required: true, message: '请选择', trigger: 'blur' }],
+        LesionType: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
         // QuestionName: [
         //   { required: true, message: '请注明', trigger: 'blur' },
         //   { max: 300, message: '最大长度为 300' },
         // ],
-        QuestionGenre: [{ required: true, message: '请选择', trigger: 'blur' }],
+        QuestionGenre: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
         TypeValue: [
-          { required: true, message: '请注明', trigger: 'blur' },
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
           { validator: validateTypeVal, trigger: 'blur' },
-          { max: 500, message: '最大长度为 500' },
+          { max: 500, message: `${this.$t('common:ruleMessage:maxLength')} 500` },
         ],
         DictionaryCode: [
-          { required: true, message: '请选择', trigger: 'blur' },
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' },
         ],
-        ShowQuestion: [{ required: true, message: '请选择', trigger: 'blur' }],
+        ShowQuestion: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
-        IsRequired: [{ required: true, message: '请选择', trigger: 'blur' }],
+        IsRequired: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
-        ParentId: [{ required: true, message: '请选择', trigger: 'blur' }],
+        ParentId: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
         ParentTriggerValueList: [
-          { required: true, message: '请选择', trigger: 'blur' },
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' },
         ],
-        RelevanceId: [{ required: true, message: '请选择', trigger: 'blur' }],
+        RelevanceId: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
         RelevanceValueList: [
-          { required: true, message: '请选择', trigger: 'blur' },
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' },
         ],
         GroupName: [
-          { required: true, message: '请注明', trigger: 'blur' },
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
-          { max: 50, message: '最大长度为 50' },
+          { max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50` },
         ],
-        ExportIdentification: [
+        // ExportIdentification: [
-          { required: true, message: '请选择', trigger: 'blur' },
+        //   { required: true, message: '请选择', trigger: 'blur' },
-        ],
+        // ],
-        ExportResult: [
+        // ExportResult: [
-          { required: true, message: '请选择', trigger: 'blur' },
+        //   { required: true, message: '请选择', trigger: 'blur' },
-        ]
+        // ]
       },
       loading: false,
       btnLoading: false,
@@ -1159,7 +1187,7 @@ export default {
       data.ConvertShowType = 0
       data.QuestionClassify = null
       data.HighlightAnswerList = []
-      data.ExportIdentification = 0
+      // data.ExportIdentification = 0
       data.ExportResult = []
       data.FileType = []
       data.ClassifyQuestionId = null

src/views/dictionary/template/components/CriterionsBaseData.vue

@@ -1,13 +1,15 @@
 <template>
   <el-tabs v-model="activeName" @tab-click="handleClick">
-    <el-tab-pane label="器官" name="organs">
+    <!-- 器官 -->
+    <el-tab-pane :label="$t('dictionary:template:basicData:organs')" name="organs">
 
       <OrgansTbl
         :criterion-id="criterionId"
         :is-complete-config="isCompleteConfig"
       />
     </el-tab-pane>
-    <el-tab-pane label="疗效评估" name="efficacyAssessment">
+    <!-- 疗效评估 -->
+    <el-tab-pane :label="$t('dictionary:template:basicData:efficacyAssessment')" name="efficacyAssessment">
       <EfficacyAssessment
         v-if="tabs.includes('efficacyAssessment')"
         :criterion-id="criterionId"
@@ -15,7 +17,8 @@
         :is-complete-config="isCompleteConfig"
       />
     </el-tab-pane>
-    <el-tab-pane label="标准字典" name="criterionDictionary">
+    <!-- 标准字典 -->
+    <el-tab-pane :label="$t('dictionary:template:basicData:criterionDictionary')" name="criterionDictionary">
       <CriterionDictionary
         v-if="tabs.includes('criterionDictionary')"
         :criterion-id="criterionId"

src/views/dictionary/template/components/CriterionsConfig.vue

@@ -1,16 +1,25 @@
 <template>
   <div class="criterion-config">
     <el-tabs v-model="activeName">
-      <el-tab-pane :label="'访视阅片'" name="0">
+      <!-- 访视阅片 -->
+      <el-tab-pane :label="$t('dictionary:template:criterionConfig:tab:visitReview')" name="0">
         <div class="search-form" style="display:flex;justify-content: space-between;">
           <el-form :inline="true" size="mini" class="base-search-form">
-            <el-form-item label="名称">
+            <!-- 问题名称 -->
+            <el-form-item :label="$t('trials:readingUnit:qsList:title:qsNameEn')">
               <el-input v-model="searchData.QuestionName" clearable style="width:120px;" />
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" @click="handleReset">重置</el-button>
+              <el-button type="primary" icon="el-icon-search" @click="handleSearch">
-              <el-button type="primary" @click="handleSearch">查询</el-button>
+                {{ $t('common:button:search') }}
-
+              </el-button>
+              <el-button
+                type="primary"
+                icon="el-icon-refresh-left"
+                @click="handleReset"
+              >
+                {{ $t('common:button:reset') }}
+              </el-button>
             </el-form-item>
           </el-form>
           <div>
@@ -20,7 +29,7 @@
               type="primary"
               @click="handlePreview"
             >
-              预览
+              {{ $t('common:button:preview') }}
             </el-button>
             <el-button
               v-if="Object.keys(data).length > 0 && !(data.IsCompleteConfig || data.IsBeUsed)"
@@ -28,7 +37,7 @@
               type="primary"
               @click="handleAdd"
             >
-              添加
+              {{ $t('common:button:add') }}
             </el-button>
           </div>
 
@@ -42,61 +51,70 @@
           stripe
           @sort-change="handleSortByColumn"
         >
+          <!-- 显示序号 -->
           <el-table-column
             prop="ShowOrder"
             label=""
             width="50"
           />
+          <!-- 分组 -->
           <el-table-column
             prop="GroupName"
-            label="分组"
+            :label="$t('trials:readingUnit:qsList:title:groupNameEn')"
             show-overflow-tooltip
           />
+          <!-- 分组(EN) -->
           <el-table-column
             prop="GroupEnName"
-            label="分组(EN)"
+            :label="$t('trials:readingUnit:qsList:title:groupNameEn')"
             show-overflow-tooltip
           />
+          <!-- 名称 -->
           <el-table-column
             prop="QuestionName"
-            label="名称"
+            :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
             show-overflow-tooltip
           />
+          <!-- 名称(EN) -->
           <el-table-column
             prop="QuestionEnName"
-            label="名称(EN)"
+            :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
             show-overflow-tooltip
           />
+          <!-- 题型 -->
           <el-table-column
             prop="Type"
-            label="题型"
+            :label="$t('trials:readingUnit:qsList:title:type')"
             show-overflow-tooltip
           >
             <template slot-scope="scope">
               {{ $fd('Criterion_Question_Type',scope.row.Type) }}
             </template>
           </el-table-column>
-          <el-table-column
+          <!-- 是否显示 -->
-            prop="IsRequired"
-            label="是否必填"
-            show-overflow-tooltip
-          >
-            <template slot-scope="scope">
-              {{ $fd('QuestionRequired',scope.row.IsRequired) }}
-            </template>
-          </el-table-column>
           <el-table-column
             prop="ShowQuestion"
-            label="是否显示"
+            :label="$t('trials:readingUnit:qsList:title:isShow')"
             show-overflow-tooltip
           >
             <template slot-scope="scope">
               {{ $fd('ShowQuestion',scope.row.ShowQuestion) }}
             </template>
           </el-table-column>
+           <!-- 是否必填 -->
+          <el-table-column
+            prop="IsRequired"
+            :label="$t('trials:readingUnit:qsList:title:isRequired')"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              {{ $fd('QuestionRequired',scope.row.IsRequired) }}
+            </template>
+          </el-table-column>
+          <!-- 是否裁判问题 -->
           <el-table-column
             prop="IsJudgeQuestion"
-            label="是否裁判问题"
+            :label="$t('trials:readingUnit:qsList:title:isJudgeQuestion')"
             width="120"
             show-overflow-tooltip
           >
@@ -104,9 +122,10 @@
               {{ $fd('YesOrNo', scope.row.IsJudgeQuestion) }}
             </template>
           </el-table-column>
+          <!-- 是否在阅片页面显示 -->
           <el-table-column
             prop="IsShowInDicom"
-            label="是否在阅片页面显示"
+            :label="$t('trials:readingUnit:qsList:title:isShowInDicom')"
             width="150"
             show-overflow-tooltip
           >
@@ -122,9 +141,10 @@
             show-overflow-tooltip
           >
           </el-table-column> -->
+          <!-- 是否在全局阅片显示 -->
           <el-table-column
             prop="GlobalReadingShowType"
-            label="是否在全局阅片显示"
+            :label="$t('trials:readingUnit:qsList:title:globalReadingShowType')"
             width="160"
             show-overflow-tooltip
           >
@@ -146,7 +166,7 @@
           <!-- 问题标识 -->
           <el-table-column
             prop="QuestionType"
-            label="问题标识"
+            :label="$t('dictionary:template:criterionConfig:table:questionType')"
             width="140"
             show-overflow-tooltip
           >
@@ -178,7 +198,7 @@
           </el-table-column>
           <el-table-column
             prop=""
-            label="操作"
+            :label="$t('common:action:action')"
             width="250"
             show-overflow-tooltip
             fixed="right"
@@ -190,7 +210,7 @@
                 size="mini"
                 @click="handleEdit(scope.row)"
               >
-                编辑
+                {{ $t('trials:readingUnit:qsList:title:edit') }}
               </el-button>
               <el-button
                 v-else
@@ -198,7 +218,7 @@
                 size="mini"
                 @click="handleLook(scope.row)"
               >
-                查看
+                {{ $t('trials:readingUnit:qsList:title:view') }}
               </el-button>
               <el-button
                 type="primary"
@@ -206,7 +226,7 @@
                 :disabled="!(scope.row.Type === 'table' || scope.row.Type === 'basicTable')"
                 @click="handleConfig(scope.row)"
               >
-                表格问题
+                {{ $t('trials:readingUnit:qsList:title:tableQs') }}
               </el-button>
               <el-button
                 v-if="Object.keys(data).length > 0 && !(data.IsCompleteConfig || data.IsBeUsed)"
@@ -215,17 +235,19 @@
                 :disabled="scope.row.IsEnable"
                 @click="handleDelete(scope.row)"
               >
-                删除
+                {{ $t('trials:readingUnit:qsList:title:delete') }}
               </el-button>
             </template>
           </el-table-column>
         </el-table>
         <pagination style="text-align: right;margin-top: 10px;" class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
       </el-tab-pane>
-      <el-tab-pane label="全局阅片" name="Global">
+      <!-- 全局阅片 -->
+      <el-tab-pane :label="$t('dictionary:template:criterionConfig:tab:globalReview')" name="Global">
         <EvaluationOfGlobalConfig v-if="activeName === 'Global'" :data="data" :criterion-id="criterionId" />
       </el-tab-pane>
-      <el-tab-pane label="肿瘤学阅片" name="Oncology">
+      <!-- 肿瘤学阅片 -->
+      <el-tab-pane :label="$t('dictionary:template:criterionConfig:tab:oncologyReview')" name="Oncology">
         <EvaluationOfOncologyConfig v-if="activeName === 'Oncology'" :data="data" :criterion-id="criterionId" />
       </el-tab-pane>
     </el-tabs>
@@ -354,19 +376,19 @@ export default {
     handleAdd() {
       this.rowData = { ReadingQuestionCriterionSystemId: this.criterionId, Id: ''}
       this.type = 'add'
-      this.addOrEdit.title = '添加'
+      this.addOrEdit.title = this.$t('common:button:new')
       this.addOrEdit.visible = true
-    },
+    }, 
     handleLook(row) {
       this.rowData = { ...row }
       this.type = 'look'
-      this.addOrEdit.title = '查看'
+      this.addOrEdit.title = this.$t('common:button:view')
       this.addOrEdit.visible = true
     },
     handleEdit(row) {
       this.rowData = { ...row }
       this.type = 'edit'
-      this.addOrEdit.title = '编辑'
+      this.addOrEdit.title = this.$t('common:button:edit')
       this.addOrEdit.visible = true
     },
     handleDelete(row) {
@@ -381,7 +403,7 @@ export default {
               this.loading = false
               if (res.IsSuccess) {
                 this.getList()
-                this.$message.success('删除成功！')
+                this.$message.success(this.$t('common:message:deletedSuccessfully'))
               }
             }).catch(() => { this.loading = false })
         })

src/views/dictionary/template/components/CriterionsTmp.vue

@@ -8,13 +8,74 @@
         >
           <el-input v-model="searchData.CriterionName" clearable style="width:120px;" />
         </el-form-item>
+        <!-- 标准类型  -->
+        <el-form-item
+          :label="$t('dictionary:template:criterionConfig:table:criterionType')"
+        >
+          <el-select v-model="searchData.CriterionType" clearable style="width:120px;">
+            <el-option
+              v-for="item of $d.CriterionType"
+              :key="item.id"
+              :value="item.value"
+              :label="item.label"
+            />
+          </el-select>
+        </el-form-item>
+        <!-- 标准分组 -->
+        <el-form-item
+          :label="$t('dictionary:template:criterionConfig:table:criterionGroup')"
+        >
+          <el-select v-model="searchData.CriterionGroup" clearable style="width:120px;">
+            <el-option
+              v-for="item of $d.CriterionGroup"
+              :key="item.id"
+              :value="item.value"
+              :label="item.label"
+            />
+          </el-select>
+        </el-form-item>
+        <!-- 是否配置完成 -->
+        <el-form-item
+          :label="$t('dictionary:template:criterionConfig:table:isCompleteConfig')"
+        >
+          <el-select v-model="searchData.IsCompleteConfig" clearable style="width:120px;">
+            <el-option
+              v-for="item of $d.YesOrNo"
+              :key="item.id"
+              :value="item.value"
+              :label="item.label"
+            />
+          </el-select>
+        </el-form-item>
+        <!-- 是否启用 -->
+        <el-form-item
+          :label="$t('dictionary:template:criterionConfig:table:isEnable')"
+        >
+          <el-select v-model="searchData.IsEnable" clearable style="width:120px;">
+            <el-option
+              v-for="item of $d.YesOrNo"
+              :key="item.id"
+              :value="item.value"
+              :label="item.label"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleReset">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
-          <el-button type="primary" @click="handleSearch">查询</el-button>
+            {{ $t('common:button:search') }}
+          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left:auto">
-        <el-button type="primary" size="mini" @click="handleAdd">添加</el-button>
+        <!-- 添加 -->
+        <el-button type="primary" size="mini" @click="handleAdd">{{$t('common:button:new')}}</el-button>
       </span>
     </div>
 
@@ -25,27 +86,44 @@
       stripe
       size="small"
       height="100"
+      @sort-change="handleSortByColumn"
+      ref="criterionsTbl"
     >
       <el-table-column type="index" width="60" />
-
+      <!-- 标准名称 -->
       <el-table-column
         prop="CriterionName"
-        label="标准名称"
+        :label="$t('trials:auditRecord:table:criterion')"
         show-overflow-tooltip
+        sortable="custom"
       />
+      <!-- 标准类型 -->
       <el-table-column
         prop="CriterionType"
-        label="标准类型"
+        :label="$t('dictionary:template:criterionConfig:table:criterionType')"
         show-overflow-tooltip
+        sortable="custom"
       >
         <template slot-scope="scope">
           {{ $fd('CriterionType',scope.row.CriterionType) }}
         </template>
       </el-table-column>
-
+      <!-- 标准分组 -->
+      <el-table-column
+        prop="CriterionGroup"
+        :label="$t('dictionary:template:criterionConfig:table:criterionGroup')"
+        show-overflow-tooltip
+        sortable="custom"
+      >
+        <template slot-scope="scope">
+          {{ $fd('CriterionGroup',scope.row.CriterionGroup) }}
+        </template>
+      </el-table-column>
+      <!-- 是否配置完成 -->
       <el-table-column
         prop="IsCompleteConfig"
-        label="是否配置完成"
+        :label="$t('dictionary:template:criterionConfig:table:isCompleteConfig')"
+        sortable="custom"
       >
         <template slot-scope="scope">
 
@@ -57,57 +135,75 @@
           {{ $fd('YesOrNo', scope.row.IsCompleteConfig) }}
         </template>
       </el-table-column>
+      <!-- 描述 -->
       <el-table-column
         prop="Description"
-        label="描述"
+        :label="$t('dictionary:template:criterionConfig:table:description')"
         show-overflow-tooltip
       />
-
+      <!-- 是否启用 -->
-      <el-table-column
-        prop="ShowOrder"
-        label="显示序号"
-        show-overflow-tooltip
-      />
-
       <el-table-column
         prop="IsEnable"
-        label="是否启用"
+        :label="$t('dictionary:template:criterionConfig:table:isEnable')"
+        sortable="custom"
       >
         <template slot-scope="scope">
           {{ $fd('YesOrNo', scope.row.IsEnable) }}
         </template>
       </el-table-column>
-
+      <!-- 显示序号 -->
-      <el-table-column label="Action" min-width="200px">
+      <el-table-column
+        prop="ShowOrder"
+        :label="$t('dictionary:template:criterionConfig:table:showOrder')"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+      <!-- eICRF仅展示阅片Tab -->
+      <el-table-column
+        prop="IseCRFShowInDicomReading"
+        :label="$t('dictionary:template:criterionConfig:table:isECRFShowInDicomReading')"
+        show-overflow-tooltip
+        sortable="custom"
+        width="210"
+      >
         <template slot-scope="scope">
+          {{ $fd('YesOrNo', scope.row.IseCRFShowInDicomReading) }}
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('common:action:action')" min-width="200px">
+        <template slot-scope="scope">
+          <!-- 编辑 -->
           <el-button
             type="primary"
             size="mini"
             @click="handleEdit(scope.row)"
           >
-            编辑
+            {{ $t('common:button:edit') }}
           </el-button>
+          <!-- eCRF -->
           <el-button
             type="primary"
             size="mini"
             @click="handleConfig(scope.row)"
           >
-            eCRF
+            {{ $t('dictionary:template:criterionConfig:button:eCRF') }}
           </el-button>
+          <!-- 基础数据 -->
           <el-button
             type="primary"
             size="mini"
             @click="handleBaseDataConfig(scope.row)"
           >
-            基础数据
+            {{ $t('dictionary:template:criterionConfig:button:basicData') }}
           </el-button>
+          <!-- 删除 -->
           <el-button
             type="danger"
             size="mini"
             :disabled="scope.row.IsCompleteConfig"
             @click="handleDelete(scope.row)"
           >
-            删除
+            {{ $t('common:button:delete') }}
           </el-button>
 
         </template>
@@ -146,7 +242,7 @@
 
     <el-dialog
       v-if="configBaseDataVisible"
-      :title="'基础数据配置' + `(${rowData.CriterionName})`"
+      :title="`${this.$t('trials:readingUnit:readingCriterion:title:baseDataCfg')} (${rowData.CriterionName})`"
       :visible.sync="configBaseDataVisible"
       :close-on-click-modal="false"
       :fullscreen="true"
@@ -172,8 +268,14 @@ import AddCriterion from './AddCriterion'
 const searchDataDefault = () => {
   return {
     CriterionName: '',
+    CriterionType: null,
+    CriterionGroup: null,
+    IsCompleteConfig: null,
+    IsEnable: null,
     PageIndex: 1,
-    PageSize: 20
+    PageSize: 20,
+    Asc: true,
+    SortField: ''
   }
 }
 export default {
@@ -205,17 +307,17 @@ export default {
       }).catch(() => { this.loading = false })
     },
     handleAdd() {
-      this.addDialog.title = '添加'
+      this.addDialog.title = this.$t('common:button:new')
       this.addDialog.visible = true
       this.rowData = {}
     },
     handleEdit(row) {
-      this.addDialog.title = '编辑'
+      this.addDialog.title = this.$t('common:button:edit')
       this.addDialog.visible = true
       this.rowData = { ...row }
     },
     handleDelete(row) {
-      this.$confirm('是否确认删除', {
+      this.$confirm(this.$t('trials:readingUnit:baseDataCfg:message:deleteConfirm'), {
         distinguishCancelAndClose: true,
         type: 'warning'
       }).then(() => {
@@ -223,7 +325,7 @@ export default {
         deleteReadingQuestionCriterionSystem(row.Id).then(res => {
           this.loading = false
           if (res.IsSuccess) {
-            this.$message.success(this.$t('common:message:savedSuccessfully'))
+            this.$message.success(this.$t('common:message:deletedSuccessfully'))
             this.getList()
           }
         }).catch(() => { this.loading = false })
@@ -232,10 +334,10 @@ export default {
     changeStatus(callback, row) {
       var message = ''
       if (callback) {
-        message = '是否确认更改？'
+        message = this.$t('trials:readingUnit:baseDataCfg:message:updateConfirm')
         row.IsCompleteConfig = false
       } else {
-        message = '是否确认更改？'
+        message = this.$t('trials:readingUnit:baseDataCfg:message:updateConfirm')
         row.IsCompleteConfig = true
       }
       this.$confirm(message, {
@@ -271,6 +373,18 @@ export default {
     // 重置
     handleReset() {
       this.searchData = searchDataDefault()
+      this.$refs['criterionsTbl'].clearSort()
+      this.getList()
+    },
+    // 指定排序字段，对列表进行排序
+    handleSortByColumn(column) {
+      if (column.order === 'ascending') {
+        this.searchData.Asc = true
+      } else {
+        this.searchData.Asc = false
+      }
+      this.searchData.SortField = column.prop
+      this.searchData.PageIndex = 1
       this.getList()
     }
   }

src/views/dictionary/template/components/EfficacyAssessment.vue

@@ -84,6 +84,7 @@
         <el-table-column
           :prop="item.ColumnKey"
           v-for="item of headList"
+          :key="item.ColumnName"
           :label="item.ColumnName"
           show-overflow-tooltip
           sortable="custom"

src/views/dictionary/template/components/EvaluationOfGlobalConfig.vue

@@ -1,10 +1,13 @@
 <template>
   <div style="position: relative">
     <el-form  size="small" :inline="true"  label-width="130px" style="position: relative;">
-      <el-divider content-position="left">阅片规则</el-divider>
+      <!-- 阅片规则 -->
-      <el-form-item label="是否必须全局阅片">
+      <el-divider content-position="left">{{ $t('dictionary:template:globalConfig:readingRules') }}</el-divider>
+      <!-- 是否必须全局阅片 -->
+      <el-form-item :label="$t('dictionary:template:globalConfig:isMustGlobalReading')">
         {{ $fd('YesOrNo', IsMustGlobalReading) }}
       </el-form-item>
+      <!-- 配置 -->
       <el-button
         size="mini"
         type="primary"
@@ -12,11 +15,13 @@
         v-if="Object.keys(data).length > 0 && !(data.IsCompleteConfig || data.IsBeUsed)"
         @click="handleAdd(1)"
       >
-        配置
+        {{ $t('dictionary:template:globalConfig:config') }}
       </el-button>
     </el-form>
     <el-form  size="small" :inline="true"  label-width="110px" style="position: relative">
-      <el-divider content-position="left">名称</el-divider>
+      <!-- 名称 -->
+      <el-divider content-position="left">{{ $t('dictionary:template:globalConfig:name') }}</el-divider>
+      <!-- 配置 -->
       <el-button
         size="mini"
         type="primary"
@@ -24,9 +29,10 @@
         v-if="Object.keys(data).length > 0 && !(data.IsCompleteConfig || data.IsBeUsed)"
         @click="handleAdd(2)"
       >
-        配置
+        {{ $t('dictionary:template:globalConfig:config') }}
       </el-button>
-      <el-form-item label="评估更新类型" style="width: 100%">
+      <!-- 评估更新类型 -->
+      <el-form-item :label="$t('dictionary:template:globalConfig:updateType')" style="width: 100%">
       </el-form-item>
       <el-table
         v-loading="loading"
@@ -34,30 +40,34 @@
         :data="list"
         stripe
       >
+        <!-- 序号 -->
         <el-table-column
           prop=""
-          label="序号"
+          :label="$t('dictionary:template:globalConfig:order')"
           width="50"
         >
           <template slot-scope="scope">
             {{scope.$index + 1}}
           </template>
         </el-table-column>
+        <!-- 中文值 -->
         <el-table-column
           prop="ValueCN"
-          label="中文值"
+          :label="$t('dictionary:template:globalConfig:valueCN')"
           show-overflow-tooltip
         >
         </el-table-column>
+        <!-- 英文值 -->
         <el-table-column
           prop="Value"
-          label="英文值"
+          :label="$t('dictionary:template:globalConfig:value')"
           show-overflow-tooltip
         >
         </el-table-column>
+        <!-- 是否基线评估 -->
         <el-table-column
           prop="IsBaseLineUse"
-          label="是否基线评估"
+          :label="$t('dictionary:template:globalConfig:isBaseLineUse')"
           show-overflow-tooltip
         >
           <template slot-scope="scope">
@@ -70,9 +80,10 @@
             <el-tag v-else type="danger">{{ $fd('YesOrNo', scope.row.IsBaseLineUse) }}</el-tag>
           </template>
         </el-table-column>
+        <!-- 是否随访评估 -->
         <el-table-column
           prop="IsFollowVisitUse"
-          label="是否随访评估"
+          :label="$t('dictionary:template:globalConfig:isFollowVisitUse')"
           show-overflow-tooltip
         >
           <template slot-scope="scope">
@@ -93,12 +104,14 @@
     >
       <template slot="dialog-body">
         <el-form  size="small" :inline="true"  label-width="130px">
-          <el-form-item label="是否必须全局阅片" v-if="config.configType === 1">
+          <!-- 是否必须全局阅片 -->
+          <el-form-item :label="$t('dictionary:template:globalConfig:isMustGlobalReading')" v-if="config.configType === 1">
             <el-radio-group v-model="form.IsMustGlobalReading">
               <el-radio v-for="item of $d.YesOrNo" :key="'form.IsMustGlobalReading' + item.value" :label="item.value">{{ item.label }}</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item v-if="config.configType === 2" label="评估更新类型" style="width: 100%">
+          <!-- 评估更新类型 -->
+          <el-form-item v-if="config.configType === 2" :label="$t('dictionary:template:globalConfig:updateType')" style="width: 100%">
           </el-form-item>
           <el-table
             v-if="config.configType === 2"
@@ -112,21 +125,24 @@
               type="selection"
               width="55">
             </el-table-column>
+            <!-- 中文值 -->
             <el-table-column
               prop="ValueCN"
-              label="中文值"
+              :label="$t('dictionary:template:globalConfig:valueCN')"
               show-overflow-tooltip
             >
             </el-table-column>
+            <!-- 英文值 -->
             <el-table-column
               prop="Value"
-              label="英文值"
+              :label="$t('dictionary:template:globalConfig:value')"
               show-overflow-tooltip
             >
             </el-table-column>
+            <!-- 是否基线评估 -->
             <el-table-column
               prop="IsBaseLineUse"
-              label="是否基线评估"
+              :label="$t('dictionary:template:globalConfig:isBaseLineUse')"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
@@ -138,9 +154,10 @@
                 <span>{{$fd('YesOrNo', scope.row.IsBaseLineUse)}}</span>
               </template>
             </el-table-column>
+            <!-- 是否随访评估 -->
             <el-table-column
               prop="IsFollowVisitUse"
-              label="是否随访评估"
+              :label="$t('dictionary:template:globalConfig:isFollowVisitUse')"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
@@ -156,8 +173,12 @@
         </el-form>
       </template>
       <template slot="dialog-footer">
-        <el-button :disabled="loading" size="small" type="primary" @click="config.visible = false">取消</el-button>
+        <el-button :disabled="loading" size="small" type="primary" @click="config.visible = false">
-        <el-button size="small" type="primary" :loading="loading" @click="handleSave">保存</el-button>
+          {{ $t('common:button:cancel') }}
+        </el-button>
+        <el-button size="small" type="primary" :loading="loading" @click="handleSave">
+          {{ $t('common:button:save') }}
+        </el-button>
       </template>
     </base-model>
   </div>
@@ -186,8 +207,8 @@ export default {
       rowData: {},
       activeName: '0',
       addOrEdit: { visible: false, title: '' },
-      preview: { visible: false, title: 'eCRF预览' },
+      // preview: { visible: false, title: 'eCRF预览' },
-      config: { visible: false, title: '评估更新类型', appendToBody: true, width: '600px', configType: 0 },
+      config: { visible: false, title: this.$t('dictionary:template:globalConfig:updateType'), appendToBody: true, width: '600px', configType: 0 },
       selectedList: [],
       IsMustGlobalReading: false,
       form: {
@@ -269,10 +290,10 @@ export default {
       this.config.configType = n
       this.form.IsMustGlobalReading = this.IsMustGlobalReading
       if (n === 1) {
-        this.config.title = '是否必须全局阅片'
+        this.config.title = this.$t('dictionary:template:globalConfig:isMustGlobalReading')
         this.config.visible = true
       } else {
-        this.config.title = '评估更新类型'
+        this.config.title = this.$t('dictionary:template:globalConfig:updateType')
         this.config.visible = true
         this.$nextTick(() => {
           var a = this.$d.GlobalAssessType.filter(v => {
@@ -322,8 +343,4 @@ export default {
 }
 </script>
 
-<style scoped>
+
-/deep/ .el-form-item__content{
-  width: calc(100% - 130px);
-}
-</style>

src/views/dictionary/template/components/EvaluationOfOncologyConfig.vue

@@ -1,10 +1,13 @@
 <template>
   <div>
     <el-form  size="small" :inline="true"  label-width="110px" style="position: relative;">
-      <el-divider content-position="left">阅片规则</el-divider>
+      <!-- 阅片规则 -->
-      <el-form-item label="是否肿瘤学阅片" style="width: 100%">
+      <el-divider content-position="left">{{ $t('dictionary:template:globalConfig:readingRules') }}</el-divider>
+      <!-- 是否肿瘤学阅片 -->
+      <el-form-item :label="$t('dictionary:template:oncologyConfig:isOncologyReading')" style="width: 100%">
         {{ $fd('YesOrNo', IsOncologyReading)}}
       </el-form-item>
+      <!-- 配置 -->
       <el-button
         size="mini"
         type="primary"
@@ -12,11 +15,13 @@
         v-if="Object.keys(data).length > 0 && !(data.IsCompleteConfig || data.IsBeUsed)"
         @click="handleAdd(1)"
       >
-        配置
+        {{ $t('dictionary:template:globalConfig:config') }}
       </el-button>
     </el-form>
     <el-form  size="small" :inline="true"  label-width="110px" style="position: relative">
-      <el-divider content-position="left">阅片问题</el-divider>
+      <!-- 阅片问题 -->
+      <el-divider content-position="left">{{ $t('dictionary:template:oncologyConfig:reviewQs') }}</el-divider>
+      <!-- 配置 -->
       <el-button
         size="mini"
         type="primary"
@@ -24,9 +29,10 @@
         v-if="Object.keys(data).length > 0 && !(data.IsCompleteConfig || data.IsBeUsed)"
         @click="handleAdd(2)"
       >
-        配置
+        {{ $t('dictionary:template:globalConfig:config') }}
       </el-button>
-      <el-form-item label="肿瘤学阅片结果" style="width: 100%">
+      <!-- 肿瘤学阅片结果 -->
+      <el-form-item :label="$t('dictionary:template:oncologyConfig:reviewResult')" style="width: 100%">
       </el-form-item>
     </el-form>
     <el-table
@@ -35,24 +41,27 @@
       :data="list"
       stripe
     >
+      <!-- 序号 -->
       <el-table-column
         prop=""
-        label="序号"
+        :label="$t('dictionary:template:globalConfig:order')"
         width="50"
       >
         <template slot-scope="scope">
           {{scope.$index + 1}}
         </template>
       </el-table-column>
+      <!-- 中文值 -->
       <el-table-column
         prop="ValueCN"
-        label="中文值"
+        :label="$t('dictionary:template:globalConfig:valueCN')"
         show-overflow-tooltip
       >
       </el-table-column>
+      <!-- 英文值 -->
       <el-table-column
         prop="Value"
-        label="英文值"
+        :label="$t('dictionary:template:globalConfig:value')"
         show-overflow-tooltip
       >
       </el-table-column>
@@ -60,12 +69,14 @@
     <base-model :config="config">
       <template slot="dialog-body">
         <el-form  size="small" :inline="true"  label-width="110px">
-          <el-form-item label="是否肿瘤学阅片" v-if="config.configType === 1">
+          <!-- 是否肿瘤学阅片 -->
+          <el-form-item :label="$t('dictionary:template:oncologyConfig:isOncologyReading')" v-if="config.configType === 1">
             <el-radio-group v-model="form.IsOncologyReading">
               <el-radio v-for="item of $d.YesOrNo" :key="'form.IsOncologyReading' + item.value" :label="item.value">{{ item.label }}</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="肿瘤学阅片结果" style="width: 100%" v-if="config.configType === 2">
+          <!-- 肿瘤学阅片结果 -->
+          <el-form-item :label="$t('dictionary:template:oncologyConfig:reviewResult')" style="width: 100%" v-if="config.configType === 2">
           </el-form-item>
           <el-table
             v-if="config.configType === 2"
@@ -80,15 +91,17 @@
               type="selection"
               width="55">
             </el-table-column>
+            <!-- 中文值 -->
             <el-table-column
               prop="ValueCN"
-              label="中文值"
+              :label="$t('dictionary:template:globalConfig:valueCN')"
               show-overflow-tooltip
             >
             </el-table-column>
+            <!-- 英文值 -->
             <el-table-column
               prop="Value"
-              label="英文值"
+              :label="$t('dictionary:template:globalConfig:value')"
               show-overflow-tooltip
             >
             </el-table-column>
@@ -96,8 +109,12 @@
         </el-form>
       </template>
       <template slot="dialog-footer">
-        <el-button :disabled="loading" size="small" type="primary" @click="config.visible = false">取消</el-button>
+        <el-button :disabled="loading" size="small" type="primary" @click="config.visible = false">
-        <el-button size="small" type="primary" :loading="loading" @click="handleSave">保存</el-button>
+          {{ $t('common:button:cancel') }}
+        </el-button>
+        <el-button size="small" type="primary" :loading="loading" @click="handleSave">
+          {{ $t('common:button:save') }}
+        </el-button>
       </template>
     </base-model>
   </div>
@@ -129,8 +146,7 @@ export default {
       rowData: {},
       activeName: '0',
       addOrEdit: { visible: false, title: '' },
-      preview: { visible: false, title: 'eCRF预览' },
+      config: { visible: false, title: this.$t('dictionary:template:oncologyConfig:reviewResult'), appendToBody: true, width: '600px', configType: 0 },
-      config: { visible: false, title: '肿瘤学阅片结果', appendToBody: true, width: '600px', configType: 0 },
       selectedList: [],
       OncologyAssessType: [],
       IsOncologyReading: true
@@ -177,10 +193,10 @@ export default {
     handleAdd(n) {
       this.config.configType = n
       if (n === 1) {
-        this.config.title = '是否肿瘤学阅片'
+        this.config.title = this.$t('dictionary:template:oncologyConfig:isOncologyReading')
         this.config.visible = true
       } else {
-        this.config.title = '肿瘤学阅片结果'
+        this.config.title = this.$t('dictionary:template:oncologyConfig:reviewResult')
         this.config.visible = true
         this.$nextTick(() => {
           var a = this.OncologyAssessType.filter(v => {
@@ -221,9 +237,3 @@ export default {
   }
 }
 </script>
-
-<style scoped>
-/deep/ .el-form-item__content{
-  width: calc(100% - 110px);
-}
-</style>

src/views/dictionary/template/components/IncreaseFields.vue

@@ -16,8 +16,16 @@
           <el-input v-model="searchData.TagDescriptionCN" clearable style="width:120px;" />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleReset">Reset</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
-          <el-button type="primary" @click="handleSearch">Search</el-button>
+            {{ $t('common:button:search') }}
+          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left:auto">

src/views/dictionary/template/components/LesionTypeForm.vue

@@ -8,7 +8,8 @@
     :rules="rules"
   >
     <div class="base-dialog-body">
-      <el-form-item label="病灶类型" prop="LesionType">
+      <!-- 病灶类型 -->
+      <el-form-item :label="$t('dictionary:template:basicData:lesionType')" prop="LesionType">
         <el-select v-model="form.LesionType">
           <el-option
             v-for="item of CriterionDictionaryList.LesionType"
@@ -18,7 +19,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="器官类型" prop="OrganType">
+      <!-- 器官类型 -->
+      <el-form-item :label="$t('trials:readingUnit:baseDataCfg:title:organType')" prop="OrganType">
         <el-select v-model="form.OrganType">
           <el-option
             v-for="item of CriterionDictionaryOrganTypeList.OrganType"

src/views/dictionary/template/components/LesionTypeTbl.vue

@@ -43,28 +43,30 @@
         height="100"
       >
         <el-table-column type="index" width="90" />
+        <!-- 病灶类型 -->
         <el-table-column
           prop="LesionType"
-          label="病灶类型"
+          :label="$t('dictionary:template:basicData:lesionType')"
           show-overflow-tooltip
         >
           <template slot-scope="scope">
             {{ $fd('LesionType',scope.row.LesionType) }}
           </template>
         </el-table-column>
+        <!-- 器官类型 -->
         <el-table-column
           prop="OrganType"
-          label="器官类型"
+          :label="$t('trials:readingUnit:baseDataCfg:title:organType')"
           show-overflow-tooltip
         >
           <template slot-scope="scope">
             {{ $fd('OrganType',scope.row.OrganType) }}
           </template>
         </el-table-column>
-
+        <!-- 创建时间 -->
         <el-table-column
           prop="CreateTime"
-          label="创建时间"
+          :label="$t('dictionary:template:basicData:createTime')"
           show-overflow-tooltip
         />
         <el-table-column
@@ -76,13 +78,13 @@
           <template slot-scope="scope">
             <el-button
               circle
-              title="编辑"
+              :title="$t('common:button:edit')"
               icon="el-icon-edit-outline"
               @click="handleEdit(scope.row)"
             />
             <el-button
               circle
-              title="删除"
+              :title="$t('common:button:delete')"
               icon="el-icon-delete"
               @click="handleDelete(scope.row)"
             />
@@ -163,18 +165,18 @@ export default {
     // 新增
     handleAdd() {
       this.rowData = { CriterionId: this.criterionId }
-      this.editDialog.title = '新增'
+      this.editDialog.title = this.$t('common:button:new')
       this.editDialog.visible = true
     },
     // 编辑
     handleEdit(row) {
       this.rowData = { ...row }
-      this.editDialog.title = '编辑'
+      this.editDialog.title = this.$t('common:button:edit')
       this.editDialog.visible = true
     },
     // 删除
     handleDelete(row) {
-      this.$confirm('是否确认删除', {
+      this.$confirm(this.$t('trials:readingUnit:baseDataCfg:message:deleteConfirm'), {
         type: 'warning',
         distinguishCancelAndClose: true
       })
@@ -185,7 +187,7 @@ export default {
               this.loading = false
               if (res.IsSuccess) {
                 this.getList()
-                this.$message.success('删除成功！')
+                this.$message.success(this.$t('common:message:deletedSuccessfully'))
               }
             }).catch(() => { this.loading = false })
         })

src/views/dictionary/template/components/MedicalAudit.vue

@@ -38,8 +38,16 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleReset">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
-          <el-button type="primary" @click="handleSearch">查询</el-button>
+            {{ $t('common:button:search') }}
+          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left:auto">

src/views/dictionary/template/components/OrganForm.vue

@@ -3,13 +3,13 @@
     ref="organForm"
     v-loading="loading"
     :model="form"
-    label-width="100px"
+    label-width="120px"
     size="small"
     :rules="rules"
   >
     <div class="base-dialog-body">
       <!-- 类型 -->
-      <el-form-item label="器官类型" prop="OrganType">
+      <el-form-item :label="$t('trials:readingUnit:baseDataCfg:title:organType')" prop="OrganType">
         <el-select
           v-model="form.OrganType"
         >
@@ -21,35 +21,37 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="分类" prop="Classification">
+      <!-- 分类 -->
+      <el-form-item :label="$t('trials:readingUnit:baseDataCfg:title:classification')" prop="Classification">
         <el-input v-model="form.Classification" />
       </el-form-item>
-      <el-form-item label="分类（英文）">
+      <!-- 分类（英文） -->
+      <el-form-item :label="$t('trials:readingUnit:baseDataCfg:title:classificationEn')">
         <el-input v-model="form.ClassificationEN" />
       </el-form-item>
       <!-- 部位 -->
-      <el-form-item label="部位" prop="Part">
+      <el-form-item :label="$t('trials:readingUnit:baseDataCfg:title:bodyPart')" prop="Part">
         <el-input v-model="form.Part" />
       </el-form-item>
-      <el-form-item label="部位（英文）">
+      <el-form-item :label="$t('trials:readingUnit:baseDataCfg:title:bodyPartEn')">
         <el-input v-model="form.PartEN" />
       </el-form-item>
-      <!-- TULOC -->
+      <!-- 器官 -->
-      <el-form-item label="器官" prop="TULOC">
+      <el-form-item :label="$t('trials:readingUnit:baseDataCfg:title:organ')" prop="TULOC">
         <el-input v-model="form.TULOC" />
       </el-form-item>
-      <el-form-item label="器官（英文）" prop="TULOCEN">
+      <el-form-item :label="$t('trials:readingUnit:baseDataCfg:title:TULOCEN')" prop="TULOCEN">
         <el-input v-model="form.TULOCEN" />
       </el-form-item>
-      <!-- TULAT -->
+      <!-- 位置 -->
-      <el-form-item label="位置">
+      <el-form-item :label="$t('trials:readingUnit:baseDataCfg:title:TULAT')">
         <el-input v-model="form.TULAT" />
       </el-form-item>
-      <el-form-item label="位置（英文）">
+      <el-form-item :label="$t('trials:readingUnit:baseDataCfg:title:TULATEn')">
         <el-input v-model="form.TULATEN" />
       </el-form-item>
       <!-- 是否淋巴结 -->
-      <el-form-item label="是否淋巴结" prop="IsLymphNodes">
+      <el-form-item :label="$t('trials:readingUnit:baseDataCfg:title:isLymphNodes')" prop="IsLymphNodes">
         <el-radio-group v-model="form.IsLymphNodes">
           <el-radio
             v-for="item of $d.ReadingYesOrNo"
@@ -60,7 +62,7 @@
       </el-form-item>
 
       <!-- 是否可以编辑 -->
-      <el-form-item label="是否可以编辑" prop="IsCanEditPosition">
+      <el-form-item :label="$t('trials:readingUnit:baseDataCfg:title:isCanEditPosition')" prop="IsCanEditPosition">
         <el-radio-group v-model="form.IsCanEditPosition">
           <el-radio
             v-for="item of $d.YesOrNo"
@@ -69,11 +71,11 @@
           >{{ item.label }}</el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="序号" prop="ShowOrder">
+      <el-form-item :label="$t('trials:readingUnit:baseDataCfg:title:showOrder')" prop="ShowOrder">
         <el-input v-model="form.ShowOrder" type="number" />
       </el-form-item>
       <!-- 描述 -->
-      <el-form-item label="描述" prop="Remark">
+      <el-form-item :label="$t('trials:readingUnit:baseDataCfg:title:remark')" prop="Remark">
         <el-input
           v-model="form.Remark"
           type="textarea"

src/views/dictionary/template/components/OrgansTbl.vue

@@ -3,18 +3,22 @@
     <!-- 搜索框 -->
     <template slot="search-container">
       <el-form :inline="true" size="mini">
-        <el-form-item label="器官类型">
+        <!-- 器官类型 -->
+        <el-form-item :label="$t('trials:readingUnit:baseDataCfg:title:organType')"> 
           <el-select v-model="searchData.OrganType" clearable style="width:130px;">
             <el-option v-for="item of CriterionDictionaryOrganTypeList && CriterionDictionaryOrganTypeList.OrganType" :key="item.Id" :value="parseInt(item.Code)" :label="item.ValueCN" />
           </el-select>
         </el-form-item>
-        <el-form-item label="部位">
+        <!-- 部位 -->
+        <el-form-item :label="$t('trials:readingUnit:baseDataCfg:title:bodyPart')">
           <el-input v-model="searchData.Part" clearable style="width:130px;" />
         </el-form-item>
-        <el-form-item label="器官">
+        <!-- 器官 -->
+        <el-form-item :label="$t('trials:readingUnit:baseDataCfg:title:organ')">
           <el-input v-model="searchData.TULOC" clearable style="width:130px;" />
         </el-form-item>
-        <el-form-item label="是否淋巴结">
+        <!-- 是否淋巴结 -->
+        <el-form-item :label="$t('trials:readingUnit:baseDataCfg:title:isLymphNodes')">
           <el-select v-model="searchData.IsLymphNodes" clearable style="width:130px;">
             <el-option v-for="item of $d.ReadingYesOrNo" :key="item.id" :value="item.value" :label="item.label" />
           </el-select>
@@ -54,7 +58,7 @@
           size="mini"
           @click="lesionType.visible = true"
         >
-          病灶关联配置
+          {{ this.$t('dictionary:template:basicData:config') }}
         </el-button>
         <!--        <el-button-->
         <!--          v-if="!isCompleteConfig"-->
@@ -91,7 +95,7 @@
         <!-- 类型 -->
         <el-table-column
           prop="OrganType"
-          label="器官类型"
+          :label="$t('trials:readingUnit:baseDataCfg:title:organType')"
           min-width="120"
           show-overflow-tooltip
           sortable="custom"
@@ -103,13 +107,13 @@
         </el-table-column>
         <el-table-column
           prop="Classification"
-          label="分类"
+          :label="$t('trials:readingUnit:baseDataCfg:title:classification')"
           show-overflow-tooltip
           sortable="custom"
         />
         <el-table-column
           prop="ClassificationEN"
-          label="分类（英文）"
+          :label="$t('trials:readingUnit:baseDataCfg:title:classificationEn')"
           min-width="140"
           show-overflow-tooltip
           sortable="custom"
@@ -117,46 +121,49 @@
         <!-- 部位 -->
         <el-table-column
           prop="Part"
-          label="部位"
+          :label="$t('trials:readingUnit:baseDataCfg:title:bodyPart')"
           show-overflow-tooltip
           sortable="custom"
         />
         <el-table-column
           prop="PartEN"
-          label="部位（英文）"
+          :label="$t('trials:readingUnit:baseDataCfg:title:bodyPartEn')"
           min-width="140"
           show-overflow-tooltip
           sortable="custom"
         />
+        <!-- 器官 -->
         <el-table-column
           prop="TULOC"
-          label="器官"
+          :label="$t('trials:readingUnit:baseDataCfg:title:organ')"
           show-overflow-tooltip
           sortable="custom"
         />
         <el-table-column
           prop="TULOCEN"
-          label="器官（英文）"
+          :label="$t('trials:readingUnit:baseDataCfg:title:TULOCEN')"
           min-width="140"
           show-overflow-tooltip
           sortable="custom"
         />
+        <!-- 位置 -->
         <el-table-column
           prop="TULAT"
-          label="位置"
+          :label="$t('trials:readingUnit:baseDataCfg:title:TULAT')"
           show-overflow-tooltip
           sortable="custom"
         />
         <el-table-column
           prop="TULATEN"
-          label="位置（英文）"
+          :label="$t('trials:readingUnit:baseDataCfg:title:TULATEn')"
           min-width="140"
           show-overflow-tooltip
           sortable="custom"
         />
+        <!-- 是否淋巴结 -->
         <el-table-column
           prop="IsLymphNodes"
-          label="是否淋巴结"
+          :label="$t('trials:readingUnit:baseDataCfg:title:isLymphNodes')"
           min-width="160"
           show-overflow-tooltip
           sortable="custom"
@@ -168,9 +175,10 @@
             <el-tag v-else type="primary">{{ $fd('ReadingYesOrNo', scope.row.IsLymphNodes) }}</el-tag>
           </template>
         </el-table-column>
+        <!-- 是否可以编辑 -->
         <el-table-column
           prop="IsCanEditPosition"
-          label="是否可以编辑"
+          :label="$t('trials:readingUnit:baseDataCfg:title:isCanEditPosition')"
           min-width="160"
           show-overflow-tooltip
           sortable="custom"
@@ -182,15 +190,17 @@
             <el-tag v-else type="primary">{{ $fd('YesOrNo', scope.row.IsCanEditPosition) }}</el-tag>
           </template>
         </el-table-column>
+        <!-- 序号 -->
         <el-table-column
           prop="ShowOrder"
-          label="序号"
+          :label="$t('trials:readingUnit:baseDataCfg:title:showOrder')"
           show-overflow-tooltip
           min-width="80"
         />
+        <!-- 备注 -->
         <el-table-column
           prop="Remark"
-          label="备注"
+          :label="$t('trials:readingUnit:baseDataCfg:title:remark')"
           show-overflow-tooltip
         />
 
@@ -203,13 +213,13 @@
           <template slot-scope="scope">
             <el-button
               circle
-              title="编辑"
+              :title="$t('common:button:edit')"
               icon="el-icon-edit-outline"
               @click="handleEdit(scope.row)"
             />
             <el-button
               circle
-              title="删除"
+              :title="$t('common:button:delete')"
               icon="el-icon-delete"
               @click="handleDelete(scope.row)"
             />
@@ -227,7 +237,7 @@
       :visible.sync="editDialog.visible"
       :close-on-click-modal="false"
       :title="editDialog.title"
-      width="500px"
+      width="600px"
       custom-class="base-dialog-wrapper"
       append-to-body
     >
@@ -273,9 +283,9 @@
         size="small"
       >
         <div class="base-dialog-body">
-          <!-- 类型 -->
+          <!-- 标准 -->
           <el-form-item
-            label="标准"
+            :label="$t('trials:auditRecord:table:criterion')"
             prop="CriterionId"
             :rules="[
               { required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] },
@@ -345,9 +355,8 @@ export default {
       total: 0,
       rowData: {},
       editDialog: { title: '', visible: false },
-      lesionType: { title: '病灶器官关联关系', visible: false },
+      lesionType: { title: this.$t('dictionary:template:basicData:title1'), visible: false },//病灶器官关联关系
-      // lesionTypes: [],
+      criterion: { title: this.$t('dictionary:template:basicData:title2'), visible: false },//默认数据配置
-      criterion: { title: '默认数据配置', visible: false },
       formLoading: false,
       form: { CriterionId: '' },
       criterions: [],
@@ -382,7 +391,7 @@ export default {
         TrialReadingCriterionId: this.criterionId
       }).then(res => {
         this.loading = false
-        this.$message.success('同步成功')
+        this.$message.success(this.$t('dictionary:template:basicData:message1'))
       }).catch(() => {
         this.loading = false
       })
@@ -411,18 +420,18 @@ export default {
     // 新增
     handleAdd() {
       this.rowData = { SystemCriterionId: this.criterionId }
-      this.editDialog.title = '新增'
+      this.editDialog.title = this.$t('common:button:new')
       this.editDialog.visible = true
     },
     // 编辑
     handleEdit(row) {
       this.rowData = { ...row }
-      this.editDialog.title = '编辑'
+      this.editDialog.title = this.$t('common:button:edit')
       this.editDialog.visible = true
     },
     // 删除
     handleDelete(row) {
-      this.$confirm('是否确认删除', {
+      this.$confirm(this.$t('trials:readingUnit:baseDataCfg:message:deleteConfirm'), {
         type: 'warning',
         distinguishCancelAndClose: true
       })
@@ -433,7 +442,7 @@ export default {
               this.loading = false
               if (res.IsSuccess) {
                 this.getList()
-                this.$message.success('删除成功！')
+                this.$message.success(this.$t('common:message:deletedSuccessfully'))
               }
             }).catch(() => { this.loading = false })
         })

src/views/dictionary/template/components/QSFormItem.vue

@@ -190,7 +190,7 @@ export default {
   margin-bottom: 0px;
 }
 .disabled{
-  /deep/ .el-upload--picture-card {
+  ::v-deep .el-upload--picture-card {
     display: none;
   }
 }

src/views/dictionary/template/components/QcQuestionForm.vue

@@ -9,7 +9,8 @@
         label-width="130px"
         size="small"
       >
-        <el-form-item label="问题名称" prop="QuestionName">
+        <!-- 问题名称 -->
+        <el-form-item :label="$t('trials:qcCfg:table:questionName')" prop="QuestionName">
           <el-input v-model="form.QuestionName" />
         </el-form-item>
         <el-form-item
@@ -27,24 +28,28 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="类型">
+        <!-- 类型 -->
+        <el-form-item :label="$t('trials:qcCfg:table:type')">
           <el-select v-model="form.Type" @change="((val)=>{typeChange(val, form)})">
-            <el-option value="select" label="下拉框" />
+            <el-option
-            <el-option value="input" label="单行文本框" />
+              v-for="item of $d.QcType"
-            <el-option value="textarea" label="多行文本框" />
+              :key="item.value"
-            <el-option value="radio" label="单选框" />
+              :value="item.value"
+              :label="item.label"
+            />
           </el-select>
         </el-form-item>
+        <!-- 选项 -->
         <el-form-item
           v-if="form.Type === 'select' || form.Type === 'radio'"
-          label="选项: "
+          :label="$t('trials:qcCfg:table:typeValue')"
           prop="TypeValue"
         >
-          <el-input v-model="form.TypeValue" placeholder="选项请用‘|’分割多个选项" />
+          <el-input v-model="form.TypeValue" :placeholder="$t('trials:qcCfg:message:typeValue')" />
         </el-form-item>
         <!-- 父问题 -->
         <el-form-item
-          label="父问题"
+          :label="$t('trials:qcCfg:table:parentQs')"
         >
           <el-select
             v-model="form.ParentId"
@@ -62,7 +67,7 @@
         <!-- 父问题触发值 -->
         <el-form-item
           v-if="form.ParentId"
-          label="父问题触发值"
+          :label="$t('trials:qcCfg:table:parentTriggerValue')"
           prop="ParentTriggerValue"
         >
           <el-select
@@ -76,27 +81,47 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="是否必填">
+        <!-- 是否必填 -->
-          <el-radio-group v-model="form.IsRequired">
+        <el-form-item :label="$t('trials:qcCfg:table:isRequired')">
-            <el-radio :label="true">是</el-radio>
+          <el-radio-group
-            <el-radio :label="false">否</el-radio>
+            v-model="form.IsRequired"
+          >
+            <el-radio
+              v-for="item of $d.YesOrNo"
+              :key="`IsRequired${item.value}`"
+              :label="item.value"
+            >
+              {{ item.label }}
+            </el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="启用状态">
+        <!-- 启用状态 -->
-          <el-radio-group v-model="form.IsEnable">
+        <el-form-item :label="$t('trials:qcCfg:table:isEnable')">
-            <el-radio :label="true">启用</el-radio>
+          <el-radio-group
-            <el-radio :label="false">停用</el-radio>
+            v-model="form.IsEnable"
+          >
+            <el-radio
+              v-for="item of $d.YesOrNo"
+              :key="item.value"
+              :label="item.value"
+            >
+              {{ item.label }}
+            </el-radio>
           </el-radio-group>
         </el-form-item>
 
-        <el-form-item label="序号" prop="ShowOrder">
+        <el-form-item :label="$t('trials:qcCfg:table:order')" prop="ShowOrder">
           <el-input-number v-model="form.ShowOrder" controls-position="right" :min="0" />
         </el-form-item>
       </el-form>
     </template>
     <template slot="dialog-footer">
-      <el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancle">Cancel</el-button>
+      <el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancle">
-      <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">Save</el-button>
+        {{ $t('common:button:cancel') }}
+      </el-button>
+      <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">
+        {{ $t('common:button:save') }}
+      </el-button>
     </template>
   </base-model>
 </template>
@@ -128,7 +153,8 @@ export default {
       } else {
         var arr = value.split('|')
         if (new Set(arr).size !== arr.length) {
-          callback(new Error('选项不允许存在相同值'))
+          // '选项不允许存在相同值'
+          callback(new Error(this.$t('trials:qcCfg:message:msg1')))
         } else {
           callback()
         }
@@ -138,13 +164,13 @@ export default {
       btnLoading: false,
       form: formDataDefault(),
       rules: {
-        QuestionName: [{ required: true, message: 'Please specify', trigger: 'blur' },
+        QuestionName: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
-          { max: 300, message: 'The maximum length is 300' }],
+          { max: 300, message: `${this.$t('common:ruleMessage:maxLength')} 300` }],
-        TypeValue: [{ required: true, message: 'Please specify', trigger: 'blur' },
+        TypeValue: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
           { validator: validateTypeVal, trigger: 'blur' },
-          { max: 200, message: 'The maximum length is 200' }],
+          { max: 200, message: `${this.$t('common:ruleMessage:maxLength')} 200` }],
-        ParentTriggerValue: [{ required: true, message: 'Please select', trigger: 'blur' }],
+        ParentTriggerValue: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
-        LanguageType: [{ required: true, message: 'Please select', trigger: 'blur' }]
+        LanguageType: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }]
       },
       model_cfg: { visible: false, showClose: true, width: '600px', title: '' },
       parentOptions: [],
@@ -185,7 +211,7 @@ export default {
           this.btnLoading = true
           addOrUpdateQCQuestionConfigure(this.form).then(res => {
             this.btnLoading = false
-            this.$message.success('Saved successfully!')
+            this.$message.success(this.$t('common:message:savedSuccessfully'))
             // this.$refs['qcQuestionForm'].resetFields()
             this.model_cfg.visible = false
             this.$emit('getList')

src/views/dictionary/template/components/QcQuestions.vue

@@ -3,7 +3,8 @@
     <!-- 搜索框 -->
     <div class="search">
       <el-form :inline="true" size="mini" class="base-search-form">
-        <el-form-item label="问题名称:">
+        <!-- 问题名称 -->
+        <el-form-item :label="$t('trials:qcCfg:table:questionName')">
           <el-input v-model="searchData.QuestionName" clearable style="width:120px;" />
         </el-form-item>
         <!-- 语言类型 -->
@@ -22,12 +23,20 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="类型:">
+        <el-form-item :label="$t('trials:qcCfg:table:type')">
           <el-input v-model="searchData.Type" clearable style="width:120px;" />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleReset">Reset</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
-          <el-button type="primary" @click="handleSearch">Search</el-button>
+            {{ $t('common:button:search') }}
+          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left:auto">
@@ -37,9 +46,9 @@
           type="primary"
           @click="preview.visible = true"
         >
-          Preview
+          {{$t('common:button:preview')}}
         </el-button>
-        <el-button type="primary" size="mini" @click="handleAdd">New</el-button>
+        <el-button type="primary" size="mini" @click="handleAdd">{{$t('common:button:new')}}</el-button>
       </span>
     </div>
 
@@ -51,14 +60,16 @@
       size="small"
       height="100"
     >
+      <!-- 序号 -->
       <el-table-column
         prop="ShowOrder"
-        label="序号"
+        :label="$t('trials:qcCfg:table:order')"
         min-width="70"
       />
+      <!-- 问题名称 -->
       <el-table-column
         prop="QuestionName"
-        label="问题名称"
+        :label="$t('trials:qcCfg:table:questionName')"
         show-overflow-tooltip
       />
       <!-- 审核问题 -->
@@ -71,68 +82,73 @@
           {{ $fd('LanguageType', scope.row.LanguageType) }}
         </template>
       </el-table-column>
+      <!-- 类型 -->
       <el-table-column
         prop="Type"
-        label="类型"
+        :label="$t('trials:qcCfg:table:type')"
         show-overflow-tooltip
       >
         <template slot-scope="scope">
-          {{ scope.row.Type=== 'radio'?'单选框':scope.row.Type=== 'select'?'下拉框':scope.row.Type=== 'input'?'文本框':scope.row.Type=== 'textarea'?'多行文本框':'' }}
+          {{ $fd('QcType', scope.row.Type) }}
         </template>
       </el-table-column>
+      <!-- 选项 -->
       <el-table-column
         prop="TypeValue"
-        label="选项"
+        :label="$t('trials:qcCfg:table:typeValue')"
         show-overflow-tooltip
         min-width="110"
       />
+      <!-- 父问题 -->
       <el-table-column
         prop="ParentShowOrder"
-        label="父问题"
+        :label="$t('trials:qcCfg:table:parentQs')"
         show-overflow-tooltip
         min-width="110"
       />
+      <!-- 父问题触发值 -->
       <el-table-column
         prop="ParentTriggerValue"
-        label="父问题触发值"
+        :label="$t('trials:qcCfg:table:parentTriggerValue')"
         show-overflow-tooltip
         min-width="110"
       />
-
+      <!-- 是否必填 -->
       <el-table-column
         prop="IsRequired"
-        label="是否必填"
+        :label="$t('trials:qcCfg:table:isRequired')"
         min-width="90"
       >
         <template slot-scope="scope">
-          {{ scope.row.IsRequired?'是':'否' }}
+          {{ $fd('YesOrNo', scope.row.IsRequired) }}
         </template>
       </el-table-column>
+      <!-- 启用状态 -->
       <el-table-column
         prop="IsEnable"
-        label="启用状态"
+        :label="$t('trials:qcCfg:table:isEnable')"
         min-width="120"
       >
         <template slot-scope="scope">
-          {{ scope.row.IsEnable?'启用':'停用' }}
+          {{ $fd('YesOrNo', scope.row.IsEnable) }}
         </template>
       </el-table-column>
 
-      <el-table-column label="Action" width="200" fixed="right">
+      <el-table-column :label="$t('common:action:action')" width="200" fixed="right">
         <template slot-scope="scope">
           <el-button
             type="primary"
             size="mini"
             @click="handleEdit(scope.row)"
           >
-            Edit
+            {{ $t('common:button:edit') }}
           </el-button>
           <el-button
             type="danger"
             size="mini"
             @click="handleDelete(scope.row)"
           >
-            Delete
+            {{ $t('common:button:delete') }}
           </el-button>
 
         </template>

src/views/dictionary/template/components/TableQsForm.vue

@@ -10,7 +10,8 @@
   >
     <div class="base-dialog-body" style="height: 550px; display:flex;flex-direction: column;">
       <div style="height: 150px;">
-        <el-form-item label="类型" prop="Type">
+        <!-- 类型 -->
+        <el-form-item :label="$t('trials:readingUnit:qsList:title:type')" prop="Type">
           <el-select
             v-model="form.Type"
             @change="((val)=>{qsTypeChange(val, form)})"
@@ -24,9 +25,10 @@
             />
           </el-select>
         </el-form-item>
+        <!-- 问题名称 -->
         <el-form-item
           v-if="form.Type !== 'group'"
-          label="问题名称"
+          :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
           prop="QuestionName"
           :rules="[
             { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
@@ -37,9 +39,10 @@
             v-model="form.QuestionName"
           />
         </el-form-item>
+        <!-- 问题名称（EN） -->
         <el-form-item
           v-if="form.Type !== 'group'"
-          label="问题名称（EN）"
+          :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
           prop="QuestionEnName"
           :rules="[
             { max: form.Type === 'summary' ? 300 : 100, message: `${this.$t('common:ruleMessage:maxLength')} ${form.Type === 'summary' ? 300 : 100}` }
@@ -51,8 +54,10 @@
         </el-form-item>
       </div>
       <div style="flex: 1;overflow-y:auto;">
-        <el-divider content-position="left">公有属性</el-divider>
+        <!-- 公有属性 -->
-        <el-form-item v-if="form.Type !== 'group'" label="是否显示" prop="ShowQuestion">
+        <el-divider content-position="left">{{$t('trials:readingUnit:title:publicProperties')}}</el-divider>
+        <!-- 是否显示 -->
+        <el-form-item v-if="form.Type !== 'group'" :label="$t('trials:readingUnit:qsList:title:isShow')" prop="ShowQuestion">
           <el-radio-group
             v-model="form.ShowQuestion"
             @change="((val)=>{isShowQuestionChange(val, form)})"
@@ -70,7 +75,7 @@
         <!-- 显示时依赖父问题 -->
         <el-form-item
           v-if="form.Type !== 'group' && form.ShowQuestion===1"
-          label="显示依赖父问题"
+          :label="$t('trials:readingUnit:qsList:title:parentId')"
           prop="ParentId"
         >
           <el-select
@@ -87,7 +92,7 @@
           </el-select>
         </el-form-item>
         <!-- 显示时依赖父问题触发值 -->
-        <el-form-item v-if="form.ParentId && form.ShowQuestion===1" label="显示触发值" prop="ParentTriggerValueList">
+        <el-form-item v-if="form.ParentId && form.ShowQuestion===1" :label="$t('trials:readingUnit:qsList:title:parentTriggerValueList')"  prop="ParentTriggerValueList">
           <el-select v-model="form.ParentTriggerValueList" clearable multiple>
             <el-option
               v-for="item of parentTriggerValOptions"
@@ -97,7 +102,8 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item v-if="form.Type !== 'group' && form.Type !== 'table' && form.Type !== 'basicTable' && form.Type !== 'summary'" label="是否必填" prop="IsRequired">
+        <!-- 是否必填 -->
+        <el-form-item v-if="form.Type !== 'group' && form.Type !== 'table' && form.Type !== 'basicTable' && form.Type !== 'summary'" :label="$t('trials:readingUnit:qsList:title:isRequired')" prop="IsRequired">
           <el-radio-group
             v-model="form.IsRequired"
             :disabled="form.IsJudgeQuestion===true || form.ShowQuestion===2"
@@ -112,10 +118,10 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
-        <!-- 父问题 -->
+        <!-- 必填依赖父问题 -->
         <el-form-item
           v-if="form.Type !== 'group' && form.IsRequired === 1"
-          label="必填依赖父问题"
+          :label="$t('trials:readingUnit:qsList:title:relevanceId')"
           prop="RelevanceId"
         >
           <el-select
@@ -131,10 +137,10 @@
             />
           </el-select>
         </el-form-item>
-        <!-- 必填依赖的父问题触发值 -->
+        <!-- 必填触发值 -->
         <el-form-item
           v-if="form.RelevanceId && form.IsRequired === 1"
-          label="必填触发值"
+          :label="$t('trials:readingUnit:qsList:title:relevanceValueList')"
           prop="RelevanceValueList"
         >
           <el-select v-model="form.RelevanceValueList" clearable multiple>
@@ -147,7 +153,7 @@
           </el-select>
         </el-form-item>
         <!-- 导出标识 -->
-        <el-form-item 
+        <!-- <el-form-item 
           :label="$t('trials:readingUnit:qsList:title:ExportIdentification')" prop="ExportIdentification"
           v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'number' || form.Type === 'class' || form.Type === 'calculation'"
         >
@@ -166,9 +172,12 @@
               >{{ item.label }}
             </el-radio>
           </el-radio-group>
-        </el-form-item>
+        </el-form-item> -->
         <!-- 导出结果 -->
-        <el-form-item :label="$t('trials:readingUnit:qsList:title:ExportResult')" v-if="form.ExportIdentification" prop="ExportResult">
+        <el-form-item 
+          :label="$t('trials:readingUnit:qsList:title:ExportResult')"
+          v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'number' || form.Type === 'class' || form.Type === 'calculation'"
+        >
           <el-select v-model="form.ExportResult" multiple>
             <el-option
               v-for="item in CriterionDictionaryList.ExportResult"
@@ -179,8 +188,9 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <!-- 限制编辑 -->
         <el-form-item 
-          label="限制编辑" 
+          :label="$t('trials:readingUnit:qsList:title:limitEdit')" 
           v-if="form.Type !== 'summary'"
           prop="LimitEdit"
           :rules="[
@@ -191,9 +201,10 @@
             <el-radio v-for="item of $d.LimitEdit" :key="item.value" :label="item.value">{{ item.label }}</el-radio>
           </el-radio-group>
         </el-form-item>
+        <!-- 问题标识 -->
         <el-form-item
           v-if="form.Type !== 'group' && form.Type !== 'summary'"
-          label="问题标识"
+          :label="$t('dictionary:template:criterionConfig:table:questionMark')"
           prop="QuestionMark"
         >
           <el-select
@@ -208,14 +219,16 @@
             />
           </el-select>
         </el-form-item>
+        <!-- 注释 -->
         <el-form-item
-          label="注释"
+          :label="$t('trials:readingUnit:qsList:title:Remark')"
           prop="Remark"
         >
           <el-input v-model="form.Remark" />
         </el-form-item>
+        <!-- 序号 -->
         <el-form-item 
-          label="序号" 
+          :label="$t('trials:readingUnit:qsList:title:order')" 
           prop="ShowOrder"
           :rules="[
             { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
@@ -227,7 +240,8 @@
             :min="0"
           />
         </el-form-item>
-        <el-form-item label="重复出现最大次数" v-if="form.Type !== 'summary' && form.Type !== 'screenshot' && form.Type !== 'upload'">
+        <!-- 重复出现最大次数 -->
+        <el-form-item :label="$t('dictionary:template:criterionConfig:table:maxRowCount')" v-if="form.Type !== 'summary' && form.Type !== 'screenshot' && form.Type !== 'upload'">
           <el-input-number
             v-model="form.MaxRowCount"
             controls-position="right"
@@ -235,7 +249,8 @@
             :max="10"
           />
         </el-form-item>
-        <el-form-item label="问题分类" v-if="criterionType === 2">
+        <!-- 问题分类 -->
+        <el-form-item :label="$t('dictionary:template:criterionConfig:table:questionClassify')" v-if="criterionType === 2">
           <el-select v-model="form.QuestionClassify" clearable>
             <el-option
               v-for="item of $d.QuestionClassify"
@@ -245,15 +260,15 @@
             />
           </el-select>
         </el-form-item>
-        
+        <!-- 私有属性 -->
-        <el-divider content-position="left">私有属性</el-divider>
+        <el-divider content-position="left">{{$t('trials:readingUnit:title:privateProperties')}}</el-divider>
         <!-- 选项类型 -->
         <el-form-item
           v-if="form.Type === 'select' || form.Type === 'radio' || form.Type === 'input'"
-          label="选项类型"
+          :label="$t('trials:readingUnit:label:QuestionGenre')"
           prop="TableQuestionType"
           :rules="[
-            { required: form.Type !== 'input', message: '请选择'}
+            { required: form.Type !== 'input', message: this.$t('common:ruleMessage:select')}
           ]"
         >
           <el-radio-group
@@ -270,21 +285,22 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
-
+        <!-- 选项 -->
         <el-form-item
           v-if="form.TableQuestionType === 0  || form.Type === 'class'"
-          label="选项"
+          :label="$t('trials:qcCfg:table:typeValue')"
           prop="TypeValue"
         >
           <el-input
             v-model="form.TypeValue"
-            placeholder="选项请用‘|’分割多个选项"
+            :placeholder="$t('trials:qcCfg:message:typeValue')"
             @change="typeValueChange"
           />
         </el-form-item>
+        <!-- 关联问题 -->
         <el-form-item
           v-if="form.TableQuestionType === 2"
-          label="关联问题"
+          :label="$t('dictionary:template:criterionConfig:table:dependParentId')"
           prop="DependParentId"
         >
           <el-select
@@ -298,9 +314,10 @@
             />
           </el-select>
         </el-form-item>
+        <!-- 关联字段 -->
         <el-form-item
           v-if="form.TableQuestionType === 1 || !!form.DependParentId"
-          label="关联字段"
+          :label="$t('dictionary:template:criterionConfig:table:dataTableColumn')"
           prop="DataTableColumn"
         >
           <el-select v-model="form.DataTableColumn">
@@ -312,9 +329,10 @@
             />
           </el-select>
         </el-form-item>
+        <!-- 关联字典 -->
         <el-form-item
           v-if="form.TableQuestionType === 3 || form.TableQuestionType === 2"
-          label="关联字典"
+          :label="$t('dictionary:template:criterionConfig:table:relatedDictionaryCode')"
           prop="DictionaryCode"
           :rules="[{ required: form.TableQuestionType === 3, message: '请选择', trigger: 'blur' }]"
         >
@@ -327,7 +345,36 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item v-if="form.Type === 'select' || form.Type === 'radio'" label="高亮标记值" prop="HighlightAnswerList">
+        <!-- 默认值 -->
+        <el-form-item v-if="form.TableQuestionType === 3" :label="$t('trials:readingUnit:qsList:title:defaultValue')">
+          <el-select v-model="form.DefaultValue" clearable>
+            <!-- <el-option
+              v-for="item of form.DictionaryCode ? $d[form.DictionaryCode] : []"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value.toString()"
+            /> -->
+            <el-option
+              v-for="item of highlightAnswers"
+              :key="item.Id"
+              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
+              :value="item.Code"
+            />
+          </el-select>
+        </el-form-item>
+        <!-- 默认值 -->
+        <el-form-item v-if="form.TableQuestionType === 0" :label="$t('trials:readingUnit:qsList:title:defaultValue')">
+          <el-select v-model="form.DefaultValue" clearable>
+            <el-option
+              v-for="item of form.TypeValue ? form.TypeValue.split('|') : []"
+              :key="item"
+              :label="item"
+              :value="item"
+            />
+          </el-select>
+        </el-form-item>
+        <!-- 高亮标记值 -->
+        <el-form-item v-if="form.Type === 'select' || form.Type === 'radio'" :label="$t('trials:readingUnit:qsList:title:highlightAnswers')" prop="HighlightAnswerList">
           <el-select v-model="form.HighlightAnswerList" clearable multiple>
             <template v-if="form.TypeValue">
               <el-option
@@ -338,18 +385,25 @@
               />
             </template>
             <template v-else-if="form.DictionaryCode">
-              <el-option
+              <!-- <el-option
                 v-for="item of $d[form.DictionaryCode]"
                 :key="item.id"
                 :label="item.label"
                 :value="item.value.toString()"
+              /> -->
+              <el-option
+                v-for="item of highlightAnswers"
+                :key="item.Id"
+                :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
+                :value="item.Code"
               />
             </template>
           </el-select>
         </el-form-item>
+        <!-- 最大长度 -->
         <el-form-item 
           v-if="form.Type === 'input' || form.Type === 'textarea'"
-          label="最大长度"
+          :label="$t('trials:readingUnit:qsList:title:MaxAnswerLength')"
           prop="MaxAnswerLength"
           :rules="[
             { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }
@@ -373,10 +427,10 @@
         <!-- 数值类型 -->
         <el-form-item
           v-if="form.Type === 'number' || form.Type === 'calculation'"
-          label="数值类型"
+          :label="$t('trials:readingUnit:qsList:title:valueType')"
           prop="ValueType"
           :rules="[
-            { required: true, message: '请选择'}
+            { required: true, message: this.$t('common:ruleMessage:select') }
           ]"
         >
           <el-radio-group
@@ -392,10 +446,10 @@
           </el-radio-group>
         </el-form-item>
 
-        <!-- 数值单位 -->
+        <!-- 单位 -->
         <el-form-item
           v-if="form.Type === 'number' || form.Type === 'calculation'"
-          label="单位"
+          :label="$t('trials:readingUnit:qsList:title:unit')"
           prop="Unit"
           :rules="[
             { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
@@ -413,9 +467,10 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
+        <!-- 最大上传个数 -->
         <el-form-item 
           v-if="form.Type === 'upload'" 
-          label="最大上传个数"
+          :label="$t('trials:readingUnit:qsList:title:imageCount')"
           prop="ImageCount"
         >
           <el-input-number
@@ -428,7 +483,7 @@
         <!-- 文件类型 -->
         <el-form-item 
           v-if="form.Type === 'upload'" 
-          label="文件类型"
+          :label="$t('trials:readingUnit:qsList:title:FileType')"
           prop="FileType"
           :rules="[{ type: 'array', required: true, message: this.$t('common:ruleMessage:specify'), trigger: [ 'change'] }]"
         >
@@ -452,9 +507,10 @@
           </el-checkbox-group>
         </el-form-item>
         <!-- 分类 -->
+        <!-- 分类数据来源 -->
         <el-form-item
           v-if="form.Type === 'class'"
-          label="分类数据来源"
+          :label="$t('dictionary:template:criterionConfig:table:classifyQuestion')"
           prop="ClassifyTableQuestionId"
         >
           <el-select v-model="form.ClassifyTableQuestionId" clearable>
@@ -462,9 +518,10 @@
                       :value="item.Id"/>
           </el-select>
         </el-form-item>
+        <!-- 分类算法 -->
         <el-form-item
           v-if="form.Type === 'class'"
-          label="分类算法"
+          :label="$t('dictionary:template:criterionConfig:table:classifyAlgorithms')"
           prop="ClassifyAlgorithms"
         >
           <div>
@@ -563,7 +620,7 @@ export default {
       } else {
         var arr = value.split('|')
         if (new Set(arr).size !== arr.length) {
-          callback(new Error('选项不允许存在相同值'))
+          callback(new Error(this.$t('trials:readingUnit:qsList:message:msg0')))
         } else {
           callback()
         }
@@ -607,38 +664,39 @@ export default {
         ImageCount: 0,
         ClassifyTableQuestionId: null,
         ClassifyAlgorithms: null,
-        ExportIdentification: 0,
+        // ExportIdentification: 0,
-        ExportResult: []
+        ExportResult: [],
+        DefaultValue:null
         // IsEnable: true
       },
       rules: {
         Type: [
-          { required: true, message: '请选择', trigger: 'blur' }
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
         ],
         // QuestionName: [{ required: true, message: '请注明', trigger: 'blur' },
         //   { max: 300, message: '最大长度为 300' }],
 
-        TypeValue: [{ required: true, message: '请注明', trigger: 'blur' },
+        TypeValue: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
           { validator: validateTypeVal, trigger: 'blur' },
-          { max: 200, message: '最大长度为 200' }],
+          { max: 200, message: `${this.$t('common:ruleMessage:maxLength')} 200` }],
-        ShowQuestion: [{ required: true, message: '请选择', trigger: 'blur' }],
+        ShowQuestion: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
-        IsRequired: [{ required: true, message: '请选择', trigger: 'blur' }],
+        IsRequired: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
-        ParentId: [{ required: true, message: '请选择', trigger: 'blur' }],
+        ParentId: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
         ParentTriggerValueList: [
-          { required: true, message: '请选择', trigger: 'blur' }
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
         ],
-        RelevanceId: [{ required: true, message: '请选择', trigger: 'blur' }],
+        RelevanceId: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
-        RelevanceValueList: [{ required: true, message: '请选择', trigger: 'blur' }],
+        RelevanceValueList: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
-        DataTableName: [{ required: true, message: '请选择', trigger: 'blur' }],
+        DataTableName: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
-        DataTableColumn: [{ required: true, message: '请选择', trigger: 'blur' }],
+        DataTableColumn: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
         // DictionaryCode: [{ required: true, message: '请选择', trigger: 'blur' }],
-        DependParentId: [{ required: true, message: '请选择', trigger: 'blur' }],
+        DependParentId: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
-        ExportIdentification: [
+        // ExportIdentification: [
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' },
+        //   { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' },
-        ],
+        // ],
-        ExportResult: [
+        // ExportResult: [
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' },
+        //   { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' },
-        ]
+        // ]
       },
       loading: false,
       parentOptions: [],
@@ -648,9 +706,31 @@ export default {
       colOptions: [],
       dicList: [],
       CriterionDictionaryList: [],
-      Questions: []
+      Questions: [],
+      highlightAnswers: []
     }
   },
+  watch: {
+    'form.DictionaryCode': {
+      deep: true,
+      immediate: true,
+      async handler(v, oldv) {
+        try {
+          if (!v) {
+            this.highlightAnswers = []
+            return
+          }
+          let res = await getCriterionDictionary({
+            ReadingCriterionId: this.criterionId,
+            DictionaryCode: this.form.DictionaryCode,
+          })
+          this.highlightAnswers = res.Result[this.form.DictionaryCode]
+        } catch (e) {
+          console.log(e)
+        }
+      },
+    },
+  },
   mounted() {
     this.initForm()
     this.getCriterionDictionary()
@@ -910,8 +990,9 @@ export default {
       form.ImageCount = null
       form.ClassifyTableQuestionId = null
       form.ClassifyAlgorithms = null
-      form.ExportIdentification = 0
+      // form.ExportIdentification = 0
       form.ExportResult = []
+      form.DefaultValue = null
     },
     close() {
       this.$emit('close')

src/views/dictionary/template/components/TableQsList.vue

@@ -10,7 +10,7 @@
         type="primary"
         @click="handleAdd"
       >
-        新增
+        {{$t('common:button:new')}}
       </el-button>
 
     </div>
@@ -20,24 +20,28 @@
       size="small"
       height="500"
     >
+      <!-- 序号 -->
       <el-table-column
         prop="ShowOrder"
-        label="序号"
+        :label="$t('trials:qcCfg:table:order')"
         min-width="70"
       />
+      <!-- 问题名称 -->
       <el-table-column
         prop="QuestionName"
-        label="问题名称"
+        :label="$t('trials:readingUnit:qsList:title:qsName')"
         show-overflow-tooltip
       />
+      <!-- 问题名称(EN) -->
       <el-table-column
         prop="QuestionEnName"
-        label="问题名称(EN)"
+        :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
         show-overflow-tooltip
       />
+      <!-- 类型 -->
       <el-table-column
         prop="Type"
-        label="类型"
+        :label="$t('trials:readingUnit:qsList:title:type')"
         show-overflow-tooltip
       >
         <template slot-scope="scope">
@@ -61,9 +65,10 @@
         min-width="110"
       />
        -->
+      <!-- 是否显示 -->
       <el-table-column
         prop="ShowQuestion"
-        label="是否显示"
+        :label="$t('trials:readingUnit:qsList:title:isShow')"
         min-width="90"
         show-overflow-tooltip
       >
@@ -71,9 +76,10 @@
           {{ $fd('ShowQuestion',scope.row.ShowQuestion) }}
         </template>
       </el-table-column>
+      <!-- 是否必填 -->
       <el-table-column
         prop="IsRequired"
-        label="是否必填"
+        :label="$t('trials:readingUnit:qsList:title:isRequired')"
         min-width="90"
         show-overflow-tooltip
       >
@@ -125,7 +131,7 @@
       <!-- 问题标识 -->
       <el-table-column
         prop="QuestionMark"
-        label="问题标识"
+        :label="$t('dictionary:template:criterionConfig:table:questionMark')"
         width="140"
         show-overflow-tooltip
       >
@@ -178,9 +184,10 @@
         </template>
       </el-table-column>
        -->
+      <!-- 最大行数 -->
       <el-table-column
         prop="MaxRowCount"
-        label="最大行数"
+        :label="$t('trials:readingUnit:qsList:title:MaxRowCount')"
         show-overflow-tooltip
       >
         <template slot-scope="scope">
@@ -190,7 +197,7 @@
 
       <el-table-column
         prop=""
-        label="操作"
+        :label="$t('common:action:action')"
         width="150"
         show-overflow-tooltip
       >
@@ -201,7 +208,7 @@
             size="mini"
             @click="handleLook(scope.row)"
           >
-            查看
+            {{ $t('trials:readingPeriod:button:view') }}
           </el-button>
           <el-button
             v-if="!isCompleteConfig"
@@ -209,7 +216,7 @@
             size="mini"
             @click="handleEdit(scope.row)"
           >
-            编辑
+            {{ $t('common:button:edit') }}
           </el-button>
           <el-button
             v-if="!isCompleteConfig"
@@ -217,7 +224,7 @@
             size="mini"
             @click="handleDelete(scope.row)"
           >
-            删除
+            {{ $t('common:button:delete') }}
           </el-button>
         </template>
       </el-table-column>
@@ -295,7 +302,7 @@ export default {
     handleLook(row) {
       this.type = 'look'
       this.rowData = { ...row }
-      this.addOrEdit.title = '编辑'
+      this.addOrEdit.title = this.$t('common:button:edit')
       this.addOrEdit.visible = true
     },
     getList() {
@@ -308,13 +315,13 @@ export default {
     handleAdd() {
       this.type = 'add'
       this.rowData = {}
-      this.addOrEdit.title = '添加'
+      this.addOrEdit.title = this.$t('common:button:new')
       this.addOrEdit.visible = true
     },
     handleEdit(row) {
       this.type = 'edit'
       this.rowData = { ...row }
-      this.addOrEdit.title = '编辑'
+      this.addOrEdit.title = this.$t('common:button:edit')
       this.addOrEdit.visible = true
     },
     handleDelete(row) {
@@ -329,7 +336,7 @@ export default {
               this.loading = false
               if (res.IsSuccess) {
                 this.getList()
-                this.$message.success('删除成功！')
+                this.$message.success(this.$t('common:message:deletedSuccessfully'))
               }
             }).catch(() => { this.loading = false })
         })

src/views/dictionary/template/email/components/AttachmentForm.vue

@@ -79,7 +79,7 @@
       </el-form-item>
       <el-form-item v-if="form.Id !== ''" label="是否废除: ">
         <el-radio-group v-model="form.IsDeleted">
-          <el-radio v-for="item of $d.YesOrNo" :label="item.value">{{ item.label }}</el-radio>
+          <el-radio v-for="item of $d.YesOrNo" :key="`IsDeleted${item.value}`" :label="item.value">{{ item.label }}</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="描述">

src/views/dictionary/template/email/components/EmailForm.vue

@@ -246,9 +246,9 @@
         :autosize="{ minRows: 8, maxRows: 8 }"
       />
       <el-button
-        :disabled="!form.EmailHtmlContentCN"
+        :disabled="!form.EmailHtmlContentCN && form.EmailHtmlContent"
         type="text"
-        @click="PreviewHTML(form.EmailHtmlContentCN)"
+        @click="PreviewHTML(form.EmailHtmlContentCN, form.EmailHtmlContent)"
         style="position: absolute; left: -50px; top: 30px"
       >
         {{ $t('common:button:preview') }}
@@ -265,9 +265,9 @@
         :autosize="{ minRows: 8, maxRows: 8 }"
       />
       <el-button
-        :disabled="!form.EmailHtmlContent"
+        :disabled="!form.EmailHtmlContentCN && form.EmailHtmlContent"
         type="text"
-        @click="PreviewHTML(form.EmailHtmlContent)"
+        @click="PreviewHTML(form.EmailHtmlContentCN, form.EmailHtmlContent)"
         style="position: absolute; left: -50px; top: 30px"
       >
         {{ $t('common:button:preview') }}
@@ -519,8 +519,8 @@ export default {
       })
     },
     // 预览模板
-    PreviewHTML(html) {
+    PreviewHTML(html, htmlEn) {
-      this.$emit('PreviewHTML', html)
+      this.$emit('PreviewHTML', html, htmlEn)
     },
   },
 }

src/views/dictionary/template/email/components/EmailList.vue

@@ -123,8 +123,16 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleSearch">查询</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
-          <el-button type="primary" @click="handleReset">重置</el-button>
+            {{ $t('common:button:search') }}
+          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left: auto">
@@ -370,6 +378,13 @@
           <el-button type="text" @click="handleDelete(scope.row)"
             >删除</el-button
           >
+          <el-button
+            type="text"
+            @click="
+              preview(scope.row.EmailHtmlContentCN, scope.row.EmailHtmlContent)
+            "
+            >{{ $t('common:button:preview') }}</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -427,7 +442,23 @@
       fullscreen
       custom-class="base-dialog-wrapper"
     >
-      <div v-html="previewHTML"></div>
+      <div
+        style="
+          display: flex;
+          align-items: flex-start;
+          justify-content: space-around;
+          flex-wrap: wrap;
+        "
+      >
+        <div style="min-width: 50%">
+          <h3>邮件内容模版（CN）</h3>
+          <div v-html="previewHTML"></div>
+        </div>
+        <div style="min-width: 50%">
+          <h3>邮件内容模版（EN）</h3>
+          <div v-html="previewHTMLEN"></div>
+        </div>
+      </div>
     </el-dialog>
   </box-content>
 </template>
@@ -487,6 +518,7 @@ export default {
       attachmentVisible: false,
       previewVisible: false,
       previewHTML: null,
+      previewHTMLEN: null,
     }
   },
   computed: {
@@ -574,8 +606,9 @@ export default {
     closeDialog() {
       this.editVisible = false
     },
-    preview(html) {
+    preview(html, htmlEN) {
       this.previewHTML = html
+      this.previewHTMLEN = htmlEN
       this.previewVisible = true
     },
     // 导出

src/views/dictionary/template/index.vue

@@ -1,31 +1,40 @@
 <template>
   <div class="question-wrapper">
     <el-tabs v-model="activeTab" @tab-click="clickTab">
-      <el-tab-pane label="QC问题配置" name="qc">
+      <!-- QC问题配置 -->
+      <el-tab-pane :label="$t('dictionary:template:tab:qcConfig')" name="qc">
         <qc-questions v-if="activeTab == 'qc'" />
       </el-tab-pane>
-      <el-tab-pane label="阅片标准配置" name="criterions">
+      <!-- 阅片标准配置 -->
+      <el-tab-pane :label="$t('dictionary:template:tab:criterionsConfig')" name="criterions">
         <criterions-tmp v-if="activeTab == 'criterions'" />
       </el-tab-pane>
-      <el-tab-pane label="临床数据配置" name="clinicalData">
+      <!-- 临床数据配置 -->
+      <el-tab-pane :label="$t('dictionary:template:tab:clinicalDataConfig')" name="clinicalData">
         <clinical-data v-if="activeTab == 'clinicalData'" />
       </el-tab-pane>
-      <el-tab-pane label="医学审核问题配置" name="medicalAudit">
+      <!-- 医学审核问题配置 -->
+      <el-tab-pane :label="$t('dictionary:template:tab:medicalConfig')" name="medicalAudit">
         <medical-audit v-if="activeTab == 'medicalAudit'" />
       </el-tab-pane>
-      <el-tab-pane label="DICOM字段匿名化配置" name="anonymization">
+      <!-- DICOM字段匿名化配置 -->
+      <el-tab-pane :label="$t('dictionary:template:tab:dicomTagConfig')" name="anonymization">
         <Anonymization v-if="activeTab == 'anonymization'" />
       </el-tab-pane>
-      <el-tab-pane label="DICOM字段新增配置" name="increasefields">
+      <!-- DICOM字段新增配置 -->
+      <el-tab-pane :label="$t('dictionary:template:tab:dicomTagAddConfig')" name="increasefields">
         <IncreaseFields v-if="activeTab == 'increasefields'" />
       </el-tab-pane>
-      <el-tab-pane label="邮件管理" name="email">
+      <!-- 邮件管理 -->
+      <el-tab-pane :label="$t('dictionary:template:tab:emailConfig')" name="email">
         <Email v-if="activeTab == 'email'" />
       </el-tab-pane>
-      <el-tab-pane label="签名管理" name="sign">
+      <!-- 签名管理 -->
+      <el-tab-pane :label="$t('dictionary:template:tab:signConfig')" name="sign">
         <Sign v-if="activeTab == 'sign'" />
       </el-tab-pane>
-      <el-tab-pane label="浏览器推荐" name="browser">
+      <!-- 浏览器推荐 -->
+      <el-tab-pane :label="$t('dictionary:template:tab:browserConfig')" name="browser">
         <Browser v-if="activeTab == 'browser'" />
       </el-tab-pane>
     </el-tabs>

src/views/dictionary/template/sign/index.vue

@@ -3,15 +3,23 @@
     <!-- 搜索框 -->
     <div class="search">
       <el-form :inline="true" size="mini" class="base-search-form">
-        <el-form-item label="编号:">
+        <el-form-item label="Code:">
           <el-input v-model="searchData.Code" style="width:100px;" />
         </el-form-item>
         <el-form-item label="模板:">
           <el-input v-model="searchData.Name" style="width:100px;" />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleReset">Reset</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
-          <el-button type="primary" @click="handleSearch">Search</el-button>
+            {{ $t('common:button:search') }}
+          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
+            {{ $t('common:button:reset') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left:auto;">

src/views/email-recompose/index.vue

@@ -38,6 +38,7 @@
         </el-form-item>
         <!-- 新密码 -->
         <el-form-item
+          class="my_new_pwd"
           :label="$t('recompose:form:newPassword')"
           prop="NewPassWord"
         >
@@ -84,6 +85,11 @@ export default {
       password: {
         NewUserName: null,
         UserId: null,
+        ConfirmPassWord: null,
+        NewPassWord: null,
+        Email: null,
+        UserType: null,
+        access_token: null,
       },
       passwordFormRules: {
         NewUserName: [
@@ -175,9 +181,9 @@ export default {
     this.$i18n.locale = this.$route.query.lang
     this.setLanguage(this.$route.query.lang)
     this.$updateDictionary()
-    if (!this.password.NewUserName) {
+    // if (!this.password.NewUserName) {
-      this.$alert(this.$t('recompose:message:warning'))
+    //   this.$alert(this.$t('recompose:message:warning'))
-    }
+    // }
   },
   methods: {
     ...mapMutations({ setLanguage: 'lang/setLanguage' }),
@@ -189,8 +195,10 @@ export default {
       } else {
         this.$router.push(`/login`)
       }
-      this.$i18n.locale = 'zh'
+      if (!this.$i18n.locale) {
-      this.setLanguage('zh')
+        //this.$i18n.locale = 'zh'
+        //this.setLanguage('zh')
+      }
       this.$updateDictionary()
     },
     save() {
@@ -228,7 +236,10 @@ export default {
       })
     },
     cancel() {
-      this.$refs['passwordForm'].resetFields()
+      // this.$refs['passwordForm'].resetFields()
+      this.password.NewPassWord = null
+      this.password.NewUserName = null
+      this.password.ConfirmPassWord = null
     },
   },
 }
@@ -262,7 +273,7 @@ input {
   background-color: transparent;
   caret-color: #fff;
 }
-.el-form-item {
+::v-deep .is-error.my_new_pwd {
-  margin-bottom: 30px;
+  margin-bottom: 45px;
 }
 </style>

src/views/error.vue

@@ -2,7 +2,8 @@
   <div class="wscn-http404-container">
     <div class="wscn-http404" style="display: flex;align-items: center">
       <div class="pic-404">
-        <img class="pic-404__parent" src="@/assets/login-bg.png" alt="404">
+        <!-- <img class="pic-404__parent" src="@/assets/login-bg.png" alt="404"> -->
+        <svg-icon icon-class="login-bg" style="width: 100%; height: 100%" />
         <img class="pic-404__child left" src="@/assets/404_images/404_cloud.png" alt="404">
         <img class="pic-404__child mid" src="@/assets/404_images/404_cloud.png" alt="404">
         <img class="pic-404__child right" src="@/assets/404_images/404_cloud.png" alt="404">
@@ -56,8 +57,10 @@ export default {
   .pic-404 {
     position: relative;
     float: left;
-    width: 400px;
+    width: 500px;
+    height: 300px;
     overflow: hidden;
+    margin-right: 10px;
     &__parent {
       width: 100%;
     }

src/views/forgetpassword/index.vue

@@ -419,11 +419,11 @@ export default {
 }
 </style>
 <style scoped>
-/*/deep/ .is-error{*/
+/*::v-deep .is-error{*/
 /*  margin-bottom: 40px;*/
 /*}*/
 .is-error.my_new_pwd {
-  margin-bottom: 40px;
+  margin-bottom: 45px;
 }
 .flexBox {
   display: flex;

src/views/login/index.vue

@@ -205,17 +205,21 @@
         "
       >
         <h1
-          style="text-align: center; margin-bottom: 20px"
+          style="text-align: center; margin-bottom: 30px"
           v-if="NODE_ENV === 'usa'"
         >
           About
         </h1>
-        <h1 style="text-align: center; margin-bottom: 20px" v-else>关于</h1>
+        <h1 style="text-align: center; margin-bottom: 30px" v-else>关于</h1>
-        <p style="margin-bottom: 20px" v-if="NODE_ENV === 'usa'">
+        <p style="margin-bottom: 0px" v-if="NODE_ENV === 'usa'">
-          {{ $t('login:title:system_title_about') }}
+          <!-- {{ $t('login:title:system_title_about') }} -->
+          <svg-icon
+            icon-class="login-logo"
+            style="width: 250px; height: 71px"
+          />
         </p>
-        <p style="margin-bottom: 20px" v-else>{{ $t('login:title:system') }}</p>
+        <p style="margin-bottom: 0px" v-else>{{ $t('login:title:system') }}</p>
-        <p style="margin-bottom: 20px">
+        <p style="margin-bottom: 20px; margin-top: 0">
           V{{ $version.IsEnv_US ? $version.Version_US : $version.Version }}
         </p>
         <p style="margin-bottom: 20px" v-if="language === 'zh'">
@@ -313,7 +317,8 @@ export default {
   computed: {
     ...mapGetters(['asyncRoutes', 'routes', 'language']),
     host() {
-      return window.location.host
+      // return window.location.host
+      return 'elevateimaging.ai '
     },
   },
   watch: {
@@ -328,7 +333,8 @@ export default {
     },
   },
   mounted() {
-    zzSessionStorage.clear()
+    let lang = zzSessionStorage.getItem('lang') || 'zh'
+    // zzSessionStorage.clear()
     this.loginType = this.$route.query.loginType
     this.location = this.$route.query.location
     zzSessionStorage.setItem('loginType', this.loginType)
@@ -343,9 +349,9 @@ export default {
         this.setLanguage('en')
         this.$updateDictionary()
       } else {
-        // this.$i18n.locale = 'zh'
+        this.$i18n.locale = lang
-        // this.setLanguage('zh')
+        this.setLanguage(lang)
-        // this.$updateDictionary()
+        this.$updateDictionary()
       }
     }
     this.$refs.browserTip.open()
@@ -387,6 +393,9 @@ export default {
       this.$store
         .dispatch('user/login', this.loginForm)
         .then((res) => {
+          if (res.BasicInfo.LoginState === 2) {
+            this.$message.warning(this.$t('login:message:login4'))
+          }
           if (res.BasicInfo.IsFirstAdd) {
             // 当前用户为首次登录,请先修改密码之后再次登录
             this.$message.success(this.$t('login:message:login1'))
@@ -396,7 +405,7 @@ export default {
               })
             }, 500)
             return
-          } else if (res.BasicInfo.LoginState === 1) {
+          } else if (res.BasicInfo.NeedChangePassWord) {
             // 请先修改密码后再登录！
             this.$alert(
               this.$t('login:message:login3'),
@@ -412,29 +421,27 @@ export default {
             )
             return
           } else if (res.IsMFA) {
+            zzSessionStorage.removeItem('userId')
+            zzSessionStorage.removeItem('identityUserId')
             this.$MFA({
-              UserId: res.BasicInfo.Id,
+              UserId: res.BasicInfo.IdentityUserId,
               EMail: res.BasicInfo.EMail,
               username: this.loginForm.username,
-              callBack: this.loginIn,
+              callBack: this.changeRoleLogin,
               cancelBack: () => {
                 this.loading = false
               },
             })
             return
-          } else if (res.BasicInfo.LoginState === 2) {
-            // 本次登录的IP或设备与上次不一致，请确认'
-            // this.$alert(this.$t('login:message:login4'), this.$t('common:title:warning'))
-            this.$message.warning(this.$t('login:message:login4'))
           }
-          if (
+          // else if (res.BasicInfo.LoginState === 2) {
-            Array.isArray(this.$store.state.user.roles) &&
+          //   // 本次登录的IP或设备与上次不一致，请确认'
-            this.$store.state.user.roles.length === 1
+          //   // this.$alert(this.$t('login:message:login4'), this.$t('common:title:warning'))
-          ) {
+          //   this.$message.warning(this.$t('login:message:login4'))
-            this.loginByRole(this.$store.state.user.roles[0].Id)
+          // }
-            return
+          zzSessionStorage.removeItem('userId')
-          }
+          zzSessionStorage.removeItem('identityUserId')
-          return (this.toggleRoleVisible = true)
+          this.changeRoleLogin()
         })
         .catch(() => {
           this.showCode = true
@@ -455,6 +462,9 @@ export default {
                 if (res && res.length > 0) {
                   this.$store.dispatch('global/getNoticeList')
                   this.$router.addRoutes(res)
+                  // if (this.LoginState === 2) {
+                  //   this.$message.warning(this.$t('login:message:login4'))
+                  // }
                   if (this.loginType === 'DevOps') {
                     this.$router.replace({ path: res[0].path })
                     return
@@ -494,6 +504,28 @@ export default {
           this.toggleRoleLoading = false
         })
     },
+    changeRoleLogin() {
+      if (
+        Array.isArray(this.$store.state.user.roles) &&
+        this.$store.state.user.roles.length === 1
+      ) {
+        this.loginByRole(this.$store.state.user.roles[0].Id)
+        return
+      }
+      if (
+        Array.isArray(this.$store.state.user.roles) &&
+        this.$store.state.user.roles.filter((item) => item.IsUserRoleDisabled)
+          .length ===
+          this.$store.state.user.roles.length - 1
+      ) {
+        let role = this.$store.state.user.roles.find(
+          (item) => !item.IsUserRoleDisabled
+        )
+        this.loginByRole(role.Id)
+        return
+      }
+      return (this.toggleRoleVisible = true)
+    },
     cancel() {
       this.showCode = true
       this.loading = false

src/views/none-dicom-show/index.vue

@@ -220,7 +220,7 @@ export default {
     border-radius: 10px;
     background: #d0d0d0;
   }
-  /deep/ .el-card__body {
+  ::v-deep .el-card__body {
     padding: 0px;
   }
 }
@@ -234,7 +234,7 @@ export default {
   width: 220px;
   height: 100%;
 
-  /deep/ .el-card__body {
+  ::v-deep .el-card__body {
     height: 100%;
     width: 100%;
     display: flex;
@@ -254,13 +254,13 @@ export default {
     overflow-y: auto;
   }
 
-  // /deep/ .el-tabs{
+  // ::v-deep .el-tabs{
   //   height: 100%;
   // }
-  // /deep/ .el-tabs__header{
+  // ::v-deep .el-tabs__header{
   //   height: 40px;
   // }
-  // /deep/ .el-tabs__content{
+  // ::v-deep .el-tabs__content{
   //   flex: 1;
   //   overflow-y: auto;
   //   padding: 0;
@@ -299,7 +299,7 @@ export default {
   flex: 1;
   height: 100%;
   margin-left: 10px;
-  /deep/ .el-card__body {
+  ::v-deep .el-card__body {
     height: 100%;
     width: 100%;
   }

src/views/recompose/index.vue

@@ -42,6 +42,7 @@
         </el-form-item>
         <!-- 新密码 -->
         <el-form-item
+          class="my_new_pwd"
           :label="$t('recompose:form:newPassword')"
           prop="NewPassWord"
         >
@@ -138,14 +139,16 @@ export default {
     ...mapMutations({ setLanguage: 'lang/setLanguage' }),
     async logout() {
       var loginType = zzSessionStorage.getItem('loginType')
-      await this.$store.dispatch('user/logout')
+      await this.$store.dispatch('user/resetData')
       if (loginType) {
         this.$router.push(`/login?loginType=${loginType}`)
       } else {
         this.$router.push(`/login`)
       }
-      this.$i18n.locale = 'zh'
+      if (!this.$i18n.locale) {
-      this.setLanguage('zh')
+        //this.$i18n.locale = 'zh'
+        //this.setLanguage('zh')
+      }
       this.$updateDictionary()
     },
     save() {
@@ -219,4 +222,7 @@ input {
   background-color: transparent;
   caret-color: #fff;
 }
+::v-deep .is-error.my_new_pwd {
+  margin-bottom: 45px;
+}
 </style>

src/views/research-mobile/components/BasicInfo.vue

@@ -271,7 +271,7 @@ export default {
     padding: 5px 20px;
     margin-top: 5px;
     background: #fff;
-    /deep/.el-form-item {
+    ::v-deep.el-form-item {
       padding-bottom: 20px;
       
     }
@@ -285,10 +285,10 @@ export default {
     }
   }
   .form-label-width{
-    /deep/.el-form-item__label{
+    ::v-deep.el-form-item__label{
       width: 140px;
     }
-    /deep/.el-form-item__content{
+    ::v-deep.el-form-item__content{
       margin-left: 140px;
     }
   }
@@ -297,7 +297,7 @@ export default {
     text-align: center;
   }
 
-  /deep/.el-form-item {
+  ::v-deep.el-form-item {
     margin-bottom: 0px;
     padding-top: 5px;
     border-bottom: 1px solid #f5f7fa;

src/views/research-mobile/components/EquipmentForm.vue

@@ -156,7 +156,7 @@ export default {
 <style lang="scss" scoped>
 .equipment_form_content{
   padding: 0 10px;
-  /deep/.el-form-item {
+  ::v-deep.el-form-item {
     margin-bottom: 0px;
     padding: 5px 0 20px 0;
     border-bottom: 1px solid #f5f7fa;

src/views/research-mobile/components/HistoricalParticipantForm.vue

@@ -292,7 +292,7 @@ export default {
 <style lang="scss" scoped>
 .participants_form_content{
   padding: 0 10px;
-  /deep/.el-form-item {
+  ::v-deep.el-form-item {
      margin-bottom: 0px;
     padding: 5px 0 20px 0;
     border-bottom: 1px solid #f5f7fa;

src/views/research-mobile/components/ParticipantForm.vue

@@ -306,7 +306,7 @@ export default {
 <style lang="scss" scoped>
 .participants_form_content{
   padding: 0 10px;
-  /deep/.el-form-item {
+  ::v-deep.el-form-item {
     margin-bottom: 0px;
     padding: 5px 0 20px 0;
     border-bottom: 1px solid #f5f7fa;

src/views/research-mobile/login.vue

@@ -375,7 +375,7 @@ export default {
     padding: 5px 20px;
     margin-top: 5px;
     background: #fff;
-    /deep/.el-form-item {
+    ::v-deep.el-form-item {
       padding-bottom: 20px;
     }
   }
@@ -392,7 +392,7 @@ export default {
     text-align: center;
   }
 
-  /deep/.el-form-item {
+  ::v-deep.el-form-item {
     margin-bottom: 0px;
     padding-top: 5px;
     border-bottom: 1px solid #f5f7fa;

src/views/research/components/ResearchForm.vue

@@ -95,7 +95,7 @@
       </el-form>
     </el-dialog>
 
-    <el-dialog
+    <!-- <el-dialog
       :visible.sync="historyVisible"
       :custom-class="isFullscreen?'full-dialog-container':'dialog-container'"
       :close-on-click-modal="false"
@@ -119,7 +119,7 @@
           :site-id="siteId"
         />
       </div>
-    </el-dialog>
+    </el-dialog> -->
 
   </div>
 </template>
@@ -129,10 +129,10 @@ import BaseInfo from './BaseInfo'
 import HistoricalParticipant from './HistoricalParticipant'
 import ParticipantList from './ParticipantList'
 import EquipmentList from './EquipmentList'
-import HistoricalRecord from './HistoricalRecord'
+// import HistoricalRecord from './HistoricalRecord'
 export default {
   name: 'QuestionForm',
-  components: { BaseInfo, HistoricalParticipant, ParticipantList, EquipmentList, HistoricalRecord },
+  components: { BaseInfo, HistoricalParticipant, ParticipantList, EquipmentList },
   props: {
     trialSiteSurveyId: {
       type: String,
@@ -312,10 +312,10 @@ export default {
     handleBack() {
       this.$router.push({ path: `/researchLogin?trialId=${this.trialId}&lang=${this.$i18n.locale}` })
     },
-    handleHistory() {
+    // handleHistory() {
-      this.isFullscreen = false
+    //   this.isFullscreen = false
-      this.historyVisible = true
+    //   this.historyVisible = true
-    }
+    // }
   }
 }
 </script>
@@ -338,19 +338,19 @@ export default {
     padding-bottom: 20px;
     overflow-y: auto;
   }
-  >>>.el-card__body{
+  ::v-deep .el-card__body{
     padding: 10px;
   }
   // >>>.el-dialog__body{
   //   padding: 10px 20px 20px 20px;
   // }
 
-  >>>.full-dialog-container{
+  ::v-deep .full-dialog-container{
    .el-dialog__body{
       height: calc(100% - 80px);
     }
   }
-  >>>.dialog-container{
+  ::v-deep .dialog-container{
     // margin-top: 50px !important;
     width:75%;
     height:80%;

src/views/research/form.vue

@@ -117,7 +117,7 @@
       :title="$t('trials:researchForm:dialogTitle:reject')"
       width="600px"
       custom-class="base-dialog-wrapper"
-      :append-to-body="userTypeEnumInt !== 0"
+      append-to-body
     >
       <el-form ref="rejectForm" :model="rejectForm" label-width="100px">
         <div class="base-dialog-body">
@@ -387,19 +387,19 @@ export default {
     padding-bottom: 20px;
     overflow-y: auto;
   }
-  /deep/.el-card__body{
+  ::v-deep.el-card__body{
     padding: 10px;
   }
   // >>>.el-dialog__body{
   //   padding: 10px 20px 20px 20px;
   // }
 
-  /deep/.full-dialog-container{
+  ::v-deep.full-dialog-container{
    .el-dialog__body{
       height: calc(100% - 80px);
     }
   }
-  /deep/.dialog-container{
+  ::v-deep.dialog-container{
     // margin-top: 50px !important;
     width:75%;
     height:80%;

src/views/resumeInfo/index.vue

@@ -206,7 +206,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-/deep/ .el-collapse-item__header{
+::v-deep .el-collapse-item__header{
   background-color: #e9eef1;
   padding: 0 10px;
 }

src/views/reviewers/ReviewersResearchForm.vue

@@ -124,7 +124,7 @@ export default {
 .el-tabs{
   height: 100%;
   .el-tabs__content{
-    height: calc(100%-50px);
+    height: calc(100% - 50px);
     overflow-y: auto;
   }
 }

src/views/reviewers/components/Agreements.vue

@@ -437,7 +437,7 @@ export default {
     },
     handlePreview3(row) {
       return this.$preview({
-        path: row.FilePath,
+        path: row.Path || row.FilePath,
         type: 'pdf',
         title: row.FileName,
       })
@@ -447,7 +447,7 @@ export default {
     },
     handlePreview2(row, r2) {
       return this.$preview({
-        path: row.fullPath,
+        path: row.Path || row.fullPath,
         type: 'pdf',
         title: row.FileName,
       })
@@ -537,7 +537,7 @@ export default {
     handlePreview(row) {
       console.log(row)
       return this.$preview({
-        path: row.FullPath,
+        path: row.Path || row.FullPath,
         type: 'pdf',
         title: row.FileName,
       })