Merge branch 'uat'

# Conflicts:
#	src/api/trials.js
#	src/permission.js
#	src/utils/uploadZip.js
#	src/views/login/index.vue

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "EICS",
-  "version": "1.0.0",
+  "version": "1.3.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -2820,36 +2820,6 @@
             }
           }
         },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          },
-          "dependencies": {
-            "has-flag": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
-              "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-              "dev": true,
-              "optional": true
-            },
-            "supports-color": {
-              "version": "7.2.0",
-              "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
-              "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "has-flag": "^4.0.0"
-              }
-            }
-          }
-        },
         "chokidar": {
           "version": "2.1.8",
           "resolved": "https://registry.npmmirror.com/chokidar/-/chokidar-2.1.8.tgz",
@@ -3229,13 +3199,6 @@
             }
           }
         },
-        "json5": {
-          "version": "2.2.3",
-          "resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.3.tgz",
-          "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-          "dev": true,
-          "optional": true
-        },
         "locate-path": {
           "version": "3.0.0",
           "resolved": "https://registry.npmmirror.com/locate-path/-/locate-path-3.0.0.tgz",
@@ -3479,32 +3442,6 @@
           "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
           "dev": true
         },
-        "vue-loader-v16": {
-          "version": "npm:vue-loader@16.8.3",
-          "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
-          "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "chalk": "^4.1.0",
-            "hash-sum": "^2.0.0",
-            "loader-utils": "^2.0.0"
-          },
-          "dependencies": {
-            "loader-utils": {
-              "version": "2.0.4",
-              "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz",
-              "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "big.js": "^5.2.2",
-                "emojis-list": "^3.0.0",
-                "json5": "^2.1.2"
-              }
-            }
-          }
-        },
         "webpack-dev-middleware": {
           "version": "3.7.3",
           "resolved": "https://registry.npmmirror.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz",
@@ -4332,6 +4269,26 @@
         "zip-stream": "^4.1.0"
       },
       "dependencies": {
+        "compress-commons": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmmirror.com/compress-commons/-/compress-commons-4.1.2.tgz",
+          "integrity": "sha512-D3uMHtGc/fcO1Gt1/L7i1e33VOvD4A9hfQLP+6ewd+BvG/gQ84Yh4oftEhAdjSMgBgwGL+jsppT7JYNpo6MHHg==",
+          "requires": {
+            "buffer-crc32": "^0.2.13",
+            "crc32-stream": "^4.0.2",
+            "normalize-path": "^3.0.0",
+            "readable-stream": "^3.6.0"
+          }
+        },
+        "crc32-stream": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmmirror.com/crc32-stream/-/crc32-stream-4.0.3.tgz",
+          "integrity": "sha512-NT7w2JVU7DFroFdYkeq8cywxrgjPHWkdX1wjpRQXPX5Asews3tA+Ght6lddQO5Mkumffp3X7GEqku3epj2toIw==",
+          "requires": {
+            "crc-32": "^1.2.0",
+            "readable-stream": "^3.4.0"
+          }
+        },
         "readable-stream": {
           "version": "3.6.2",
           "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.2.tgz",
@@ -4341,6 +4298,35 @@
             "string_decoder": "^1.1.1",
             "util-deprecate": "^1.0.1"
           }
+        },
+        "zip-stream": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmmirror.com/zip-stream/-/zip-stream-4.1.1.tgz",
+          "integrity": "sha512-9qv4rlDiopXg4E69k+vMHjNN63YFMe9sZMrdlvKnCjlCRWeCBswPPMPUfx+ipsAWq1LXHe70RcbaHdJJpS6hyQ==",
+          "requires": {
+            "archiver-utils": "^3.0.4",
+            "compress-commons": "^4.1.2",
+            "readable-stream": "^3.6.0"
+          },
+          "dependencies": {
+            "archiver-utils": {
+              "version": "3.0.4",
+              "resolved": "https://registry.npmmirror.com/archiver-utils/-/archiver-utils-3.0.4.tgz",
+              "integrity": "sha512-KVgf4XQVrTjhyWmx6cte4RxonPLR9onExufI1jhvw/MQ4BB6IsZD5gT8Lq+u/+pRkWna/6JoHpiQioaqFP5Rzw==",
+              "requires": {
+                "glob": "^7.2.3",
+                "graceful-fs": "^4.2.0",
+                "lazystream": "^1.0.0",
+                "lodash.defaults": "^4.2.0",
+                "lodash.difference": "^4.5.0",
+                "lodash.flatten": "^4.4.0",
+                "lodash.isplainobject": "^4.0.6",
+                "lodash.union": "^4.6.0",
+                "normalize-path": "^3.0.0",
+                "readable-stream": "^3.6.0"
+              }
+            }
+          }
         }
       }
     },
@@ -6252,29 +6238,6 @@
       "integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==",
       "dev": true
     },
-    "compress-commons": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmmirror.com/compress-commons/-/compress-commons-4.1.2.tgz",
-      "integrity": "sha512-D3uMHtGc/fcO1Gt1/L7i1e33VOvD4A9hfQLP+6ewd+BvG/gQ84Yh4oftEhAdjSMgBgwGL+jsppT7JYNpo6MHHg==",
-      "requires": {
-        "buffer-crc32": "^0.2.13",
-        "crc32-stream": "^4.0.2",
-        "normalize-path": "^3.0.0",
-        "readable-stream": "^3.6.0"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.6.2",
-          "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.2.tgz",
-          "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        }
-      }
-    },
     "compressible": {
       "version": "2.0.18",
       "resolved": "https://registry.npmmirror.com/compressible/-/compressible-2.0.18.tgz",
@@ -6592,27 +6555,6 @@
       "resolved": "https://registry.npmmirror.com/crc-32/-/crc-32-1.2.2.tgz",
       "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ=="
     },
-    "crc32-stream": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmmirror.com/crc32-stream/-/crc32-stream-4.0.3.tgz",
-      "integrity": "sha512-NT7w2JVU7DFroFdYkeq8cywxrgjPHWkdX1wjpRQXPX5Asews3tA+Ght6lddQO5Mkumffp3X7GEqku3epj2toIw==",
-      "requires": {
-        "crc-32": "^1.2.0",
-        "readable-stream": "^3.4.0"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.6.2",
-          "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.2.tgz",
-          "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        }
-      }
-    },
     "create-ecdh": {
       "version": "4.0.4",
       "resolved": "https://registry.npmmirror.com/create-ecdh/-/create-ecdh-4.0.4.tgz",
@@ -14223,6 +14165,11 @@
       "integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==",
       "dev": true
     },
+    "qrcodejs2": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmmirror.com/qrcodejs2/-/qrcodejs2-0.0.2.tgz",
+      "integrity": "sha512-+Y4HA+cb6qUzdgvI3KML8GYpMFwB24dFwzMkS/yXq6hwtUGNUnZQdUnksrV1XGMc2mid5ROw5SAuY9XhI3ValA=="
+    },
     "qs": {
       "version": "6.11.2",
       "resolved": "https://registry.npmmirror.com/qs/-/qs-6.11.2.tgz",
@@ -15841,6 +15788,11 @@
       "resolved": "https://registry.npmmirror.com/stream-wormhole/-/stream-wormhole-1.1.0.tgz",
       "integrity": "sha512-gHFfL3px0Kctd6Po0M8TzEvt3De/xu6cnRrjlfYNhwbhLPLwigI2t1nc6jrzNuaYg5C4YF78PPFuQPzRiqn9ew=="
     },
+    "streamsaver": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmmirror.com/streamsaver/-/streamsaver-2.0.6.tgz",
+      "integrity": "sha512-LK4e7TfCV8HzuM0PKXuVUfKyCB1FtT9L0EGxsFk5Up8njj0bXK8pJM9+Wq2Nya7/jslmCQwRK39LFm55h7NBTw=="
+    },
     "strict-uri-encode": {
       "version": "1.1.0",
       "resolved": "https://registry.npmmirror.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
@@ -17508,6 +17460,94 @@
         }
       }
     },
+    "vue-loader-v16": {
+      "version": "npm:vue-loader@16.8.3",
+      "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
+      "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "chalk": "^4.1.0",
+        "hash-sum": "^2.0.0",
+        "loader-utils": "^2.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true,
+          "optional": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true,
+          "optional": true
+        },
+        "json5": {
+          "version": "2.2.3",
+          "resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.3.tgz",
+          "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+          "dev": true,
+          "optional": true
+        },
+        "loader-utils": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz",
+          "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
     "vue-pdf": {
       "version": "4.3.0",
       "resolved": "https://registry.npmmirror.com/vue-pdf/-/vue-pdf-4.3.0.tgz",
@@ -18898,45 +18938,6 @@
         }
       }
     },
-    "zip-stream": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmmirror.com/zip-stream/-/zip-stream-4.1.1.tgz",
-      "integrity": "sha512-9qv4rlDiopXg4E69k+vMHjNN63YFMe9sZMrdlvKnCjlCRWeCBswPPMPUfx+ipsAWq1LXHe70RcbaHdJJpS6hyQ==",
-      "requires": {
-        "archiver-utils": "^3.0.4",
-        "compress-commons": "^4.1.2",
-        "readable-stream": "^3.6.0"
-      },
-      "dependencies": {
-        "archiver-utils": {
-          "version": "3.0.4",
-          "resolved": "https://registry.npmmirror.com/archiver-utils/-/archiver-utils-3.0.4.tgz",
-          "integrity": "sha512-KVgf4XQVrTjhyWmx6cte4RxonPLR9onExufI1jhvw/MQ4BB6IsZD5gT8Lq+u/+pRkWna/6JoHpiQioaqFP5Rzw==",
-          "requires": {
-            "glob": "^7.2.3",
-            "graceful-fs": "^4.2.0",
-            "lazystream": "^1.0.0",
-            "lodash.defaults": "^4.2.0",
-            "lodash.difference": "^4.5.0",
-            "lodash.flatten": "^4.4.0",
-            "lodash.isplainobject": "^4.0.6",
-            "lodash.union": "^4.6.0",
-            "normalize-path": "^3.0.0",
-            "readable-stream": "^3.6.0"
-          }
-        },
-        "readable-stream": {
-          "version": "3.6.2",
-          "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.2.tgz",
-          "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        }
-      }
-    },
     "zrender": {
       "version": "4.3.2",
       "resolved": "https://registry.npmmirror.com/zrender/-/zrender-4.3.2.tgz",

package.json

@@ -51,9 +51,11 @@
     "path-to-regexp": "2.4.0",
     "pdfobject": "^2.2.8",
     "popper.js": "^1.16.1",
+    "qrcodejs2": "0.0.2",
     "sass-loader": "^8.0.0",
     "screenfull": "^4.2.0",
     "sortablejs": "^1.15.0",
+    "streamsaver": "^2.0.6",
     "v-viewer": "^1.6.4",
     "vcrontab": "^0.3.5",
     "vue": "^2.6.11",

src/App.vue

@@ -275,4 +275,7 @@ textarea {
 .title-logo {
   height: 40px;
 }
+.title-logo {
+  height: 40px;
+}
 </style>

src/api/admin.js

@@ -277,3 +277,19 @@ export function batchAddInternationalization(param) {
     data: param
   })
 }
+
+// 国际化获取迭代列表
+export function getPublishVersionSelect() {
+  return request({
+    url: `/PublishLog/getPublishVersionSelect`,
+    method: 'get',
+  })
+}
+// 国际化批量更新
+export function batchUpdateInternationalInfo(data) {
+  return request({
+    url: `/Internationalization/batchUpdateInternationalInfo`,
+    method: 'put',
+    data
+  })
+}

src/api/dictionary.js

@@ -1013,4 +1013,36 @@ export function getTrialSiteList(params) {
     method: 'post',
     data: params
   })
+}
+
+// 获取版本记录列表
+export function getExploreRecommendList(params) {
+  return request({
+    url: `/ExploreRecommend/getExploreRecommendList`,
+    method: 'post',
+    data: params
+  })
+}
+// 新增或修改推荐版本记录
+export function addOrUpdateExploreRecommend(params) {
+  return request({
+    url: `/ExploreRecommend/addOrUpdateExploreRecommend`,
+    method: 'post',
+    data: params
+  })
+}
+// 删除推荐版本记录
+export function deleteExploreRecommend(id) {
+  return request({
+    url: `/ExploreRecommend/deleteExploreRecommend/${id}`,
+    method: 'delete'
+  })
+}
+// 获取推荐版本记录详情
+export function getExploreRecommentInfo(params) {
+  return request({
+    url: `/ExploreRecommend/getExploreRecommentInfo`,
+    method: 'get',
+    params
+  })
 }

src/api/dictionary/dictionary.js

@@ -51,4 +51,10 @@ export function batchAddOrUpdateFrontInternationalization(params) {
     data: params
   })
 }
-
+// 获取当前版本
+export function getCurrentPublishInfo() {
+  return request({
+    url: `/PublishLog/getCurrentPublishInfo`,
+    method: 'get'
+  })
+}

src/api/trials.js

@@ -3675,6 +3675,54 @@ export function getTrialSiteSelectList(params) {
     params
   })
 }
+
+export function getNextIRMedicalFeedback(param) {
+  return request({
+    url: `/ReadingMedicalReview/getNextIRMedicalFeedback`,
+    method: 'post',
+    data: param
+  })
+}
+
+export function getNextCRCChallenge(param) {
+  return request({
+    url: `/QCList/getNextCRCChallenge`,
+    method: 'post',
+    data: param
+  })
+}
+
+// 获取中心dicomae列表
+export function getTrialSiteDicomAEList(param) {
+  return request({
+    url: `/TrialSiteDicomAE/getTrialSiteDicomAEList`,
+    method: 'post',
+    data: param
+  })
+}
+// 新增或修改中心dicomae信息
+export function addOrUpdateTrialSiteDicomAE(param) {
+  return request({
+    url: `/TrialSiteDicomAE/addOrUpdateTrialSiteDicomAE`,
+    method: 'post',
+    data: param
+  })
+}
+// 删除中心dicomae信息
+export function deleteTrialSiteDicomAE(id) {
+  return request({
+    url: `/TrialSiteDicomAE/deleteTrialSiteDicomAE/${id}`,
+    method: 'delete',
+  })
+}
+// 获取项目中dicomAE配置
+export function getTrialDicomAE(params) {
+  return request({
+    url: `/TrialDicomAE/getTrialDicomAE`,
+    method: 'get',
+    params
+  })
+}
 // 获取项目配置
 export function getTrialExtralConfig(params) {
   return request({
@@ -3683,3 +3731,66 @@ export function getTrialExtralConfig(params) {
     params
   })
 }
+// 项目新增或修改dicomAE配置
+export function addOrUpdateDicomAE(data) {
+  return request({
+    url: `/TrialDicomAE/addOrUpdateDicomAE`,
+    method: 'post',
+    data
+  })
+}
+// 测试dicomAE链接
+export function testSCPServerConnect(id) {
+  return request({
+    url: `/TrialDicomAE/testSCPServerConnect/${id}`,
+    method: 'get',
+  })
+}
+// dicomAE配置签名
+export function ConfigTrialPACSInfoConfirm(data) {
+  return request({
+    url: `/Inspection/configTrialBasicInfo/ConfigTrialPACSInfoConfirm`,
+    method: 'post',
+    data
+  })
+}
+// 获取推送记录
+export function getSCPImageUploadList(data) {
+  return request({
+    url: `/Patient/getSCPImageUploadList`,
+    method: 'post',
+    data
+  })
+}
+// 获取影像检查患者列表
+export function getPatientList(data) {
+  return request({
+    url: `/Patient/getPatientList`,
+    method: 'post',
+    data
+  })
+}
+// 获取影像检查患者检查列表
+export function getPatientStudyList(data) {
+  return request({
+    url: `/Patient/getPatientStudyList`,
+    method: 'post',
+    data
+  })
+}
+// 获取接收方AE列表
+export function getDicomCalledAEList(params) {
+  return request({
+    url: `/Patient/getDicomCalledAEList`,
+    method: 'get',
+    params
+  })
+}
+// 获取发送方AE列表
+export function getDicomCallingAEList(params) {
+  return request({
+    url: `/Patient/getDicomCallingAEList`,
+    method: 'get',
+    params
+  })
+}

src/components/TrialsTab/index.vue

@@ -4,14 +4,15 @@
     <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-tab-pane
-            v-for="item1 of item.children"
-            v-if="TrialConfig && isShow(item1.path)"
-            :key="`tab1${item1.path}`"
-            :disabled="TotalNeedSignTrialDocCount !== 0 && item1.path !== '/trials/trials-panel/attachments/self-attachment' || (TrialStatusStr === 'Initializing' && (item1.path === '/trials/trials-panel/setting/personnel-manage' || item1.path === '/trials/trials-panel/setting/qc-question' || item1.path === '/trials/trials-panel/setting/reading-unit' || item1.path === '/trials/trials-panel/setting/medical-audit' || item1.path === '/trials/trials-panel/setting/email-manage'))"
-            :label="$t(item1.LanguageMark)"
-            :name="item1.path"
-          />
+          <template v-for="item1 of item.children">
+            <el-tab-pane
+              v-if="TrialConfig && isShow(item1.path)"
+              :key="`tab1${item1.path}`"
+              :disabled="TotalNeedSignTrialDocCount !== 0 && item1.path !== '/trials/trials-panel/attachments/self-attachment' || (TrialStatusStr === 'Initializing' && (item1.path === '/trials/trials-panel/setting/personnel-manage' || item1.path === '/trials/trials-panel/setting/qc-question' || item1.path === '/trials/trials-panel/setting/reading-unit' || item1.path === '/trials/trials-panel/setting/medical-audit' || item1.path === '/trials/trials-panel/setting/email-manage'))"
+              :label="$t(item1.LanguageMark)"
+              :name="item1.path"
+            />
+          </template>
         </el-tabs>
       </el-tab-pane>
     </el-tabs>
@@ -126,6 +127,10 @@ export default {
       var additionalAssessmentList = [
         '/trials/trials-panel/subject/brain-metastasis'
       ]
+      let dicomList = [
+        '/trials/trials-panel/trial-summary/image-inspect',
+        '/trials/trials-panel/trial-summary/push-record',
+      ]
       if (this.TrialConfig.QCProcessEnum === 0 && ~qualityList.indexOf(path)) {
         isShow = false
       }
@@ -135,6 +140,9 @@ export default {
       if (!this.IsAdditionalAssessment && ~additionalAssessmentList.indexOf(path)) {
         isShow = false
       }
+      if ((!this.TrialConfig.IsPACSConnect || !this.TrialConfig.IsTrialPACSConfirmed) && ~dicomList.indexOf(path)) {
+        isShow = false
+      }
       return isShow
     },
     goBack() {

src/components/uploadImage/components/upload-list.vue

@@ -224,6 +224,7 @@ import {
   addOrUpdateArchiveTaskStudy,
 } from "@/api/load.js";
 import { parseDicom, getThumbnail, dicomToOSS } from "@/utils/parseDicom.js";
+import store from "@/store";
 export default {
   name: "uploadList",
   props: {
@@ -262,6 +263,7 @@ export default {
   },
   watch: {
     isLoad() {
+      store.dispatch("trials/setUnLock", this.isLoad);
       if (!this.isLoad) {
         this.$refs.file.value = null;
         if (this.dicomList.some((item) => item.isUpload === 3)) {
@@ -747,6 +749,7 @@ export default {
   },
   beforeDestroy() {
     this.isClose = true;
+    store.dispatch("trials/setUnLock", false);
   },
 };
 </script>

src/components/uploadImage/index.vue

@@ -66,13 +66,13 @@
       >
         <template slot-scope="scope">
           <!--下载--->
-          <el-button
+          <!-- <el-button
             v-if="!isUpload && Criterion.ImageDownloadEnum > 0"
             circle
             icon="el-icon-download"
             :title="$t('trials:uploadImage:button:download')"
             @click.stop="downloadImage(scope.row)"
-          />
+          /> -->
           <!--删除--->
           <el-button
             v-if="isUpload"
@@ -103,6 +103,7 @@ import uploadList from "./components/upload-list.vue";
 import studyView from "./components/study-view.vue";
 import { getSubjectImageUploadList, deleteTaskStudy } from "@/api/load.js";
 import { downloadImage } from "@/utils/uploadZip.js";
+import store from "@/store";
 export default {
   name: "uploadImage",
   props: {
@@ -247,16 +248,356 @@ export default {
     },
     // 打包下载
     async downloadImage(item) {
-      try {
-        await downloadImage(
-          this.$route.query.trialId,
-          item.SourceSubjectVisitId
-        );
-      } catch (err) {
-        console.log(err);
+      let zipName = "压缩包.zip";
+      let InstanceInfoList = [
+        {
+          Id: "e634352c-6465-32ba-04b3-824ec8d346a8",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/e634352c-6465-32ba-04b3-824ec8d346a8",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 1,
+        },
+        {
+          Id: "d4ad1dd2-747b-6de7-8ad4-3e81c58943dd",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/d4ad1dd2-747b-6de7-8ad4-3e81c58943dd",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 2,
+        },
+        {
+          Id: "6a1d1d12-2b4a-0368-c7e1-d44f7180b280",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/6a1d1d12-2b4a-0368-c7e1-d44f7180b280",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 3,
+        },
+        {
+          Id: "7a8fb1b4-9ea8-1189-4ca6-b9a9b9547a39",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/7a8fb1b4-9ea8-1189-4ca6-b9a9b9547a39",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 4,
+        },
+        {
+          Id: "8d00be19-5ac5-c608-dbd0-41f84cfacd95",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/8d00be19-5ac5-c608-dbd0-41f84cfacd95",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 5,
+        },
+        {
+          Id: "729ded91-0eca-78f2-1c17-5182d4f27e3a",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/729ded91-0eca-78f2-1c17-5182d4f27e3a",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 6,
+        },
+        {
+          Id: "9e2fd28c-72fe-bb66-e0ce-40115cd82260",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/9e2fd28c-72fe-bb66-e0ce-40115cd82260",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 7,
+        },
+        {
+          Id: "9b31613f-3c9e-28ad-fd9e-7001a69e09b5",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/9b31613f-3c9e-28ad-fd9e-7001a69e09b5",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 8,
+        },
+        {
+          Id: "4982b453-d068-7e56-2acd-a361d8584f35",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/4982b453-d068-7e56-2acd-a361d8584f35",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 9,
+        },
+        {
+          Id: "8279cf5a-2551-43ea-3fe4-673e88ba7e5a",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/8279cf5a-2551-43ea-3fe4-673e88ba7e5a",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 10,
+        },
+        {
+          Id: "6424e9c5-d31b-9388-3b64-a56705ab6fc8",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/6424e9c5-d31b-9388-3b64-a56705ab6fc8",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 11,
+        },
+        {
+          Id: "a73cf3f9-defa-0c22-dfdc-8c5bfb93c9a7",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/a73cf3f9-defa-0c22-dfdc-8c5bfb93c9a7",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 12,
+        },
+        {
+          Id: "dbfaafea-f721-0a93-37c6-69bcc0d957c3",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/dbfaafea-f721-0a93-37c6-69bcc0d957c3",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 13,
+        },
+        {
+          Id: "52000ac1-6a5b-83e2-5468-4dfdf394e455",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/52000ac1-6a5b-83e2-5468-4dfdf394e455",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 14,
+        },
+        {
+          Id: "de34a347-41f4-1018-a710-48d81fa9aadc",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/de34a347-41f4-1018-a710-48d81fa9aadc",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 15,
+        },
+        {
+          Id: "251d6a13-26b7-935b-d765-0c5db1ed7dfc",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/251d6a13-26b7-935b-d765-0c5db1ed7dfc",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 16,
+        },
+        {
+          Id: "b22e93c8-3f6a-484a-a32b-f7626689f8da",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/b22e93c8-3f6a-484a-a32b-f7626689f8da",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 17,
+        },
+        {
+          Id: "6517400b-d4b5-db65-d026-8c06c40bf244",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/6517400b-d4b5-db65-d026-8c06c40bf244",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 18,
+        },
+        {
+          Id: "8e70df99-525a-4ecd-5cf1-6c32698eaa3f",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/8e70df99-525a-4ecd-5cf1-6c32698eaa3f",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 19,
+        },
+        {
+          Id: "7df907f2-b6a6-fd03-67ab-be86c497d412",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/7df907f2-b6a6-fd03-67ab-be86c497d412",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 20,
+        },
+        {
+          Id: "ba31ba5b-728e-8301-273d-459fd3c65a43",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/ba31ba5b-728e-8301-273d-459fd3c65a43",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 21,
+        },
+        {
+          Id: "7528c70c-5ba1-59c1-413c-7bfc984c0066",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/7528c70c-5ba1-59c1-413c-7bfc984c0066",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 22,
+        },
+        {
+          Id: "15dd574d-fc82-c5b7-fefb-497346d4abbb",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/15dd574d-fc82-c5b7-fefb-497346d4abbb",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 23,
+        },
+        {
+          Id: "6cd76aca-91fa-64ce-6077-af48c5e5b18b",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/6cd76aca-91fa-64ce-6077-af48c5e5b18b",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 24,
+        },
+        {
+          Id: "2f0f9f4e-12b8-a6a8-d3f9-f43e2055653d",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/2f0f9f4e-12b8-a6a8-d3f9-f43e2055653d",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 25,
+        },
+        {
+          Id: "3c49f379-8548-67cd-1333-dde28219c6e9",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/3c49f379-8548-67cd-1333-dde28219c6e9",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 26,
+        },
+        {
+          Id: "910f43c8-123a-0753-aaf7-11081eef4268",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/910f43c8-123a-0753-aaf7-11081eef4268",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 27,
+        },
+        {
+          Id: "ffad6b36-74aa-1c7d-01eb-18524da91f6e",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/ffad6b36-74aa-1c7d-01eb-18524da91f6e",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 28,
+        },
+        {
+          Id: "9e2bf22d-8734-62ae-881a-7404064a95ce",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/9e2bf22d-8734-62ae-881a-7404064a95ce",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 29,
+        },
+        {
+          Id: "eef8b291-ffdf-dbfb-244d-5e63dc5b8cc7",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/eef8b291-ffdf-dbfb-244d-5e63dc5b8cc7",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 30,
+        },
+        {
+          Id: "12b0de3a-243c-78b9-b006-82f2cc633a0f",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/12b0de3a-243c-78b9-b006-82f2cc633a0f",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 31,
+        },
+        {
+          Id: "4341ea87-7d54-2608-184e-01e5c976ce9f",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/4341ea87-7d54-2608-184e-01e5c976ce9f",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 32,
+        },
+        {
+          Id: "4db2bac2-18eb-0589-d520-f297b2840e1d",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/4db2bac2-18eb-0589-d520-f297b2840e1d",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 33,
+        },
+        {
+          Id: "9442c2a3-0972-67f7-afc3-6f1a47abefab",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/9442c2a3-0972-67f7-afc3-6f1a47abefab",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 34,
+        },
+        {
+          Id: "a7fb75b0-0b09-5340-70cf-a11afd84b1ec",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/a7fb75b0-0b09-5340-70cf-a11afd84b1ec",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 35,
+        },
+        {
+          Id: "753d7795-451a-bd32-69ea-fd58c1e89d63",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/753d7795-451a-bd32-69ea-fd58c1e89d63",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 36,
+        },
+        {
+          Id: "33bf7274-de0a-e8f9-f97a-c58fb2ea3aaf",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/33bf7274-de0a-e8f9-f97a-c58fb2ea3aaf",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 37,
+        },
+        {
+          Id: "adadae31-37a1-818d-3721-09a1d371c6a5",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/adadae31-37a1-818d-3721-09a1d371c6a5",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 38,
+        },
+        {
+          Id: "f64e8b0d-d2ab-b112-5705-92c23cfc5df6",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/f64e8b0d-d2ab-b112-5705-92c23cfc5df6",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 39,
+        },
+        {
+          Id: "781088b0-5afd-6eb3-5f87-9bfec210d490",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/781088b0-5afd-6eb3-5f87-9bfec210d490",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 40,
+        },
+        {
+          Id: "56df4cef-8053-bff3-21f7-1b1841a3d6e6",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/56df4cef-8053-bff3-21f7-1b1841a3d6e6",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 41,
+        },
+        {
+          Id: "a3e3dab9-7a61-f822-d113-42f46bc5e8ce",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/a3e3dab9-7a61-f822-d113-42f46bc5e8ce",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 42,
+        },
+        {
+          Id: "1cc195b9-e498-179d-b927-6d706266decb",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/1cc195b9-e498-179d-b927-6d706266decb",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 43,
+        },
+        {
+          Id: "7dca834f-d959-898e-a0cb-5c8244c4c4a9",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/7dca834f-d959-898e-a0cb-5c8244c4c4a9",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 44,
+        },
+        {
+          Id: "13eeba83-2e93-800e-e934-a56061633c64",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/13eeba83-2e93-800e-e934-a56061633c64",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 45,
+        },
+        {
+          Id: "971f0a62-92a3-6d04-53c5-51fa9155e28c",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/971f0a62-92a3-6d04-53c5-51fa9155e28c",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 46,
+        },
+        {
+          Id: "2959d06c-5ac7-f3b9-63d4-1a56e3974fc7",
+          Path: "/01000000-c0a8-0242-ff9a-08dc8a84633c/Image/01000000-c0a8-0242-2179-08dc8a9e55b4/01000000-c0a8-0242-7f99-08dc8abdc649/01000000-c0a8-0242-89ca-08dc8abdc65d/1.2.840.113619.2.334.3.2831181473.554.1419910103.185/2959d06c-5ac7-f3b9-63d4-1a56e3974fc7",
+          HtmlPath: "",
+          NumberOfFrames: 0,
+          InstanceNumber: 47,
+        },
+      ];
+      let path = "https://zy-irc-test-store.oss-cn-shanghai.aliyuncs.com";
+      let files = new Array();
+      for (let i = 0; i < InstanceInfoList.length; i++) {
+        let item = InstanceInfoList[i];
+        let obj = {
+          name: "file" + i,
+          url: path + item.Path,
+        };
+        files.push(obj);
       }
+      store.dispatch("trials/setUnLock", true);
+      let res = await downloadImage(zipName, files);
+      store.dispatch("trials/setUnLock", false);
     },
   },
+  beforeDestroy() {
+    store.dispatch("trials/setUnLock", false);
+  },
 };
 </script>
 <style lang="scss" scoped>

src/const/sign-code.vue

@@ -1,6 +1,5 @@
 <script>
-export default
-{
+export default {
   processSignature: {
     LogicalConfigConfirmation: 101, // 逻辑配置确认：逻辑配置确认操作
     ProcessConfigConfirmation: 102, // 流程配置确认：流程配置确认操作
@@ -25,9 +24,11 @@ export default
     ImageAssessmentReportConfirmation: 214, // 影像评估报告确认
     MedicalAuditConfirmation: 109, // 医学审核问题确认
     ReadingUnitConfirmation: 108, // 医学审核问题确认
-    MedicalAudit: 215,// 医学审核
-    HeavyReadingApproval: 216,// 重阅审批
+    MedicalAudit: 215, // 医学审核
+    HeavyReadingApproval: 216, // 重阅审批
     ResetAndAsyncCriterion: 218, //同步签名
-  }
-}
+    DicomConfigConfirmation: 219, // DICOM AE配置确认
+    DicomConfigUpdates: 220, // DICOM AE配置更新
+  },
+};
 </script>

src/main.js

@@ -3,7 +3,7 @@ import Vue from 'vue'
 import 'normalize.css/normalize.css' // A modern alternative to CSS resets
 
 import ElementUI, { MessageBox } from 'element-ui'
-import { getBasicDataAllSelect, getFrontInternationalizationList } from '@/api/dictionary/dictionary'
+import { getBasicDataAllSelect, getFrontInternationalizationList, getCurrentPublishInfo } from '@/api/dictionary/dictionary'
 import { sendMFAEmail } from "@/api/user.js";
 import { resetReadingRestTime } from '@/api/trials/reading'
 // import 'element-ui/lib/theme-chalk/index.css'
@@ -44,6 +44,7 @@ Viewer.setDefaults({
     'rotatable': true,
     'scalable': true,
     'transition': true,
+    'fullscreen': true,
     'keyboard': true,
     'url': 'data-source'
   }
@@ -185,6 +186,9 @@ async function VueInit() {
     zhMessages[v.Code] = v.ValueCN
     enMessages[v.Code] = v.Value
   })
+  // 获取版本信息
+  let PublishInfo = await getCurrentPublishInfo();
+  Vue.prototype.$version = PublishInfo.Result;
   // 获取检查部位
   Vue.prototype.$getBodyPart = (id) => {
     return new Promise(async (resolve, reject) => {
@@ -357,6 +361,10 @@ async function VueInit() {
   }
   const h = _vm.$createElement
   /* eslint-disable */
+  // eval(process.env.VUE_APP_LOGOUT_FOR_PERMISSION)
+  // process.env.VUE_APP_LOGOUT_FOR_TIME
+  // eval(process.env.VUE_APP_LOCK_FOR_PERMISSION)
+  // process.env.VUE_APP_LOCK_FOR_TIME
   window.VUE_APP_COMPANY_NAME = process.env.VUE_APP_COMPANY_NAME;
   waitOperate(eval(process.env.VUE_APP_LOGOUT_FOR_PERMISSION) ? () => {
     var lang = zzSessionStorage.getItem('lang') ? zzSessionStorage.getItem('lang') : 'zh'
@@ -373,7 +381,7 @@ async function VueInit() {
       zzSessionStorage.removeItem('isLock')
       router.push("/login")
     }).then(() => {
-      _vm.$alert(lang === 'zh' ? '由于您长时间未操作，为保护您的数据安全已强制将您下线，如果需要继续操作请重新登陆！' : 'No operation for a long time non-operation, you have been forced logout to protect data security. If continue to operate, please login again!', {
+      _vm.$alert(lang === 'zh' ? '由于您长时间未操作，为保护您的数据安全已强制将您下线，如果需要继续操作请重新登录！' : 'No operation for a long time non-operation, you have been forced logout to protect data security. If continue to operate, please login again!', {
         type: 'warning',
       })
     })
@@ -381,7 +389,7 @@ async function VueInit() {
   } : () => { }, process.env.VUE_APP_LOGOUT_FOR_TIME,
     eval(process.env.VUE_APP_LOCK_FOR_PERMISSION) ? () => {
       var lang = zzSessionStorage.getItem('lang') ? zzSessionStorage.getItem('lang') : 'zh'
-      if (_vm.$route.path === '/ReviewersResearchForm' || _vm.$route.path === '/ReviewersResearch' || _vm.$route.path === '/login' || _vm.$route.path === '/researchForm' || _vm.$route.path === '/researchLogin' || _vm.$route.path === '/email-recompose' || _vm.$route.path === '/recompose' || _vm.$route.path === '/resetpassword' || _vm.$route.path === '/error') {
+      if (_vm.$store.state.trials.unlock || _vm.$route.path === '/ReviewersResearchForm' || _vm.$route.path === '/ReviewersResearch' || _vm.$route.path === '/login' || _vm.$route.path === '/researchForm' || _vm.$route.path === '/researchLogin' || _vm.$route.path === '/email-recompose' || _vm.$route.path === '/recompose' || _vm.$route.path === '/resetpassword' || _vm.$route.path === '/error') {
         count = 0;
         localStorage.setItem('count', '0')
         if (_vm.$route.path === '/login') {

src/permission.js

@@ -10,7 +10,7 @@ import { OSSclient } from './utils/oss'
 
 NProgress.configure({ showSpinner: false })
 
-const whiteList = ['/ReviewersResearch', '/login', '/error', '/resetpassword', '/recompose', '/email-recompose', '/trialStats', '/showdicom', '/imagesShare', '/audit', '/preview', '/researchLogin', '/blindResumeInfo', '/trialsResume', '/joinVerify', '/showNoneDicoms', '/noneDicomReading', '/clinicalData', '/readingDicoms', '/readingPage', '/visitDicomReview', '/visitNondicomReview', '/globalReview', '/adReview', '/oncologyReview', '/nonedicoms']
+const whiteList = ['/ReviewersResearch', '/login', '/error', '/resetpassword', '/recompose', '/email-recompose', '/trialStats', '/showdicom', '/imagesShare', '/audit', '/preview', '/researchLogin', '/researchLogin_m', '/blindResumeInfo', '/trialsResume', '/joinVerify', '/showNoneDicoms', '/noneDicomReading', '/clinicalData', '/readingDicoms', '/readingPage', '/visitDicomReview', '/visitNondicomReview', '/globalReview', '/adReview', '/oncologyReview', '/nonedicoms']
 
 router.beforeEach(async (to, from, next) => {
   NProgress.start()
@@ -55,15 +55,28 @@ router.beforeEach(async (to, from, next) => {
   } else {
     /* has no token*/
     if (whiteList.indexOf(to.path) !== -1) {
-      // 在免登录whiteList中，直接进入
-      if (to.path === '/readingDicoms' || to.path === '/noneDicomReading') {
-        OSSclient()
+      if (to.path === '/researchLogin') {
+        console.log(to)
+        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}`)
+        } else {
+          next()
+        }
+      } else {
+        // 在免登录whiteList中，直接进入
+        if (to.path === '/readingDicoms' || to.path === '/noneDicomReading') {
+          OSSclient()
+        }
+        next()
       }
-      next()
     } else {
       if (to.path === '/researchForm') {
         next(`/researchLogin?`)
         NProgress.done()
+      } else if (to.path === '/researchDetail_m') {
+        next(`/researchLogin_m?`)
+        NProgress.done()
       } else if (to.path === '/ReviewersResearchForm') {
         next(`/ReviewersResearch?`)
         NProgress.done()

src/router/index.js

@@ -201,6 +201,18 @@ export const constantRoutes = [
     component: () => import('@/views/research/form'),
     hidden: true
   },
+  {
+    path: '/researchLogin_m',
+    name: 'researchLogin_m',
+    component: () => import('@/views/research-mobile/login'),
+    hidden: true
+  },
+  {
+    path: '/researchDetail_m',
+    name: 'researchDetail_m',
+    component: () => import('@/views/research-mobile/detail'),
+    hidden: true
+  },
   {
     path: '/trialsResume',
     component: () => import('@/views/trials/trials-panel/enrolled-reviewers/resume/index'),

src/utils/dcmUpload/anonymization.js

@@ -1,6 +1,5 @@
 import dicomParser from "dicom-parser";
 import dcmjs from './dcmjs'
-import { encoder } from "./encoder";
 
 export const anonymization = function (file, config) {
   return new Promise(async (resolve, reject) => {

src/utils/uploadZip.js

@@ -1,16 +1,14 @@
 import JSZip from "jszip";
-import axios from "axios";
 import { saveAs } from "file-saver";
 import Vue from 'vue';
 import {
     requestPackageAndAnonymizImage,
 } from "@/api/load.js";
+import streamSaver from "streamsaver";
+import "streamsaver/examples/zip-stream.js"
 let flag = {};
-export const resetFlag = () => {
-    flag = {}
-}
 export const downloadImage = async (id, id2, IsDicom = true) => {
-    if (flag[`${id2}_${IsDicom}`]) return Vue.prototype.$message.warning(Vue.prototype.$t('trials:upload:tip:uploading'));
+    if (flag[`${id2}_${IsDicom}`]) return
     flag[`${id2}_${IsDicom}`] = true
     try {
         let params = {
@@ -19,31 +17,27 @@ export const downloadImage = async (id, id2, IsDicom = true) => {
             IsDicom: IsDicom
         }
         let res = await requestPackageAndAnonymizImage(params);
+        flag[`${id2}_${IsDicom}`] = false;
         if (res.IsSuccess) {
             if (!res.Result) {
-                flag[`${id2}_${IsDicom}`] = false;
                 Vue.prototype.$message.warning(Vue.prototype.$t("trials:upload:message:not"))
                 return 1;
             }
-            Vue.prototype.$message.success(Vue.prototype.$t("trials:upload:message:startUpload"));
+            let a = document.createElement("a");
             let href = Vue.prototype.OSSclientConfig.basePath + res.Result;
-            download(href, res.OtherInfo.FileName, { id2, IsDicom })
+            // let fileName =
+            //     res.Result.split("/")[res.Result.split("/").length - 1];
+            a.download = res.OtherInfo.fileName;
+            a.href = href;
+            a.click();
+            URL.revokeObjectURL(href);
+            let timer = setTimeout(() => {
+                a = null;
+                href = null;
+                timer = null;
+            }, 500)
             return 2;
-            // let a = document.createElement("a");
-            // // let fileName =
-            // //     res.Result.split("/")[res.Result.split("/").length - 1];
-            // a.download = res.OtherInfo.FileName;
-            // a.href = href;
-            // a.click();
-            // URL.revokeObjectURL(href);
-            // let timer = setTimeout(() => {
-            //     a = null;
-            //     href = null;
-            //     timer = null;
-            // }, 500)
-            // return 2;
         } else {
-            flag[`${id2}_${IsDicom}`] = false;
             return false;
         }
     } catch (err) {
@@ -117,79 +111,35 @@ const setfolder = async (item) => {
 };
 const handleBatchDown = async (item, zip) => {
     return new Promise((resolve) => {
-        getFileData(
-            Vue.prototype.OSSclientConfig.basePath + item.instancePath
-        ).then((res) => {
-            const fileName = item.dicomName + ".dcm";
-            zip.file(fileName, res.data, { binary: true });
-            resolve();
-        });
-    });
-};
-const getFileData = (fileUrl) => {
-    return new Promise((resolve, reject) => {
-        axios(fileUrl, {
-            method: "GET",
-            responseType: "blob", // 返回的数据会被强制转为blob类型 ，转换成arraybuffer 也行
-        })
-            .then((res) => {
-                resolve(res);
-            })
-            .catch((error) => {
-                reject(error);
-            });
-    });
-};
-export const fileDownload = (content, filename) => {
-    const eleLink = document.createElement("a");
-    eleLink.download = filename;
-    eleLink.style.display = "none";
-    const blob = new Blob([content]);
-    eleLink.href = URL.createObjectURL(blob);
-    document.body.appendChild(eleLink);
-    eleLink.click();
-    document.body.removeChild(eleLink);
-};
-let download = async (downloadUrl, downloadFileName, res) => {
-    const blob = await getBlob(downloadUrl);
-    flag[`${res.id2}_${res.IsDicom}`] = false;
-    saveAsB(blob, downloadFileName);
-}
-
-let getBlob = (url) => {
-    return new Promise((resolve, reject) => {
-        const xhr = new XMLHttpRequest();
-
-        xhr.open('GET', url, true);
-        xhr.responseType = 'blob';
-        xhr.onload = () => {
-            if (xhr.status === 200) {
-                resolve(xhr.response);
-            } else {
-                reject(new Error(`Request failed with status ${xhr.status}`));
+        console.log("同步下载打包开始时间：" + new Date());
+        // 创建压缩文件输出流  
+        const zipFileOutputStream = streamSaver.createWriteStream(zipName);
+        // 创建下载文件流  
+        const fileIterator = files.values();
+        const readableZipStream = new window.ZIP({
+            async pull(ctrl) {
+                const fileInfo = fileIterator.next();
+                if (fileInfo.done) {//迭代终止  
+                    ctrl.close();
+                } else {
+                    const { name, url } = fileInfo.value;
+                    return fetch(url).then(res => {
+                        ctrl.enqueue({
+                            name,
+                            stream: () => res.body
+                        })
+                    })
+                }
             }
-        };
-        xhr.onerror = () => {
-            reject(new Error('Request failed'));
-        };
+        });
+        if (window.WritableStream && readableZipStream.pipeTo) {
+            // 开始下载  
+            readableZipStream
+                .pipeTo(zipFileOutputStream)
+                .then(() => { console.log("同步下载打包结束时间：" + new Date()); resolve(true) })
+        } else {
+            resolve(false);
+        }
+    })
 
-        xhr.send();
-    });
-}
-
-let saveAsB = (blob, filename) => {
-    const link = document.createElement('a');
-    const body = document.body;
-
-    link.href = window.URL.createObjectURL(blob);
-    link.download = filename;
-
-    // hide the link
-    link.style.display = 'none';
-    body.appendChild(link);
-
-    link.click();
-    body.removeChild(link);
-
-    window.URL.revokeObjectURL(link.href);
-}
+};

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

@@ -0,0 +1,214 @@
+<template>
+  <base-model :config="config">
+    <div slot="dialog-body">
+      <el-form
+        ref="browserForm"
+        :model="form"
+        label-width="140px"
+        size="small"
+        :rules="rules"
+      >
+        <div class="base-dialog-body">
+          <el-form-item
+            :label="$t('dictionary:browser:form:title')"
+            prop="Title"
+          >
+            <el-input v-model="form.Title" />
+          </el-form-item>
+          <el-form-item
+            :label="$t('dictionary:browser:form:exploreType')"
+            prop="ExploreType"
+          >
+            <el-input v-model="form.ExploreType" />
+          </el-form-item>
+          <el-form-item
+            :label="$t('dictionary:browser:form:version')"
+            prop="Version"
+          >
+            <el-input v-model="form.Version" type="textarea" rows="5" />
+          </el-form-item>
+          <el-form-item
+            :label="$t('dictionary:browser:form:downloadUrl')"
+            prop="DownloadUrl"
+          >
+            <el-input v-model="form.DownloadUrl" />
+          </el-form-item>
+          <el-form-item :label="$t('dictionary:browser:form:addFile')">
+            <el-upload
+              class="upload-demo"
+              action
+              :before-upload="beforeUpload"
+              :http-request="handleUploadFile"
+              :on-preview="handlePreview"
+              :on-remove="handleRemoveFile"
+              :show-file-list="true"
+              :limit="1"
+              :file-list="fileList"
+            >
+              <el-button
+                size="small"
+                type="primary"
+                :disabled="fileList.length > 0"
+                >{{ $t("common:button:upload") }}</el-button
+              >
+            </el-upload>
+          </el-form-item>
+          <el-form-item :label="$t('dictionary:browser:form:isDeleted')">
+            <el-switch
+              v-model="form.IsDeleted"
+              :active-value="false"
+              :inactive-value="true"
+            >
+            </el-switch>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div slot="dialog-footer">
+      <el-button size="small" @click="canel">
+        {{ $t("dictionary:browser:button:canel") }}
+      </el-button>
+      <el-button size="small" type="primary" :loading="loading" @click="save">
+        {{ $t("dictionary:browser:button:save") }}
+      </el-button>
+    </div>
+  </base-model>
+</template>
+<script>
+import baseModel from "@/components/BaseModel";
+import { addOrUpdateExploreRecommend } from "@/api/dictionary";
+export default {
+  props: {
+    config: {
+      required: true,
+      default: () => {
+        return {};
+      },
+    },
+    data: {
+      required: true,
+      default: () => {
+        return {};
+      },
+    },
+  },
+  components: {
+    "base-model": baseModel,
+  },
+  data() {
+    return {
+      form: {
+        Version: null,
+        Title: null,
+        IsDeleted: true,
+        ExploreType: null,
+        DownloadUrl: null,
+        Path: null,
+        FileName: null,
+      },
+      rules: {
+        Title: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: ["blur", "change"],
+          },
+        ],
+        ExploreType: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: ["blur", "change"],
+          },
+        ],
+        Version: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: ["blur", "change"],
+          },
+        ],
+        DownloadUrl: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: ["blur", "change"],
+          },
+        ],
+      },
+      fileList: [],
+      loading: false,
+    };
+  },
+  created() {
+    if (this.config.status === "edit") {
+      Object.keys(this.form).forEach((key) => {
+        this.form[key] = this.data[key];
+      });
+      if (this.form.FileName) {
+        this.fileList[0] = {
+          name: this.form.FileName,
+          path: this.form.Path,
+          fullPath: this.form.Path,
+        };
+      }
+    }
+  },
+  methods: {
+    async save() {
+      try {
+        let validate = await this.$refs.browserForm.validate();
+        if (!validate) return false;
+        this.loading = true;
+        if (this.config.status === "edit") {
+          this.form.Id = this.data.Id;
+        }
+        let res = await addOrUpdateExploreRecommend(this.form);
+        if (res.IsSuccess) {
+          this.$emit("close");
+          this.$emit("getList");
+        }
+      } catch (err) {
+        console.log(err);
+        this.loading = false;
+      }
+    },
+    canel() {
+      this.$emit("close");
+    },
+    handleRemoveFile() {
+      this.form.FileName = null;
+      this.form.Path = null;
+      this.fileList = [];
+    },
+    beforeUpload() {
+      if (this.fileList.length > 0) {
+        this.$alert(this.$t("dictionary:bbrowser:msg:message1"));
+        return;
+      }
+    },
+    handlePreview(row, r2) {
+      if (row.fullPath) {
+        window.open(row.fullPath, "_blank");
+      }
+    },
+    async handleUploadFile(param) {
+      this.loading = true;
+      var file = await this.fileToBlob(param.file);
+      const res = await this.OSSclient.put(
+        `/System/Browser/${param.file.name}`,
+        file
+      );
+      this.fileList.push({
+        name: param.file.name,
+        path: this.$getObjectName(res.url),
+        fullPath: this.$getObjectName(res.url),
+        url: this.$getObjectName(res.url),
+      });
+      this.form.Path = this.$getObjectName(res.url);
+      this.form.FileName = param.file.name;
+      this.loading = false;
+    },
+  },
+};
+</script>

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

@@ -0,0 +1,252 @@
+<template>
+  <box-content>
+    <!-- 搜索框 -->
+    <div class="search">
+      <el-form :inline="true" size="mini" class="base-search-form">
+        <el-form-item :label="$t('dictionary:browser:search:title')">
+          <el-input v-model="searchData.Title" style="width: 100px" />
+        </el-form-item>
+        <el-form-item :label="$t('dictionary:browser:search:version')">
+          <el-input v-model="searchData.Version" style="width: 100px" />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="handleReset">{{
+            $t("dictionary:browser:button:reset")
+          }}</el-button>
+          <el-button type="primary" @click="handleSearch">{{
+            $t("dictionary:browser:button:search")
+          }}</el-button>
+        </el-form-item>
+      </el-form>
+      <span style="margin-left: auto">
+        <el-button type="primary" size="mini" @click="handleAdd">
+          {{ $t("dictionary:browser:button:add") }}
+        </el-button>
+      </span>
+    </div>
+
+    <!-- 浏览器推荐版本列表 -->
+    <el-table
+      v-loading="loading"
+      v-adaptive="{ bottomOffset: 45 }"
+      :data="list"
+      stripe
+      height="100"
+      style="width: 100%"
+      @sort-change="handleSortByColumn"
+    >
+      <el-table-column type="index" width="40" />
+
+      <el-table-column
+        prop="Title"
+        :label="$t('dictionary:browser:table:title')"
+        sortable="custom"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="ExploreType"
+        :label="$t('dictionary:browser:table:exploreType')"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+      <el-table-column
+        prop="Version"
+        :label="$t('dictionary:browser:table:version')"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+      <el-table-column
+        prop="DownloadUrl"
+        :label="$t('dictionary:browser:table:path')"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+      <el-table-column
+        prop="FileName"
+        :label="$t('dictionary:browser:table:fileName')"
+        show-overflow-tooltip
+        sortable="custom"
+      >
+        <template slot-scope="scope">
+          <a
+            :href="OSSclientConfig.basePath + scope.row.Path"
+            target="_blank"
+            style="color: #428bca"
+          >
+            {{ scope.row.FileName }}
+          </a>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="IsDeleted"
+        :label="$t('dictionary:browser:table:IsDeleted')"
+        show-overflow-tooltip
+        sortable="custom"
+      >
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.IsDeleted" type="danger">{{
+            $fd("IsSiteDisable", scope.row.IsDeleted)
+          }}</el-tag>
+          <el-tag v-else>{{
+            $fd("IsSiteDisable", scope.row.IsDeleted)
+          }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="UpdateTime"
+        :label="$t('dictionary:browser:table:updateTime')"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+      <el-table-column
+        :label="$t('dictionary:browser:table:action')"
+        width="200"
+        fixed="right"
+      >
+        <template slot-scope="scope">
+          <el-button type="text" @click="handleEdit(scope.row)">
+            {{ $t("dictionary:browser:button:edit") }}
+          </el-button>
+          <el-button type="text" @click="handleDelete(scope.row)">
+            {{ $t("dictionary:browser:button:delete") }}
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 分页组件 -->
+    <pagination
+      class="page"
+      :total="total"
+      :page.sync="searchData.PageIndex"
+      :limit.sync="searchData.PageSize"
+      @pagination="getList"
+    />
+    <browser-form
+      :config="config"
+      :data="rowData"
+      v-if="config.visible"
+      @close="close"
+      @getList="getList"
+    />
+  </box-content>
+</template>
+<script>
+import {
+  getExploreRecommendList,
+  deleteExploreRecommend,
+} from "@/api/dictionary";
+import Pagination from "@/components/Pagination";
+import BoxContent from "@/components/BoxContent";
+import browserForm from "./form.vue";
+const searchDataDefault = () => {
+  return {
+    Version: null,
+    Title: null,
+    DownloadUrl: null,
+    FileName: null,
+    IsDeleted: null,
+    PageIndex: 1,
+    PageSize: 20,
+    Asc: false,
+    SortField: null,
+  };
+};
+export default {
+  name: "browser",
+  components: { BoxContent, Pagination, browserForm },
+  data() {
+    return {
+      searchData: searchDataDefault(),
+      loading: false,
+      list: [],
+      total: 0,
+      rowData: {},
+      config: {
+        visible: false,
+        showClose: true,
+        width: "600px",
+        title: "",
+        appendToBody: true,
+        status: "add",
+      },
+    };
+  },
+  mounted() {
+    this.getList();
+  },
+  methods: {
+    async getList() {
+      try {
+        this.loading = true;
+        let res = await getExploreRecommendList(this.searchData);
+        if (res.IsSuccess) {
+          this.loading = false;
+          this.list = res.Result.CurrentPageData;
+          this.total = res.Result.TotalCount;
+        }
+      } catch (err) {
+        console.log(err);
+        this.loading = false;
+      }
+    },
+    // 新增
+    handleAdd() {
+      this.rowData = {};
+      this.config.title = this.$t("dictionary:browser:form:title:add");
+      this.config.status = "add";
+      this.config.visible = true;
+    },
+    // 编辑
+    handleEdit(row) {
+      this.rowData = { ...row };
+      this.config.title = this.$t("dictionary:browser:form:title:edit");
+      this.config.status = "edit";
+      this.config.visible = true;
+    },
+    // 删除
+    handleDelete(row) {
+      this.$confirm(this.$t("dictionary:browser:message:deleteMessage"), {
+        type: "warning",
+        distinguishCancelAndClose: true,
+      }).then(() => {
+        deleteExploreRecommend(row.Id).then((res) => {
+          if (res.IsSuccess) {
+            this.list.splice(
+              this.list.findIndex((item) => item.Id === row.Id),
+              1
+            );
+            this.$message.success(
+              this.$t("common:message:deletedSuccessfully")
+            );
+          }
+        });
+      });
+    },
+    // 查询
+    handleSearch() {
+      this.searchData.PageIndex = 1;
+      this.getList();
+    },
+    // 重置
+    handleReset() {
+      this.searchData = searchDataDefault();
+      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();
+    },
+    close() {
+      this.config.visible = false;
+    },
+  },
+};
+</script>

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

@@ -0,0 +1,109 @@
+<template>
+  <div class="browserTip" v-if="visible">
+    <i class="el-icon-warning-outline"></i>
+    <span v-html="tip"></span>
+  </div>
+</template>
+<script>
+import { getExploreRecommentInfo } from "@/api/dictionary";
+export default {
+  name: "browserTip",
+  data() {
+    return {
+      form: {},
+      tip: this.$t("browser:tip:changeBorwser"),
+      visible: false,
+    };
+  },
+  methods: {
+    async getInfo() {
+      try {
+        let res = await getExploreRecommentInfo();
+        if (res.IsSuccess) {
+          return res.Result;
+        }
+        return false;
+      } catch (err) {
+        console.log(err);
+        return false;
+      }
+    },
+    async open() {
+      try {
+        let browserType = this.getExplore();
+        let type = browserType.split(": ")[0];
+        let No = browserType.split(": ")[1].split(".")[0];
+        console.log(type, No);
+        if (type !== "Chrome" && type !== "Edge") {
+          this.tip = this.$t("browser:tip:changeBorwser");
+          return (this.visible = true);
+        }
+        let res = await this.getInfo();
+        if (!res) return this.$t("dictionary:browser:tip:getError");
+        let currentType = res.filter(
+          (item) => item.ExploreType.toLowerCase() === type.toLowerCase()
+        )[0];
+        if (No < currentType.Version) {
+          this.tip = `<span>${this.$t("browser:tip:borwserversionLow")}</span>`;
+          res.forEach((item, index) => {
+            this.tip += `<a href="${item.DownloadUrl}" target="_blank" style="color:#428bca">${item.Title}</a>`;
+            if (index < res.length - 1) {
+              this.tip += "、";
+            }
+          });
+          return (this.visible = true);
+        }
+      } catch (err) {
+        console.log(err);
+      }
+    },
+    getExplore() {
+      var Sys = {};
+      var ua = navigator.userAgent.toLowerCase();
+      var s;
+      (s = ua.match(/rv:([\d.]+)\) like gecko/))
+        ? (Sys.ie = s[1])
+        : (s = ua.match(/msie ([\d\.]+)/))
+        ? (Sys.ie = s[1])
+        : (s = ua.match(/edg\/([\d\.]+)/) || ua.match(/edge\/([\d\.]+)/))
+        ? (Sys.edge = s[1])
+        : (s = ua.match(/firefox\/([\d\.]+)/))
+        ? (Sys.firefox = s[1])
+        : (s = ua.match(/(?:opera|opr).([\d\.]+)/))
+        ? (Sys.opera = s[1])
+        : (s = ua.match(/chrome\/([\d\.]+)/))
+        ? (Sys.chrome = s[1])
+        : (s = ua.match(/version\/([\d\.]+).*safari/))
+        ? (Sys.safari = s[1])
+        : 0;
+      // 根据关系进行判断
+      if (Sys.ie) return "IE: " + Sys.ie;
+      if (Sys.edge) return "Edge: " + Sys.edge;
+      if (Sys.firefox) return "Firefox: " + Sys.firefox;
+      if (Sys.chrome) return "Chrome: " + Sys.chrome;
+      if (Sys.opera) return "Opera: " + Sys.opera;
+      if (Sys.safari) return "Safari: " + Sys.safari;
+      return "Unkonwn";
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.browserTip {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 40px;
+  background-color: rgba(250, 205, 145, 0.129411764705882);
+  display: flex;
+  align-items: center;
+  padding: 0 20px;
+  color: #555;
+  i {
+    color: red;
+    font-size: 24px;
+    margin-right: 10px;
+  }
+}
+</style>

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

@@ -113,13 +113,13 @@
               width="55">
             </el-table-column>
             <el-table-column
-              prop="raw.ValueCN"
+              prop="ValueCN"
               label="中文值"
               show-overflow-tooltip
             >
             </el-table-column>
             <el-table-column
-              prop="raw.Value"
+              prop="Value"
               label="英文值"
               show-overflow-tooltip
             >

src/views/dictionary/template/index.vue

@@ -25,56 +25,68 @@
       <el-tab-pane label="签名管理" name="sign">
         <Sign v-if="activeTab == 'sign'" />
       </el-tab-pane>
+      <el-tab-pane label="浏览器推荐" name="browser">
+        <Browser v-if="activeTab == 'browser'" />
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
 <script>
-import QcQuestions from './components/QcQuestions.vue'
-import CriterionsTmp from './components/CriterionsTmp'
-import ClinicalData from './components/ClinicalDataConfig'
-import MedicalAudit from './components/MedicalAudit'
-import Anonymization from './components/Anonymization'
-import IncreaseFields from './components/IncreaseFields'
-import Email from './email/index.vue'
-import Sign from './sign/index.vue'
+import QcQuestions from "./components/QcQuestions.vue";
+import CriterionsTmp from "./components/CriterionsTmp";
+import ClinicalData from "./components/ClinicalDataConfig";
+import MedicalAudit from "./components/MedicalAudit";
+import Anonymization from "./components/Anonymization";
+import IncreaseFields from "./components/IncreaseFields";
+import Email from "./email/index.vue";
+import Sign from "./sign/index.vue";
+import Browser from "./browser/index.vue";
 export default {
-  name: 'Questions',
+  name: "Questions",
   components: {
-    QcQuestions, CriterionsTmp, ClinicalData, Anonymization, IncreaseFields, Email, Sign,
-    MedicalAudit
+    QcQuestions,
+    CriterionsTmp,
+    ClinicalData,
+    Anonymization,
+    IncreaseFields,
+    Email,
+    Sign,
+    MedicalAudit,
+    Browser,
   },
   data() {
     return {
-      activeTab: 'qc'
-    }
-  }, mounted() {
+      activeTab: "qc",
+    };
+  },
+  mounted() {
     if (this.$route.query.tabActive) {
-      this.activeTab = this.$route.query.tabActive
+      this.activeTab = this.$route.query.tabActive;
     } else {
-      this.activeTab = 'qc'
+      this.activeTab = "qc";
     }
   },
   methods: {
     clickTab(tab, event) {
-      this.$router.push({ path: `/dictionary/template?tabActive=${tab.name}` })
-    }
-  }
-}
+      this.$router.push({ path: `/dictionary/template?tabActive=${tab.name}` });
+    },
+  },
+};
 </script>
 <style lang="scss">
-.question-wrapper{
-  .el-tabs{
+.question-wrapper {
+  .el-tabs {
     height: 100%;
     display: flex;
     flex-direction: column;
   }
   .el-tabs__header {
     height: 40px;
-    margin-bottom:5px;
+    margin-bottom: 5px;
   }
-  .el-tabs__content{
+  .el-tabs__content {
     flex: 1;
-    .el-tab-pane{
+    .el-tab-pane {
       height: 100%;
     }
   }

src/views/login/index.vue

@@ -183,7 +183,7 @@
           {{ $t("login:title:system_title") }}
         </p>
         <p style="margin-bottom: 20px" v-else>{{ $t("login:title:system") }}</p>
-        <p style="margin-bottom: 20px">V1.5.3.001</p>
+        <p style="margin-bottom: 20px">V{{ $version.Version }}</p>
         <p style="margin-bottom: 20px" v-if="language === 'zh'">
           Copyright © {{ new Date().getFullYear() }} 上海展影医疗科技有限公司
           版权所有
@@ -202,6 +202,7 @@
         >
       </div>
     </el-dialog>
+    <browserTip ref="browserTip" />
   </div>
 </template>
 
@@ -210,13 +211,14 @@ import { mapGetters, mapMutations } from "vuex";
 import TopLang from "./topLang";
 // import NoticeMarquee from '../trials/trials-layout/components/noticeMarquee'
 import Vcode from "vue-puzzle-vcode";
+import browserTip from "@/views/dictionary/template/browser/tip.vue";
 import Img1 from "@/assets/pic-2.png";
 export default {
   name: "Login",
-  components: { TopLang, Vcode },
+  components: { TopLang, Vcode, browserTip },
   data() {
     return {
-      NODE_ENV: process.env.NODE_ENV,
+      NODE_ENV: process.env.NODE_ENV, // process.env.NODE_ENV
       VUE_APP_OSS_CONFIG_REGION: process.env.VUE_APP_OSS_CONFIG_REGION,
       aboutVisible: false,
       loginForm: {
@@ -279,6 +281,7 @@ export default {
         // this.$updateDictionary()
       }
     }
+    this.$refs.browserTip.open();
   },
   methods: {
     ...mapMutations({ setLanguage: "lang/setLanguage" }),

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

@@ -0,0 +1,310 @@
+<template>
+  <div class="research_bs_content">
+    <el-form ref="researchBSForm" label-position="left" :model="form" :rules="rules">
+      <div class="basic_content form-label-width">
+        <el-form-item :label="$t('trials:researchForm:title:researchSurveyStatus')">
+          <el-tag>{{ $fd('ResearchRecord', state) }}</el-tag>
+        </el-form-item>
+        <!-- 项目编号 -->
+        <el-form-item :label="$t('trials:researchForm:form:trialId')">
+          <span>{{ form.TrialCode }}</span>
+        </el-form-item>
+        <!-- 试验方案号 -->
+        <el-form-item :label="$t('trials:researchForm:form:researchNo')">
+          <span>{{ form.ResearchProgramNo }}</span>
+        </el-form-item>
+        <!-- 试验名称 -->
+        <el-form-item :label="$t('trials:researchForm:form:researchName')">
+          <span>{{ form.ExperimentName }}</span>
+        </el-form-item>
+        <!-- 适应症类型 -->
+        <el-form-item :label="$t('trials:researchForm:form:decleareType')">
+          <span>{{ form.IndicationType }}</span>
+        </el-form-item>
+      </div>
+      <div class="login_content">
+        <div class="form-label-width">
+          <el-form-item :label="$t('trials:researchForm:form:siteName')" prop="TrialSiteId">
+            <el-select
+              v-model="form.TrialSiteId"
+              filterable
+              style="width:100%;"
+              :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory"
+              @change="handleSiteChange"
+            >
+              <el-option
+                v-for="(item,index) of siteOptions"
+                :key="index"
+                :label="item.TrialSiteAliasName"
+                :value="item.TrialSiteId"
+              />
+            </el-select>
+          </el-form-item>
+          <!-- 中心编号 -->
+          <el-form-item v-if="form.TrialSiteId" :label="$t('trials:researchForm:form:siteId')">
+            <el-input v-model="form.TrialSiteCode" disabled />
+          </el-form-item>
+          <!-- 联系人 -->
+          <el-form-item :label="$t('trials:researchForm:form:contactor')" prop="UserName">
+            <el-input v-model="form.UserName" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" />
+          </el-form-item>
+          <!-- 联系电话 -->
+          <el-form-item
+            :label="$t('trials:researchForm:form:contactorPhone')"
+            prop="Phone"
+          >
+            <el-input v-model="form.Phone" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" />
+          </el-form-item>
+          <!-- 联系邮箱 -->
+          <el-form-item :label="$t('trials:researchForm:form:contactorEmail')">
+            <el-input v-model="form.Email" disabled />
+          </el-form-item>
+          <!-- 平均刻盘周期（天） -->
+          <el-form-item :label="$t('trials:researchForm:form:engravingCycle')">
+            <el-input-number v-model="form.AverageEngravingCycle" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" controls-position="right" :min="0" style="width:100%;" />
+          </el-form-item>
+        </div>
+        <!-- 请确认参与本项目影像采集的影像技师具备对应的资质（如：“技师证”，对应设备的“大型设备上岗证”） -->
+        <el-form-item v-if="!notShowFieldList.includes('IsConfirmImagingTechnologist')" :label="$t('trials:researchForm:form:isQualified')">
+          <el-radio-group v-model="form.IsConfirmImagingTechnologist" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory">
+            <el-radio
+              v-for="item of $d.YesOrNo"
+              :key="`IsConfirmImagingTechnologist${item.value}`"
+              :label="item.value"
+            >{{ item.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <!-- 原因 -->
+        <el-form-item
+          v-if="!notShowFieldList.includes('NotConfirmReson') && form.IsConfirmImagingTechnologist === false"
+          :label="$t('trials:researchForm:form:notQualifiedReason')"
+        >
+          <el-input
+            v-model="form.NotConfirmReson"
+            type="textarea"
+            :autosize="{ minRows: 2, maxRows: 4}"
+            :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory"
+          />
+        </el-form-item>
+        <!-- 研究单位疗效评估人员类型 -->
+        <el-form-item v-if="!notShowFieldList.includes('EfficacyEvaluatorType')" :label="$t('trials:researchForm:form:staffType')">
+          <el-radio-group v-model="form.EfficacyEvaluatorType" :disabled="!(state === 0 && userTypeEnumInt === 0)|| isHistory">
+            <el-radio v-for="item of $d.EfficacyEvaluatorType" :key="`EfficacyEvaluatorType${item.value}`" :label="item.value">{{ item.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <!-- 是否严格按照研究单位影像手册参数完成图像采集 -->
+        <el-form-item v-if="!notShowFieldList.includes('IsFollowStudyParameters')">
+          <span slot="label" v-html="$t('trials:researchForm:form:isFollowStudyParam')" />
+          <el-radio-group v-model="form.IsFollowStudyParameters" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory">
+            <el-radio v-for="item of $d.YesOrNo" :key="`IsFollowStudyParameters${item.value}`" :label="item.value">{{ item.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <!-- 不能严格按照研究单位影像手册参数采集图像原因 -->
+        <el-form-item
+          v-if="!notShowFieldList.includes('NotFollowReson') && !form.IsFollowStudyParameters"
+        >
+          <span slot="label" v-html="$t('trials:researchForm:form:notFollowStudyParam')" />
+          <el-input
+            v-model="form.NotFollowReson"
+            type="textarea"
+            :autosize="{ minRows: 2, maxRows: 4}"
+            :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory"
+          />
+        </el-form-item>
+      </div>
+    </el-form>
+  </div>
+</template>
+<script>
+import { getTrialSiteSelect } from '@/api/trials'
+import { addOrUpdateTrialSiteSurvey } from '@/api/research'
+export default {
+  name: 'ResearchBasicInfo',
+  props: {
+    isHistory: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    var checkPhone = (rule, value, callback) => {
+      const phoneReg = /^[0-9]+$/
+      if (!value) {
+        callback(new Error(this.$t('trials:researchForm:formRule:specify')))
+      } else {
+        setTimeout(() => {
+          if (phoneReg.test(value)) {
+            callback()
+          } else {
+            callback(new Error(this.$t('trials:researchForm:formRule:phone')))
+          }
+        }, 100)
+      }
+    }
+    return {
+      form: {
+        Id: '',
+        Sponsor: '', // 申办方
+        ResearchProgramNo: '', // 方案号
+        ExperimentName: '',
+        TrialCode: '', // 项目编号
+        TrialSiteCode: '',
+        TrialSiteAliasName: '',
+        IndicationType: '', // 适应症
+        TrialSiteId: '', // 研究单位名称
+        UserName: '', // 联系人
+        Phone: '', // 联系人电话
+        Email: '', // 联系人邮箱
+        AverageEngravingCycle: '',
+        IsConfirmImagingTechnologist: '',
+        NotConfirmReson: '',
+        EfficacyEvaluatorType: '',
+        IsFollowStudyParameters: '',
+        NotFollowReson: ''
+      },
+      rules: {
+        TrialSiteId: [
+          { required: true, message: this.$t('trials:researchForm:formRule:specify'), trigger: 'blur' }
+        ],
+        UserName: [
+          { required: true, validator: (rule, value, callback) => { !value ? callback(new Error(this.$t('trials:researchForm:formRule:specify'))) : callback() }, trigger: 'blur' },
+          { min: 0, max: 50, message: this.$t('trials:researchForm:formRule:maxLength'), trigger: ['blur', 'change'] }
+        ],
+        Phone: [
+          { required: true, validator: checkPhone, trigger: 'blur' }
+        ]
+      },
+      siteOptions: [],
+      loading: false,
+      state: null,
+      userTypeEnumInt: zzSessionStorage.getItem('userTypeEnumInt') * 1,
+      isShow: false,
+      notShowFieldList: []
+    }
+  },
+  methods: {
+    // 保存基本信息
+    handleSave(isAutoCommit) {
+      return new Promise(async(resolve) => {
+        try {
+          const valid = await this.$refs['researchBSForm'].validate()
+          if (valid) {
+            this.loading = true
+            const param = {
+              id: this.form.Id,
+              trialId: this.$route.query.trialId,
+              trialSiteId: this.form.TrialSiteId,
+              userName: this.form.UserName,
+              phone: this.form.Phone,
+              email: this.form.Email,
+              averageEngravingCycle: this.form.AverageEngravingCycle,
+              isConfirmImagingTechnologist: this.form.IsConfirmImagingTechnologist,
+              notConfirmReson: this.form.NotConfirmReson,
+              efficacyEvaluatorType: this.form.EfficacyEvaluatorType,
+              isFollowStudyParameters: this.form.IsFollowStudyParameters,
+              notFollowReson: this.form.NotFollowReson
+            }
+            const res = await addOrUpdateTrialSiteSurvey(param)
+            this.loading = false
+            if (res.IsSuccess && !isAutoCommit) {
+              this.$message.success(this.$t('common:message:savedSuccessfully'))
+            }
+            resolve(true)
+          } else {
+            if (isAutoCommit) {
+              this.$message.error(this.$t('trials:researchForm:button:msg1'))
+            }
+            resolve(false)
+          }
+        } catch (e) {
+          console.log(e)
+          resolve(false)
+        }
+      })
+    },
+    // 初始化
+    async initForm(trialInfo, trialSiteSurvey, notShowFieldList) {
+      // 获取项目下的site
+      const { Result } = await getTrialSiteSelect(this.$route.query.trialId)
+      this.siteOptions = Result
+      this.form.Id = trialSiteSurvey.Id
+      this.form.Sponsor = trialInfo.Sponsor // 申办方
+      this.form.ResearchProgramNo = trialInfo.ResearchProgramNo // 方案号
+      this.form.ExperimentName = trialInfo.ExperimentName
+      this.form.TrialCode = trialInfo.TrialCode // 项目编号
+      this.form.TrialSiteCode = trialSiteSurvey.TrialSiteCode
+      this.form.TrialSiteAliasName = trialSiteSurvey.TrialSiteAliasName // 项目别称
+      this.form.IndicationType = trialInfo.IndicationType // 适应症
+      this.form.TrialSiteId = trialSiteSurvey.TrialSiteId
+      this.form.UserName = trialSiteSurvey.UserName // 联系人
+      this.form.Phone = trialSiteSurvey.Phone // 联系人电话
+      this.form.Email = trialSiteSurvey.Email // 联系人邮箱
+      this.form.AverageEngravingCycle = trialSiteSurvey.AverageEngravingCycle
+      this.form.IsConfirmImagingTechnologist = trialSiteSurvey.IsConfirmImagingTechnologist
+      this.form.NotConfirmReson = trialSiteSurvey.NotConfirmReson
+      this.form.EfficacyEvaluatorType = trialSiteSurvey.EfficacyEvaluatorType
+      this.form.IsFollowStudyParameters = trialSiteSurvey.IsFollowStudyParameters
+      this.form.NotFollowReson = trialSiteSurvey.NotFollowReson
+      this.state = trialSiteSurvey.State
+      this.isShow = true
+      if (!notShowFieldList) return
+      this.notShowFieldList = notShowFieldList
+    },
+    handleSiteChange(val) {
+      var selected = this.siteOptions.find(item => item.TrialSiteId === val)
+      if (selected) {
+        this.form.TrialSiteCode = selected.TrialSiteCode
+      }
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.research_bs_content{
+
+  .basic_content{
+    padding: 0 20px;
+    background: #fff;
+
+  }
+  .login_content{
+    padding: 5px 20px;
+    margin-top: 5px;
+    background: #fff;
+    /deep/.el-form-item {
+      padding-bottom: 20px;
+      
+    }
+  }
+  .code_content{
+    display:flex;
+    flex-direction: row;
+    justify-content: flex-start;
+    .el-input{
+      margin-right: 10px;
+    }
+  }
+  .form-label-width{
+    /deep/.el-form-item__label{
+      width: 140px;
+    }
+    /deep/.el-form-item__content{
+      margin-left: 140px;
+    }
+  }
+  .submit_content{
+    margin-top: 20px;
+    text-align: center;
+  }
+
+  /deep/.el-form-item {
+    margin-bottom: 0px;
+    padding-top: 5px;
+    border-bottom: 1px solid #f5f7fa;
+    .el-form-item__content{
+      color: #82848a;
+    }
+  }
+
+}
+</style>

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

@@ -0,0 +1,168 @@
+<template>
+  <div
+    v-loading="loading"
+    class="equipment_form_content"
+  >
+    <el-form
+      ref="equipmentForm"
+      :model="form"
+      :rules="rules"
+      label-position="left"
+    >
+      <!-- 扫描设备 -->
+      <el-form-item :label="$t('trials:equiptResearch:form:equipment')" prop="EquipmentTypeId">
+        <el-select
+          v-model="form.EquipmentTypeId"
+          style="width:100%"
+        >
+          <el-option
+            v-for="item of $d.SiteSurvey_ScanEquipmentType"
+            :key="item.id"
+            :label="item.label"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <!-- 扫描参数 -->
+      <el-form-item v-if="isShowParameters" :label="$t('trials:equiptResearch:form:param')">
+        <el-input v-model="form.Parameters" />
+      </el-form-item>
+      <!-- 扫描仪器制造商名称 -->
+      <el-form-item :label="$t('trials:equiptResearch:form:manufacturer')">
+        <el-input v-model="form.ManufacturerName" />
+      </el-form-item>
+      <!-- 扫描仪型号 -->
+      <el-form-item :label="$t('trials:equiptResearch:form:model')">
+        <el-input v-model="form.ScannerType" />
+      </el-form-item>
+      <!-- 备注 -->
+      <el-form-item :label="$t('trials:equiptResearch:form:remark')">
+        <el-input v-model="form.Note" />
+      </el-form-item>
+      <div style="text-align: center;padding:20px 0px;">
+        <!-- 取消 -->
+        <el-button
+          size="large"
+          type="primary"
+          @click="handleCancel"
+        >
+          {{ $t("common:button:cancel") }}
+        </el-button>
+        <!-- 保存 -->
+        <el-button
+          size="large"
+          type="primary"
+          @click="handleSave"
+        >
+          {{ $t("common:button:save") }}
+        </el-button>
+      </div>
+    </el-form>
+  </div>
+</template>
+<script>
+import { addOrUpdateTrialSiteEquipmentSurvey } from '@/api/research'
+import { getQueryString } from '@/utils/history.js'
+export default {
+  name: 'EquipmentForm',
+  props: {
+    equipmentInfo: {
+      type: Object,
+      default() {
+        return {}
+      }
+    },
+    trialSiteSurveyEquipmentType: {
+      type: String,
+      default: ''
+    },
+    isShowParameters: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      form: {
+        Id: '',
+        EquipmentTypeId: '',
+        Parameters: '',
+        ManufacturerName: '',
+        ScannerType: '',
+        Note: '',
+        TrialSiteSurveyId: ''
+      },
+      rules: {
+        EquipmentTypeId: [
+          { required: true, message: this.$t('trials:researchForm:formRule:select'), trigger: ['blur', 'change'] }
+        ]
+      },
+      loading: false,
+      dictionaryList: {}
+    }
+  },
+  mounted() {
+    this.initForm()
+  },
+  methods: {
+    async initForm() {
+      Object.keys(this.equipmentInfo).forEach(key => {
+        this.form[key] = this.equipmentInfo[key]
+      })
+    },
+    // 保存参与者信息
+    async handleSave() {
+      try {
+        const validate = await this.$refs.equipmentForm.validate()
+        if (!validate) return
+        this.loading = true
+        if (!this.form.TrialSiteSurveyId) {
+          this.form.TrialSiteSurveyId = getQueryString('trialSiteSurveyId')
+        }
+        const trialId = getQueryString('trialId')
+        const res = await addOrUpdateTrialSiteEquipmentSurvey(trialId, this.form)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          this.$emit('getList')
+          this.$emit('close')
+        }
+      } catch (e) {
+        this.loading = false
+        console.log(e)
+      }
+    },
+    handleTrialRoleChange(v) {
+      if (v === 1) {
+        // crc
+        this.form.IsGenerateAccount = true
+        this.form.UserTypeId = this.crcId
+      } else if (v === 2) {
+        // cra
+        this.form.IsGenerateAccount = true
+        this.form.UserTypeId = this.craId
+      } else {
+        this.form.IsGenerateAccount = false
+        this.form.UserTypeId = ''
+      }
+    },
+    // 取消保存
+    handleCancel() {
+      this.$emit('close')
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.equipment_form_content{
+  padding: 0 10px;
+  /deep/.el-form-item {
+    margin-bottom: 0px;
+    padding: 5px 0 20px 0;
+    border-bottom: 1px solid #f5f7fa;
+    .el-form-item__content{
+      color: #82848a;
+    }
+  }
+}
+</style>

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

@@ -0,0 +1,219 @@
+<template>
+  <div class="equipments_content">
+    <div class="title">
+      <div>{{ $t('trials:equiptResearch:title:equiptResearch') }}</div>
+      <div v-if="state === 0 && userTypeEnumInt === 0 && !isHistory">
+        <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">
+          {{ $t('common:button:add') }}
+        </el-button>
+      </div>
+    </div>
+    <div v-for="item in list" :key="item.name" class="equipment_info">
+      <div class="p_icon">
+        <i class="el-icon-receiving" />
+      </div>
+      <div class="p_info">
+        <div
+          class="p_info_basic"
+          :style="{maxWidth:w+'px','white-space': 'nowrap',
+                   overflow: 'hidden',
+                   'text-overflow': 'ellipsis'}"
+        >
+          <div class="p_text">{{ item.EquipmentType }}</div>
+          <div v-if="isShowParameters" class="p_text" style="margin-left:10px">{{ item.Parameters }}</div>
+          <div class="p_text" style="margin-left:10px">{{ item.ManufacturerName }}</div>
+        </div>
+        <div class="p_text">{{ item.ScannerType }}</div>
+        <div class="p_text">{{ item.Note }}</div>
+      </div>
+      <div v-if="state === 0 && userTypeEnumInt === 0 && !isHistory" class="p_func">
+        <el-button type="text" @click="handleEdit(item)">
+          <i class="el-icon-edit-outline" style="font-size: 20px;" />
+        </el-button>
+        <el-button type="text" @click="handleDelete(item)">
+          <i class="el-icon-delete" style="font-size: 20px;" />
+        </el-button>
+      </div>
+    </div>
+    <!-- 添加/编辑设备信息 -->
+    <el-drawer
+      :title="title"
+      :visible.sync="formVisible"
+      direction="btt"
+      size="70%"
+    >
+      <EquipmentForm
+        v-if="formVisible"
+        :equipment-info="equipmentInfo"
+        :is-show-parameters="isShowParameters"
+        @getList="getList"
+        @close="close"
+      />
+    </el-drawer>
+  </div>
+</template>
+<script>
+import { getTrialSiteEquipmentSurveyList, deleteTrialSiteEquipmentSurvey } from '@/api/research'
+import EquipmentForm from './EquipmentForm'
+import { getQueryString } from '@/utils/history.js'
+export default {
+  name: 'EquipmentsResearch',
+  components: { EquipmentForm },
+  props: {
+    trialSiteSurveyEquipmentType: {
+      type: String,
+      default: ''
+    },
+    isHistory: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      list: [],
+      formVisible: false,
+      title: '',
+      equipmentInfo: {},
+      w: 0,
+      loading: false,
+      userTypeEnumInt: 0,
+      state: null,
+      trialSiteSurveyId: '',
+      trialId: '',
+      isShowParameters: false
+    }
+  },
+  mounted() {
+    this.w = document.body.clientWidth - 200
+    if (zzSessionStorage.getItem('userTypeEnumInt')) {
+      this.userTypeEnumInt = zzSessionStorage.getItem('userTypeEnumInt') * 1
+    }
+    this.trialSiteSurveyId = getQueryString('trialSiteSurveyId')
+    this.trialId = getQueryString('trialId')
+  },
+  methods: {
+    // 获取列表数据
+    async getList() {
+      try {
+        this.loading = true
+        const res = await getTrialSiteEquipmentSurveyList(this.trialSiteSurveyId)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.list = res.Result
+        }
+      } catch (e) {
+        this.loading = false
+        console.log(e)
+      }
+    },
+    // 新增
+    handleAdd() {
+      this.equipmentInfo = {}
+      this.title = this.$t('trials:equiptResearch:dialogTitle:add')
+      this.formVisible = true
+    },
+    // 编辑
+    handleEdit(obj) {
+      this.equipmentInfo = Object.assign({ ...obj })
+      this.title = this.$t('trials:equiptResearch:dialogTitle:edit')
+      this.formVisible = true
+    },
+    // 删除
+    async handleDelete(obj) {
+      try {
+        const confirm = await this.$confirm(
+          this.$t('trials:staffResearch:message:confirmDel'),
+          {
+            type: 'warning',
+            distinguishCancelAndClose: true
+          }
+        )
+        if (confirm !== 'confirm') return
+        this.loading = true
+        const res = await deleteTrialSiteEquipmentSurvey(obj.Id, this.trialId)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.list.splice(this.list.findIndex((item) => item.Id === obj.Id), 1)
+          this.$message.success(this.$t('trials:equiptResearch:message:delSuccessfully'))
+        }
+      } catch (e) {
+        this.loading = false
+        console.log(e)
+      }
+    },
+    initList(TrialSiteEquipmentSurveyList, trialSiteSurvey, isShowParameters) {
+      this.isShowParameters = isShowParameters
+      this.list = TrialSiteEquipmentSurveyList
+      this.state = trialSiteSurvey.State
+      this.$forceUpdate()
+      console.log(this.list)
+    },
+    // 关闭窗口
+    close() {
+      this.formVisible = false
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.equipments_content{
+  background: #fff;
+  padding: 10px;
+  .title{
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+  .equipment_info{
+    display: flex;
+    flex-direction: row;
+    justify-content: space-around;
+    align-items: center;
+    border-top: 1px solid #f5f7fa;
+    .p_icon{
+      width: 70px;
+      font-size: 25px;
+      font-weight: bold;
+      text-align: center;
+    }
+    .p_info{
+      position: relative;
+      flex:1;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-evenly;
+      // border-right: 1px solid #f5f7fa;
+      font-size: 13px;
+    }
+    .p_info:after {
+        content: '';
+        position: absolute;
+        top: 50%;
+        transform: translateY(-50%);
+        right: 0;
+        height: 50px;
+        width: 1px;
+        background-color: #f5f7fa;
+    }
+    .p_info_basic{
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+
+    }
+    .p_text{
+      line-height: 25px;
+      color: #82848a;
+    }
+    .p_func{
+      width: 80px;
+      padding: 0 10px;
+      text-align: center;
+    }
+  }
+}
+
+</style>

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

@@ -0,0 +1,304 @@
+<template>
+  <div
+    v-loading="loading"
+    class="participants_form_content"
+  >
+    <el-form
+      ref="participantForm"
+      :model="form"
+      :rules="rules"
+      label-width="80px"
+      label-position="left"
+    >
+      <!-- 姓 -->
+      <el-form-item
+        :label="$t('trials:staffResearch:form:lastName')"
+        prop="LastName"
+      >
+        <span>{{ form.LastName }}</span>
+      </el-form-item>
+      <!-- 名 -->
+      <el-form-item
+        :label="$t('trials:staffResearch:form:firstName')"
+        prop="FirstName"
+      >
+        <span>{{ form.FirstName }}</span>
+      </el-form-item>
+      <!-- 电话号码 -->
+      <el-form-item
+        :label="$t('trials:staffResearch:form:phone')"
+        prop="Phone"
+      >
+        <span>{{ form.Phone }}</span>
+      </el-form-item>
+      <!-- 邮箱 -->
+      <el-form-item
+        :label="$t('trials:staffResearch:form:email')"
+        prop="Email"
+      >
+        <span>{{ form.Email }}</span>
+      </el-form-item>
+      <!-- 单位 -->
+      <el-form-item
+        :label="$t('trials:staffResearch:form:organization')"
+        prop="OrganizationName"
+      >
+        <span>{{ form.Email }}</span>
+      </el-form-item>
+      <!-- 用户类型 -->
+      <el-form-item v-if="form.IsGenerateAccount" :label="$t('trials:staffResearch:form:userType')" prop="UserTypeId">
+        <el-select v-model="form.UserTypeId" style="width: 100%" disabled>
+          <el-option v-for="item of userTypeOptions" :key="item.Id" :label="item.UserTypeShortName" :value="item.Id">
+            <span>{{ item.UserType }}</span>
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <!-- 更新状态 -->
+      <el-form-item :label="$t('trials:staffResearch:form:updateState')">
+        <el-radio-group v-model="form.IsHistoryUserDeleted" style="width: 100%">
+          <el-radio v-for="item of $d.IsUserExitTrial" :key="`IsHistoryUserDeleted${item.value}`" :label="item.value">{{
+            item.label }}</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        v-if="errorMsg"
+        label=""
+      >
+        <span
+          v-if="errorMsg"
+          style="font-size: 12px; color: #f66"
+        >
+          {{ errorMsg }}
+        </span>
+      </el-form-item>
+      <div style="text-align: center;padding:20px 0px;">
+        <!-- 取消 -->
+        <el-button
+          size="large"
+          type="primary"
+          @click="handleCancel"
+        >
+          {{ $t("common:button:cancel") }}
+        </el-button>
+        <!-- 保存 -->
+        <el-button
+          size="large"
+          type="primary"
+          @click="handleSave"
+        >
+          {{ $t("common:button:save") }}
+        </el-button>
+      </div>
+    </el-form>
+  </div>
+</template>
+<script>
+import { addOrUpdateTrialSiteUserSurvey } from '@/api/research'
+import { getUserTypeList } from '@/api/research'
+import { getQueryString } from '@/utils/history.js'
+export default {
+  name: 'ParticipantForm',
+  props: {
+    participantInfo: {
+      type: Object,
+      default() {
+        return {}
+      }
+    },
+    state: {
+      type: Number,
+      required: true
+    }
+  },
+  data() {
+    var validateEmail = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error(this.$t('trials:researchForm:formRule:specify')))
+      } else {
+        var reg =
+          /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
+        if (this.form.Email && reg.test(this.form.Email)) {
+          this.sendDisabled = false
+          callback()
+        } else {
+          callback(new Error(this.$t('trials:researchForm:formRule:email')))
+          this.sendDisabled = true
+        }
+      }
+    }
+    return {
+      form: {
+        Id: '',
+        LastName: null,
+        FirstName: null,
+        TrialRoleCode: null,
+        UserTypeId: null,
+        Phone: null,
+        Email: null,
+        OrganizationName: '',
+        IsGenerateAccount: false,
+        IsHistoryUserDeleted: ''
+      },
+      rules: {
+        LastName: [
+          {
+            required: true,
+            message: this.$t('trials:researchForm:formRule:specify'),
+            trigger: 'blur'
+          },
+          {
+            min: 0,
+            max: 50,
+            message: this.$t('trials:researchForm:formRule:maxLength'),
+            trigger: 'blur'
+          }
+        ],
+        FirstName: [
+          {
+            required: true,
+            message: this.$t('trials:researchForm:formRule:specify'),
+            trigger: 'blur'
+          },
+          {
+            min: 0,
+            max: 50,
+            message: this.$t('trials:researchForm:formRule:maxLength'),
+            trigger: 'blur'
+          }
+        ],
+        TrialRoleCode: [
+          {
+            required: true,
+            message: this.$t('trials:researchForm:formRule:select'),
+            trigger: ['blur', 'change']
+          }
+        ],
+        UserTypeId: [
+          {
+            required: true,
+            message: this.$t('trials:researchForm:formRule:select'),
+            trigger: ['blur']
+          }
+        ],
+        Phone: [
+          {
+            max: 50,
+            message: this.$t('common:ruleMessage:maxLength') + ' 50',
+            trigger: 'blur'
+          }
+        ],
+        Email: [
+          { required: true, validator: validateEmail, trigger: ['blur'] }
+        ],
+        IsHistoryUserDeleted: [
+          {
+            required: true,
+            message: this.$t('trials:researchForm:formRule:select'),
+            trigger: ['blur', 'change']
+          }
+        ]
+      },
+      userRoles: [],
+      userTypeOptions: [],
+      userTypeEnumInt: 0,
+      errorMsg: '',
+      loading: false
+    }
+  },
+  mounted() {
+    this.initForm()
+  },
+  methods: {
+    async initForm() {
+      this.loading = true
+      const res = await getUserTypeList(3)
+      if (res.IsSuccess) {
+        this.userTypeOptions = res.Result
+        var crcObj = res.Result.find((i) => i.UserTypeEnum === 2)
+        this.crcId = crcObj ? crcObj.Id : ''
+        var craObj = res.Result.find((i) => i.UserTypeEnum === 9)
+        this.craId = craObj ? craObj.Id : ''
+      }
+      Object.keys(this.participantInfo).forEach((key) => {
+        this.form[key] = this.participantInfo[key]
+      })
+      if (zzSessionStorage.getItem('userTypeEnumInt')) {
+        this.userTypeEnumInt = zzSessionStorage.getItem('userTypeEnumInt') * 1
+      }
+      this.loading = false
+    },
+    // 保存参与者信息
+    async handleSave() {
+      try {
+        const validate = await this.$refs.participantForm.validate()
+        if (!validate) return
+        this.loading = true
+        if (!this.form.TrialSiteSurveyId) {
+          this.form.TrialSiteSurveyId = getQueryString('trialSiteSurveyId')
+        }
+        const trialId = getQueryString('trialId')
+        const res = await addOrUpdateTrialSiteUserSurvey(trialId, this.form)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.$message.success(
+            this.$t('common:message:savedSuccessfully')
+          )
+
+          this.$emit('close', { id: res.Result, errorMessage: '' })
+        }
+      } catch (e) {
+        if (e.Result && e.Result.Id && e.ErrorMessage) {
+          this.$emit('close', {
+            id: e.Result.Id,
+            errorMessage: e.ErrorMessage
+          })
+        } else {
+          console.log(e)
+        }
+        this.loading = false
+      }
+    },
+    handleTrialRoleChange(v) {
+      if (v === 1) {
+        // crc
+        this.form.IsGenerateAccount = true
+        this.form.UserTypeId = this.crcId
+      } else if (v === 2) {
+        // cra
+        this.form.IsGenerateAccount = true
+        this.form.UserTypeId = this.craId
+      } else {
+        this.form.IsGenerateAccount = false
+        this.form.UserTypeId = ''
+      }
+    },
+    // 取消保存
+    handleCancel() {
+      this.$emit('close')
+    },
+    handleIsCorrectChange(val) {
+      if (!val) {
+        this.form.IsGenerateAccount = false
+      }
+    },
+    handleIsGenerateAccountChange(val) {
+      if (!val) {
+        this.form.UserTypeId = ''
+      }
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.participants_form_content{
+  padding: 0 10px;
+  /deep/.el-form-item {
+     margin-bottom: 0px;
+    padding: 5px 0 20px 0;
+    border-bottom: 1px solid #f5f7fa;
+    .el-form-item__content{
+      color: #82848a;
+    }
+  }
+}
+</style>

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

@@ -0,0 +1,198 @@
+<template>
+  <div class="participants_content">
+    <div class="title">
+      <div>{{ $t('trials:staffResearch:title:historicalStaff') }}</div>
+    </div>
+    <div v-for="item in list" :key="item.Id" class="participant_info">
+      <div class="p_icon">
+        <i class="el-icon-user" />
+      </div>
+      <div class="p_info">
+        <div
+          class="p_info_basic"
+          :style="{maxWidth:w+'px','white-space': 'nowrap',overflow: 'hidden','text-overflow': 'ellipsis'}"
+        >
+          <div class="p_text">{{ `${item.LastName} / ${item.FirstName}` }}</div>
+          <div class="p_text" style="margin:0 10px">{{ $fd('SiteSurvey_UserRoles',item.TrialRoleCode) }}</div> 
+        </div>
+        <div class="p_text">{{ item.Phone }}</div>
+        <div class="p_text">{{ item.Email }}</div>
+        <div class="p_text">{{ item.OrganizationName }}</div>
+      </div>
+      <div v-if="state === 0 && (userTypeEnumInt===0 ) && !isHistory" class="p_func">
+        <!-- 编辑 -->
+        <el-button
+          v-if="userTypeEnumInt===0"
+          type="text"
+          @click="editParticipant(item)"
+        >
+          <i class="el-icon-edit-outline" style="font-size: 20px;" />
+        </el-button>
+      </div>
+    </div>
+
+    <!-- 编辑人员信息 -->
+    <el-drawer
+      :title="title"
+      :visible.sync="formVisible"
+      direction="btt"
+      size="70%"
+    >
+      <HistoricalParticipantForm
+        v-if="formVisible"
+        :state="state"
+        :participant-info="participantInfo"
+        @getList="getList"
+        @close="close"
+      />
+    </el-drawer>
+  </div>
+</template>
+<script>
+import { getTrialSiteUserSurveyList } from '@/api/research'
+import HistoricalParticipantForm from './HistoricalParticipantForm'
+import { getQueryString } from '@/utils/history.js'
+export default {
+  name: 'HisParticipantsResearch',
+  components: { HistoricalParticipantForm },
+  props: {
+    isHistory: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      list: [],
+      formVisible: false,
+      title: '',
+      participantInfo: null,
+      w: 0,
+      state: null,
+      trialSiteSurveyId: '',
+      trialId: '',
+      userTypeEnumInt: 0,
+      warningList: []
+    }
+  },
+  mounted() {
+    this.w = document.body.clientWidth - 200
+    if (zzSessionStorage.getItem('userTypeEnumInt')) {
+      this.userTypeEnumInt = zzSessionStorage.getItem('userTypeEnumInt') * 1
+    }
+    this.trialSiteSurveyId = getQueryString('trialSiteSurveyId')
+    this.trialId = getQueryString('trialId')
+  },
+  methods: {
+    // 获取参与者列表数据
+    async getList() {
+      try {
+        this.loading = true
+        var params = {
+          trialSiteSurveyId: this.trialSiteSurveyId,
+          isHistoryUser: true
+        }
+        const res = await getTrialSiteUserSurveyList(params)
+        this.loading = false
+        if (res.IsSuccess) {
+          res.Result.map(item => {
+            var obj = this.warningList.find(i => i.id === item.Id)
+            if (obj) {
+              item.ErrorMessage = obj.errorMessage
+            }
+          })
+          this.list = res.Result
+        }
+      } catch (e) {
+        this.loading = false
+        console.log(e)
+      }
+    },
+    // 编辑
+    editParticipant(row) {
+      this.participantInfo = Object.assign({ ...row })
+      this.title = this.$t('trials:staffResearch:dialogTitle:edit')
+      this.formVisible = true
+    },
+    // 初始化列表
+    initList(trialSiteUserSurveyList, trialSiteSurvey) {
+      this.list = trialSiteUserSurveyList
+      this.state = trialSiteSurvey.State
+      this.$forceUpdate()
+    },
+    // 关闭窗口
+    async close(obj) {
+      this.formVisible = false
+      var idx = this.warningList.findIndex(i => i.id === obj.id)
+      if (idx > -1) {
+        this.warningList[idx].errorMessage = obj.errorMessage
+      } else {
+        this.warningList.push({ id: obj.id, errorMessage: obj.errorMessage })
+      }
+      this.getList()
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.participants_content{
+  background: #fff;
+  padding: 10px;
+  .title{
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+  .participant_info{
+    display: flex;
+    flex-direction: row;
+    justify-content: space-around;
+    align-items: center;
+    border-top: 1px solid #f5f7fa;
+    .p_icon{
+      width: 70px;
+      font-size: 25px;
+      font-weight: bold;
+      text-align: center;
+    }
+    .p_info{
+      position: relative;
+      flex:1;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-evenly;
+      // border-right: 1px solid #f5f7fa;
+      font-size: 13px;
+    }
+    .p_info:after {
+        content: '';
+        position: absolute;
+        top: 50%;
+        transform: translateY(-50%);
+        right: 0;
+        height: 50px;
+        width: 1px;
+        background-color: #f5f7fa;
+    }
+    .p_info_basic{
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+
+    }
+    .p_text{
+      line-height: 25px;
+      color: #82848a;
+    }
+    .p_func{
+      width: 80px;
+      padding: 0 10px;
+      text-align: center;
+    }
+  }
+}
+
+</style>

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

@@ -0,0 +1,47 @@
+<template>
+  <div class="research_note">
+    <div class="title">
+      {{ $t('trials:equiptResearch:form:precautions') }}
+    </div>
+    <ol v-if="siteSurveyNoteInfo">
+      <div v-if="$i18n.locale === 'zh'" v-html="siteSurveyNoteInfo.ReplaceContentCN" />
+      <div v-else v-html="siteSurveyNoteInfo.ReplaceContent" />
+    </ol>
+    <ol v-else>
+      <!-- 只要有可能，请确保受试者使用上述指定的扫描仪器采集影像。 -->
+      <li>{{ $t('trials:equiptResearch:form:item1') }}</li>
+      <!-- 请确保对每位受试者的扫描参数在整个研究过程中保持一致。 -->
+      <li>{{ $t('trials:equiptResearch:form:item2') }}</li>
+      <!-- 试验过程中，如果有任何人员、设备或扫描仪器的替换，请立即通知我们。 -->
+      <li>{{ $t('trials:equiptResearch:form:item3') }}</li>
+      <!-- 请保存好原始（未经压缩的；非重建的）数据。 -->
+      <li>{{ $t('trials:equiptResearch:form:item4') }}</li>
+    </ol>
+  </div>
+</template>
+<script>
+export default {
+  name: 'ResearchNotes',
+  data() {
+    return {
+      siteSurveyNoteInfo: null
+    }
+  },
+  methods: {
+    initPage(siteSurveyNoteInfo) {
+      this.siteSurveyNoteInfo = siteSurveyNoteInfo
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.research_note{
+  background: #fff;
+  padding: 10px;
+  li{
+    line-height: 20px;
+    font-size: 14px;
+    color: #82848a;
+  }
+}
+</style>

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

@@ -0,0 +1,318 @@
+<template>
+  <div
+    v-loading="loading"
+    class="participants_form_content"
+  >
+    <el-form
+      ref="participantForm"
+      :model="form"
+      :rules="rules"
+      label-width="80px"
+      label-position="left"
+    >
+      <!-- 姓 -->
+      <el-form-item
+        :label="$t('trials:staffResearch:form:lastName')"
+        prop="LastName"
+      >
+        <el-input
+          v-model="form.LastName"
+          :disabled="!(state === 0 && userTypeEnumInt === 0)"
+        />
+      </el-form-item>
+      <!-- 名 -->
+      <el-form-item
+        :label="$t('trials:staffResearch:form:firstName')"
+        prop="FirstName"
+      >
+        <el-input
+          v-model="form.FirstName"
+          :disabled="!(state === 0 && userTypeEnumInt === 0)"
+        />
+      </el-form-item>
+      <!-- 角色 -->
+      <el-form-item
+        :label="$t('trials:staffResearch:form:role')"
+        prop="TrialRoleCode"
+      >
+        <el-select
+          v-model="form.TrialRoleCode"
+          :disabled="!(state === 0 && userTypeEnumInt === 0)"
+          style="width:100%"
+          @change="handleTrialRoleChange"
+        >
+          <el-option
+            v-for="item of $d.SiteSurvey_UserRoles"
+            :key="item.id"
+            :label="item.label"
+            :value="parseInt(item.value)"
+          />
+        </el-select>
+      </el-form-item>
+      <!-- 电话号码 -->
+      <el-form-item
+        :label="$t('trials:staffResearch:form:phone')"
+        prop="Phone"
+      >
+        <el-input
+          v-model="form.Phone"
+          :disabled="!(state === 0 && userTypeEnumInt === 0)"
+        />
+      </el-form-item>
+      <!-- 邮箱 -->
+      <el-form-item
+        :label="$t('trials:staffResearch:form:email')"
+        prop="Email"
+      >
+        <el-input
+          v-model="form.Email"
+          :disabled="!(state === 0 && userTypeEnumInt === 0)"
+        />
+      </el-form-item>
+      <!-- 单位 -->
+      <el-form-item
+        :label="$t('trials:staffResearch:form:organization')"
+        prop="OrganizationName"
+      >
+        <el-input
+          v-model="form.OrganizationName"
+          :disabled="!(state === 0 && userTypeEnumInt === 0)"
+        />
+      </el-form-item>
+      <el-form-item
+        v-if="errorMsg"
+        label=""
+      >
+        <span
+          v-if="errorMsg"
+          style="font-size: 12px; color: #f66"
+        >
+          {{ errorMsg }}
+        </span>
+      </el-form-item>
+      <div style="text-align: center;padding:20px 0px;">
+        <!-- 取消 -->
+        <el-button
+          size="large"
+          type="primary"
+          @click="handleCancel"
+        >
+          {{ $t("common:button:cancel") }}
+        </el-button>
+        <!-- 保存 -->
+        <el-button
+          size="large"
+          type="primary"
+          @click="handleSave"
+        >
+          {{ $t("common:button:save") }}
+        </el-button>
+      </div>
+    </el-form>
+  </div>
+</template>
+<script>
+import { addOrUpdateTrialSiteUserSurvey } from '@/api/research'
+import { getUserTypeList } from '@/api/research'
+import { getQueryString } from '@/utils/history.js'
+export default {
+  name: 'ParticipantForm',
+  props: {
+    participantInfo: {
+      type: Object,
+      default() {
+        return {}
+      }
+    },
+    state: {
+      type: Number,
+      required: true
+    }
+  },
+  data() {
+    var validateEmail = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error(this.$t('trials:researchForm:formRule:specify')))
+      } else {
+        var reg =
+          /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
+        if (this.form.Email && reg.test(this.form.Email)) {
+          this.sendDisabled = false
+          callback()
+        } else {
+          callback(new Error(this.$t('trials:researchForm:formRule:email')))
+          this.sendDisabled = true
+        }
+      }
+    }
+    return {
+      form: {
+        Id: '',
+        LastName: null,
+        FirstName: null,
+        TrialRoleCode: null,
+        UserTypeId: null,
+        Phone: null,
+        Email: null,
+        OrganizationName: '',
+        IsGenerateAccount: false,
+        IsDisable: false
+      },
+      rules: {
+        LastName: [
+          {
+            required: true,
+            message: this.$t('trials:researchForm:formRule:specify'),
+            trigger: 'blur'
+          },
+          {
+            min: 0,
+            max: 50,
+            message: this.$t('trials:researchForm:formRule:maxLength'),
+            trigger: 'blur'
+          }
+        ],
+        FirstName: [
+          {
+            required: true,
+            message: this.$t('trials:researchForm:formRule:specify'),
+            trigger: 'blur'
+          },
+          {
+            min: 0,
+            max: 50,
+            message: this.$t('trials:researchForm:formRule:maxLength'),
+            trigger: 'blur'
+          }
+        ],
+        TrialRoleCode: [
+          {
+            required: true,
+            message: this.$t('trials:researchForm:formRule:select'),
+            trigger: ['blur', 'change']
+          }
+        ],
+        UserTypeId: [
+          {
+            required: true,
+            message: this.$t('trials:researchForm:formRule:select'),
+            trigger: ['blur']
+          }
+        ],
+        Phone: [
+          {
+            max: 50,
+            message: this.$t('common:ruleMessage:maxLength') + ' 50',
+            trigger: 'blur'
+          }
+        ],
+        Email: [
+          { required: true, validator: validateEmail, trigger: ['blur'] }
+        ]
+      },
+      userRoles: [],
+      userTypeOptions: [],
+      userTypeEnumInt: 0,
+      errorMsg: '',
+      crcId: '',
+      craId: '',
+      loading: false
+    }
+  },
+  mounted() {
+    this.initForm()
+  },
+  methods: {
+    async initForm() {
+      this.loading = true
+      const res = await getUserTypeList(3)
+      if (res.IsSuccess) {
+        this.userTypeOptions = res.Result
+        var crcObj = res.Result.find((i) => i.UserTypeEnum === 2)
+        this.crcId = crcObj ? crcObj.Id : ''
+        var craObj = res.Result.find((i) => i.UserTypeEnum === 9)
+        this.craId = craObj ? craObj.Id : ''
+      }
+      Object.keys(this.participantInfo).forEach((key) => {
+        this.form[key] = this.participantInfo[key]
+      })
+      if (zzSessionStorage.getItem('userTypeEnumInt')) {
+        this.userTypeEnumInt = zzSessionStorage.getItem('userTypeEnumInt') * 1
+      }
+      this.loading = false
+    },
+    // 保存参与者信息
+    async handleSave() {
+      try {
+        const validate = await this.$refs.participantForm.validate()
+        if (!validate) return
+        this.loading = true
+        if (!this.form.TrialSiteSurveyId) {
+          this.form.TrialSiteSurveyId = getQueryString('trialSiteSurveyId')
+        }
+        const trialId = getQueryString('trialId')
+        const res = await addOrUpdateTrialSiteUserSurvey(trialId, this.form)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.$message.success(
+            this.$t('common:message:savedSuccessfully')
+          )
+
+          this.$emit('close', { id: res.Result, errorMessage: '' })
+        }
+      } catch (e) {
+        if (e.Result && e.Result.Id && e.ErrorMessage) {
+          this.$emit('close', {
+            id: e.Result.Id,
+            errorMessage: e.ErrorMessage
+          })
+        } else {
+          console.log(e)
+        }
+        this.loading = false
+      }
+    },
+    handleTrialRoleChange(v) {
+      if (v === 1) {
+        // crc
+        this.form.IsGenerateAccount = true
+        this.form.UserTypeId = this.crcId
+      } else if (v === 2) {
+        // cra
+        this.form.IsGenerateAccount = true
+        this.form.UserTypeId = this.craId
+      } else {
+        this.form.IsGenerateAccount = false
+        this.form.UserTypeId = ''
+      }
+    },
+    // 取消保存
+    handleCancel() {
+      this.$emit('close')
+    },
+    handleIsCorrectChange(val) {
+      if (!val) {
+        this.form.IsGenerateAccount = false
+      }
+    },
+    handleIsGenerateAccountChange(val) {
+      if (!val) {
+        this.form.UserTypeId = ''
+      }
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.participants_form_content{
+  padding: 0 10px;
+  /deep/.el-form-item {
+    margin-bottom: 0px;
+    padding: 5px 0 20px 0;
+    border-bottom: 1px solid #f5f7fa;
+    .el-form-item__content{
+      color: #82848a;
+    }
+  }
+}
+</style>

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

@@ -0,0 +1,249 @@
+<template>
+  <div class="participants_content">
+    <div class="title">
+      <div>{{ $t('trials:staffResearch:title:newStaff') }}</div>
+      <div v-if="state === 0 && userTypeEnumInt === 0 && !isHistory">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="addParticipant"
+        >
+          {{ $t('common:button:add') }}
+        </el-button>
+      </div>
+    </div>
+    <div v-for="item in list" :key="item.Id" class="participant_info">
+      <div class="p_icon">
+        <i class="el-icon-user" />
+      </div>
+      <div class="p_info">
+        <div
+          class="p_info_basic"
+          :style="{maxWidth:w+'px','white-space': 'nowrap',overflow: 'hidden','text-overflow': 'ellipsis'}"
+        >
+          <div class="p_text">{{ `${item.LastName} / ${item.FirstName}` }}</div>
+          <div class="p_text" style="margin:0 10px">{{ $fd('SiteSurvey_UserRoles',item.TrialRoleCode) }}</div>
+        </div>
+        <div class="p_text">{{ item.Phone }}</div>
+        <div class="p_text">{{ item.Email }}</div>
+        <div class="p_text">{{ item.OrganizationName }}</div>
+      </div>
+      <div v-if="state === 0 && (userTypeEnumInt===0 ) && !isHistory" class="p_func">
+        <!-- 编辑 -->
+        <el-button
+          type="text"
+          :disabled="state!==0 || item.IsGenerateSuccess"
+          @click="editParticipant(item)"
+        >
+          <i class="el-icon-edit-outline" style="font-size: 20px;" />
+        </el-button>
+        <!-- 移除 -->
+        <el-button
+          type="text"
+          :disabled="state!==0 || item.IsGenerateSuccess"
+          @click="removeParticipant(item)"
+        >
+          <i class="el-icon-delete" style="font-size: 20px;" />
+        </el-button>
+      </div>
+    </div>
+
+    <!-- 添加/编辑人员信息 -->
+    <el-drawer
+      :title="title"
+      :visible.sync="formVisible"
+      direction="btt"
+      size="70%"
+    >
+      <ParticipantForm
+        v-if="formVisible"
+        :state="state"
+        :participant-info="participantInfo"
+        @getList="getList"
+        @close="close"
+      />
+    </el-drawer>
+  </div>
+</template>
+<script>
+import { getTrialSiteUserSurveyList, deleteTrialSiteUserSurvey } from '@/api/research'
+import ParticipantForm from './ParticipantForm'
+import { getQueryString } from '@/utils/history.js'
+export default {
+  name: 'ParticipantsResearch',
+  components: { ParticipantForm },
+  props: {
+    isHistory: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      list: [],
+      formVisible: false,
+      title: '',
+      participantInfo: null,
+      w: 0,
+      state: null,
+      trialSiteSurveyId: '',
+      trialId: '',
+      userTypeEnumInt: 0,
+      warningList: []
+    }
+  },
+  mounted() {
+    this.w = document.body.clientWidth - 200
+    if (zzSessionStorage.getItem('userTypeEnumInt')) {
+      this.userTypeEnumInt = zzSessionStorage.getItem('userTypeEnumInt') * 1
+    }
+    this.trialSiteSurveyId = getQueryString('trialSiteSurveyId')
+    this.trialId = getQueryString('trialId')
+  },
+  methods: {
+    // 获取参与者列表数据
+    async getList() {
+      try {
+        this.loading = true
+        var params = {
+          trialSiteSurveyId: this.trialSiteSurveyId,
+          isHistoryUser: false
+        }
+        const res = await getTrialSiteUserSurveyList(params)
+        this.loading = false
+        if (res.IsSuccess) {
+          res.Result.map(item => {
+            var obj = this.warningList.find(i => i.id === item.Id)
+            if (obj) {
+              item.ErrorMessage = obj.errorMessage
+            }
+          })
+          this.list = res.Result
+        }
+      } catch (e) {
+        this.loading = false
+        console.log(e)
+      }
+    },
+    // 新增
+    addParticipant() {
+      this.participantInfo = {}
+      this.title = this.$t('trials:staffResearch:dialogTitle:add')
+      this.formVisible = true
+    },
+    // 编辑
+    editParticipant(obj) {
+      this.participantInfo = Object.assign({ ...obj })
+      this.title = this.$t('trials:staffResearch:dialogTitle:edit')
+      this.formVisible = true
+    },
+    // 删除
+    async removeParticipant(obj) {
+      try {
+        const confirm = await this.$confirm(
+          this.$t('trials:staffResearch:message:confirmDel'),
+          {
+            type: 'warning',
+            distinguishCancelAndClose: true
+          }
+        )
+        if (confirm !== 'confirm') return
+        this.loading = true
+        const res = await deleteTrialSiteUserSurvey(obj.Id, this.trialId)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.list.splice(this.list.findIndex((item) => item.Id === obj.Id), 1)
+          this.$message.success(this.$t('trials:staffResearch:message:delSuccessfully'))
+        }
+      } catch (e) {
+        this.loading = false
+        console.log(e)
+      }
+    },
+    isExistIncorrect() {
+      return this.list.some(item => item.IsCorrect === false)
+    },
+
+    // 初始化列表
+    initList(trialSiteUserSurveyList, trialSiteSurvey) {
+      this.list = trialSiteUserSurveyList
+      this.state = trialSiteSurvey.State
+      this.$forceUpdate()
+    },
+    // 关闭窗口
+    async close(obj) {
+      this.formVisible = false
+      var idx = this.warningList.findIndex(i => i.id === obj.id)
+      if (idx > -1) {
+        this.warningList[idx].errorMessage = obj.errorMessage
+      } else {
+        this.warningList.push({ id: obj.id, errorMessage: obj.errorMessage })
+      }
+      this.getList()
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.participants_content{
+  background: #fff;
+  padding: 10px;
+  .title{
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+  .participant_info{
+    display: flex;
+    flex-direction: row;
+    justify-content: space-around;
+    align-items: center;
+    border-top: 1px solid #f5f7fa;
+    .p_icon{
+      width: 70px;
+      font-size: 25px;
+      font-weight: bold;
+      text-align: center;
+    }
+    .p_info{
+      position: relative;
+      flex:1;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-evenly;
+      // border-right: 1px solid #f5f7fa;
+      font-size: 13px;
+    }
+    .p_info:after {
+        content: '';
+        position: absolute;
+        top: 50%;
+        transform: translateY(-50%);
+        right: 0;
+        height: 50px;
+        width: 1px;
+        background-color: #f5f7fa;
+    }
+    .p_info_basic{
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+
+    }
+    .p_text{
+      line-height: 25px;
+      color: #82848a;
+    }
+    .p_func{
+      width: 80px;
+      padding: 0 10px;
+      text-align: center;
+    }
+  }
+}
+
+</style>

src/views/research-mobile/detail.vue

@@ -0,0 +1,221 @@
+<template>
+  <div v-loading="loading" class="research_detal_wrapper">
+    <div class="d_title">{{ $t('trials:researchForm:title:question') }}</div>
+    <div class="d_content">
+
+      <!-- 项目基本信息 -->
+      <BasicInfo ref="basicInfo" />
+      <!-- 历史人员 -->
+      <HistoricalParticipants ref="historicalParticipant" class="mt5" />
+      <!-- 新增人员 -->
+      <Participants ref="participants" class="mt5" />
+      <!-- 设备调研 -->
+      <Equipments ref="equipments" class="mt5" />
+      <!-- 备注 -->
+      <Notes ref="notes" class="mt5" />
+    </div>
+    <div class="d_footer">
+      <div class="d_func_row">
+        <div
+          v-if="state === 0 && userTypeEnumInt === 0"
+          class="d_func"
+          @click="handleSave"
+        >
+          {{ $t('common:button:save') }}
+        </div>
+        <div
+          v-if="(state === 0 && userTypeEnumInt === 0)"
+          class="d_func"
+          @click="handleSubmit('submit')"
+        >
+          {{ $t('trials:researchForm:button:submit') }}
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { getSiteSurveyInfo, trialSurveySubmit } from '@/api/research'
+import { getQueryString } from '@/utils/history.js'
+import BasicInfo from './components/BasicInfo'
+import HistoricalParticipants from './components/HistoricalParticipants'
+import Participants from './components/Participants'
+import Equipments from './components/Equipments'
+import Notes from './components/Notes'
+export default {
+  name: 'ResearchMobileDetail',
+  components: {
+    BasicInfo,
+    HistoricalParticipants,
+    Participants, Equipments, Notes
+  },
+  data() {
+    return {
+      trialId: this.$route.query.trialId,
+      trialSiteSurveyId: '',
+      loading: false,
+      state: null,
+      userTypeEnumInt: 0,
+      rejectVisible: false,
+      rejectForm: { reason: '' },
+      siteSurveyNoteInfo: null
+    }
+  },
+  mounted() {
+    this.trialSiteSurveyId = getQueryString('trialSiteSurveyId')
+    this.initPage()
+    if (zzSessionStorage.getItem('userTypeEnumInt')) {
+      this.userTypeEnumInt = zzSessionStorage.getItem('userTypeEnumInt') * 1
+    }
+  },
+  methods: {
+    // 初始化页面
+    async initPage() {
+      try {
+        this.loading = true
+        const res = await getSiteSurveyInfo(this.trialId, this.trialSiteSurveyId)
+        if (res.Result) {
+          if (res.Result.SiteSurveyFiledConfig && res.Result.SiteSurveyFiledConfig.ModifyFiledList.length > 0) {
+            this.siteSurveyNoteInfo = res.Result.SiteSurveyFiledConfig.ModifyFiledList.find(i => i.NeedModifyFiled === 'SiteSurveyNote')
+          }
+          this.state = res.Result.TrialSiteSurvey.State
+          this.$refs['basicInfo'].initForm(res.Result.TrialInfo, res.Result.TrialSiteSurvey, res.Result.SiteSurveyFiledConfig ? res.Result.SiteSurveyFiledConfig.NotShowFieldList : null)
+          var historicalArr = []
+          var newArr = []
+          res.Result.TrialSiteUserSurveyList.map(i => {
+            if (i.IsHistoryUser) {
+              historicalArr.push(i)
+            } else {
+              newArr.push(i)
+            }
+          })
+
+          this.$refs['historicalParticipant'].initList(historicalArr, res.Result.TrialSiteSurvey)
+          this.$refs['participants'].initList(newArr, res.Result.TrialSiteSurvey)
+          this.$refs['equipments'].initList(res.Result.TrialSiteEquipmentSurveyList, res.Result.TrialSiteSurvey, !(res.Result.SiteSurveyFiledConfig && res.Result.SiteSurveyFiledConfig.ModifyFiledList.length > 0))
+          this.$refs['notes'].initPage(this.siteSurveyNoteInfo)
+        }
+        this.loading = false
+      } catch (e) {
+        this.loading = false
+        console.log(e)
+      }
+    },
+    // 保存
+    handleSave() {
+      this.$refs['basicInfo'].handleSave(false)
+    },
+    // 提交
+    async handleSubmit(type) {
+      if (this.userTypeEnumInt === 0) {
+        try {
+          this.loading = true
+          const res = await this.$refs['basicInfo'].handleSave(true)
+          this.loading = false
+          if (res) {
+            this.submit(type)
+          }
+        } catch (e) {
+          this.loading = false
+          console.log(e)
+        }
+      } else {
+        this.submit(type)
+      }
+    },
+    async submit(type) {
+      try {
+        const confirm = await this.$confirm(
+          this.userTypeEnumInt === 0 ? this.$t('trials:researchForm:message:submitWarning') : this.$t('trials:researchForm:message:submitWarning2'),
+          {
+            type: 'warning',
+            distinguishCancelAndClose: true
+          }
+        )
+        if (confirm !== 'confirm') return
+        var param = {
+          TrialId: this.trialId,
+          TrialSiteSurveyId: this.trialSiteSurveyId
+        }
+        const res = await trialSurveySubmit(param)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.initPage()
+          if (type === 'approve') {
+            this.$message.success(this.$t('common:message:approvedSuccessfully'))
+          } else {
+            this.$message.success(this.$t('trials:researchForm:message:savedSuccessfully'))
+          }
+        }
+      } catch (e) {
+        this.loading = false
+        console.log(e)
+      }
+    },
+    // 退出
+    handleBack() {
+      this.$router.push({ path: `/researchLogin_m?trialId=${this.trialId}&lang=${this.$i18n.locale}` })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.research_detal_wrapper{
+  background-color:#f5f7fa;
+  .d_title{
+    margin-bottom: 5px;
+    line-height: 80px;
+    font-size: 28px;
+    font-weight: bold;
+    text-align: center;
+    background: #fff;
+    position: sticky;
+    top: 0;
+    z-index: 10;
+  }
+  // .d_content{
+
+  // }
+  .d_footer{
+    position: sticky;
+    bottom: 0;
+    z-index: 10;
+    background-color: #f8f8f8;
+    line-height: 50px;
+    text-align: center;
+    // padding: 20px;
+  }
+  .d_func_row{
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+  }
+  .d_func{
+    flex: 1;
+    margin: 20px;
+    color: #fff;
+    background-color: #428bca;
+    border-color: #428bca;
+    padding: 12px 20px;
+    font-size: 14px;
+    border-radius: 4px;
+    transition: .1s;
+    font-weight: 500;
+    box-sizing: border-box;
+    outline: 0;
+    text-align: center;
+    line-height: 1;
+    white-space: nowrap;
+    cursor: pointer;
+    &:hover{
+      background: #68a2d5;
+      border-color: #68a2d5;
+      color: #fff;
+    }
+  }
+  .mt5{
+    margin-top: 5px
+  }
+}
+
+</style>

src/views/research-mobile/login.vue

@@ -0,0 +1,406 @@
+<template>
+  <div class="research_login_m_content">
+    <div class="title">{{ $t('trials:researchForm:title:question') }}</div>
+    <el-form
+      ref="loginForm"
+      v-loading="loading"
+      label-position="left"
+      label-width="120px"
+      :model="form"
+      :rules="rules"
+    >
+      <div class="basic_content">
+        <!-- 项目编号 -->
+        <el-form-item
+          :label="$t('trials:researchForm:form:trialId')"
+        >
+          <span>{{ form.TrialCode }}</span>
+        </el-form-item>
+        <!-- 试验方案号 -->
+        <el-form-item
+          :label="$t('trials:researchForm:form:researchNo')"
+        >
+          <span>{{ form.ResearchProgramNo }}</span>
+        </el-form-item>
+        <!-- 试验名称 -->
+        <el-form-item
+          :label="$t('trials:researchForm:form:researchName')"
+        >
+          <span>{{ form.ExperimentName }}</span>
+        </el-form-item>
+        <!-- 适应症类型 -->
+        <el-form-item
+          :label="$t('trials:researchForm:form:decleareType')"
+        >
+          <span>{{ form.IndicationType }}</span>
+        </el-form-item>
+      </div>
+      <div class="login_content">
+        <el-form-item
+          :label="$t('trials:researchForm:form:siteName')"
+          prop="SiteId"
+        >
+          <el-select
+            v-model="form.TrialSiteId"
+            filterable
+            style="width:100%;"
+            @change="handleSiteChange"
+          >
+            <el-option
+              v-for="(item,index) of siteOptions"
+              :key="index"
+              :label="item.TrialSiteAliasName"
+              :value="item.TrialSiteId"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          v-if="form.TrialSiteId && isHaveSiteSurveyRecord"
+          label=""
+          style="text-align:right;"
+        >
+          <!-- 更新调研表 -->
+          <el-link
+            v-if="!form.IsUpdate"
+            type="primary"
+            @click="form.IsUpdate = true"
+          >
+            {{ $t('trials:researchForm:button:updateQsForm') }}
+          </el-link>
+          <!-- 取消更新调研表 -->
+          <el-link
+            v-else
+            type="primary"
+            @click="form.IsUpdate = false;form.ReplaceUserEmailOrPhone=''"
+          >
+            {{ $t('trials:researchForm:button:cancelUpdateQsForm') }}
+          </el-link>
+        </el-form-item>
+
+        <!-- 原调研表填写人邮箱 -->
+        <el-form-item
+          v-if="form.IsUpdate"
+          :label="$t('trials:researchForm:form:originalEmail')"
+          prop="ReplaceUserEmailOrPhone"
+        >
+          <el-input
+            v-model="form.ReplaceUserEmailOrPhone"
+            autocomplete="new-password"
+          />
+        </el-form-item>
+        <!-- 联系邮箱 -->
+        <el-form-item
+          :label="$t('trials:researchForm:form:contactorEmail')"
+          prop="EmailOrPhone"
+        >
+          <el-input
+            v-model="form.EmailOrPhone"
+            autocomplete="new-password"
+          />
+        </el-form-item>
+        <el-form-item
+          :label="$t('trials:researchForm:form:verifyCode')"
+        >
+          <div class="code_content">
+            <el-input
+              v-model="form.VerificationCode"
+              autocomplete="new-password"
+            />
+            <el-button
+              type="primary"
+              :disabled="sendDisabled || !form.EmailOrPhone || count > 0"
+              @click="handleSendCode"
+            >
+              {{ this.$t('trials:researchForm:button:send') }} {{ sendTitle ? `${sendTitle}` : null }}
+            </el-button>
+          </div>
+        </el-form-item>
+        <div class="submit_content">
+          <el-button
+            size="large"
+            type="primary"
+            @click="onSubmit"
+          >
+            {{ $t('common:button:submit') }}
+          </el-button>
+        </div>
+      </div>
+    </el-form>
+  </div>
+</template>
+<script>
+import { sendVerifyCode, verifySendCode, getTrialSurveyInitInfo } from '@/api/research'
+import { getUserMenuTree, getUserPermissions } from '@/api/user'
+import store from '@/store'
+import { mapGetters, mapMutations } from 'vuex'
+export default {
+  name: 'ResearchMobileLogin',
+  data() {
+    var checkPhone = (rule, value, callback) => {
+      const phoneReg = /^1[3|4|5|7|8][0-9]{9}$/
+      if (!value) {
+        return callback(new Error(this.$t('trials:researchForm:formRule:specify')))
+      }
+      setTimeout(() => {
+        if (!Number.isInteger(+value)) {
+          callback(new Error(this.$t('trials:researchForm:formRule:phone')))
+        } else {
+          if (phoneReg.test(value)) {
+            callback()
+          } else {
+            callback(new Error(this.$t('trials:researchForm:formRule:phone')))
+          }
+        }
+      }, 100)
+    }
+    var validateEmail = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error(this.$t('trials:researchForm:formRule:specify')))
+      } else {
+        var reg = /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
+        if (this.form.EmailOrPhone && reg.test(this.form.EmailOrPhone)) {
+          callback()
+        } else {
+          callback(new Error(this.$t('trials:researchForm:formRule:email')))
+        }
+      }
+    }
+    var validateReplaceEmail = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error(this.$t('trials:researchForm:formRule:specify')))
+      } else {
+        var reg = /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
+        if (this.form.ReplaceUserEmailOrPhone && reg.test(this.form.ReplaceUserEmailOrPhone)) {
+          callback()
+        } else {
+          callback(new Error(this.$t('trials:researchForm:formRule:email')))
+        }
+      }
+    }
+    return {
+      trialId: '',
+      form: {
+        Sponsor: null, // 申办方
+        ResearchProgramNo: null, // 方案号
+        TrialCode: null, // 项目编号
+        IndicationType: null, // 适应症
+        ExperimentName: '',
+        TrialSiteId: null, // 研究单位名称
+        UserName: null, // 联系人
+        Phone: '', // 联系人电话
+        EmailOrPhone: '',
+        TrialSiteCode: '',
+        IsUpdate: false,
+        ReplaceUserEmailOrPhone: '',
+        VerificationCode: ''
+      },
+      rules: {
+        TrialSiteId: [
+          { required: true, message: this.$t('trials:researchForm:formRule:specify'), trigger: ['blur'] }
+        ],
+        UserName: [
+          { required: true, message: this.$t('trials:researchForm:formRule:specify'), trigger: ['blur'] },
+          { min: 0, max: 50, message: this.$t('trials:researchForm:formRule:maxLength'), trigger: 'blur' }
+        ],
+        Phone: [
+          { required: true, validator: checkPhone, trigger: ['blur'] }
+        ],
+        EmailOrPhone: [
+          { required: true, validator: validateEmail, trigger: ['blur', 'change'] }
+        ],
+        ReplaceUserEmailOrPhone: [
+          { required: true, validator: validateReplaceEmail, trigger: ['blur'] }
+        ],
+        VerificationCode: [{ required: true, validator: (rule, value, callback) => { !value ? callback(new Error(this.$t('trials:researchForm:formRule:specify'))) : callback() }, trigger: ['blur'] }]
+      },
+      siteOptions: [],
+      loading: false,
+      sendDisabled: false,
+      btnLoading: false,
+      sendTitle: '',
+      count: '',
+      timer: null,
+      msg: '',
+      lang: 'zh',
+      isHaveSiteSurveyRecord: false
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'asyncRoutes',
+      'routes',
+      'language'
+    ])
+  },
+  mounted() {
+    this.$i18n.locale = this.$route.query.lang
+    this.setLanguage(this.$route.query.lang)
+    this.$updateDictionary()
+    if (this.$route.query.trialId) {
+      this.trialId = this.$route.query.trialId
+      this.initPage()
+    }
+  },
+  methods: {
+    ...mapMutations({ setLanguage: 'lang/setLanguage' }),
+    // 初始化页面
+    async initPage() {
+      try {
+        this.loading = true
+        const res = await getTrialSurveyInitInfo(this.trialId)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.siteOptions = res.Result.TrialSiteSelectList
+        }
+        Object.keys(this.form).forEach(key => {
+          if (res.Result.hasOwnProperty(key)) {
+            this.form[key] = res.Result[key]
+          }
+        })
+      } catch (e) {
+        this.loading = false
+        console.log(e)
+      }
+    },
+    // 提交
+    async onSubmit() {
+      const validate = await this.$refs.loginForm.validate()
+      if (!validate) return
+      try {
+        this.loading = true
+        if (!this.form.IsUpdate) {
+          this.form.ReplaceUserEmailOrPhone = ''
+        }
+        const param = {
+          trialSiteId: this.form.TrialSiteId,
+          userName: this.form.UserName,
+          phone: this.form.Phone,
+          verificationType: 0,
+          emailOrPhone: this.form.EmailOrPhone,
+          verificationCode: this.form.VerificationCode,
+          isUpdate: this.form.IsUpdate,
+          replaceUserEmailOrPhone: this.form.ReplaceUserEmailOrPhone,
+          trialId: this.trialId
+        }
+        const res = await verifySendCode(param)
+
+        if (res.IsSuccess) {
+          zzSessionStorage.clear()
+          this.$i18n.locale = this.$route.query.lang
+          this.setLanguage(this.$route.query.lang)
+          store.dispatch('user/setToken', res.Result.Token)
+          zzSessionStorage.setItem('TokenKey', res.Result.Token)
+          var permissions = await getUserPermissions()
+          var menuTree = await getUserMenuTree()
+          store.dispatch('user/setTree', menuTree.Result)
+          store.dispatch('user/setPermissions', permissions.Result)
+          this.$router.push({ path: `/researchDetail_m?trialId=${this.trialId}&trialSiteSurveyId=${res.Result.TrialSiteSurveyId}` })
+          this.loading = false
+        }
+      } catch (e) {
+        this.loading = false
+        this.sendDisabled = false
+      }
+    },
+    handleSiteChange(val) {
+      this.isHaveSiteSurveyRecord = false
+      var selected = this.siteOptions.find(item => item.TrialSiteId === val)
+      if (selected) {
+        this.form.TrialSiteCode = selected.TrialSiteCode
+        this.isHaveSiteSurveyRecord = selected.IsHaveSiteSurveyRecord
+      }
+    },
+    // 发送验证码
+    async handleSendCode() {
+      try {
+        this.loading = true
+        const param = {
+          Email: this.form.EmailOrPhone,
+          TrialId: this.trialId
+        }
+        const res = await sendVerifyCode(param)
+        if (res.IsSuccess) {
+          this.getCode()
+          this.loading = false
+          const msg = this.$t('trials:researchForm:tip:sendCode').replace('xxx', this.form.EmailOrPhone)
+          this.$message.success(msg)
+        } else {
+          this.$alert(res.ErrorMessage)
+        }
+      } catch (e) {
+        this.loading = false
+        console.log(e)
+      }
+    },
+    getCode() {
+      const TIME_COUNT = 60
+      if (!this.timer) {
+        this.count = TIME_COUNT
+        this.sendDisabled = true
+        this.timer = setInterval(() => {
+          if (this.count > 0 && this.count <= TIME_COUNT) {
+            this.sendTitle = `(${this.count}s)`
+            this.count--
+          } else {
+            this.sendDisabled = false
+            this.sendTitle = ''
+            clearInterval(this.timer)
+            this.timer = null
+          }
+        }, 1000)
+      }
+    },
+    onCancel() {
+      this.$refs['loginForm'].resetFields()
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.research_login_m_content{
+  background-color:#f5f7fa;
+  .title{
+    margin-bottom: 5px;
+    line-height: 80px;
+    font-size: 28px;
+    font-weight: bold;
+    text-align: center;
+    background: #fff;
+  }
+  .basic_content{
+    padding: 0 20px;
+    background: #fff;
+  }
+  .login_content{
+    padding: 5px 20px;
+    margin-top: 5px;
+    background: #fff;
+    /deep/.el-form-item {
+      padding-bottom: 20px;
+    }
+  }
+  .code_content{
+    display:flex;
+    flex-direction: row;
+    justify-content: flex-start;
+    .el-input{
+      margin-right: 10px;
+    }
+  }
+  .submit_content{
+    margin-top: 20px;
+    text-align: center;
+  }
+
+  /deep/.el-form-item {
+    margin-bottom: 0px;
+    padding-top: 5px;
+    border-bottom: 1px solid #f5f7fa;
+    .el-form-item__content{
+      color: #82848a;
+    }
+  }
+  
+
+}
+</style>

src/views/reviewers/components/Agreements.vue

@@ -5,7 +5,7 @@
       <div class="upload-content">
         <upload-files ref="uploadAgreement" :disabled="$route.query.ReviewStatus === '1'" :doctor-id="doctorId" type="Consultant Agreement" accept=".pdf" @getFileList="getFileList" />
       </div>
-      <p>{{ $t('system:GcpCertificate:tap:must') }}</p>
+      <p>{{ $t('system:Agreements:tap:must') }}</p>
     </div>
     <div v-if="!$route.query.ReviewStatus">
       <el-table :data="agreementList" size="small">

src/views/system/i18n/components/BatchAddForm.vue

@@ -6,122 +6,162 @@
         v-loading="loading"
         :model="form"
         size="small"
+        :rules="rules"
       >
         <el-form-item label="国际化类型" prop="InternationalizationType">
           <el-radio-group v-model="form.InternationalizationType">
             <el-radio
               v-for="item of $d.InternationalizationType"
-              :key="'InternationalizationType'+item.value"
+              :key="'InternationalizationType' + item.value"
               :label="item.value"
-            >{{ item.label }}</el-radio>
+              >{{ item.label }}</el-radio
+            >
           </el-radio-group>
         </el-form-item>
         <el-form-item label="状态" prop="State">
           <el-radio-group v-model="form.State">
             <el-radio
               v-for="item of $d.InternationalizationKeyState"
-              :key="'InternationalizationKeyState'+item.value"
+              :key="'InternationalizationKeyState' + item.value"
               :label="item.value"
-            >{{ item.label }}</el-radio>
+              >{{ item.label }}</el-radio
+            >
           </el-radio-group>
         </el-form-item>
-        <el-table
-          :data="form.AddList"
-          style="width: 100%"
-          height="300"
-        >
-          <el-table-column
-            prop=""
-            label="功能模块/服务名"
-          >
+        <el-form-item label="迭代" prop="PublishLogId">
+          <el-select v-model="form.PublishLogId" clearable filterable>
+            <el-option
+              v-for="item in PublishVersionList"
+              :key="item.Id"
+              :label="item.Version"
+              :value="item.Id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-table :data="form.AddList" style="width: 100%" height="300">
+          <el-table-column prop="" label="功能模块/服务名">
             <template slot-scope="scope">
               <el-form-item
                 label=""
-                :prop="`AddList.${scope.$index}.Description`"
+                :prop="`AddList.${scope.$index}.Module`"
                 :rules="[
-                  { required: true,message: $t('common:ruleMessage:specify'), trigger: ['change','blur']},
-                  { max: 200, message: `${$t('common:ruleMessage:maxLength')} 200` }
+                  {
+                    max: 200,
+                    message: `${$t('common:ruleMessage:maxLength')} 200`,
+                    trigger: ['change', 'blur'],
+                  },
                 ]"
               >
                 <el-input
-                  v-model="scope.row.Description"
+                  v-model="scope.row.Module"
                   type="textarea"
                   maxlength="200"
-                  :autosize="{ minRows: 2, maxRows: 4}"
+                  :autosize="{ minRows: 2, maxRows: 4 }"
                 />
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column
-            prop=""
-            label="标识"
-          >
+          <el-table-column prop="" label="标识">
             <template slot-scope="scope">
               <el-form-item
                 label=""
                 :prop="`AddList.${scope.$index}.Code`"
                 :rules="[
-                  { required: true,message: $t('common:ruleMessage:specify'), trigger: ['change','blur']},
-                  { max: 200, message: `${$t('common:ruleMessage:maxLength')} 200` }
+                  {
+                    required: true,
+                    message: $t('common:ruleMessage:specify'),
+                    trigger: ['change', 'blur'],
+                  },
+                  {
+                    max: 200,
+                    message: `${$t('common:ruleMessage:maxLength')} 200`,
+                  },
                 ]"
               >
                 <el-input
                   v-model="scope.row.Code"
                   type="textarea"
                   maxlength="200"
-                  :autosize="{ minRows: 2, maxRows: 4}"
+                  :autosize="{ minRows: 2, maxRows: 4 }"
                 />
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column
-            prop=""
-            label="中文值"
-          >
+          <el-table-column prop="" label="中文值">
             <template slot-scope="scope">
               <el-form-item
                 label=""
                 :prop="`AddList.${scope.$index}.ValueCN`"
                 :rules="[
-                  { required: true,message: $t('common:ruleMessage:specify'), trigger: ['change','blur']},
-                  { max: 1000, message: `${$t('common:ruleMessage:maxLength')} 1000` }
+                  {
+                    required: true,
+                    message: $t('common:ruleMessage:specify'),
+                    trigger: ['change', 'blur'],
+                  },
+                  {
+                    max: 1000,
+                    message: `${$t('common:ruleMessage:maxLength')} 1000`,
+                  },
                 ]"
               >
                 <el-input
                   v-model="scope.row.ValueCN"
                   type="textarea"
                   maxlength="1000"
-                  :autosize="{ minRows: 2, maxRows: 4}"
+                  :autosize="{ minRows: 2, maxRows: 4 }"
                 />
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column
-            prop=""
-            label="英文值"
-          >
+          <el-table-column prop="" label="英文值">
             <template slot-scope="scope">
               <el-form-item
                 label=""
                 :prop="`AddList.${scope.$index}.Value`"
                 :rules="[
-                  { required: true,message: $t('common:ruleMessage:specify'), trigger: ['change','blur']},
-                  { max: 1000, message: `${$t('common:ruleMessage:maxLength')} 1000` }
+                  {
+                    required: true,
+                    message: $t('common:ruleMessage:specify'),
+                    trigger: ['change', 'blur'],
+                  },
+                  {
+                    max: 1000,
+                    message: `${$t('common:ruleMessage:maxLength')} 1000`,
+                  },
                 ]"
               >
                 <el-input
                   v-model="scope.row.Value"
                   type="textarea"
                   maxlength="1000"
-                  :autosize="{ minRows: 2, maxRows: 4}"
+                  :autosize="{ minRows: 2, maxRows: 4 }"
                 />
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column
-            align="right"
-            width="100"
-          >
+          <el-table-column prop="" label="说明">
+            <template slot-scope="scope">
+              <el-form-item
+                label=""
+                :prop="`AddList.${scope.$index}.Description`"
+                :rules="[
+                  {
+                    max: 200,
+                    message: `${$t('common:ruleMessage:maxLength')} 200`,
+                    trigger: ['change', 'blur'],
+                  },
+                ]"
+              >
+                <el-input
+                  v-model="scope.row.Description"
+                  type="textarea"
+                  maxlength="200"
+                  :autosize="{ minRows: 2, maxRows: 4 }"
+                />
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column align="right" width="100">
             <template slot="header">
               <!-- 新增 -->
               <el-button
@@ -129,7 +169,8 @@
                 type="primary"
                 icon="el-icon-plus"
                 @click="handleAdd"
-              >{{ $t('common:button:new') }}</el-button>
+                >{{ $t("common:button:new") }}</el-button
+              >
             </template>
             <template slot-scope="scope">
               <!-- 删除 -->
@@ -138,81 +179,97 @@
                 type="text"
                 icon="el-icon-delete"
                 @click="handleDelete(scope.$index)"
-              >{{ $t('common:button:delete') }}</el-button>
+                >{{ $t("common:button:delete") }}</el-button
+              >
             </template>
           </el-table-column>
         </el-table>
       </el-form>
-
     </template>
     <template slot="dialog-footer">
-      <el-button size="small" type="primary" @click="handleCancle">取消</el-button>
-      <el-button size="small" type="primary" @click="handleSave">保存</el-button>
+      <el-button size="small" type="primary" @click="handleCancle"
+        >取消</el-button
+      >
+      <el-button size="small" type="primary" @click="handleSave"
+        >保存</el-button
+      >
     </template>
   </base-model>
 </template>
 <script>
-import { batchAddInternationalization } from '@/api/admin'
-import BaseModel from '@/components/BaseModel'
+import { batchAddInternationalization } from "@/api/admin";
+import BaseModel from "@/components/BaseModel";
 const formDataDefault = () => {
   return {
     State: 0,
     InternationalizationType: 1,
-    AddList: []
-  }
-}
+    PublishLogId: null,
+    AddList: [],
+  };
+};
 export default {
-  name: 'BatcnAddForm',
+  name: "BatcnAddForm",
   components: { BaseModel },
   data() {
     return {
       loading: false,
       form: formDataDefault(),
-      model_cfg: { visible: false, showClose: true, width: '800px', title: '', appendToBody: true }
-    }
-  },
-  mounted() {
+      model_cfg: {
+        visible: false,
+        showClose: true,
+        width: "800px",
+        title: "",
+        appendToBody: true,
+      },
+      rules: {
+        PublishLogId: [{ required: true, message: "请选择", trigger: "blur" }],
+      },
+      PublishVersionList: [],
+    };
   },
+  mounted() {},
   methods: {
-
-    openDialog(title, data) {
-      this.model_cfg.visible = true
-      this.model_cfg.title = title
-      this.form = formDataDefault()
+    openDialog(title, data, options = []) {
+      this.PublishVersionList = options;
+      this.model_cfg.visible = true;
+      this.model_cfg.title = title;
+      this.form = formDataDefault();
     },
     handleSave() {
-      this.$refs.batcnAddForm.validate(valid => {
-        if (!valid) return
-        this.loading = true
-        batchAddInternationalization(this.form).then(res => {
-          this.loading = false
-          this.$message.success(this.$t('common:message:savedSuccessfully'))
-          this.model_cfg.visible = false
-          this.$emit('getList')
-        }).catch(() => {
-          this.loading = false
-        })
-      })
+      this.$refs.batcnAddForm.validate((valid) => {
+        if (!valid) return;
+        this.loading = true;
+        batchAddInternationalization(this.form)
+          .then((res) => {
+            this.loading = false;
+            this.$message.success(this.$t("common:message:savedSuccessfully"));
+            this.model_cfg.visible = false;
+            this.$emit("getList");
+          })
+          .catch(() => {
+            this.loading = false;
+          });
+      });
     },
     handleCancle() {
-      this.model_cfg.visible = false
+      this.model_cfg.visible = false;
     },
     handleAdd() {
       this.form.AddList.push({
-        Description: '',
-        Code: '',
-        ValueCN: '',
-        Value: ''
-      })
+        Description: "",
+        Code: "",
+        ValueCN: "",
+        Value: "",
+      });
     },
     handleDelete(index) {
-      this.$confirm('是否确认删除？', {
-        type: 'warning',
-        distinguishCancelAndClose: true
+      this.$confirm("是否确认删除？", {
+        type: "warning",
+        distinguishCancelAndClose: true,
       }).then(() => {
-        this.form.AddList.splice(index, 1)
-      })
-    }
-  }
-}
+        this.form.AddList.splice(index, 1);
+      });
+    },
+  },
+};
 </script>

src/views/system/i18n/components/I18nForm.vue

@@ -9,147 +9,216 @@
         label-width="130px"
         size="small"
       >
-        <el-form-item label="国际化类型" prop="InternationalizationType">
+        <el-form-item
+          label="国际化类型"
+          prop="InternationalizationType"
+          v-if="status !== 'batch'"
+        >
           <el-radio-group v-model="form.InternationalizationType">
             <el-radio
               v-for="item of $d.InternationalizationType"
-              :key="'InternationalizationType'+item.value"
+              :key="'InternationalizationType' + item.value"
               :label="item.value"
-            >{{ item.label }}</el-radio>
+              >{{ item.label }}</el-radio
+            >
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="功能模块/服务名" prop="Description">
+        <el-form-item
+          label="功能模块/服务名"
+          prop="Module"
+          v-if="status !== 'batch'"
+        >
           <el-input
-            v-model="form.Description"
+            v-model="form.Module"
             type="textarea"
             maxlength="200"
-            :autosize="{ minRows: 2, maxRows: 4}"
+            :autosize="{ minRows: 2, maxRows: 4 }"
           />
         </el-form-item>
-        <el-form-item label="标识" prop="Code">
+        <el-form-item label="标识" prop="Code" v-if="status !== 'batch'">
           <el-input
             v-model="form.Code"
             type="textarea"
             maxlength="200"
-            :autosize="{ minRows: 2, maxRows: 4}"
+            :autosize="{ minRows: 2, maxRows: 4 }"
           />
         </el-form-item>
-        <el-form-item label="中文值" prop="ValueCN">
+        <el-form-item label="中文值" prop="ValueCN" v-if="status !== 'batch'">
           <el-input
             v-model="form.ValueCN"
             type="textarea"
             maxlength="1000"
-            :autosize="{ minRows: 2, maxRows: 4}"
+            :autosize="{ minRows: 2, maxRows: 4 }"
           />
         </el-form-item>
-        <el-form-item label="英文值" prop="Value">
+        <el-form-item label="英文值" prop="Value" v-if="status !== 'batch'">
           <el-input
             v-model="form.Value"
             type="textarea"
             maxlength="1000"
-            :autosize="{ minRows: 2, maxRows: 4}"
+            :autosize="{ minRows: 2, maxRows: 4 }"
           />
         </el-form-item>
-
         <el-form-item label="状态" prop="State">
           <el-radio-group v-model="form.State">
             <el-radio
               v-for="item of $d.InternationalizationKeyState"
-              :key="'InternationalizationKeyState'+item.value"
+              :key="'InternationalizationKeyState' + item.value"
               :label="item.value"
-            >{{ item.label }}</el-radio>
+              >{{ item.label }}</el-radio
+            >
           </el-radio-group>
         </el-form-item>
+        <el-form-item label="说明" prop="Description" v-if="status !== 'batch'">
+          <el-input
+            v-model="form.Description"
+            type="textarea"
+            maxlength="200"
+            :autosize="{ minRows: 2, maxRows: 4 }"
+          />
+        </el-form-item>
+        <el-form-item label="迭代" prop="PublishLogId">
+          <el-select v-model="form.PublishLogId" clearable filterable>
+            <el-option
+              v-for="item in PublishVersionList"
+              :key="item.Id"
+              :label="item.Version"
+              :value="item.Id"
+            />
+          </el-select>
+        </el-form-item>
       </el-form>
     </template>
     <template slot="dialog-footer">
-      <el-button size="small" type="primary" @click="handleCancle">取消</el-button>
-      <el-button size="small" type="primary" @click="handleSave">保存</el-button>
+      <el-button size="small" type="primary" @click="handleCancle"
+        >取消</el-button
+      >
+      <el-button size="small" type="primary" @click="handleSave"
+        >保存</el-button
+      >
     </template>
   </base-model>
 </template>
 <script>
-import { addOrUpdateInternationalization } from '@/api/admin'
-import BaseModel from '@/components/BaseModel'
+import { addOrUpdateInternationalization } from "@/api/admin";
+import BaseModel from "@/components/BaseModel";
 const formDataDefault = () => {
   return {
     Id: null,
     State: 0,
     Description: null,
+    Module: null,
     Code: null,
     Value: null,
     ValueCN: null,
-    InternationalizationType: 1
-  }
-}
+    InternationalizationType: 1,
+    PublishLogId: null,
+  };
+};
 export default {
-  name: 'I18nForm',
+  name: "I18nForm",
   components: { BaseModel },
   data() {
     return {
+      status: "add", // add update batch
       loading: false,
       form: formDataDefault(),
       rules: {
-        State: [
-          { required: true, message: '请选择', trigger: 'blur' }
+        State: [{ required: true, message: "请选择", trigger: "blur" }],
+        Module: [
+          {
+            max: 200,
+            message: `${this.$t("common:ruleMessage:maxLength")} 200`,
+            trigger: "blur",
+          },
         ],
         Description: [
-          { required: true, message: '请注明', trigger: 'blur' },
-          { max: 200, message: `${this.$t('common:ruleMessage:maxLength')} 200` }
+          {
+            max: 200,
+            message: `${this.$t("common:ruleMessage:maxLength")} 200`,
+            trigger: "blur",
+          },
         ],
         Code: [
-          { required: true, message: '请注明', trigger: 'blur' },
-          { max: 200, message: `${this.$t('common:ruleMessage:maxLength')} 200` }
+          { required: true, message: "请注明", trigger: "blur" },
+          {
+            max: 200,
+            message: `${this.$t("common:ruleMessage:maxLength")} 200`,
+          },
         ],
         Value: [
-          { required: true, message: '请注明', trigger: 'blur' },
-          { max: 1000, message: `${this.$t('common:ruleMessage:maxLength')} 1000` }
+          { required: true, message: "请注明", trigger: "blur" },
+          {
+            max: 1000,
+            message: `${this.$t("common:ruleMessage:maxLength")} 1000`,
+          },
         ],
         ValueCN: [
-          { required: true, message: '请注明', trigger: 'blur' },
-          { max: 1000, message: `${this.$t('common:ruleMessage:maxLength')} 1000` }
+          { required: true, message: "请注明", trigger: "blur" },
+          {
+            max: 1000,
+            message: `${this.$t("common:ruleMessage:maxLength")} 1000`,
+          },
         ],
         InternationalizationType: [
-          { required: true, message: '请选择', trigger: 'blur' }
-        ]
+          { required: true, message: "请选择", trigger: "blur" },
+        ],
+        PublishLogId: [{ required: true, message: "请选择", trigger: "blur" }],
       },
-      model_cfg: { visible: false, showClose: true, width: '600px', title: '', appendToBody: true }
-    }
-  },
-  mounted() {
+      model_cfg: {
+        visible: false,
+        showClose: true,
+        width: "600px",
+        title: "",
+        appendToBody: true,
+      },
+      PublishVersionList: [],
+    };
   },
+  mounted() {},
   methods: {
-
-    openDialog(title, data) {
-      this.model_cfg.visible = true
-      this.model_cfg.title = title
+    openDialog(title, data, options = [], status) {
+      this.PublishVersionList = options;
+      this.status = status;
+      this.model_cfg.visible = true;
+      this.model_cfg.title = title;
       if (Object.keys(data).length > 0) {
         for (const k in this.form) {
           if (data.hasOwnProperty(k)) {
-            this.form[k] = data[k]
+            this.form[k] = data[k];
           }
         }
       } else {
-        this.form = formDataDefault()
+        this.form = formDataDefault();
       }
     },
     handleSave() {
-      this.$refs.i18nForm.validate(valid => {
-        if (!valid) return
-        this.loading = true
-        addOrUpdateInternationalization(this.form).then(res => {
-          this.loading = false
-          this.$message.success(this.$t('common:message:savedSuccessfully'))
-          this.model_cfg.visible = false
-          this.$emit('getList')
-        }).catch(() => {
-          this.loading = false
-        })
-      })
+      this.$refs.i18nForm.validate((valid) => {
+        if (!valid) return;
+        this.loading = true;
+        if (this.status === "batch") {
+          return this.$emit("batch", this.form);
+        }
+        addOrUpdateInternationalization(this.form)
+          .then((res) => {
+            this.loading = false;
+            this.$message.success(this.$t("common:message:savedSuccessfully"));
+            this.model_cfg.visible = false;
+            this.$emit("getList");
+          })
+          .catch(() => {
+            this.loading = false;
+          });
+      });
     },
     handleCancle() {
-      this.model_cfg.visible = false
-    }
-  }
-}
+      this.model_cfg.visible = false;
+    },
+  },
+};
 </script>
+<style lang="scss" scoped>
+::v-deep .el-select {
+  width: 100%;
+}
+</style>

src/views/system/i18n/index.vue

@@ -7,11 +7,11 @@
             v-model="searchData.InternationalizationType"
             clearable
             filterable
-            style="width:130px;"
+            style="width: 130px"
           >
             <el-option
               v-for="item of $d.InternationalizationType"
-              :key="'InternationalizationType'+item.value"
+              :key="'InternationalizationType' + item.value"
               :label="item.label"
               :value="item.value"
             />
@@ -19,10 +19,10 @@
         </el-form-item>
         <el-form-item label="功能模块/服务名">
           <el-input
-            v-model="searchData.Description"
+            v-model="searchData.Module"
             size="small"
             clearable
-            style="width:130px;"
+            style="width: 130px"
           />
         </el-form-item>
         <el-form-item label="标识">
@@ -30,7 +30,7 @@
             v-model="searchData.Code"
             size="small"
             clearable
-            style="width:130px;"
+            style="width: 130px"
           />
         </el-form-item>
         <el-form-item label="中文值">
@@ -38,27 +38,55 @@
             v-model="searchData.ValueCN"
             size="small"
             clearable
-            style="width:130px;"
+            style="width: 130px"
           />
         </el-form-item>
         <el-form-item label="英文值">
           <el-input
             v-model="searchData.Value"
             size="small"
-            style="width:130px;"
+            style="width: 130px"
             clearable
           />
         </el-form-item>
         <el-form-item label="状态">
-          <el-select v-model="searchData.State" clearable filterable style="width:130px;">
+          <el-select
+            v-model="searchData.State"
+            clearable
+            filterable
+            style="width: 130px"
+          >
             <el-option
               v-for="item of $d.InternationalizationKeyState"
-              :key="'InternationalizationKeyState'+item.value"
+              :key="'InternationalizationKeyState' + item.value"
               :label="item.label"
               :value="item.value"
             />
           </el-select>
         </el-form-item>
+        <el-form-item label="说明">
+          <el-input
+            v-model="searchData.Description"
+            size="small"
+            clearable
+            style="width: 130px"
+          />
+        </el-form-item>
+        <el-form-item label="迭代">
+          <el-select
+            v-model="searchData.PublishLogId"
+            clearable
+            filterable
+            style="width: 130px"
+          >
+            <el-option
+              v-for="item in PublishVersionList"
+              :key="item.Id"
+              :label="item.Version"
+              :value="item.Id"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <el-button
             type="primary"
@@ -84,20 +112,27 @@
           >
             批量新增
           </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-edit-outline"
+            size="mini"
+            :disabled="selectTableList.length <= 0"
+            @click="handleBatchUpdate"
+          >
+            批量更新
+          </el-button>
         </el-form-item>
       </el-form>
       <el-table
         v-loading="loading"
-        v-adaptive="{bottomOffset:45}"
+        v-adaptive="{ bottomOffset: 45 }"
         height="100"
         :data="list"
         class="table"
         @sort-change="handleSortByColumn"
-      >
-        <el-table-column
-          type="index"
-          width="50"
-        />
+        @selection-change="handleSelectionChange"
+        ><el-table-column type="selection" width="50" />
+        <el-table-column type="index" width="50" />
         <el-table-column
           label="国际化类型"
           prop="InternationalizationType"
@@ -106,21 +141,42 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.InternationalizationType === 0" type="primary">
-              {{ $fd('InternationalizationType', scope.row.InternationalizationType) }}
+            <el-tag
+              v-if="scope.row.InternationalizationType === 0"
+              type="primary"
+            >
+              {{
+                $fd(
+                  "InternationalizationType",
+                  scope.row.InternationalizationType
+                )
+              }}
             </el-tag>
-            <el-tag v-else-if="scope.row.InternationalizationType === 1" type="warning">
-              {{ $fd('InternationalizationType', scope.row.InternationalizationType) }}
+            <el-tag
+              v-else-if="scope.row.InternationalizationType === 1"
+              type="warning"
+            >
+              {{
+                $fd(
+                  "InternationalizationType",
+                  scope.row.InternationalizationType
+                )
+              }}
             </el-tag>
             <el-tag v-else>
-              {{ $fd('InternationalizationType', scope.row.InternationalizationType) }}
+              {{
+                $fd(
+                  "InternationalizationType",
+                  scope.row.InternationalizationType
+                )
+              }}
             </el-tag>
           </template>
         </el-table-column>
         <el-table-column
           label="功能模块/服务名"
-          prop="Description"
-          min-width="100"
+          prop="Module"
+          min-width="120"
           show-overflow-tooltip
           sortable="custom"
         />
@@ -154,16 +210,30 @@
         >
           <template slot-scope="scope">
             <el-tag v-if="scope.row.State === 0" type="danger">
-              {{ $fd('InternationalizationKeyState', scope.row.State) }}
+              {{ $fd("InternationalizationKeyState", scope.row.State) }}
             </el-tag>
             <el-tag v-else-if="scope.row.State === 1" type="primary">
-              {{ $fd('InternationalizationKeyState', scope.row.State) }}
+              {{ $fd("InternationalizationKeyState", scope.row.State) }}
             </el-tag>
             <el-tag v-else>
-              {{ $fd('InternationalizationKeyState', scope.row.State) }}
+              {{ $fd("InternationalizationKeyState", scope.row.State) }}
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column
+          label="说明"
+          prop="Description"
+          min-width="100"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <el-table-column
+          label="迭代"
+          prop="Version"
+          min-width="100"
+          show-overflow-tooltip
+          sortable="custom"
+        />
         <el-table-column
           label="更新时间"
           prop="UpdateTime"
@@ -197,11 +267,10 @@
             >
               删除
             </el-button>
-
           </template>
         </el-table-column>
       </el-table>
-      <div class="pagination" style="text-align: right;margin-top:5px;">
+      <div class="pagination" style="text-align: right; margin-top: 5px">
         <pagination
           :total="total"
           :page.sync="searchData.PageIndex"
@@ -209,20 +278,22 @@
           @pagination="getList"
         />
       </div>
-      <i18n-form
-        ref="i18nForm"
-        @getList="getList"
-      />
+      <i18n-form ref="i18nForm" @getList="getList" @batch="batch" />
       <BatchAddForm ref="batcnAddForm" @getList="getList" />
     </div>
   </div>
 </template>
 <script>
-import { getInternationalizationList, deleteInternationalization } from '@/api/admin'
-import Pagination from '@/components/Pagination'
-import I18nForm from './components/I18nForm.vue'
-import BatchAddForm from './components/BatchAddForm.vue'
-import moment from 'moment'
+import {
+  getInternationalizationList,
+  deleteInternationalization,
+  getPublishVersionSelect,
+  batchUpdateInternationalInfo,
+} from "@/api/admin";
+import Pagination from "@/components/Pagination";
+import I18nForm from "./components/I18nForm.vue";
+import BatchAddForm from "./components/BatchAddForm.vue";
+import moment from "moment";
 const searchDataDefault = () => {
   return {
     Description: null,
@@ -230,14 +301,16 @@ const searchDataDefault = () => {
     ValueCN: null,
     InternationalizationType: null,
     State: null,
+    Module: null,
+    PublishLogId: null,
     Asc: true,
-    SortField: '',
+    SortField: "",
     PageIndex: 1,
-    PageSize: 20
-  }
-}
+    PageSize: 20,
+  };
+};
 export default {
-  name: 'I18n',
+  name: "I18n",
   components: { Pagination, I18nForm, BatchAddForm },
   data() {
     return {
@@ -245,100 +318,169 @@ export default {
       searchData: searchDataDefault(),
       list: [],
       total: 0,
-      loading: false
-    }
+      loading: false,
+      PublishVersionList: [],
+      selectTableList: [],
+    };
   },
   mounted() {
-    this.getList()
+    this.getList();
+    this.getPublishVersionSelect();
   },
   methods: {
+    // 获取迭代
+    async getPublishVersionSelect() {
+      try {
+        let res = await getPublishVersionSelect();
+        if (res.IsSuccess) {
+          this.PublishVersionList = res.Result;
+        }
+      } catch (err) {
+        console.log(err);
+      }
+    },
     getList() {
-      this.loading = true
-      getInternationalizationList(this.searchData).then((res) => {
-        this.loading = false
-        this.list = res.Result.CurrentPageData
-        this.total = res.Result.TotalCount
-      }).catch(() => {
-        this.loading = false
-      })
+      this.loading = true;
+      getInternationalizationList(this.searchData)
+        .then((res) => {
+          this.loading = false;
+          this.list = res.Result.CurrentPageData;
+          this.total = res.Result.TotalCount;
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+    // 批量更新
+    handleBatchUpdate() {
+      this.$nextTick(() => {
+        this.$refs["i18nForm"].openDialog(
+          "批量更新",
+          {},
+          this.PublishVersionList,
+          "batch"
+        );
+      });
+    },
+    async batch(row) {
+      let { PublishLogId, State } = row;
+      let data = {
+        PublishLogId,
+        State,
+        IdList: this.selectTableList.map((item) => item.Id),
+      };
+      try {
+        let res = await batchUpdateInternationalInfo(data);
+        if (res.IsSuccess) {
+          this.$message.success(this.$t("common:message:updatedSuccessfully"));
+          this.getList();
+          this.$nextTick(() => {
+            this.$refs["i18nForm"].handleCancle();
+          });
+        }
+      } catch (err) {
+        console.log(err);
+      }
     },
     handleAdd() {
       this.$nextTick(() => {
-        this.$refs['i18nForm'].openDialog('新增', {})
-      })
+        this.$refs["i18nForm"].openDialog(
+          "新增",
+          {},
+          this.PublishVersionList,
+          "add"
+        );
+      });
     },
     handleBatchAdd() {
       this.$nextTick(() => {
-        this.$refs['batcnAddForm'].openDialog('批量新增', {})
-      })
+        this.$refs["batcnAddForm"].openDialog(
+          "批量新增",
+          {},
+          this.PublishVersionList
+        );
+      });
     },
     handleEdit(row) {
       this.$nextTick(() => {
-        this.$refs['i18nForm'].openDialog('编辑', row)
-      })
+        this.$refs["i18nForm"].openDialog(
+          "编辑",
+          row,
+          this.PublishVersionList,
+          "update"
+        );
+      });
     },
     // 重置列表查询
     handleReset() {
-      this.searchData = searchDataDefault()
-      this.getList()
+      this.searchData = searchDataDefault();
+      this.getList();
     },
     // 删除
     handleDelete(row) {
-      this.$confirm('是否确认删除？', {
-        type: 'warning',
-        distinguishCancelAndClose: true
-      })
-        .then(() => {
-          this.loading = true
-          deleteInternationalization(row.Id)
-            .then(res => {
-              this.loading = false
-              if (res.IsSuccess) {
-                this.getList()
-                this.$message.success(this.$t('common:message:deletedSuccessfully'))
-              }
-            }).catch(() => { this.loading = false })
-        })
+      this.$confirm("是否确认删除？", {
+        type: "warning",
+        distinguishCancelAndClose: true,
+      }).then(() => {
+        this.loading = true;
+        deleteInternationalization(row.Id)
+          .then((res) => {
+            this.loading = false;
+            if (res.IsSuccess) {
+              this.getList();
+              this.$message.success(
+                this.$t("common:message:deletedSuccessfully")
+              );
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+          });
+      });
     },
     // 排序
     handleSortByColumn(column) {
-      if (column.order === 'ascending') {
-        this.searchData.Asc = true
+      if (column.order === "ascending") {
+        this.searchData.Asc = true;
       } else {
-        this.searchData.Asc = false
+        this.searchData.Asc = false;
       }
-      this.searchData.SortField = column.prop
-      this.searchData.PageIndex = 1
-      this.getList()
+      this.searchData.SortField = column.prop;
+      this.searchData.PageIndex = 1;
+      this.getList();
+    },
+    // 选择
+    handleSelectionChange(val) {
+      this.selectTableList = val;
+    },
+  },
+};
+</script>
+<style lang="scss">
+.log {
+  height: 100%;
+  box-sizing: border-box;
+  display: flex;
+  padding: 10px;
+  border-radius: 5px;
+  .left {
+    display: flex;
+    flex-direction: column;
+    width: 0;
+    flex-grow: 4;
+    // border-right: 1px solid #ccc;
+    .filter-container {
+      display: flex;
+      align-items: center;
+      margin: 5px;
+    }
+    .data-table {
+      flex: 1;
+      padding: 5px 0px;
+    }
+    .pagination-container {
+      text-align: right;
     }
   }
 }
-</script>
-<style lang="scss">
-  .log {
-    height: 100%;
-    box-sizing: border-box;
-    display: flex;
-    padding: 10px;
-    border-radius: 5px;
-    .left {
-      display: flex;
-      flex-direction: column;
-      width: 0;
-      flex-grow: 4;
-      // border-right: 1px solid #ccc;
-      .filter-container {
-        display: flex;
-        align-items: center;
-        margin: 5px;
-      }
-      .data-table {
-        flex: 1;
-        padding: 5px 0px;
-      }
-      .pagination-container {
-        text-align: right;
-      }
-    }
-  }
 </style>

src/views/system/log/components/LogForm.vue

@@ -10,46 +10,72 @@
         size="small"
       >
         <el-form-item label="发布版本" prop="Version">
-          <el-input
-            v-model="form.Version"
-          />
+          <el-input v-model="form.Version" />
         </el-form-item>
         <el-form-item label="更新功能" prop="UpdateContent">
           <el-input
             v-model="form.UpdateContent"
             type="textarea"
             maxlength="1000"
-            :autosize="{ minRows: 4, maxRows: 5}"
+            :autosize="{ minRows: 4, maxRows: 5 }"
           />
         </el-form-item>
-        <el-form-item label="发布日期" prop="PublishTime">
+        <el-form-item label="发布状态" prop="State">
+          <el-select v-model="form.State" placeholder="请选择">
+            <el-option
+              v-for="item in $d.PublishStatus"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="发布日期">
           <el-date-picker
             v-model="form.PublishTime"
             type="date"
             value-format="yyyy-MM-dd HH:mm:ss"
           />
         </el-form-item>
+        <el-form-item label="是否当前版本" prop="IsCurrentVersion">
+          <el-select v-model="form.IsCurrentVersion" placeholder="请选择">
+            <el-option
+              v-for="item in $d.YesOrNo"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
       </el-form>
     </template>
     <template slot="dialog-footer">
-      <el-button size="small" type="primary" @click="handleCancle">取消</el-button>
-      <el-button size="small" type="primary" @click="handleSave">保存</el-button>
+      <el-button size="small" type="primary" @click="handleCancle"
+        >取消</el-button
+      >
+      <el-button size="small" type="primary" @click="handleSave"
+        >保存</el-button
+      >
     </template>
   </base-model>
 </template>
 <script>
-import { addOrUpdatePublishLog } from '@/api/admin'
-import BaseModel from '@/components/BaseModel'
+import { addOrUpdatePublishLog } from "@/api/admin";
+import BaseModel from "@/components/BaseModel";
 const formDataDefault = () => {
   return {
     Id: null,
     Version: null,
     PublishTime: null,
-    UpdateContent: null
-  }
-}
+    UpdateContent: null,
+    State: null,
+    IsCurrentVersion: null,
+  };
+};
 export default {
-  name: 'LogForm',
+  name: "LogForm",
   components: { BaseModel },
   data() {
     return {
@@ -57,54 +83,73 @@ export default {
       form: formDataDefault(),
       rules: {
         Version: [
-          { required: true, message: '请注明', trigger: 'blur' },
-          { max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50` }
+          { required: true, message: "请注明", trigger: "blur" },
+          { max: 50, message: `${this.$t("common:ruleMessage:maxLength")} 50` },
         ],
-        PublishTime: [
-          { required: true, message: '请注明', trigger: 'blur' }
+        // PublishTime: [
+        //   { required: true, message: '请注明', trigger: 'blur' }
+        // ],
+        IsCurrentVersion: [
+          { required: true, message: "请选择", trigger: "blur" },
         ],
+        State: [{ required: true, message: "请选择", trigger: "blur" }],
         UpdateContent: [
-          { required: true, message: '请注明', trigger: 'blur' },
-          { max: 1000, message: `${this.$t('common:ruleMessage:maxLength')} 500` }
-        ]
+          { required: true, message: "请注明", trigger: "blur" },
+          {
+            max: 1000,
+            message: `${this.$t("common:ruleMessage:maxLength")} 500`,
+          },
+        ],
       },
-      model_cfg: { visible: false, showClose: true, width: '500px', title: '', appendToBody: true }
-    }
-  },
-  mounted() {
+      model_cfg: {
+        visible: false,
+        showClose: true,
+        width: "500px",
+        title: "",
+        appendToBody: true,
+      },
+    };
   },
+  mounted() {},
   methods: {
-
     openDialog(title, data) {
-      this.model_cfg.visible = true
-      this.model_cfg.title = title
+      this.model_cfg.visible = true;
+      this.model_cfg.title = title;
       if (Object.keys(data).length > 0) {
         for (const k in this.form) {
           if (data.hasOwnProperty(k)) {
-            this.form[k] = data[k]
+            this.form[k] = data[k];
           }
         }
       } else {
-        this.form = formDataDefault()
+        this.form = formDataDefault();
       }
     },
     handleSave() {
-      this.$refs.LogForm.validate(valid => {
-        if (!valid) return
-        this.loading = true
-        addOrUpdatePublishLog(this.form).then(res => {
-          this.loading = false
-          this.$message.success(this.$t('common:message:savedSuccessfully'))
-          this.model_cfg.visible = false
-          this.$emit('getList')
-        }).catch(() => {
-          this.loading = false
-        })
-      })
+      this.$refs.LogForm.validate((valid) => {
+        if (!valid) return;
+        this.loading = true;
+        addOrUpdatePublishLog(this.form)
+          .then((res) => {
+            this.loading = false;
+            this.$message.success(this.$t("common:message:savedSuccessfully"));
+            this.model_cfg.visible = false;
+            this.$emit("getList");
+          })
+          .catch(() => {
+            this.loading = false;
+          });
+      });
     },
     handleCancle() {
-      this.model_cfg.visible = false
-    }
-  }
-}
+      this.model_cfg.visible = false;
+    },
+  },
+};
 </script>
+<style lang="scss" scoped>
+::v-deep .el-select,
+.el-date-editor {
+  width: 100%;
+}
+</style>

src/views/system/log/index.vue

@@ -2,25 +2,11 @@
   <div class="log">
     <div ref="leftContainer" class="left">
       <el-form :inline="true">
-        <el-form-item
-          label="发布版本"
-          prop="Version"
-        >
-          <el-input
-            v-model="searchData.Version"
-            size="small"
-            clearable
-          />
+        <el-form-item label="发布版本" prop="Version">
+          <el-input v-model="searchData.Version" size="small" clearable />
         </el-form-item>
-        <el-form-item
-          label="更新功能"
-          prop="UpdateContent"
-        >
-          <el-input
-            v-model="searchData.UpdateContent"
-            size="small"
-            clearable
-          />
+        <el-form-item label="更新功能" prop="UpdateContent">
+          <el-input v-model="searchData.UpdateContent" size="small" clearable />
         </el-form-item>
         <el-form-item>
           <el-button
@@ -43,17 +29,14 @@
       </el-form>
       <el-table
         v-loading="loading"
-        v-adaptive="{bottomOffset:45}"
+        v-adaptive="{ bottomOffset: 45 }"
         height="100"
         :data="list"
         class="table"
         @sort-change="handleSortByColumn"
-        :default-sort="{prop:'PublishTime',order:'descending'}"
+        :default-sort="{ prop: 'PublishTime', order: 'descending' }"
       >
-        <el-table-column
-          type="index"
-          width="50"
-        />
+        <el-table-column type="index" width="50" />
         <el-table-column
           label="发布版本"
           prop="Version"
@@ -67,6 +50,16 @@
           min-width="150"
           show-overflow-tooltip
         />
+        <el-table-column
+          label="发布状态"
+          prop="State"
+          min-width="150"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <span>{{ $fd("PublishStatus", scope.row.State) }}</span>
+          </template>
+        </el-table-column>
         <el-table-column
           label="发布日期"
           prop="PublishTime"
@@ -75,10 +68,23 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            {{ scope.row.PublishTime?moment(scope.row.PublishTime).format('YYYY-MM-DD'):'' }}
+            {{
+              scope.row.PublishTime
+                ? moment(scope.row.PublishTime).format("YYYY-MM-DD")
+                : ""
+            }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="是否当前版本"
+          prop="IsCurrentVersion"
+          min-width="150"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <span>{{ $fd("YesOrNo", scope.row.IsCurrentVersion) }}</span>
           </template>
         </el-table-column>
-
         <el-table-column
           label="操作"
           fixed="right"
@@ -103,11 +109,10 @@
             >
               删除
             </el-button>
-
           </template>
         </el-table-column>
       </el-table>
-      <div class="pagination" style="text-align: right;margin-top:5px;">
+      <div class="pagination" style="text-align: right; margin-top: 5px">
         <pagination
           :total="total"
           :page.sync="searchData.PageIndex"
@@ -115,28 +120,25 @@
           @pagination="getList"
         />
       </div>
-      <log-form
-        ref="LogForm"
-        @getList="getList"
-      />
+      <log-form ref="LogForm" @getList="getList" />
     </div>
   </div>
 </template>
 <script>
-import { getPublishLogList, deletePublishLog } from '@/api/admin'
-import Pagination from '@/components/Pagination'
-import LogForm from './components/LogForm.vue'
-import moment from 'moment'
+import { getPublishLogList, deletePublishLog } from "@/api/admin";
+import Pagination from "@/components/Pagination";
+import LogForm from "./components/LogForm.vue";
+import moment from "moment";
 const searchDataDefault = () => {
   return {
     Version: null,
     UpdateContent: null,
     Asc: false,
-    SortField: 'PublishTime',
+    SortField: "PublishTime",
     PageIndex: 1,
-    PageSize: 20
-  }
-}
+    PageSize: 20,
+  };
+};
 export default {
   components: { Pagination, LogForm },
   data() {
@@ -145,95 +147,101 @@ export default {
       searchData: searchDataDefault(),
       list: [],
       total: 0,
-      loading: false
-    }
+      loading: false,
+    };
   },
   mounted() {
-    this.getList()
+    this.getList();
   },
   methods: {
     getList() {
-      this.loading = true
-      getPublishLogList(this.searchData).then((res) => {
-        this.loading = false
-        this.list = res.Result.CurrentPageData
-        this.total = res.Result.TotalCount
-      }).catch(() => {
-        this.loading = false
-      })
+      this.loading = true;
+      getPublishLogList(this.searchData)
+        .then((res) => {
+          this.loading = false;
+          this.list = res.Result.CurrentPageData;
+          this.total = res.Result.TotalCount;
+        })
+        .catch(() => {
+          this.loading = false;
+        });
     },
     handleAdd() {
       this.$nextTick(() => {
-        this.$refs['LogForm'].openDialog('新增', {})
-      })
+        this.$refs["LogForm"].openDialog("新增", {});
+      });
     },
     handleEdit(row) {
       this.$nextTick(() => {
-        this.$refs['LogForm'].openDialog('编辑', row)
-      })
+        this.$refs["LogForm"].openDialog("编辑", row);
+      });
     },
     // 重置列表查询
     handleReset() {
-      this.searchData = searchDataDefault()
-      this.getList()
+      this.searchData = searchDataDefault();
+      this.getList();
     },
     // 删除
     handleDelete(row) {
-      this.$confirm('是否确认删除？', {
-        type: 'warning',
-        distinguishCancelAndClose: true
-      })
-        .then(() => {
-          this.loading = true
-          deletePublishLog(row.Id)
-            .then(res => {
-              this.loading = false
-              if (res.IsSuccess) {
-                this.getList()
-                this.$message.success(this.$t('common:message:deletedSuccessfully'))
-              }
-            }).catch(() => { this.loading = false })
-        })
+      this.$confirm("是否确认删除？", {
+        type: "warning",
+        distinguishCancelAndClose: true,
+      }).then(() => {
+        this.loading = true;
+        deletePublishLog(row.Id)
+          .then((res) => {
+            this.loading = false;
+            if (res.IsSuccess) {
+              this.getList();
+              this.$message.success(
+                this.$t("common:message:deletedSuccessfully")
+              );
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+          });
+      });
     },
     // 排序
     handleSortByColumn(column) {
-      if (column.order === 'ascending') {
-        this.searchData.Asc = true
+      if (column.order === "ascending") {
+        this.searchData.Asc = true;
       } else {
-        this.searchData.Asc = false
+        this.searchData.Asc = false;
       }
-      this.searchData.SortField = column.prop
-      this.searchData.PageIndex = 1
-      this.getList()
+      this.searchData.SortField = column.prop;
+      this.searchData.PageIndex = 1;
+      this.getList();
+    },
+  },
+};
+</script>
+<style lang="scss">
+.log {
+  height: 100%;
+  box-sizing: border-box;
+  display: flex;
+  padding: 10px;
+  border-radius: 5px;
+  .left {
+    display: flex;
+    flex-direction: column;
+    width: 0;
+    flex-grow: 4;
+    // border-right: 1px solid #ccc;
+    .filter-container {
+      display: flex;
+      align-items: center;
+      margin: 5px;
+    }
+    .data-table {
+      flex: 1;
+      padding: 5px 0px;
+    }
+    .pagination-container {
+      text-align: right;
     }
   }
 }
-</script>
-<style lang="scss">
-  .log {
-    height: 100%;
-    box-sizing: border-box;
-    display: flex;
-    padding: 10px;
-    border-radius: 5px;
-    .left {
-      display: flex;
-      flex-direction: column;
-      width: 0;
-      flex-grow: 4;
-      // border-right: 1px solid #ccc;
-      .filter-container {
-        display: flex;
-        align-items: center;
-        margin: 5px;
-      }
-      .data-table {
-        flex: 1;
-        padding: 5px 0px;
-      }
-      .pagination-container {
-        text-align: right;
-      }
-    }
-  }
 </style>

src/views/trials/trials-layout/components/trialsNavbar.vue

@@ -41,11 +41,7 @@
           <!-- 工作台 -->
           <span slot="title">{{ $t("trials:menuTitle:workbench") }}</span>
         </el-menu-item>
-        <el-menu-item
-          v-if="!hasPermi(['role:zys'])"
-          index="2"
-          :disabled="TotalNeedSignSystemDocCount !== 0"
-        >
+        <el-menu-item v-if="!hasPermi(['role:zys','role:zyss','role:zybs'])" index="2" :disabled="TotalNeedSignSystemDocCount !== 0">
           <i class="el-icon-box" />
           <!-- 我的项目 -->
           <span slot="title">

src/views/trials/trials-panel/attachments/self-attachment/index.vue

@@ -323,6 +323,7 @@ export default {
     },
     // 关闭签名弹窗
     closeSignDialog(isSave) {
+      this.duration = 0
       this.signVisible = false
       if (isSave) {
         this.currentIsConfirm = true

src/views/trials/trials-panel/attachments/site-research/index.vue

@@ -5,9 +5,14 @@
       <el-form :inline="true">
         <!-- 中心 -->
         <el-form-item :label="$t('trials:researchRecord:table:siteId')">
-          <el-select v-model="searchData.TrialSiteId" clearable filterable style="width:120px;">
+          <el-select
+            v-model="searchData.TrialSiteId"
+            clearable
+            filterable
+            style="width: 120px"
+          >
             <el-option
-              v-for="(item,index) of siteOptions"
+              v-for="(item, index) of siteOptions"
               :key="index"
               :label="item.TrialSiteCode"
               :value="item.TrialSiteId"
@@ -20,17 +25,21 @@
             v-model="searchData.UserKeyInfo"
             class="mr"
             clearable
-            :placeholder="`${$t('trials:researchRecord:placeholder:contactorInfo')}`"
-            style="width:140px;"
+            :placeholder="`${$t(
+              'trials:researchRecord:placeholder:contactorInfo'
+            )}`"
+            style="width: 140px"
           />
         </el-form-item>
         <!-- 初审人 -->
-        <el-form-item :label="$t('trials:researchRecord:table:preliminaryUser')">
+        <el-form-item
+          :label="$t('trials:researchRecord:table:preliminaryUser')"
+        >
           <el-input
             v-model="searchData.PreliminaryUserName"
             class="mr"
             clearable
-            style="width:140px;"
+            style="width: 140px"
           />
         </el-form-item>
         <!-- 审核人 -->
@@ -39,14 +48,19 @@
             v-model="searchData.ReviewerUserName"
             class="mr"
             clearable
-            style="width:140px;"
+            style="width: 140px"
           />
         </el-form-item>
         <!-- 状态 -->
         <el-form-item :label="$t('trials:researchRecord:table:status')">
-          <el-select v-model="searchData.State" clearable filterable style="width:120px;">
+          <el-select
+            v-model="searchData.State"
+            clearable
+            filterable
+            style="width: 120px"
+          >
             <el-option
-              v-for="(item,index) of $d.ResearchRecord"
+              v-for="(item, index) of $d.ResearchRecord"
               :key="index"
               :label="item.label"
               :value="item.value"
@@ -55,8 +69,19 @@
         </el-form-item>
         <!-- 是否废除 -->
         <el-form-item :label="$t('trials:researchRecord:table:isDeleted')">
-          <el-select v-model="searchData.IsDeleted" clearable filterable style="width:120px;">
-            <el-option v-for="item of $d.YesOrNo" v-show="item.raw.ValueCN !== '无'" :key="`IsDeleted${item.value}`" :label="item.label" :value="item.value" />
+          <el-select
+            v-model="searchData.IsDeleted"
+            clearable
+            filterable
+            style="width: 120px"
+          >
+            <el-option
+              v-for="item of $d.YesOrNo"
+              v-show="item.raw.ValueCN !== '无'"
+              :key="`IsDeleted${item.value}`"
+              :label="item.label"
+              :value="item.value"
+            />
           </el-select>
         </el-form-item>
         <!-- 更新时间 -->
@@ -66,34 +91,42 @@
             type="daterange"
             value-format="yyyy-MM-dd"
             format="yyyy-MM-dd"
-            style="width:250px;"
+            style="width: 250px"
           />
         </el-form-item>
         <!-- 查询 -->
         <el-button type="primary" icon="el-icon-search" @click="handleSearch">
-          {{ $t('common:button:search') }}
+          {{ $t("common:button:search") }}
         </el-button>
         <!-- 重置 -->
-        <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
-          {{ $t('common:button:reset') }}
+        <el-button
+          type="primary"
+          icon="el-icon-refresh-left"
+          @click="handleReset"
+        >
+          {{ $t("common:button:reset") }}
         </el-button>
         <!-- 中心人员 -->
         <el-button
-          v-hasPermi="['trials:trials-panel:attachments:site-research:summary-record']"
+          v-hasPermi="[
+            'trials:trials-panel:attachments:site-research:summary-record',
+          ]"
           type="primary"
           icon="el-icon-info"
           @click="showResearchUser"
         >
-          {{ $t('trials:researchRecord:button:questionStaffs') }}
+          {{ $t("trials:researchRecord:button:questionStaffs") }}
         </el-button>
         <!-- 调查表链接 -->
         <el-button
-          v-hasPermi="['trials:trials-panel:attachments:site-research:questionnaire-link']"
+          v-hasPermi="[
+            'trials:trials-panel:attachments:site-research:questionnaire-link',
+          ]"
           type="primary"
           icon="el-icon-link"
           @click="showResearchLink"
         >
-          {{ $t('trials:researchRecord:button:questionLink') }}
+          {{ $t("trials:researchRecord:button:questionLink") }}
         </el-button>
       </el-form>
     </template>
@@ -103,7 +136,7 @@
       <el-table
         ref="siteResearchList"
         v-loading="loading"
-        v-adaptive="{bottomOffset:60}"
+        v-adaptive="{ bottomOffset: 60 }"
         :data="list"
         stripe
         height="100"
@@ -153,7 +186,11 @@
           show-overflow-tooltip
         >
           <template slot-scope="scope">
-            {{ scope.row.PreliminaryUser?scope.row.PreliminaryUser.RealName:"" }}
+            {{
+              scope.row.PreliminaryUser
+                ? scope.row.PreliminaryUser.RealName
+                : ""
+            }}
           </template>
         </el-table-column>
         <!-- 审核人 -->
@@ -164,7 +201,7 @@
           show-overflow-tooltip
         >
           <template slot-scope="scope">
-            {{ scope.row.ReviewerUser?scope.row.ReviewerUser.RealName:"" }}
+            {{ scope.row.ReviewerUser ? scope.row.ReviewerUser.RealName : "" }}
           </template>
         </el-table-column>
         <!-- 状态 -->
@@ -175,10 +212,18 @@
           show-overflow-tooltip
         >
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.State === 0" type="primary">{{ $fd('ResearchRecord', scope.row.State) }}</el-tag>
-            <el-tag v-if="scope.row.State === 1" type="info">{{ $fd('ResearchRecord', scope.row.State) }}</el-tag>
-            <el-tag v-if="scope.row.State === 2" type="warning">{{ $fd('ResearchRecord', scope.row.State) }}</el-tag>
-            <el-tag v-if="scope.row.State === 3" type="danger">{{ $fd('ResearchRecord', scope.row.State) }}</el-tag>
+            <el-tag v-if="scope.row.State === 0" type="primary">{{
+              $fd("ResearchRecord", scope.row.State)
+            }}</el-tag>
+            <el-tag v-if="scope.row.State === 1" type="info">{{
+              $fd("ResearchRecord", scope.row.State)
+            }}</el-tag>
+            <el-tag v-if="scope.row.State === 2" type="warning">{{
+              $fd("ResearchRecord", scope.row.State)
+            }}</el-tag>
+            <el-tag v-if="scope.row.State === 3" type="danger">{{
+              $fd("ResearchRecord", scope.row.State)
+            }}</el-tag>
           </template>
         </el-table-column>
         <!-- 是否废除 -->
@@ -189,8 +234,12 @@
           show-overflow-tooltip
         >
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.IsDeleted" type="danger">{{ $fd('YesOrNo', scope.row.IsDeleted) }}</el-tag>
-            <el-tag v-else type="primary">{{ $fd('YesOrNo', scope.row.IsDeleted) }}</el-tag>
+            <el-tag v-if="scope.row.IsDeleted" type="danger">{{
+              $fd("YesOrNo", scope.row.IsDeleted)
+            }}</el-tag>
+            <el-tag v-else type="primary">{{
+              $fd("YesOrNo", scope.row.IsDeleted)
+            }}</el-tag>
           </template>
         </el-table-column>
         <!-- 更新时间 -->
@@ -200,9 +249,7 @@
           min-width="150"
           show-overflow-tooltip
         />
-        <el-table-column
-          width="150"
-        >
+        <el-table-column width="150">
           <template slot-scope="scope">
             <!-- 查看 -->
             <el-button
@@ -214,7 +261,9 @@
             />
             <!-- 审批 -->
             <el-button
-              v-hasPermi="['trials:trials-panel:attachments:site-research:auidt']"
+              v-hasPermi="[
+                'trials:trials-panel:attachments:site-research:auidt',
+              ]"
               :disabled="scope.row.State === 0 || scope.row.State === 3"
               circle
               :title="$t('trials:researchRecord:action:view')"
@@ -223,7 +272,9 @@
             />
             <!-- 废除 -->
             <el-button
-              v-hasPermi="['trials:trials-panel:attachments:site-research:abolish']"
+              v-hasPermi="[
+                'trials:trials-panel:attachments:site-research:abolish',
+              ]"
               :disabled="scope.row.State !== 0 || scope.row.IsDeleted"
               circle
               :title="$t('trials:researchRecord:action:abolish')"
@@ -235,7 +286,13 @@
       </el-table>
 
       <!-- 分页组件 -->
-      <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
+      <pagination
+        class="page"
+        :total="total"
+        :page.sync="searchData.PageIndex"
+        :limit.sync="searchData.PageSize"
+        @pagination="getList"
+      />
     </template>
 
     <!-- 中心人员 -->
@@ -246,10 +303,12 @@
       custom-class="base-dialog-wrapper"
       :fullscreen="true"
     >
-      <div class="base-modal-body" style="border:1px solid #ccc;padding: 10px">
+      <div
+        class="base-modal-body"
+        style="border: 1px solid #ccc; padding: 10px"
+      >
         <Users v-if="researchUserVisible" />
       </div>
-
     </el-dialog>
 
     <!-- 调查表 -->
@@ -265,53 +324,87 @@
     <!-- 调查表链接 -->
     <base-model :config="share_model">
       <template slot="dialog-body">
-        <div>
-          <i style="color:#428bca;" class="el-icon-success" />
-          <!-- 成功创建调查表链接 -->
-          <span>{{ $t('trials:researchRecord:message:createLinkSuccessfully') }}</span>
-        </div>
-        <div style="margin:10px 0;">
-          <!-- 链接： -->
-          {{ $t('trials:researchRecord:label:link') }}
-          <el-input ref="shareLink" v-model="shareLink" readonly type="textarea" autosize />
-        </div>
-        <div>
-          <!-- 复制链接 -->
-          <el-button type="primary" round @click="copyLink">
-            {{ $t('trials:researchRecord:button:copyLink') }}
-          </el-button>
+        <div style="width: 100%; display: flex">
+          <div class="shareLink">
+            <div>
+              <i style="color: #428bca" class="el-icon-success" />
+              <!-- 成功创建调查表链接 -->
+              <span>{{
+                $t("trials:researchRecord:message:createLinkSuccessfully")
+              }}</span>
+            </div>
+            <div style="margin: 10px 0">
+              <!-- 链接： -->
+              {{ $t("trials:researchRecord:label:link") }}
+              <el-input
+                ref="shareLink"
+                v-model="shareLink"
+                readonly
+                type="textarea"
+                autosize
+              />
+            </div>
+            <div>
+              <!-- 复制链接 -->
+              <el-button
+                type="primary"
+                round
+                @click="copyLink"
+                class="shareLinkBtn"
+              >
+                {{ $t("trials:researchRecord:button:copyLink") }}
+              </el-button>
+            </div>
+          </div>
+          <div class="shareCode">
+            <div class="qrCode">
+              <div id="qrcode" ref="qrcode"></div>
+            </div>
+            <div class="codeBtnBox">
+              <el-button @click="handleCopyImg" type="primary" round>{{
+                $t("trials:researchRecord:button:copyCode")
+              }}</el-button>
+              <el-button @click="savePic" round>{{
+                $t("trials:researchRecord:button:savePic")
+              }}</el-button>
+            </div>
+          </div>
         </div>
       </template>
     </base-model>
-
   </BaseContainer>
 </template>
 <script>
-import { getTrialSiteSurveyList, getTrialSiteSelect, abandonSiteSurvey } from '@/api/trials'
-import { changeURLStatic } from '@/utils/history.js'
-import BaseContainer from '@/components/BaseContainer'
-import Pagination from '@/components/Pagination'
-import Users from './components/users'
-import ResearchForm from '@/views/research/form'
-import BaseModel from '@/components/BaseModel'
+import {
+  getTrialSiteSurveyList,
+  getTrialSiteSelect,
+  abandonSiteSurvey,
+} from "@/api/trials";
+import { changeURLStatic } from "@/utils/history.js";
+import BaseContainer from "@/components/BaseContainer";
+import Pagination from "@/components/Pagination";
+import Users from "./components/users";
+import ResearchForm from "@/views/research/form";
+import BaseModel from "@/components/BaseModel";
+import QRCode from "qrcodejs2";
 
 const searchDataDefault = () => {
   return {
-    SortField: '',
+    SortField: "",
     Asc: true,
     PageIndex: 1,
     PageSize: 20,
-    TrialSiteId: '',
-    UserKeyInfo: '',
+    TrialSiteId: "",
+    UserKeyInfo: "",
     State: null,
-    IsDeleted: '',
+    IsDeleted: "",
     DateRange: [],
     PreliminaryUserName: null,
-    ReviewerUserName: null
-  }
-}
+    ReviewerUserName: null,
+  };
+};
 export default {
-  name: 'SiteResearchList',
+  name: "SiteResearchList",
   components: { BaseContainer, Pagination, Users, ResearchForm, BaseModel },
   data() {
     return {
@@ -323,117 +416,223 @@ export default {
       siteOptions: [],
       researchUserVisible: false,
       researchInfoVisible: false,
-      share_model: { visible: false, title: '', width: '500px' },
-      shareLink: '',
-      researchState: this.$d.ResearchRecord
-    }
+      share_model: {
+        visible: false,
+        title: this.$t("trials:researchRecord:title:shark"),
+        width: "800px",
+      },
+      shareLink: "",
+      researchState: this.$d.ResearchRecord,
+      qrcode: null,
+    };
   },
   mounted() {
-    this.getList()
-    this.getSite()
+    this.getList();
+    this.getSite();
   },
   methods: {
     // 获取系统文件数据
     getList() {
-      this.loading = true
-      this.searchData.TrialId = this.trialId
+      this.loading = true;
+      this.searchData.TrialId = this.trialId;
       if (this.searchData.DateRange && this.searchData.DateRange.length === 2) {
-        this.searchData.UpdateTimeBegin = this.searchData.DateRange[0]
-        this.searchData.updateTimeEnd = this.searchData.DateRange[1]
+        this.searchData.UpdateTimeBegin = this.searchData.DateRange[0];
+        this.searchData.updateTimeEnd = this.searchData.DateRange[1];
       } else {
-        this.searchData.UpdateTimeBegin = ''
-        this.searchData.updateTimeEnd = ''
+        this.searchData.UpdateTimeBegin = "";
+        this.searchData.updateTimeEnd = "";
       }
-      getTrialSiteSurveyList(this.searchData).then(res => {
-        this.loading = false
-        this.list = res.Result.CurrentPageData
-        this.total = res.Result.TotalCount
-      }).catch(() => {
-        this.loading = false
-      })
+      getTrialSiteSurveyList(this.searchData)
+        .then((res) => {
+          this.loading = false;
+          this.list = res.Result.CurrentPageData;
+          this.total = res.Result.TotalCount;
+        })
+        .catch(() => {
+          this.loading = false;
+        });
     },
     // 查看调查表记录详情
     handleViewResearchList(row) {
-      changeURLStatic('trialSiteSurveyId', row.Id)
-      this.researchInfoVisible = true
+      changeURLStatic("trialSiteSurveyId", row.Id);
+      this.researchInfoVisible = true;
     },
     // 废除待提交的调查表
     handleRepealResearch(row) {
       // 是否确认废除？
-      this.$confirm(this.$t('trials:researchRecord:message:abolish'), {
-        type: 'warning',
-        distinguishCancelAndClose: true
-      })
-        .then(() => {
-          abandonSiteSurvey(this.trialId, row.Id)
-            .then(res => {
-              if (res.IsSuccess) {
-                this.getList()
-                // 废除成功
-                this.$message.success(this.$t('trials:researchRecord:message:abolishSuccessfully'))
-              }
-            })
-        })
+      this.$confirm(this.$t("trials:researchRecord:message:abolish"), {
+        type: "warning",
+        distinguishCancelAndClose: true,
+      }).then(() => {
+        abandonSiteSurvey(this.trialId, row.Id).then((res) => {
+          if (res.IsSuccess) {
+            this.getList();
+            // 废除成功
+            this.$message.success(
+              this.$t("trials:researchRecord:message:abolishSuccessfully")
+            );
+          }
+        });
+      });
     },
     // 展示当前项目下所有调查表需生成账户的用户信息
     showResearchUser() {
-      this.researchUserVisible = true
+      this.researchUserVisible = true;
     },
     // 复制链接
     copyLink() {
       // 中心调研表链接
-      this.$copyText(`${this.$t('trials:researchRecord:message:researchFormLink')}: ${this.shareLink}`).then(
-        res => {
+      this.$copyText(
+        `${this.$t("trials:researchRecord:message:researchFormLink")}: ${
+          this.shareLink
+        }`
+      )
+        .then((res) => {
           // 复制成功
-          this.$message.success(this.$t('trials:researchRecord:message:copySuccessfully'))
-        }
-      ).catch(() => {
-        // 复制失败
-        this.$alert(this.$t('trials:researchRecord:message:copyFailed'))
-      })
+          this.$message.success(
+            this.$t("trials:researchRecord:message:copySuccessfully")
+          );
+        })
+        .catch(() => {
+          // 复制失败
+          this.$alert(this.$t("trials:researchRecord:message:copyFailed"));
+        });
+    },
+    // 创建二维码
+    creatQrCode() {
+      this.$refs.qrcode.innerHTML = ""; //清除二维码方法一
+      let text = this.shareLink;
+      this.qrcode = new QRCode(this.$refs.qrcode, {
+        text: text, //页面地址 ,如果页面需要参数传递请注意哈希模式#
+        width: 200,
+        height: 200,
+        colorDark: "#000000",
+        colorLight: "#ffffff",
+        correctLevel: QRCode.CorrectLevel.H,
+      });
+      // qrcode.clear(); // 清除二维码方法二
+    },
+    // 下载二维码
+    savePic() {
+      let qrCodeCanvas = document
+        .getElementById("qrcode")
+        .getElementsByTagName("canvas");
+      let a = document.createElement("a");
+      a.href = qrCodeCanvas[0].toDataURL("image/url");
+      a.download = `${this.$t("trials:researchRecord:title:code")}.png`;
+      a.click();
+    },
+    // 复制二维码
+    handleCopyImg() {
+      let qrCodeCanvas = document
+        .getElementById("qrcode")
+        .getElementsByTagName("canvas");
+      qrCodeCanvas[0].toBlob(async (blob) => {
+        console.log(blob);
+        const data = [
+          new ClipboardItem({
+            [blob.type]: blob,
+          }),
+        ]; // https://w3c.github.io/clipboard-apis/#dom-clipboard-write
+        await navigator.clipboard.write(data).then(
+          () => {
+            this.$message.success(
+              this.$t("trials:researchRecord:message:copySuccess")
+            );
+          },
+          () => {
+            this.$message.error(
+              this.$t("trials:researchRecord:message:UnableWrite")
+            );
+          }
+        );
+      });
     },
     // 获取site下拉框数据
     getSite() {
-      getTrialSiteSelect(this.trialId).then(res => {
-        this.siteOptions = res.Result
-      })
+      getTrialSiteSelect(this.trialId).then((res) => {
+        this.siteOptions = res.Result;
+      });
     },
     // 展示调查表链接
     showResearchLink() {
-      const trialId = this.trialId
-      this.shareLink = `${location.protocol}//${location.host}/researchLogin?trialId=${trialId}&lang=${this.$i18n.locale}`
-      this.share_model.visible = true
+      const trialId = this.trialId;
+      this.shareLink = `${location.protocol}//${location.host}/researchLogin?trialId=${trialId}&lang=${this.$i18n.locale}`;
+      this.share_model.visible = true;
+      this.$nextTick(() => {
+        this.creatQrCode();
+      });
     },
     // 重置
     handleReset() {
-      this.searchData = searchDataDefault()
-      this.searchData.DateRange = []
+      this.searchData = searchDataDefault();
+      this.searchData.DateRange = [];
       if (this.searchData.DateRange && this.searchData.DateRange.length === 2) {
-        this.searchData.UpdateTimeBegin = this.searchData.DateRange[0]
-        this.searchData.updateTimeEnd = this.searchData.DateRange[1]
+        this.searchData.UpdateTimeBegin = this.searchData.DateRange[0];
+        this.searchData.updateTimeEnd = this.searchData.DateRange[1];
       } else {
-        this.searchData.UpdateTimeBegin = ''
-        this.searchData.updateTimeEnd = ''
+        this.searchData.UpdateTimeBegin = "";
+        this.searchData.updateTimeEnd = "";
       }
-      this.getList()
+      this.getList();
       this.$nextTick(() => {
-        this.$refs.siteResearchList.clearSort()
-      })
+        this.$refs.siteResearchList.clearSort();
+      });
     },
     // 查询
     handleSearch() {
-      this.getList()
+      this.getList();
     },
     // 排序
     handleSortByColumn(column) {
-      if (column.order === 'ascending') {
-        this.searchData.Asc = true
+      if (column.order === "ascending") {
+        this.searchData.Asc = true;
       } else {
-        this.searchData.Asc = false
+        this.searchData.Asc = false;
       }
-      this.searchData.SortField = column.prop
-      this.getList()
+      this.searchData.SortField = column.prop;
+      this.getList();
+    },
+  },
+  beforeDestroy() {
+    if (this.qrcode) {
+      this.qrcode = null;
     }
+  },
+};
+</script>
+<style lang="scss" scoped>
+.shareLink {
+  padding-right: 20px;
+  width: 50%;
+  position: relative;
+  .shareLinkBtn{
+    position: absolute;
+    bottom: 0px;
+    left: 0px;
   }
 }
-</script>
+.shareCode {
+  width: 50%;
+  border-left: 1px solid #eee;
+  display: flex;
+  justify-content: center;
+  flex-wrap: wrap;
+  .qrCode {
+    width: 220px;
+    height: 220px;
+    display: flex;
+    border: 1px solid #c0c4cc;
+    border-radius: 5px;
+    box-shadow: 1px 1px 5px #c0c4cc;
+    align-items: center;
+    justify-content: center;
+  }
+  .codeBtnBox {
+    margin-top: 20px;
+    width: 100%;
+    display: flex;
+    justify-content: space-around;
+  }
+}
+</style>

src/views/trials/trials-panel/enrolled-reviewers/list/index.vue

@@ -140,7 +140,8 @@
           >
             <template slot-scope="scope">
               <div v-if="scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).StatementCriterionFileList.length > 0">
-                <el-button type="text" @click="windowOpen(scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).StatementCriterionFileList[0].FilePath)">View</el-button>
+                <el-button type="text" @click="preview(scope.row,ite.TrialReadingCriterionId)">View</el-button>
+                <!-- <el-button type="text" @click="windowOpen(scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).StatementCriterionFileList[0].FilePath)">View</el-button> -->
               </div>
               <div v-else>
                 <span>{{ $t('trials:enrolledReviews:label:notUpload') }}</span>
@@ -474,6 +475,17 @@ export default {
     this.initPage()
   },
   methods: {
+    // 预览
+    preview(row,TrialReadingCriterionId){
+      let file = row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === TrialReadingCriterionId}).StatementCriterionFileList[0];
+      let arr = file.FilePath.split(".");
+
+      this.$preview({
+        path:file.FilePath, 
+        type:arr[arr.length - 1], 
+        title:file.FileName
+      })
+    },
     isConsistencyChange(row, ite, value, showMessage) {
       this.batchSetCriterionJoinJoinAnalysis(row, ite, value, showMessage)
     },

src/views/trials/trials-panel/reading/ad-review/index.vue

@@ -203,30 +203,28 @@
           >
             <i slot="default" class="el-icon-plus" />
             <div slot="file" slot-scope="{file}">
-              <viewer :images="images" :ref="file.url">
-                <img
-                  class="el-upload-list__item-thumbnail"
-                  :src="OSSclientConfig.basePath + file.url"
-                  alt=""
-                  crossorigin="anonymous"
+              <img
+                class="el-upload-list__item-thumbnail"
+                :src="OSSclientConfig.basePath + file.url"
+                alt=""
+                crossorigin="anonymous"
+              >
+              <span class="el-upload-list__item-actions">
+                <span
+                  class="el-upload-list__item-preview"
+                  @click="handlePictureCardPreview(file)"
                 >
-                <span class="el-upload-list__item-actions">
-                  <span
-                    class="el-upload-list__item-preview"
-                    @click="handlePictureCardPreview(file)"
-                  >
-                    <i class="el-icon-zoom-in" />
-                  </span>
-
-                  <span
-                    v-if="adInfo.ReadingTaskState < 2"
-                    class="el-upload-list__item-delete"
-                    @click="handleRemove(file)"
-                  >
-                    <i class="el-icon-delete" />
-                  </span>
+                  <i class="el-icon-zoom-in" />
                 </span>
-              </viewer>
+
+                <span
+                  v-if="adInfo.ReadingTaskState < 2"
+                  class="el-upload-list__item-delete"
+                  @click="handleRemove(file)"
+                >
+                  <i class="el-icon-delete" />
+                </span>
+              </span>
             </div>
           </el-upload>
           
@@ -305,6 +303,9 @@
       </div>
       <SignForm ref="signForm" :sign-code-enum="signCode" @closeDialog="closeSignDialog" />
     </el-dialog>
+    <viewer v-if="imgVisible" :images="[imageUrl]" ref="viewer">
+      <img :src="imageUrl"  crossorigin="anonymous" alt="">
+    </viewer>
   </div>
 </template>
 <script>
@@ -387,8 +388,7 @@ export default {
       judgeResultArmEnum: '',
       criterionType: null,
       openWindow: null,
-      isFixed: false,
-      images: []
+      isFixed: false
     }
   },
   // watch: {
@@ -707,9 +707,9 @@ export default {
     },
     // 预览图片
     handlePictureCardPreview(file) {
-      this.images = this.fileList.map(f => this.OSSclientConfig.basePath + f.url)
-      // this.imageUrl = this.OSSclientConfig.basePath + file.url
-      this.$refs[file.url].$viewer.show()
+      this.imageUrl = this.OSSclientConfig.basePath + file.url
+      this.imgVisible = true
+      this.$refs.viewer.$viewer.show()
     },
     // 删除图片
     handleRemove(file, fileList) {

src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue

@@ -222,7 +222,8 @@ export default {
         taskBlindName: '',
         frame: null,
         imageRendered: false,
-        isExistsClinicalData:false
+        isExistsClinicalData: false,
+        isExistMutiFrames: false
         // preventCache: true
       },
       dicomInfo: {
@@ -758,7 +759,7 @@ export default {
       const imageInfo = this.getInstanceInfo(imageId)
       var instanceId = imageInfo.instanceId
       var frame = imageInfo.frame
-      this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
+      this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
       const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager
       for (var m = 0; m < this.measuredTools.length; m++) {
         var toolType = this.measuredTools[m]
@@ -880,7 +881,6 @@ export default {
       return seriesList[seriesIdx].loadStatus ? 1 : 0
     },
     renderMeasuredData(e) {
-      this.stack.frame = !isNaN(parseInt(this.stack.frame)) ? parseInt(this.stack.frame) : 0
       var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.stack.visitTaskId)
       if (idx === -1) return
       this.measureData = this.visitTaskList[idx].MeasureData
@@ -899,9 +899,7 @@ export default {
           } else {
             cornerstoneTools.setToolEnabledForElement(element, data.MeasureData.type, { mouseButtonMask: 1 })
           }
-          // console.log('renderMeasuredData', this.stack.frame)
-
-          if (this.stack.instanceId.includes(data.InstanceId) && ((data.NumberOfFrames === this.stack.frame) || !data.NumberOfFrames) && data.MeasureData) {
+          if (this.stack.instanceId.includes(data.InstanceId) && ((this.stack.isExistMutiFrames && data.MeasureData.frame === this.stack.frame) || !data.MeasureData.frame) && data.MeasureData) {
             const toolState = ToolStateManager.getImageIdToolState(e.detail.image.imageId, data.MeasureData.type)
             if (toolState && toolState.data.length > 0) {
               var idx = toolState.data.findIndex(item => item.uuid === data.MeasureData.data.uuid)
@@ -988,7 +986,7 @@ export default {
       const imageInfo = this.getInstanceInfo(imageId)
       var instanceId = imageInfo.instanceId
       var frame = imageInfo.frame
-      this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
+      this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
       const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager
       for (let t = 0; t < this.measuredTools.length; t++) {
         var toolType = this.measuredTools[t]
@@ -1067,6 +1065,7 @@ export default {
         this.stack.sliceThickness = dicomSeries.sliceThickness
         this.stack.instanceCount = dicomSeries.instanceCount
         this.stack.isExistsClinicalData = dicomSeries.isExistsClinicalData
+        this.stack.isExistMutiFrames = dicomSeries.isExistMutiFrames
         // this.measuredData = dicomSeries.measuredData
         var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === dicomSeries.visitTaskId)
         this.stack.visitTaskNum = this.visitTaskList[idx].VisitTaskNum
@@ -1087,7 +1086,7 @@ export default {
         const imageInfo = this.getInstanceInfo(imageId)
         var instanceId = imageInfo.instanceId
         var frame = imageInfo.frame
-        this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
+        this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
         this.stack.instanceId = instanceId
         const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager
         ToolStateManager.clearImageIdToolState(dicomSeries.imageIds)
@@ -1201,7 +1200,7 @@ export default {
         const imageInfo = this.getInstanceInfo(image.imageId)
         var instanceId = imageInfo.instanceId
         var frame = imageInfo.frame
-        this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
+        this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
         this.stack.instanceId = instanceId
         this.height = (this.stack.currentImageIdIndex) * 100 / (this.stack.imageIds.length - 1)
         this.resetWwwc()
@@ -1276,7 +1275,7 @@ export default {
       const imageInfo = this.getInstanceInfo(imageId)
       var instanceId = imageInfo.instanceId
       var frame = imageInfo.frame
-      this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
+      this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
       if (this.imageId !== instanceId) {
         this.getOrientationMarker(e.detail.element)
         // 初次加载时，如果该影像存在标记，则以标记的窗宽窗位为初始化默认值，否则以序列的窗宽窗位为初始化默认值
@@ -1335,13 +1334,13 @@ export default {
       const imageInfo = this.getInstanceInfo(imageId)
       var instanceId = imageInfo.instanceId
       var frame = imageInfo.frame
-      this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
+      this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
       if (e.detail.toolName === 'Length' || e.detail.toolName === 'ArrowAnnotate' || e.detail.toolName === 'RectangleRoi') {
         const measureData = {}
         measureData.studyId = this.stack.studyId
         measureData.seriesId = this.stack.seriesId
         measureData.instanceId = instanceId
-        measureData.frame = this.stack.frame ? this.stack.frame : 0
+        measureData.frame = this.stack.frame
         measureData.data = e.detail.measurementData
         measureData.type = e.detail.toolName
         measureData.thick = this.dicomInfo.thick
@@ -1455,7 +1454,7 @@ export default {
       const imageInfo = this.getInstanceInfo(imageId)
       var instanceId = imageInfo.instanceId
       var frame = imageInfo.frame
-      this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
+      this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
 
       var uuid = measurementData.uuid
       var idx = this.measureData.findIndex(item => item.MeasureData && item.MeasureData.data && item.MeasureData.data.uuid === uuid)

src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue

@@ -1582,7 +1582,9 @@ export default {
             var seriesIdx = studyList[studyIdx].SeriesList.findIndex(s => s.seriesId === seriesId)
             if (seriesIdx > -1) {
               var series = studyList[studyIdx].SeriesList[seriesIdx]
-              var instanceIdx = series.instanceList.findIndex(imageId => !!~imageId.indexOf(instanceId))
+              const frame = this.visitTaskList[index].MeasureData[idx].MeasureData.frame
+              const filterStr = series.isExistMutiFrames ? `frame=${frame}&instanceId=${instanceId}` : `instanceId=${instanceId}`
+              var instanceIdx = series.imageIds.findIndex(imageId => imageId.includes(filterStr))
               if (instanceIdx > -1) {
                 series.imageIdIndex = instanceIdx
                 seriesInfo = series

src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue

@@ -464,7 +464,10 @@ export default {
               var seriesIdx = studyList[studyIdx].SeriesList.findIndex(s => s.seriesId === seriesId)
               if (seriesIdx > -1) {
                 var series = studyList[studyIdx].SeriesList[seriesIdx]
-                var instanceIdx = series.instanceList.findIndex(imageId => !!~imageId.indexOf(instanceId))
+                // var instanceIdx = series.instanceList.findIndex(imageId => !!~imageId.indexOf(instanceId))
+                const frame = this.visitTaskList[index].MeasureData[idx].MeasureData.frame
+                const filterStr = series.isExistMutiFrames ? `frame=${frame}&instanceId=${instanceId}` : `instanceId=${instanceId}`
+                var instanceIdx = series.imageIds.findIndex(imageId => imageId.includes(filterStr))
                 if (instanceIdx > -1) {
                   series.imageIdIndex = instanceIdx
                   // series.studyIndex = studyIdx

src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue

@@ -444,9 +444,10 @@ export default {
           const sdIndx = studyList.findIndex(sd => sd.StudyId === measureDatas[i].StudyId)
           const seriesList = studyList[sdIndx].SeriesList
           const srIdx = seriesList.findIndex(sr => sr.seriesId === measureDatas[i].SeriesId)
-          // const instanceList = seriesList[srIdx].imageIds
-          const instanceList = seriesList[srIdx].instanceList
-          const isIdx = instanceList.findIndex(is => is.includes(measureDatas[i].InstanceId))
+          // const instanceList = seriesList[srIdx].instanceList
+          const imageIds = seriesList[srIdx].imageIds
+          const filterStr = seriesList[srIdx].isExistMutiFrames ? `frame=${measureDatas[i].MeasureData.frame}&instanceId=${measureDatas[i].InstanceId}` : `instanceId=${measureDatas[i].InstanceId}`
+          const isIdx = imageIds.findIndex(is => is.includes(filterStr))
           const series = seriesList[srIdx]
           series.imageIdIndex = isIdx
 
@@ -517,8 +518,9 @@ export default {
           const seriesList = studyList[sdIndx].SeriesList
           const srIdx = seriesList.findIndex(sr => sr.seriesId === measureDatas[mIdx].SeriesId)
           // const instanceList = seriesList[srIdx].imageIds
-          const instanceList = seriesList[srIdx].instanceList
-          const isIdx = instanceList.findIndex(is => is.includes(measureDatas[mIdx].InstanceId))
+          const imageIds = seriesList[srIdx].imageIds
+          const filterStr = seriesList[srIdx].isExistMutiFrames ? `frame=${measureDatas[mIdx].MeasureData.frame}&instanceId=${measureDatas[mIdx].InstanceId}` : `instanceId=${measureDatas[mIdx].InstanceId}`
+          const isIdx = imageIds.findIndex(is => is.includes(filterStr))
           const series = seriesList[srIdx]
           series.imageIdIndex = isIdx
 

src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue

@@ -222,7 +222,8 @@ export default {
         taskBlindName: '',
         frame: null,
         imageRendered: false,
-        isExistsClinicalData: false
+        isExistsClinicalData: false,
+        isExistMutiFrames: false
         // preventCache: true
       },
       dicomInfo: {
@@ -746,7 +747,7 @@ export default {
       const imageInfo = this.getInstanceInfo(imageId)
       var instanceId = imageInfo.instanceId
       var frame = imageInfo.frame
-      this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
+      this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
       const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager
       for (var m = 0; m < this.measuredTools.length; m++) {
         var toolType = this.measuredTools[m]
@@ -868,7 +869,6 @@ export default {
       return seriesList[seriesIdx].loadStatus ? 1 : 0
     },
     renderMeasuredData(e) {
-      this.stack.frame = !isNaN(parseInt(this.stack.frame)) ? parseInt(this.stack.frame) : 0
       var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.stack.visitTaskId)
       if (idx === -1) return
       this.measureData = this.visitTaskList[idx].MeasureData
@@ -891,7 +891,7 @@ export default {
           }
           // console.log('renderMeasuredData', this.stack.frame)
 
-          if (this.stack.instanceId.includes(data.InstanceId) && ((data.NumberOfFrames === this.stack.frame) || !data.NumberOfFrames) && data.MeasureData) {
+          if (this.stack.instanceId.includes(data.InstanceId) && ((this.stack.isExistMutiFrames && data.MeasureData.frame === this.stack.frame) || !data.MeasureData.frame) && data.MeasureData) {
             const toolState = ToolStateManager.getImageIdToolState(e.detail.image.imageId, data.MeasureData.type)
             if (toolState && toolState.data.length > 0) {
               var idx = toolState.data.findIndex(item => item.uuid === data.MeasureData.data.uuid)
@@ -978,7 +978,7 @@ export default {
       const imageInfo = this.getInstanceInfo(imageId)
       var instanceId = imageInfo.instanceId
       var frame = imageInfo.frame
-      this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
+      this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
       const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager
       for (let t = 0; t < this.measuredTools.length; t++) {
         var toolType = this.measuredTools[t]
@@ -1063,7 +1063,7 @@ export default {
         const imageInfo = this.getInstanceInfo(imageId)
         var instanceId = imageInfo.instanceId
         var frame = imageInfo.frame
-        this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
+        this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
         this.stack.instanceId = instanceId
         const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager
         ToolStateManager.clearImageIdToolState(dicomSeries.imageIds)
@@ -1178,7 +1178,7 @@ export default {
         const imageInfo = this.getInstanceInfo(image.imageId)
         var instanceId = imageInfo.instanceId
         var frame = imageInfo.frame
-        this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
+        this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
         this.stack.instanceId = instanceId
         this.height = (this.stack.currentImageIdIndex) * 100 / (this.stack.imageIds.length - 1)
         this.resetWwwc()
@@ -1253,7 +1253,7 @@ export default {
       const imageInfo = this.getInstanceInfo(imageId)
       var instanceId = imageInfo.instanceId
       var frame = imageInfo.frame
-      this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
+      this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
       if (this.imageId !== instanceId) {
         this.getOrientationMarker(e.detail.element)
         // 初次加载时，如果该影像存在标记，则以标记的窗宽窗位为初始化默认值，否则以序列的窗宽窗位为初始化默认值
@@ -1434,7 +1434,7 @@ export default {
       const imageInfo = this.getInstanceInfo(imageId)
       var instanceId = imageInfo.instanceId
       var frame = imageInfo.frame
-      this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
+      this.stack.frame = this.stack.isExistMutiFrames ? parseInt(frame) : null
 
       var uuid = measurementData.uuid
       var idx = this.measureData.findIndex(item => item.MeasureData && item.MeasureData.data && item.MeasureData.data.uuid === uuid)

src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue

@@ -1702,10 +1702,13 @@ export default {
               (s) => s.seriesId === seriesId
             )
             if (seriesIdx > -1) {
-              var series = studyList[studyIdx].SeriesList[seriesIdx]
-              var instanceIdx = series.instanceList.findIndex(
-                (imageId) => !!~imageId.indexOf(instanceId)
-              )
+              var series = studyList[studyIdx].SeriesList[seriesIdx];
+              let frame = this.visitTaskList[index].MeasureData[idx].MeasureData.frame
+              let filterStr = series.isExistMutiFrames ? `frame=${frame}&instanceId=${instanceId}` : `instanceId=${instanceId}`
+              var instanceIdx = series.imageIds.findIndex(imageId => imageId.includes(filterStr))
+              // var instanceIdx = series.instanceList.findIndex(
+              //   (imageId) => !!~imageId.indexOf(instanceId)
+              // );
               if (instanceIdx > -1) {
                 series.imageIdIndex = instanceIdx
                 seriesInfo = series

src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReadPage.vue

@@ -607,9 +607,12 @@ export default {
               );
               if (seriesIdx > -1) {
                 var series = studyList[studyIdx].SeriesList[seriesIdx];
-                var instanceIdx = series.instanceList.findIndex(
-                  (imageId) => !!~imageId.indexOf(instanceId)
-                );
+                // var instanceIdx = series.instanceList.findIndex(
+                //   (imageId) => !!~imageId.indexOf(instanceId)
+                // );
+                let frame = this.visitTaskList[index].MeasureData[idx].MeasureData.frame
+                let filterStr = series.isExistMutiFrames ? `frame=${frame}&instanceId=${instanceId}` : `instanceId=${instanceId}`
+                var instanceIdx = series.imageIds.findIndex(imageId => imageId.includes(filterStr))
                 if (instanceIdx > -1) {
                   series.imageIdIndex = instanceIdx;
                   // series.studyIndex = studyIdx

src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue

@@ -420,9 +420,11 @@ export default {
           const sdIndx = studyList.findIndex(sd => sd.StudyId === measureDatas[i].StudyId)
           const seriesList = studyList[sdIndx].SeriesList
           const srIdx = seriesList.findIndex(sr => sr.seriesId === measureDatas[i].SeriesId)
-          // const instanceList = seriesList[srIdx].imageIds
-          const instanceList = seriesList[srIdx].instanceList
-          const isIdx = instanceList.findIndex(is => is.includes(measureDatas[i].InstanceId))
+          // const instanceList = seriesList[srIdx].instanceList
+          // const isIdx = instanceList.findIndex(is => is.includes(measureDatas[i].InstanceId))
+          const imageIds = seriesList[srIdx].imageIds
+          let filterStr = seriesList[srIdx].isExistMutiFrames ? `frame=${measureDatas[i].MeasureData.frame}&instanceId=${measureDatas[i].InstanceId}` : `instanceId=${measureDatas[i].InstanceId}`
+          const isIdx = imageIds.findIndex(is => is.includes(filterStr))
           const series = seriesList[srIdx]
           series.imageIdIndex = isIdx
 
@@ -492,9 +494,11 @@ export default {
         if (sdIndx > -1) {
           const seriesList = studyList[sdIndx].SeriesList
           const srIdx = seriesList.findIndex(sr => sr.seriesId === measureDatas[mIdx].SeriesId)
-          // const instanceList = seriesList[srIdx].imageIds
-          const instanceList = seriesList[srIdx].instanceList
-          const isIdx = instanceList.findIndex(is => is.includes(measureDatas[mIdx].InstanceId))
+          // const instanceList = seriesList[srIdx].instanceList
+          // const isIdx = instanceList.findIndex(is => is.includes(measureDatas[mIdx].InstanceId))
+          const imageIds = seriesList[srIdx].imageIds
+          let filterStr = seriesList[srIdx].isExistMutiFrames ? `frame=${measureDatas[mIdx].MeasureData.frame}&instanceId=${measureDatas[mIdx].InstanceId}` : `instanceId=${measureDatas[mIdx].InstanceId}`
+          const isIdx = imageIds.findIndex(is => is.includes(filterStr))
           const series = seriesList[srIdx]
           series.imageIdIndex = isIdx
 

src/views/trials/trials-panel/reading/medical-feedback/index.vue

@@ -271,7 +271,7 @@
                 sortable="custom"
               />
               <!-- 审核结论 -->
-               <el-table-column
+              <el-table-column
                 prop="IsHaveQuestion"
                 :label="$t('trials:medicalFeedback:button:isQuestions')"
                 min-width="120"
@@ -323,7 +323,7 @@
                   />
                   <!-- 回复:disabled="!scope.row.IsHaveQuestion || scope.row.IsInvalid" -->
                   <el-button
-                    
+
                     circle
                     :title="$t('trials:medicalFeedback:table:reply')"
                     icon="el-icon-chat-dot-round"
@@ -369,12 +369,13 @@
         :row-data="currentRow"
         @getList="getList"
         @close="auditVisible=false"
+        @nextTask="nextTask"
       />
     </el-dialog>
   </BaseContainer>
 </template>
 <script>
-import { getIRMedicalFeedbackList } from '@/api/trials'
+import { getIRMedicalFeedbackList, getNextIRMedicalFeedback } from '@/api/trials'
 import { getTrialCriterionList } from '@/api/trials/reading'
 import BaseContainer from '@/components/BaseContainer'
 import Pagination from '@/components/Pagination'
@@ -456,6 +457,26 @@ export default {
       this.chatForm.title = `${this.$t('trials:medicalFeedback:title:qaRecord')} (${row.SubjectCode} ${row.TaskBlindName})`
       this.chatForm.visible = true
     },
+    async nextTask(taskMedicalReviewId) {
+      try {
+        const params = {
+          trialId: this.trialId,
+          trialReadingCriterionId: this.TrialReadingCriterionId,
+          taskMedicalReviewId: taskMedicalReviewId
+        }
+        const res = await getNextIRMedicalFeedback(params)
+        if (res.IsSuccess) {
+          this.auditVisible = false
+          this.currentRow = res.Result
+          this.$nextTick(() => {
+            this.auditVisible = true
+          })
+        }
+      } catch (e) {
+        this.auditVisible = false
+        console.log(e)
+      }
+    },
     // 排序
     handleSortChange(column) {
       if (column.order === 'ascending') {

src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue

@@ -92,30 +92,28 @@
         >
           <i slot="default" class="el-icon-plus" />
           <div slot="file" slot-scope="{file}">
-            <viewer :images="images" :ref="file.url">
-              <img
-                class="el-upload-list__item-thumbnail"
-                :src="OSSclientConfig.basePath + file.url"
-                crossOrigin="anonymous"
-                alt=""
+            <img
+              class="el-upload-list__item-thumbnail"
+              :src="OSSclientConfig.basePath + file.url"
+              crossOrigin="anonymous"
+              alt=""
+            >
+            <span class="el-upload-list__item-actions">
+              <span
+                class="el-upload-list__item-preview"
+                @click="handlePictureCardPreview(file)"
               >
-              <span class="el-upload-list__item-actions">
-                <span
-                  class="el-upload-list__item-preview"
-                  @click="handlePictureCardPreview(file)"
-                >
-                  <i class="el-icon-zoom-in" />
-                </span>
-
-                <span
-                  v-if="!isSendMessage && auditState!==2"
-                  class="el-upload-list__item-delete"
-                  @click="handleRemove(file)"
-                >
-                  <i class="el-icon-delete" />
-                </span>
+                <i class="el-icon-zoom-in" />
               </span>
-            </viewer>
+
+              <span
+                v-if="!isSendMessage && auditState!==2"
+                class="el-upload-list__item-delete"
+                @click="handleRemove(file)"
+              >
+                <i class="el-icon-delete" />
+              </span>
+            </span>
           </div>
         </el-upload>
         <!-- <el-dialog
@@ -132,9 +130,9 @@
       </el-form-item>
 
     </el-form>
-    <!-- <viewer v-if="imgVisible" :images="[imageUrl]" ref="viewer">
+    <viewer v-if="imgVisible" :images="[imageUrl]" ref="viewer">
       <img :src="imageUrl"  crossorigin="anonymous" alt="">
-    </viewer> -->
+    </viewer>
     <el-dialog
       v-if="chatVisible"
       :visible.sync="chatVisible"
@@ -224,8 +222,7 @@ export default {
       userTypeEnumInt: zzSessionStorage.getItem('userTypeEnumInt') * 1,
       isClosedDialog: false,
       isSendMessage: false,
-      closeQuestionVisible: false,
-      images:[]
+      closeQuestionVisible: false
     }
   },
   mounted() {
@@ -385,9 +382,9 @@ export default {
     },
     // 预览图片
     handlePictureCardPreview(file) {
-      this.images = this.fileList.map(f => this.OSSclientConfig.basePath + f.url)
-      // this.imageUrl = this.OSSclientConfig.basePath + file.url
-      this.$refs[file.url].$viewer.show()
+      this.imageUrl = this.OSSclientConfig.basePath + file.url
+      this.imgVisible = true
+      this.$refs.viewer.$viewer.show()
     },
     // 删除图片
     handleRemove(file, fileList) {
@@ -397,7 +394,7 @@ export default {
     },
     initializeViewer() {
       Viewer.setDefaults({
-        toolbar: { zoomIn: true, zoomOut: true, rotateLeft: true, rotateRight: true, flipHorizontal: true, flipVertical: true}
+        toolbar: { zoomIn: true, zoomOut: true, rotateLeft: true, rotateRight: true, flipHorizontal: true, flipVertical: true }
       })
     }
   }

src/views/trials/trials-panel/reading/mim-medical-audit/components/MedicalAudit.vue

@@ -67,6 +67,10 @@
       <el-button v-if="hasPermi(['trials:trials-panel:reading:mim-medical-audit:edit']) && auditInfo.AuditState !== 2" type="primary" @click="getNextTask">
         {{ $t('trials:medicalFeedback:button:nextTask') }}
       </el-button>
+      <!-- IR下一任务 -->
+      <el-button v-if="hasPermi(['trials:trials-panel:medicalFeedback:nextTask']) && auditInfo.AuditState === 1" type="primary" @click="getNextIRTask">
+        {{ $t('trials:irmedicalFeedback:button:nextTask') }}
+      </el-button>
     </div>
 
     <!--签名框 -->
@@ -221,7 +225,20 @@ export default {
     // 获取下一任务
     getNextTask() {
       this.disPatchNextTask(this.auditInfo.AuditState >= 2)
-
+    },
+    getNextIRTask() {
+      // 是否确认进入下一任务？
+      this.$confirm(this.$t('trials:medicalFeedback:message:goNextTask04'), {
+        type: 'warning',
+        distinguishCancelAndClose: true
+      })
+        .then(() => {
+          this.loading = true
+          this.$emit('nextTask', this.taskMedicalReviewId)
+        })
+        .catch(action => {
+          this.loading = false
+        })
     },
     disPatchNextTask(isComplete) {
       // '是否确认进入下一个医学审核任务？' : '当前医学审核任务未完成，是否确认进入下一个医学审核任务？'

src/views/trials/trials-panel/setting/email-manage/index.vue

@@ -135,12 +135,25 @@ export default {
         EmailAuthorizationCode: [{ required: true, message: this.$t('common:ruleMessage:specify') }],
         EmailSMTPServerAddress: [{ required: true, message: this.$t('common:ruleMessage:specify') }],
         EmailSMTPServerPort: [{ required: true, message: this.$t('common:ruleMessage:select') }]
-      }
+      },
+      NODE_ENV: process.env.NODE_ENV,
     }
   },
-  watch: {
-    activeTab(v) {
-      console.log(v)
+  // watch: {
+  //   activeTab(v) {
+  //     console.log(v)
+  //   }
+  // },
+  created() {
+    if(this.NODE_ENV === 'production'){
+      this.form= {
+        EmailFromEmail: 'test@extimaging.com',
+        EmailFromName: 'Test_IRC',
+        EmailAuthorizationCode: 'SHzyyl2021',
+        EmailSMTPServerAddress: 'smtp.qiye.aliyun.com',
+        EmailSMTPServerPort: 465,
+        IsConfigureEmail: true
+      };
     }
   },
   mounted() {

src/views/trials/trials-panel/setting/medical-audit/components/QSForm.vue

@@ -17,21 +17,6 @@
           v-model="form.QuestionName"
         />
       </el-form-item>
-      <el-form-item
-        :label="$t('common:title:languageType')"
-        prop="LanguageType"
-      >
-        <el-select
-          v-model="form.LanguageType"
-        >
-          <el-option
-            v-for="item of $d.LanguageType"
-            :key="item.value"
-            :value="item.value"
-            :label="item.label"
-          />
-        </el-select>
-      </el-form-item>
       <!-- 类型 -->
       <el-form-item
         :label="$t('trials:qcCfg:table:type')"

src/views/trials/trials-panel/setting/medical-audit/index.vue

@@ -326,7 +326,7 @@
   </box-content>
 </template>
 <script>
-import { batchDeteteCriterionMedicineQuestion, getReadingMedicineTrialQuestionList, deleteReadingMedicineTrialQuestion, confirmReadingMedicineQuestion, verifyReadingMedicineQuestion, verifyIsCanConfirm } from '@/api/trials'
+import { addDefaultQuestions , batchDeteteCriterionMedicineQuestion, getReadingMedicineTrialQuestionList, deleteReadingMedicineTrialQuestion, confirmReadingMedicineQuestion, verifyReadingMedicineQuestion, verifyIsCanConfirm } from '@/api/trials'
 import { getTrialCriterionList } from '@/api/trials/reading'
 import BoxContent from '@/components/BoxContent'
 import DefaultQS from './components/DefaultQsLang'
@@ -334,7 +334,7 @@ import QSForm from './components/QSForm'
 import Pagination from '@/components/Pagination'
 import QuestionsPreview from './components/QuestionsPreview'
 import SignForm from '@/views/trials/components/newSignForm'
-import const_ from '@/const/sign-code'
+import const_ from '@/const/sign-code';
 const searchDataDefault = () => {
   return {
     QuestionName: '',
@@ -382,7 +382,6 @@ export default {
       this.CurrentCriterionType = this.trialCriterionList.find(v => {
         return v.TrialReadingCriterionId === this.trialReadingCriterionId
       }).CriterionType
-      console.log(this.CurrentCriterionType)
     }
   },
   mounted() {
@@ -390,6 +389,23 @@ export default {
     this.getTrialCriterionList()
   },
   methods: {
+    // 添加默认问题
+    addDefaultQuestions(){
+      let data = {
+        TrialId: this.$route.query.trialId,
+        TrialReadingCriterionId: this.trialReadingCriterionId,
+        LanguageType: 0
+      }
+      if( this.otherInfo.LanguageType === null ){
+        data.LanguageType = this.$i18n.locale === 'zh' ? 0 : 1
+      } else {
+        data.LanguageType = this.otherInfo.LanguageType
+      }
+      addDefaultQuestions(data).then(res => {
+        this.$message.success(this.$t('common:message:savedSuccessfully'))
+        this.getList();
+      })
+    },
     handleSelectionChange(value) {
       this.selectedList = value
     },
@@ -433,7 +449,8 @@ export default {
     },
     // 打开系统模板配置项
     handleAdd() {
-      this.addVisible = true
+      // this.addVisible = true
+      this.addDefaultQuestions();
     },
     handleEdit(row) {
       this.currentRow = { ...row }

src/views/trials/trials-panel/setting/personnel-manage/components/dicomAEList.vue

@@ -0,0 +1,127 @@
+<template>
+  <base-model v-if="config.visible" :config="config">
+    <template slot="dialog-body">
+      <el-button type="primary" icon="el-icon-plus" @click="openAdd" style="float: right" v-if="status === 'add'">
+        {{ $t("common:button:add") }}
+      </el-button>
+      <el-table v-loading="loading" :data="list" stripe>
+        <!-- AE 名称 -->
+        <el-table-column prop="CallingAE" :label="$t('trials:sitesList:dicomAEList:table:AEName')" show-overflow-tooltip
+          min-width="120" />
+        <!-- IP地址 -->
+        <el-table-column prop="IP" :label="$t('trials:sitesList:dicomAEList:table:ip')" show-overflow-tooltip
+          min-width="120" />
+        <!-- 端口 -->
+        <el-table-column prop="Port" :label="$t('trials:sitesList:dicomAEList:table:port')" show-overflow-tooltip
+          min-width="120" />
+        <!-- 说明 -->
+        <el-table-column prop="Description" :label="$t('trials:sitesList:dicomAEList:table:description')"
+          show-overflow-tooltip min-width="120" />
+        <!-- 操作 -->
+        <!-- <el-table-column prop="action" :label="$t('trials:sitesList:dicomAEList:table:action')" min-width="120">
+          <template slot-scope="scope">
+            <el-button circle :title="$t('trials:sitesList:dicomAEList:action:del')" icon="el-icon-delete"
+              :disabled="scope.row.IsDeleted" @click="delDicom(scope.row)" />
+          </template>
+        </el-table-column> -->
+
+      </el-table>
+      <dicomForm ref="dicomForm" @getList="getList" @save="save" />
+    </template>
+  </base-model>
+</template>
+<script>
+import BaseModel from "@/components/BaseModel";
+import dicomForm from "./dicomForm.vue";
+import {
+  getTrialSiteDicomAEList,
+  deleteTrialSiteDicomAE
+} from "@/api/trials";
+const defaultSearchData = () => {
+  return {
+    TrialSiteId: null,
+    CallingAE: null,
+    Ip: null,
+    Port: null,
+    Description: null,
+  };
+};
+export default {
+  name: "dicomAE",
+  components: { BaseModel, dicomForm },
+  data() {
+    return {
+      config: {
+        visible: false,
+        title: null,
+        width: "800px",
+        appendToBody: true
+      },
+      status: "add",
+      TrialSiteId: null,
+      loading: false,
+      list: [],
+      searchData: defaultSearchData(),
+      siteData: {},
+    };
+  },
+  methods: {
+    open(row, status = "add") {
+      this.status = status;
+      this.TrialSiteId = row.TrialSiteId;
+      this.config.title = this.$t(
+        "trials:trials-panel:setting:personnel-manage:dicomAETitle"
+      ).replace("xxx", `${row.TrialSiteCode}、${row.TrialSiteAliasName}`);
+      this.siteData = row;
+      this.config.visible = true;
+      this.getList();
+    },
+    // 获取dicomAE列表
+    async getList() {
+      try {
+        this.searchData.TrialSiteId = this.TrialSiteId;
+        this.loading = true;
+        let res = await getTrialSiteDicomAEList(this.searchData);
+        this.loading = false;
+        if (res.IsSuccess) {
+          this.list = res.Result;
+        }
+      } catch (err) {
+        console.log(err);
+        this.loading = false;
+      }
+    },
+    // 新增
+    openAdd() {
+      this.$refs.dicomForm.open(this.siteData, null, 'add');
+    },
+    save() {
+      this.$emit('getList')
+    },
+    // 删除dicom
+    async delDicom(row) {
+      try {
+        let confirm = await this.$confirm(
+          this.$t("trials:sitesList:dicomAEList:confirm:delMessage"),
+          {
+            type: "warning",
+            distinguishCancelAndClose: true,
+            confirmButtonText: this.$t("common:button:confirm"),
+            cancelButtonText: this.$t("common:button:cancel"),
+          }
+        );
+        if (confirm !== "confirm") return;
+        let res = await deleteTrialSiteDicomAE(row.Id);
+        if (res.IsSuccess) {
+          this.getList();
+          this.save();
+          this.$t('common:message:deletedSuccessfully');
+        }
+      } catch (err) {
+        console.log(err);
+      }
+    }
+  },
+};
+</script>
+<style lang="scss" scoped></style>

src/views/trials/trials-panel/setting/personnel-manage/components/dicomForm.vue

@@ -0,0 +1,183 @@
+<template>
+  <base-model v-if="config.visible" :config="config">
+    <template slot="dialog-body">
+      <el-form ref="dicomForm" :model="form" label-width="100px" :rules="rules">
+        <!-- 中心编号 -->
+        <el-form-item :label="$t('trials:sitesList:table:siteId')" prop="TrialSiteCode">
+          <el-input v-model="siteData.TrialSiteCode" disabled />
+        </el-form-item>
+        <!-- 中心别称 -->
+        <el-form-item :label="$t('trials:sitesList:table:siteName')" prop="TrialSiteAliasName">
+          <el-input v-model="siteData.TrialSiteAliasName" disabled />
+        </el-form-item>
+        <!-- AE -->
+        <el-form-item :label="$t('trials:setting:siteList:dicomForm:dicomAE')" prop="CallingAE">
+          <el-input v-model="form.CallingAE" clearable maxlength="16" />
+        </el-form-item>
+        <!-- IP -->
+        <el-form-item :label="$t('trials:setting:siteList:dicomForm:ip')" prop="Ip">
+          <el-input v-model="form.Ip" clearable />
+        </el-form-item>
+        <!-- PORT -->
+        <el-form-item :label="$t('trials:setting:siteList:dicomForm:port')" prop="Port">
+          <el-input v-model.number="form.Port" type="number" clearable />
+        </el-form-item>
+        <!-- 说明 -->
+        <el-form-item :label="$t('trials:setting:siteList:dicomForm:description')" prop="Description">
+          <el-input v-model="form.Description" clearable />
+        </el-form-item>
+      </el-form>
+    </template>
+    <template slot="dialog-footer">
+      <el-button type="primary" size="small" :disabled="loading" @click="config.visible = false">
+        {{ $t("common:button:cancel") }}
+      </el-button>
+      <el-button type="primary" size="small" :loading="loading" @click="save">
+        {{ $t("common:button:save") }}
+      </el-button>
+    </template>
+  </base-model>
+</template>
+<script>
+import {
+  addOrUpdateTrialSiteDicomAE,
+} from "@/api/trials";
+import BaseModel from "@/components/BaseModel";
+export default {
+  name: "dicomForm",
+  components: { BaseModel },
+  data() {
+    return {
+      config: {
+        visible: false,
+        title: null,
+        width: "600px",
+        appendToBody: true,
+      },
+      form: {
+        Id: null,
+        CallingAE: null,
+        Ip: null,
+        Port: null,
+        Description: null
+      },
+      rules: {
+        CallingAE: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
+          {
+            pattern: /[a-zA-Z0-9]/,
+            message: this.$t("common:ruleMessage:CallingAEPattern"),
+            trigger: "blur",
+          },
+          {
+            min: 1,
+            max: 16,
+            message: this.$t("common:ruleMessage:CallingAEPattern"),
+            trigger: "blur",
+          },
+        ],
+        Ip: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
+          {
+            validator: (rule, value, callback) => {
+              if (
+                value === "" ||
+                typeof value === "undefined" ||
+                value == null
+              ) {
+                callback(new Error(this.$t("common:ruleMessage:ipPattern")));
+              } else {
+                const reg =
+                  /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/;
+                if (!reg.test(value) && value !== "") {
+                  callback(new Error(this.$t("common:ruleMessage:ipPattern")));
+                } else {
+                  callback();
+                }
+              }
+            },
+            message: this.$t("common:ruleMessage:ipPattern"),
+            trigger: "blur",
+          },
+        ],
+        Port: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
+          {
+            type: "number",
+            min: 0,
+            max: 65535,
+            message: this.$t("common:ruleMessage:portPattern"),
+            trigger: "blur",
+          },
+          {
+            validator: (rule, value, callback) => {
+              if (
+                value &&
+                (String(value).includes(".") ||
+                  new RegExp(/\D/g).test(String(value)))
+              ) {
+                callback(new Error(this.$t("common:ruleMessage:portPattern")));
+              } else {
+                callback();
+              }
+            },
+            trigger: "blur",
+          },
+        ],
+      },
+      siteData: {},
+      loading: false,
+      status: 'add'
+    };
+  },
+  methods: {
+    open(siteData, data = null, status = 'add') {
+      this.siteData = siteData;
+      this.status = status;
+      if (data) {
+        Object.keys(this.form).forEach(key => {
+          this.form[key] = data[key];
+        })
+      }
+      this.config.title = this.$t(
+        "trials:trials-panel:setting:personnel-manage:dicomAETitle"
+      ).replace("xxx", `${siteData.TrialSiteCode}、${siteData.TrialSiteAliasName}`);
+      this.config.visible = true;
+    },
+    // 保存
+    async save() {
+      try {
+        let validate = await this.$refs.dicomForm.validate();
+        if (!validate) return false;
+        this.loading = true;
+        this.form.TrialSiteId = this.siteData.TrialSiteId;
+        this.form.TrialId = this.$route.query.trialId;
+        let res = await addOrUpdateTrialSiteDicomAE(this.form);
+        this.loading = false;
+        if (res.IsSuccess) {
+          this.status === 'add' ? this.$t('common:message:savedSuccessfully') : this.$t('common:message:savedFail');
+          this.$emit('getList');
+          this.$emit("save");
+          this.config.visible = false;
+        }
+      } catch (err) {
+        console.log(err);
+        this.loading = false;
+      }
+    }
+  }
+};
+</script>
+<style lang="scss" scoped></style>

src/views/trials/trials-panel/setting/personnel-manage/components/site.vue

@@ -16,23 +16,13 @@
         </el-form-item> -->
         <!-- 关键词 -->
         <el-form-item :label="$t('trials:sitesList:form:keyWord')">
-          <el-input
-            v-model="listQuery.UserKeyInfo"
-            style="width: 200px"
-            class="mr"
-            clearable
-            :placeholder="$t('trials:sitesList:formPlaceholder:keyWord')"
-          />
+          <el-input v-model="listQuery.UserKeyInfo" style="width: 200px" class="mr" clearable
+            :placeholder="$t('trials:sitesList:formPlaceholder:keyWord')" />
         </el-form-item>
         <!-- 状态 -->
         <el-form-item :label="$t('trials:sitesList:table:status')">
           <el-select v-model="listQuery.IsDeleted" clearable class="mr">
-            <el-option
-              v-for="item of $d.IsSiteDisable"
-              :key="item.label"
-              :label="item.label"
-              :value="item.value"
-            />
+            <el-option v-for="item of $d.IsSiteDisable" :key="item.label" :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>
         <el-form-item>
@@ -41,120 +31,60 @@
             {{ $t("common:button:search") }}
           </el-button>
           <!-- 重置 -->
-          <el-button
-            type="primary"
-            icon="el-icon-refresh-left"
-            @click="handleReset"
-          >
+          <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
             {{ $t("common:button:reset") }}
           </el-button>
           <!-- 中心调研 -->
-          <el-button
-            v-hasPermi="[
-              'trials:trials-panel:setting:personnel-manage:questionnaire-record',
-            ]"
-            type="primary"
-            icon="el-icon-info"
-            @click="handleResearchList"
-          >
+          <el-button v-hasPermi="[
+            'trials:trials-panel:setting:personnel-manage:questionnaire-record',
+          ]" type="primary" icon="el-icon-info" @click="handleResearchList">
             {{ $t("trials:sitesList:button:siteResearch") }}
           </el-button>
           <!-- 添加中心 -->
-          <el-button
-            v-hasPermi="[
-              'trials:trials-panel:setting:personnel-manage:add-site',
-            ]"
-            type="primary"
-            icon="el-icon-plus"
-            @click="handleAdd"
-          >
+          <el-button v-hasPermi="[
+            'trials:trials-panel:setting:personnel-manage:add-site',
+          ]" type="primary" icon="el-icon-plus" @click="handleAdd">
             {{ $t("trials:sitesList:dialogTitle:assignSite") }}
           </el-button>
-          <el-button
-            type="primary"
-            icon="el-icon-download"
-            :disabled="list.length === 0"
-            @click="handleResearchListExport"
-          >
+          <el-button type="primary" icon="el-icon-download" :disabled="list.length === 0"
+            @click="handleResearchListExport">
             {{ $t("common:button:export") }}
           </el-button>
           <!-- 下载模板 -->
-          <el-button
-            type="primary"
-            icon="el-icon-download"
-            @click="handleDownload"
-          >
+          <el-button type="primary" icon="el-icon-download" @click="handleDownload">
             {{ $t("common:button:downloadTpl") }}
           </el-button>
-          <el-button
-            v-hasPermi="[
-              'trials:trials-panel:setting:personnel-manage:add-site',
-            ]"
-            type="primary"
-            icon="el-icon-upload2"
-            @click="handleUpload"
-          >
+          <el-button v-hasPermi="[
+            'trials:trials-panel:setting:personnel-manage:add-site',
+          ]" type="primary" icon="el-icon-upload2" @click="handleUpload">
             {{ $t("common:button:upload") }}
           </el-button>
         </el-form-item>
       </el-form>
     </div>
-    <el-table
-      v-loading="listLoading"
-      :data="list"
-      stripe
-      @sort-change="handleSortByColumn"
-    >
+    <el-table v-loading="listLoading" :data="list" stripe @sort-change="handleSortByColumn">
       <el-table-column type="index" width="50" />
       <!-- 中心编号 -->
-      <el-table-column
-        prop="TrialSiteCode"
-        :label="$t('trials:sitesList:table:siteId')"
-        show-overflow-tooltip
-        sortable="custom"
-        width="120"
-      >
+      <el-table-column prop="TrialSiteCode" :label="$t('trials:sitesList:table:siteId')" show-overflow-tooltip
+        sortable="custom" width="120">
         <template slot-scope="scope">
           <span v-if="!!scope.row.TrialSiteCode">{{
             scope.row.TrialSiteCode
           }}</span>
-          <i
-            v-else
-            class="el-icon-warning"
-            style="color: #f44336; font-size: 14px"
-          />
+          <i v-else class="el-icon-warning" style="color: #f44336; font-size: 14px" />
         </template>
       </el-table-column>
       <!-- 中心名称 -->
-      <el-table-column
-        prop="TrialSiteName"
-        :label="$t('trials:sitesList:table:siteName')"
-        show-overflow-tooltip
-        sortable="custom"
-        min-width="120"
-      />
+      <el-table-column prop="TrialSiteName" :label="$t('trials:sitesList:table:siteName')" show-overflow-tooltip
+        sortable="custom" min-width="120" />
       <!-- 中心别名 -->
-      <el-table-column
-        prop="TrialSiteAliasName"
-        :label="$t('trials:sitesList:table:siteAliasName')"
-        show-overflow-tooltip
-        sortable="custom"
-        min-width="120"
-      />
+      <el-table-column prop="TrialSiteAliasName" :label="$t('trials:sitesList:table:siteAliasName')"
+        show-overflow-tooltip sortable="custom" min-width="120" />
       <!-- 参与者 -->
-      <el-table-column
-        prop="UserNameList"
-        :label="$t('trials:sitesList:table:staff')"
-        show-overflow-tooltip
-        min-width="100"
-      >
+      <el-table-column prop="UserNameList" :label="$t('trials:sitesList:table:staff')" show-overflow-tooltip
+        min-width="100">
         <template slot-scope="scope">
-          <el-button
-            v-if="scope.row.UserCount > 0"
-            size="small"
-            type="text"
-            @click="getCrcList(scope.row)"
-          >
+          <el-button v-if="scope.row.UserCount > 0" size="small" type="text" @click="getCrcList(scope.row)">
             {{
               scope.row.UserNameList.length > 0
                 ? scope.row.UserNameList.join(", ")
@@ -164,29 +94,14 @@
         </template>
       </el-table-column>
       <!-- Subjects -->
-      <el-table-column
-        prop="SubjectCount"
-        min-width="100"
-        :label="$t('trials:site:table:subjects')"
-        show-overflow-tooltip
-        sortable="custom"
-      />
+      <el-table-column prop="SubjectCount" min-width="100" :label="$t('trials:site:table:subjects')"
+        show-overflow-tooltip sortable="custom" />
       <!-- Visits -->
-      <el-table-column
-        prop="VisitCount"
-        min-width="100"
-        :label="$t('trials:site:table:visits')"
-        show-overflow-tooltip
-        sortable="custom"
-      />
+      <el-table-column prop="VisitCount" min-width="100" :label="$t('trials:site:table:visits')" show-overflow-tooltip
+        sortable="custom" />
       <!-- 状态 -->
-      <el-table-column
-        prop="IsDeleted"
-        :label="$t('trials:sitesList:table:status')"
-        show-overflow-tooltip
-        sortable
-        min-width="100"
-      >
+      <el-table-column prop="IsDeleted" :label="$t('trials:sitesList:table:status')" show-overflow-tooltip sortable
+        min-width="100">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.IsDeleted" type="danger">{{
             $fd("IsSiteDisable", scope.row.IsDeleted)
@@ -196,53 +111,45 @@
           }}</el-tag>
         </template>
       </el-table-column>
-      <!-- 授权时间 -->
-      <el-table-column
-        prop="EnabledTime"
-        :label="$t('trials:sitesList:table:timeAdded')"
-        show-overflow-tooltip
-        sortable
-        min-width="150"
-      />
-      <el-table-column
-        v-if="
-          hasPermi([
-            'trials:trials-panel:setting:personnel-manage:edit-site',
-            'trials:trials-panel:setting:personnel-manage:remove-site',
-          ])
-        "
-        :label="$t('common:action:action')"
-        min-width="120"
-      >
+      <!-- DICOM AE -->
+      <el-table-column prop="CallingAEList" :label="$t('trials:sitesList:table:AE')" show-overflow-tooltip sortable
+        min-width="100">
         <template slot-scope="scope">
-          <el-button
-            circle
-            :title="$t('trials:sitesList:action:assign')"
-            icon="el-icon-user"
-            :disabled="scope.row.IsDeleted"
-            @click="getCrcList(scope.row)"
-          />
+          <el-button v-if="scope.row.CallingAEList.length > 0" size="small" type="text"
+            @click="handleConfig(scope.row, 'view')">
+            {{
+              scope.row.CallingAEList.length > 0
+                ? scope.row.CallingAEList.join(", ")
+                : ""
+            }}
+          </el-button>
+        </template>
+      </el-table-column>
+      <!-- 授权时间 -->
+      <el-table-column prop="EnabledTime" :label="$t('trials:sitesList:table:timeAdded')" show-overflow-tooltip sortable
+        min-width="150" />
+      <el-table-column v-if="
+        hasPermi([
+          'trials:trials-panel:setting:personnel-manage:edit-site',
+          'trials:trials-panel:setting:personnel-manage:remove-site',
+        ])
+      " :label="$t('common:action:action')" min-width="120">
+        <template slot-scope="scope">
+          <el-button circle :title="$t('trials:sitesList:action:assign')" icon="el-icon-user"
+            :disabled="scope.row.IsDeleted" @click="getCrcList(scope.row)" />
 
           <!-- Edit -->
-          <el-button
-            v-hasPermi="[
-              'trials:trials-panel:setting:personnel-manage:edit-site',
-            ]"
-            circle
-            :title="$t('common:button:edit')"
-            icon="el-icon-edit-outline"
-            @click="handleEdit(scope.row)"
-          />
+          <el-button v-hasPermi="[
+            'trials:trials-panel:setting:personnel-manage:edit-site',
+          ]" circle :title="$t('common:button:edit')" icon="el-icon-edit-outline" @click="handleEdit(scope.row)" />
+          <el-button circle :title="$t('common:button:config')" icon="el-icon-setting"
+            @click="handleConfig(scope.row, 'add')" />
         </template>
       </el-table-column>
     </el-table>
     <div class="pagination" style="text-align: right">
-      <pagination
-        :total="total"
-        :page.sync="listQuery.PageIndex"
-        :limit.sync="listQuery.PageSize"
-        @pagination="getList"
-      />
+      <pagination :total="total" :page.sync="listQuery.PageIndex" :limit.sync="listQuery.PageSize"
+        @pagination="getList" />
     </div>
 
     <!-- 给site分配crc -->
@@ -255,66 +162,31 @@
     <!-- 修改site信息 -->
     <base-model v-if="edit_model.visible" :config="edit_model">
       <template slot="dialog-body">
-        <el-form
-          ref="editForm"
-          :model="form"
-          label-width="100px"
-          :rules="rules"
-        >
+        <el-form ref="editForm" :model="form" label-width="100px" :rules="rules">
           <!-- 中心编号 -->
-          <el-form-item
-            :label="$t('trials:sitesList:table:siteId')"
-            prop="TrialSiteCode"
-          >
+          <el-form-item :label="$t('trials:sitesList:table:siteId')" prop="TrialSiteCode">
             <el-input v-model="form.TrialSiteCode" />
           </el-form-item>
           <!-- 中心名称 -->
-          <el-form-item
-            :label="$t('trials:sitesList:table:siteName')"
-            prop="TrialSiteName"
-          >
-            <el-autocomplete
-              clearable
-              class="inline-input"
-              style="width: 100%"
-              v-model="form.TrialSiteName"
-              :fetch-suggestions="querySearch"
-              @select="handleSelect"
-              placeholder=""
-            ></el-autocomplete>
+          <el-form-item :label="$t('trials:sitesList:table:siteName')" prop="TrialSiteName">
+            <el-autocomplete clearable class="inline-input" style="width: 100%" v-model="form.TrialSiteName"
+              :fetch-suggestions="querySearch" @select="handleSelect" placeholder=""></el-autocomplete>
           </el-form-item>
           <!-- 中心别称 -->
-          <el-form-item
-            :label="$t('trials:sitesList:table:siteAliasName')"
-            prop="TrialSiteAliasName"
-          >
+          <el-form-item :label="$t('trials:sitesList:table:siteAliasName')" prop="TrialSiteAliasName">
             <el-input v-model="form.TrialSiteAliasName" />
           </el-form-item>
           <!-- 状态 -->
           <el-form-item :label="$t('trials:sitesList:table:status')">
-            <el-switch
-              v-model="form.IsDeleted"
-              :active-value="false"
-              :inactive-value="true"
-            />
+            <el-switch v-model="form.IsDeleted" :active-value="false" :inactive-value="true" />
           </el-form-item>
         </el-form>
       </template>
       <template slot="dialog-footer">
-        <el-button
-          type="primary"
-          size="small"
-          :disabled="saveBtnLoading"
-          @click="edit_model.visible = false"
-        >
+        <el-button type="primary" size="small" :disabled="saveBtnLoading" @click="edit_model.visible = false">
           {{ $t("common:button:cancel") }}
         </el-button>
-        <el-button
-          type="primary"
-          size="small"
-          :loading="saveBtnLoading"
-          @click="handleUpdateSiteID"
-        >
+        <el-button type="primary" size="small" :loading="saveBtnLoading" @click="handleUpdateSiteID">
           {{ $t("common:button:save") }}
         </el-button>
       </template>
@@ -325,29 +197,14 @@
       <template slot="dialog-body">
         <span>{{ $t("trials:internalStaff:table:status") }}:</span>
         <el-radio-group v-model="staffStatus">
-          <el-radio
-            v-for="item of $d.IsUserExitTrial"
-            :key="item.label"
-            :label="item.value"
-            >{{ item.label }}</el-radio
-          >
+          <el-radio v-for="item of $d.IsUserExitTrial" :key="item.label" :label="item.value">{{ item.label }}</el-radio>
         </el-radio-group>
       </template>
       <template slot="dialog-footer">
-        <el-button
-          :disabled="btnLoading"
-          size="small"
-          type="primary"
-          @click="status_model.visible = false"
-        >
+        <el-button :disabled="btnLoading" size="small" type="primary" @click="status_model.visible = false">
           {{ $t("common:button:cancel") }}
         </el-button>
-        <el-button
-          size="small"
-          type="primary"
-          :loading="btnLoading"
-          @click="saveStatus"
-        >
+        <el-button size="small" type="primary" :loading="btnLoading" @click="saveStatus">
           {{ $t("common:button:save") }}
         </el-button>
       </template>
@@ -357,72 +214,33 @@
     <base-model v-if="siteOfcrc_model.visible" :config="siteOfcrc_model">
       <template slot="dialog-body">
         <div style="text-align: right">
-          <el-button
-            v-hasPermi="[
-              'trials:trials-panel:setting:personnel-manage:assign-staff',
-            ]"
-            type="primary"
-            icon="el-icon-plus"
-            size="small"
-            @click="crc_model.visible = true"
-          >
+          <el-button v-hasPermi="[
+            'trials:trials-panel:setting:personnel-manage:assign-staff',
+          ]" type="primary" icon="el-icon-plus" size="small" @click="crc_model.visible = true">
             {{ $t("common:button:add") }}
           </el-button>
         </div>
-        <el-table
-          v-loading="userListLoading"
-          :data="userList"
-          height="400"
-          size="small"
-        >
+        <el-table v-loading="userListLoading" :data="userList" height="400" size="small">
           <!-- 姓名 -->
-          <el-table-column
-            prop="UserRealName"
-            :label="$t('trials:internalStaff:table:name')"
-            width="100"
-            show-overflow-tooltip
-          />
+          <el-table-column prop="UserRealName" :label="$t('trials:internalStaff:table:name')" width="100"
+            show-overflow-tooltip />
           <!-- 用户名 -->
-          <el-table-column
-            prop="UserName"
-            :label="$t('trials:internalStaff:table:uid')"
-            min-width="100"
-            show-overflow-tooltip
-          />
+          <el-table-column prop="UserName" :label="$t('trials:internalStaff:table:uid')" min-width="100"
+            show-overflow-tooltip />
           <!-- 用户类型 -->
-          <el-table-column
-            prop="UserType"
-            :label="$t('trials:internalStaff:table:userType')"
-            width="100"
-            show-overflow-tooltip
-          />
+          <el-table-column prop="UserType" :label="$t('trials:internalStaff:table:userType')" width="100"
+            show-overflow-tooltip />
           <!-- 电话 -->
-          <el-table-column
-            prop="Phone"
-            :label="$t('trials:internalStaff:table:phone')"
-            show-overflow-tooltip
-            width="100"
-          />
+          <el-table-column prop="Phone" :label="$t('trials:internalStaff:table:phone')" show-overflow-tooltip
+            width="100" />
           <!-- 邮箱 -->
-          <el-table-column
-            prop="EMail"
-            :label="$t('trials:internalStaff:table:email')"
-            show-overflow-tooltip
-            width="100"
-          />
+          <el-table-column prop="EMail" :label="$t('trials:internalStaff:table:email')" show-overflow-tooltip
+            width="100" />
           <!-- 单位 -->
-          <el-table-column
-            prop="OrganizationName"
-            :label="$t('trials:internalStaff:table:organization')"
-            width="100"
-          />
+          <el-table-column prop="OrganizationName" :label="$t('trials:internalStaff:table:organization')" width="100" />
           <!-- 状态 -->
-          <el-table-column
-            prop="IsDeleted"
-            :label="$t('trials:internalStaff:table:status')"
-            show-overflow-tooltip
-            width="100"
-          >
+          <el-table-column prop="IsDeleted" :label="$t('trials:internalStaff:table:status')" show-overflow-tooltip
+            width="100">
             <template slot-scope="scope">
               <el-tag v-if="scope.row.IsDeleted" type="danger">{{
                 $fd("IsUserExitTrial", scope.row.IsDeleted)
@@ -432,37 +250,18 @@
               }}</el-tag>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="CreateTime"
-            :label="$t('trials:internalStaff:table:authorizationTime')"
-            show-overflow-tooltip
-            sortable="custom"
-            width="210"
-          />
-          <el-table-column
-            prop="DeletedTime"
-            :label="$t('trials:internalStaff:table:disableTime')"
-            show-overflow-tooltip
-            sortable
-            width="210"
-          />
-          <el-table-column
-            v-hasPermi="[
-              'trials:trials-panel:setting:personnel-manage:assign-staff',
-            ]"
-            :label="$t('common:action:action')"
-            width="100"
-          >
+          <el-table-column prop="CreateTime" :label="$t('trials:internalStaff:table:authorizationTime')"
+            show-overflow-tooltip sortable="custom" width="210" />
+          <el-table-column prop="DeletedTime" :label="$t('trials:internalStaff:table:disableTime')"
+            show-overflow-tooltip sortable width="210" />
+          <el-table-column v-hasPermi="[
+            'trials:trials-panel:setting:personnel-manage:assign-staff',
+          ]" :label="$t('common:action:action')" width="100">
             <template slot-scope="scope">
-              <el-button
-                v-hasPermi="[
-                  'trials:trials-panel:setting:personnel-manage:assign-staff',
-                ]"
-                circle
-                :title="$t('trials:internalStaff:action:status')"
-                icon="el-icon-edit-outline"
-                @click="handleStatus(scope.row)"
-              />
+              <el-button v-hasPermi="[
+                'trials:trials-panel:setting:personnel-manage:assign-staff',
+              ]" circle :title="$t('trials:internalStaff:action:status')" icon="el-icon-edit-outline"
+                @click="handleStatus(scope.row)" />
             </template>
           </el-table-column>
         </el-table>
@@ -471,12 +270,11 @@
     <!-- 导入 -->
     <base-model v-if="upload_model.visible" :config="upload_model">
       <template slot="dialog-body">
-        <UploadExcel
-          @closeDialog="upload_model.visible = false"
-          @getList="getList"
-        />
+        <UploadExcel @closeDialog="upload_model.visible = false" @getList="getList" />
       </template>
     </base-model>
+    <!--dicom AE-->
+    <dicomAEList ref="dicomAEList" @getList="getList" />
   </div>
 </template>
 <script>
@@ -496,6 +294,7 @@ import CRCForm from "./crcForm";
 import BaseModel from "@/components/BaseModel";
 import UploadExcel from "./uploadExcel";
 import moment from "moment";
+import dicomAEList from "./dicomAEList.vue";
 const getListQueryDefault = () => {
   return {
     UserKeyInfo: "",
@@ -511,7 +310,7 @@ const getListQueryDefault = () => {
 };
 export default {
   name: "Participant",
-  components: { Pagination, CRCForm, BaseModel, UploadExcel },
+  components: { Pagination, CRCForm, BaseModel, UploadExcel, dicomAEList },
   data() {
     return {
       list: [],
@@ -610,6 +409,10 @@ export default {
     this.getTrialSiteSelectList();
   },
   methods: {
+    // 打开DICOMAE配置列表
+    handleConfig(row, status) {
+      this.$refs.dicomAEList.open(row, status);
+    },
     handleSelect(item) {
       this.form.TrialSiteName = item.SiteName;
       this.form.TrialSiteAliasName = item.AliasName
@@ -891,19 +694,23 @@ export default {
   .filter-box {
     display: flex;
     padding: 5px;
+
     .base-search-form {
       .el-form-item {
         margin-bottom: 0px;
       }
     }
+
     .mr {
       margin-right: 5px;
       width: 120px;
     }
   }
+
   .el-dialog__header {
     padding: 10px;
   }
+
   .el-dialog__body {
     padding: 10px;
   }

src/views/trials/trials-panel/setting/qc-question/components/DefaultQS.vue

@@ -7,23 +7,6 @@
         <el-form-item :label="$t('trials:qcCfg:table:questionName')">
           <el-input v-model="searchData.QuestionName" clearable style="width:120px;" />
         </el-form-item>
-        <!-- 语言类型 -->
-        <el-form-item
-          :label="$t('common:title:languageType')"
-        >
-          <el-select
-            v-model="searchData.LanguageType"
-            style="width:120px;"
-            clearable
-          >
-            <el-option
-              v-for="item of $d.LanguageType"
-              :key="item.value"
-              :value="item.value"
-              :label="item.label"
-            />
-          </el-select>
-        </el-form-item>
         <!-- 类型 -->
         <el-form-item :label="$t('trials:qcCfg:table:type')">
           <el-select v-model="searchData.Type" clearable style="width:120px;">
@@ -70,16 +53,6 @@
         :label="$t('trials:qcCfg:table:questionName')"
         show-overflow-tooltip
       />
-      <!-- 审核问题 -->
-      <el-table-column
-        prop="LanguageType"
-        :label="$t('common:title:languageType')"
-        show-overflow-tooltip
-      >
-        <template slot-scope="scope">
-          {{ $fd('LanguageType', scope.row.LanguageType) }}
-        </template>
-      </el-table-column>
       <!-- 类型 -->
       <el-table-column
         prop="Type"
@@ -140,6 +113,7 @@ import { getQCQuestionConfigureList } from '@/api/dictionary'
 import { batchAddTrialQCQuestionConfigure } from '@/api/trials'
 import BoxContent from '@/components/BoxContent'
 import Pagination from '@/components/Pagination'
+import { mapGetters } from 'vuex'
 
 const searchDataDefault = () => {
   return {
@@ -167,15 +141,23 @@ export default {
       selectArr: []
     }
   },
-  mounted() {
-    this.trialId = this.$route.query.trialId
-    this.getList()
+  computed: {
+    ...mapGetters(['language'])
+  },
+  created(){
+    this.trialId = this.$route.query.trialId;
+    this.getList();
   },
   methods: {
     // 获取受试者列表信息
     getList() {
       this.loading = true
-      this.searchData.TrialId = this.trialId
+      this.searchData.TrialId = this.trialId;
+      if (this.$i18n.locale === 'zh') {
+        this.searchData.LanguageType = 0
+      } else {
+        this.searchData.LanguageType = 1
+      }
       getQCQuestionConfigureList(this.searchData).then(res => {
         this.loading = false
         this.list = res.Result.CurrentPageData
@@ -214,7 +196,7 @@ export default {
     },
     // 重置
     handleReset() {
-      this.searchData = searchDataDefault()
+      this.searchData = searchDataDefault();
       this.getList()
     }
   }

src/views/trials/trials-panel/setting/trial-config/components/clinicalDataForm.vue

@@ -16,10 +16,12 @@
         <el-input
           v-model="form.ClinicalDataSetEnName"
           :disabled="data.IsFromSystemData === true"
+          @input="form.ClinicalDataSetName = form.ClinicalDataSetEnName"
+          @blur="form.ClinicalDataSetName = form.ClinicalDataSetEnName"
         />
       </el-form-item>
       <!-- 临床数据名称 -->
-      <el-form-item
+      <!-- <el-form-item
         :label="$t('trials:processCfg:title:clinicalDataName')+ '（CN）'"
         prop="ClinicalDataSetName"
       >
@@ -27,7 +29,7 @@
           v-model="form.ClinicalDataSetName"
           :disabled="data.IsFromSystemData === true"
         />
-      </el-form-item>
+      </el-form-item> -->
       <!-- 上传人 -->
       <el-form-item
         :label="$t('trials:processCfg:title:uploader')"

src/views/trials/trials-panel/setting/trial-config/components/dicomConfig.vue

@@ -0,0 +1,546 @@
+<template>
+  <div>
+    <el-form
+      ref="dicomConfigForm"
+      v-loading="loading"
+      :model="form"
+      label-width="300px"
+      style="width: 800px"
+      :rules="rules"
+      size="small"
+    >
+      <!-- pacs直连 -->
+      <el-form-item
+        :label="$t('trials:dicomCfg:form:pacsLine')"
+        prop="IsPACSConnect"
+      >
+        <el-radio-group
+          v-model="form.IsPACSConnect"
+          :disabled="form.IsTrialPACSConfirmed && !isEdit"
+          @change="changeConnect"
+        >
+          <el-radio
+            v-for="item of $d.PACSConnectMode"
+            :key="item.id"
+            :label="item.value"
+          >
+            {{ item.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <template v-if="form.IsPACSConnect">
+        <!--AE名称-->
+        <el-form-item
+          :label="$t('trials:dicomCfg:form:CalledAE')"
+          prop="CalledAE"
+        >
+          <el-input
+            v-model="form.CalledAE"
+            style="width: 80%"
+            :disabled="form.IsTrialPACSConfirmed && !isEdit"
+            clearable
+            maxlength="16"
+          />
+        </el-form-item>
+        <!-- IP地址 -->
+        <el-form-item :label="$t('trials:dicomCfg:form:Ip')" prop="Ip">
+          <el-input
+            v-model="form.Ip"
+            style="width: 80%"
+            :disabled="form.IsTrialPACSConfirmed && !isEdit"
+            clearable
+          />
+        </el-form-item>
+        <!-- 端口 -->
+        <el-form-item :label="$t('trials:dicomCfg:form:Port')" prop="Port">
+          <el-input
+            v-model.number="form.Port"
+            type="number"
+            clearable
+            style="width: 80%"
+            :disabled="form.IsTrialPACSConfirmed && !isEdit"
+          />
+        </el-form-item>
+        <!--状态-->
+        <el-form-item
+          :label="$t('trials:dicomCfg:form:IsTestOK')"
+          prop="IsTestOK"
+        >
+          <el-tag
+            :type="form.IsTestOK ? 'success' : 'danger'"
+            effect="plain"
+            v-if="form.IsTestOK !== null"
+          >
+            {{ $fd("DicomTest", form.IsTestOK) }}
+          </el-tag>
+        </el-form-item>
+      </template>
+      <el-form-item>
+        <!-- 测试DICOM AE -->
+        <el-button
+          v-if="
+            isEdit &&
+            hasPermi(['trials:trials-panel:setting:trial-config:save']) &&
+            form.IsPACSConnect
+          "
+          type="primary"
+          @click.stop="testSCPServerConnect"
+        >
+          {{ $t("common:button:DicomTest") }}
+        </el-button>
+        <!-- 保存 -->
+        <el-button
+          v-if="
+            form.IsTrialPACSConfirmed === false &&
+            hasPermi(['trials:trials-panel:setting:trial-config:save'])
+          "
+          type="primary"
+          @click="addOrUpdateDicomAE"
+        >
+          {{ $t("common:button:save") }}
+        </el-button>
+        <!-- 配置确认:disabled="!form.IsTestOK" -->
+        <el-button
+          v-if="
+            form.IsTrialPACSConfirmed === false &&
+            hasPermi(['trials:trials-panel:setting:trial-config:save'])
+          "
+          type="primary"
+          @click="handleConfirm"
+        >
+          {{ $t("trials:trialCfg:button:confirm") }}
+        </el-button>
+        <!-- 配置更新 -->
+        <el-button
+          v-if="
+            form.IsTrialPACSConfirmed === true &&
+            !isEdit &&
+            hasPermi(['trials:trials-panel:setting:trial-config:save'])
+          "
+          type="primary"
+          @click="isEdit = true"
+        >
+          {{ $t("trials:trialCfg:button:update") }}
+        </el-button>
+        <!-- 配置更新确认:disabled="!form.IsTestOK" -->
+        <el-button
+          v-if="
+            form.IsTrialPACSConfirmed === true &&
+            isEdit &&
+            hasPermi(['trials:trials-panel:setting:trial-config:save'])
+          "
+          type="primary"
+          @click="handleUpdate"
+        >
+          {{ $t("trials:trialCfg:button:updateAndConfirm") }}
+        </el-button>
+      </el-form-item>
+    </el-form>
+    <!-- 配置信息签名框 -->
+    <el-dialog
+      v-if="signVisible"
+      :visible.sync="signVisible"
+      :close-on-click-modal="false"
+      width="600px"
+      custom-class="base-dialog-wrapper"
+    >
+      <div slot="title">
+        <span style="font-size: 18px">{{ $t("common:dialogTitle:sign") }}</span>
+        <span style="font-size: 12px; margin-left: 5px">{{
+          `(${$t("common:label:sign")}${currentUser})`
+        }}</span>
+      </div>
+      <SignForm
+        ref="signForm"
+        :sign-code-enum="signCode"
+        @closeDialog="closeSignDialog"
+      />
+    </el-dialog>
+    <!-- 配置信息确认框 -->
+    <el-dialog
+      v-if="confirmVisible"
+      :visible.sync="confirmVisible"
+      :close-on-click-modal="false"
+      width="600px"
+      :title="$t('trials:trialCfg:dialogTitle:cfgConfirm')"
+      custom-class="base-dialog-wrapper"
+    >
+      <div class="base-dialog-body">
+        <el-table :data="confirmData" border style="width: 100%" size="small">
+          <!-- 配置项 -->
+          <el-table-column
+            prop="Name"
+            :label="$t('trials:trialCfg:table:cfgItem')"
+            show-overflow-tooltip
+          />
+          <!-- 配置值 -->
+          <el-table-column
+            prop="NewVal"
+            :label="$t('trials:trialCfg:table:cfgVal')"
+            show-overflow-tooltip
+          />
+        </el-table>
+      </div>
+      <div
+        class="base-dialog-footer"
+        style="text-align: right; margin-top: 10px"
+      >
+        <!-- 确认 -->
+        <el-button size="small" type="primary" @click="handleConfirmConfigData">
+          {{ $t("trials:trialCfg:button:confirmCfg") }}
+        </el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 配置信息更新框 -->
+    <el-dialog
+      v-if="updateVisible"
+      :visible.sync="updateVisible"
+      :close-on-click-modal="false"
+      width="600px"
+      :title="$t('trials:trialCfg:dialogTitle:cfgConfirm')"
+      custom-class="base-dialog-wrapper"
+    >
+      <div class="base-dialog-body">
+        <el-table :data="confirmData" border style="width: 100%" size="small">
+          <!-- 配置项 -->
+          <el-table-column
+            prop="Name"
+            :label="$t('trials:trialCfg:table:cfgItem')"
+            show-overflow-tooltip
+          />
+          <!-- 配置值（更改前） -->
+          <el-table-column
+            prop="OldVal"
+            :label="`${$t('trials:trialCfg:table:cfgVal')} （${$t(
+              'trials:trialCfg:table:beforeChange'
+            )}）`"
+            show-overflow-tooltip
+          />
+          <!-- 配置值（更改后） -->
+          <el-table-column
+            prop="NewVal"
+            :label="`${$t('trials:trialCfg:table:cfgVal')} （${$t(
+              'trials:trialCfg:table:updated'
+            )}）`"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <span
+                :class="{ fontColor: scope.row.NewVal !== scope.row.OldVal }"
+                >{{ scope.row.NewVal }}</span
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div
+        class="base-dialog-footer"
+        style="text-align: right; margin-top: 10px"
+      >
+        <!-- 确认 -->
+        <el-button size="small" type="primary" @click="handleUpdateConfigData">
+          {{ $t("trials:trialCfg:button:confirmCfg") }}
+        </el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {
+  getTrialDicomAE,
+  addOrUpdateDicomAE,
+  testSCPServerConnect,
+  ConfigTrialPACSInfoConfirm,
+} from "@/api/trials";
+import SignForm from "@/views/trials/components/newSignForm";
+import const_ from "@/const/sign-code";
+export default {
+  name: "dicomConfig",
+  components: { SignForm },
+  data() {
+    return {
+      loading: false,
+      form: {
+        IsTestOK: null,
+        IsPACSConnect: true,
+        IsTrialPACSConfirmed: false,
+        CalledAE: null,
+        Ip: null,
+        Port: null,
+        Modality: null,
+      },
+      initialForm: {},
+      rules: {
+        IsPACSConnect: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
+        ],
+        CalledAE: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
+          {
+            pattern: /[a-zA-Z0-9]/,
+            message: this.$t("common:ruleMessage:CallingAEPattern"),
+            trigger: "blur",
+          },
+          {
+            min: 1,
+            max: 16,
+            message: this.$t("common:ruleMessage:CallingAEPattern"),
+            trigger: "blur",
+          },
+        ],
+        Ip: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
+          {
+            validator: (rule, value, callback) => {
+              if (
+                value === "" ||
+                typeof value === "undefined" ||
+                value == null
+              ) {
+                callback(new Error(this.$t("common:ruleMessage:ipPattern")));
+              } else {
+                const reg =
+                  /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/;
+                if (!reg.test(value) && value !== "") {
+                  callback(new Error(this.$t("common:ruleMessage:ipPattern")));
+                } else {
+                  callback();
+                }
+              }
+            },
+            message: this.$t("common:ruleMessage:ipPattern"),
+            trigger: "blur",
+          },
+        ],
+        Port: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
+          {
+            type: "number",
+            min: 0,
+            max: 65535,
+            message: this.$t("common:ruleMessage:portPattern"),
+            trigger: "blur",
+          },
+          {
+            validator: (rule, value, callback) => {
+              if (
+                value &&
+                (String(value).includes(".") ||
+                  new RegExp(/\D/g).test(String(value)))
+              ) {
+                callback(new Error(this.$t("common:ruleMessage:portPattern")));
+              } else {
+                callback();
+              }
+            },
+            trigger: "blur",
+          },
+        ],
+      },
+      isEdit: false,
+      Id: null,
+      signVisible: false,
+      signCode: null,
+      currentUser: zzSessionStorage.getItem("userName"),
+      confirmData: [],
+      confirmVisible: false,
+      updateVisible: false,
+    };
+  },
+  methods: {
+    changeConnect(val) {
+      if (!val) {
+        this.form.CalledAE = null;
+        this.form.Ip = null;
+        this.form.Port = null;
+        this.form.Modality = null;
+        this.form.IsTestOK = null;
+      }
+    },
+    initForm(res) {
+      this.getInfo();
+    },
+    // 测试dicomAE
+    async testSCPServerConnect() {
+      try {
+        let res = await this.addOrUpdateDicomAE();
+        if (!res) return;
+        this.loading = true;
+        let d = await testSCPServerConnect(res);
+        this.loading = false;
+        if (d.IsSuccess) {
+          this.form.IsTestOK = d.Result;
+        }
+      } catch (err) {
+        console.log(err);
+        this.loading = false;
+      }
+    },
+    // 获取配置
+    async getInfo() {
+      try {
+        let data = {
+          TrialId: this.$route.query.trialId,
+        };
+        this.loading = true;
+        let res = await getTrialDicomAE(data);
+        this.loading = false;
+        if (res.IsSuccess) {
+          this.form.IsPACSConnect = res.OtherInfo.IsPACSConnect;
+          this.form.IsTrialPACSConfirmed = res.OtherInfo.IsTrialPACSConfirmed;
+          if (!res.OtherInfo.IsTrialPACSConfirmed) {
+            this.isEdit = true;
+          }
+          this.form.IsTestOK = res.Result.IsTestOK;
+          this.form.CalledAE = res.Result.CalledAE;
+          this.form.Ip = res.Result.IP;
+          this.form.Port = res.Result.Port;
+          this.Id = res.Result.Id;
+
+          this.initialForm.IsPACSConnect = res.OtherInfo.IsPACSConnect;
+          this.initialForm.IsTrialPACSConfirmed =
+            res.OtherInfo.IsTrialPACSConfirmed;
+          this.initialForm.IsTestOK = res.Result.IsTestOK;
+          this.initialForm.CalledAE = res.Result.CalledAE;
+          this.initialForm.Ip = res.Result.IP;
+          this.initialForm.Port = res.Result.Port;
+        }
+      } catch (err) {
+        console.log(err);
+        this.loading = false;
+      }
+    },
+    // 新增或修改配置
+    async addOrUpdateDicomAE() {
+      try {
+        let validate = await this.$refs.dicomConfigForm.validate();
+        if (!validate) return;
+        if (this.Id) {
+          this.form.Id = this.Id;
+        }
+        this.form.TrialId = this.$route.query.trialId;
+        this.loading = true;
+        let res = await addOrUpdateDicomAE(this.form);
+        this.loading = false;
+        if (res.IsSuccess) {
+          // this.$emit("refresh");
+          return res.Result;
+        }
+        return false;
+      } catch (err) {
+        console.log(err);
+        this.loading = false;
+        return false;
+      }
+    },
+    // 关闭签名框
+    closeSignDialog(isSign, signInfo) {
+      if (isSign) {
+        this.signConfirm(signInfo);
+      } else {
+        this.signVisible = false;
+      }
+    },
+    async signConfirm(signInfo) {
+      try {
+        let data = {
+          data: {
+            TrialId: this.$route.query.trialId,
+            IsPACSConnect: this.form.IsPACSConnect,
+            IsTrialPACSConfirmed: true,
+          },
+          signInfo,
+        };
+        let res = await ConfigTrialPACSInfoConfirm(data);
+        if (res.IsSuccess) {
+          this.signVisible = false;
+          this.confirmVisible = false;
+          this.updateVisible = false;
+          this.isEdit = false;
+          res = await this.addOrUpdateDicomAE();
+          if (res) this.$emit("refresh");
+        }
+      } catch (err) {
+        console.log(err);
+      }
+    },
+    // 配置更新
+    handleUpdateConfigData() {
+      const { DicomConfigUpdates } = const_.processSignature;
+      this.signCode = DicomConfigUpdates;
+      this.signVisible = true;
+    },
+    // 配置确认
+    handleConfirmConfigData() {
+      const { DicomConfigConfirmation } = const_.processSignature;
+      this.signCode = DicomConfigConfirmation;
+      this.signVisible = true;
+    },
+    // 打开配置信息确认框
+    handleConfirm() {
+      this.$refs["dicomConfigForm"].validate(async (valid) => {
+        if (!valid) return;
+        this.getConfigArr();
+        this.confirmVisible = true;
+      });
+    },
+
+    // 打开配置信息更新框
+    handleUpdate() {
+      this.$refs["dicomConfigForm"].validate(async (valid) => {
+        if (!valid) return;
+        this.getConfigArr();
+        this.updateVisible = true;
+      });
+    },
+    // 配置信息数组结构
+    getConfigArr() {
+      this.confirmData = [
+        {
+          Name: this.$t("trials:dicomCfg:form:pacsLine"), // pacs直连
+          NewVal: this.$fd("PACSConnectMode", this.form.IsPACSConnect),
+          OldVal: this.$fd("PACSConnectMode", this.initialForm.IsPACSConnect),
+        },
+        {
+          Name: this.$t("trials:dicomCfg:form:CalledAE"), // AE名称
+          NewVal: this.form.CalledAE,
+          OldVal: this.initialForm.CalledAE,
+        },
+        {
+          Name: this.$t("trials:dicomCfg:form:Ip"), // IP地址
+          NewVal: this.form.Ip,
+          OldVal: this.initialForm.Ip,
+        },
+        {
+          Name: this.$t("trials:dicomCfg:form:Port"),
+          NewVal: this.form.Port,
+          OldVal: this.initialForm.Port,
+        },
+        {
+          Name: this.$t("trials:dicomCfg:form:IsTestOK"), // 状态
+          NewVal: this.$fd("DicomTest", this.form.IsTestOK),
+          OldVal: this.$fd("DicomTest", this.initialForm.IsTestOK),
+        },
+      ];
+    },
+  },
+};
+</script>
+<style lang="scss" scoped></style>

src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue

@@ -578,7 +578,18 @@
             prop="Name"
             :label="$t('trials:logincCfg:form:bodypart')"
           >
-            <template slot-scope="scope">{{ scope.row.Name }}</template>
+            <template slot-scope="scope">
+              <div class="bodyPartName">
+                <span :title="scope.row.Name">{{ scope.row.Name }}</span>
+                <el-button
+                  v-if="scope.row.IsHandAdd"
+                  circle
+                  icon="el-icon-edit-outline"
+                  :title="$t('trials:logincCfg:form:bodypart:edit')"
+                  @click.stop="handleEditBodyPart(scope.row)"
+                />
+              </div>
+            </template>
           </el-table-column>
         </el-table>
       </div>
@@ -604,7 +615,7 @@
         </el-button>
       </div>
     </el-dialog>
-
+    <!--选择检查技术-->
     <el-dialog
       v-if="modalityListVisible"
       :visible.sync="modalityListVisible"
@@ -674,6 +685,7 @@
         </el-button>
       </div>
     </el-dialog>
+    <!--新增检查部位-->
     <base-model v-if="addBodyPart_model.visible" :config="addBodyPart_model">
       <template slot="dialog-body">
         <el-form
@@ -873,6 +885,7 @@ export default {
       },
       addBodyPartForm: {
         bodyPartStr: null,
+        Id: null,
       },
       addBodyPartrules: {
         bodyPartStr: [
@@ -993,6 +1006,9 @@ export default {
           NameCN: str,
           TrialId: this.$route.query.trialId,
         };
+        if(this.addBodyPartForm.Id){
+          data.Id = this.addBodyPartForm.Id;
+        }
         let res = await addOrUpdateTrialBodyPart(data);
         if (res.IsSuccess) {
           this.getTrialBodyPartList(data);
@@ -1001,6 +1017,7 @@ export default {
           );
           this.addBodyPart_model.visible = false;
           this.addBodyPartForm.bodyPartStr = null;
+          this.addBodyPartForm.Id = null;
         }
       } catch (err) {
         console.log(err);
@@ -1010,6 +1027,13 @@ export default {
         }
       }
     },
+    // 编辑检查部位
+    handleEditBodyPart(item) {
+      this.addBodyPartForm.bodyPartStr = item.Code;
+      this.addBodyPartForm.Id = item.Id;
+      this.addBodyPart_model.title = this.$t("trials:setting:button:edit");
+      this.addBodyPart_model.visible = true;
+    },
     handleSetBodyPart() {
       this.bodyPartListVisible = true;
       this.$nextTick(() => {
@@ -1434,6 +1458,21 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.bodyPartName {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  width: 100%;
+  height: 100%;
+  span {
+    display: inline-block;
+    max-width: 80%;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    -o-text-overflow: ellipsis;
+  }
+}
 .logincal-config-form {
   .fontColor {
     color: red;

src/views/trials/trials-panel/setting/trial-config/index.vue

@@ -1,7 +1,14 @@
 <template>
-  <el-collapse v-model="activeCollapse" v-loading="loading" class="setting-config">
+  <el-collapse
+    v-model="activeCollapse"
+    v-loading="loading"
+    class="setting-config"
+  >
     <!-- 逻辑配置 -->
-    <el-collapse-item :title="$t('trials:trialConfig:title:logincCfg')" name="1">
+    <el-collapse-item
+      :title="$t('trials:trialConfig:title:logincCfg')"
+      name="1"
+    >
       <LogicalConfig ref="logicalConfig" @refresh="getConfigInfo" />
     </el-collapse-item>
     <!-- 流程配置 -->
@@ -12,50 +19,58 @@
     <el-collapse-item :title="$t('trials:trialCfg:title:urgentCfg')" name="3">
       <UrgentConfig ref="urgentConfig" @refresh="getConfigInfo" />
     </el-collapse-item>
+    <!--dicom接入配置-->
+    <el-collapse-item :title="$t('trials:trialCfg:title:dicomCfg')" name="4">
+      <dicomConfig ref="dicomConfig" @refresh="getConfigInfo" />
+    </el-collapse-item>
   </el-collapse>
 </template>
 <script>
-import { getTrialConfigInfo } from '@/api/trials'
-import LogicalConfig from './components/logicalConfig'
-import ProcessConfig from './components/processConfig'
-import UrgentConfig from './components/urgentConfig'
+import { getTrialConfigInfo } from "@/api/trials";
+import LogicalConfig from "./components/logicalConfig";
+import ProcessConfig from "./components/processConfig";
+import UrgentConfig from "./components/urgentConfig";
+import dicomConfig from "./components/dicomConfig.vue";
 export default {
-  name: 'SubjectConfig',
-  components: { LogicalConfig, ProcessConfig, UrgentConfig },
+  name: "SubjectConfig",
+  components: { LogicalConfig, ProcessConfig, UrgentConfig, dicomConfig },
   data() {
     return {
-      activeCollapse: ['1', '2', '3'],
+      activeCollapse: ["1", "2", "3", "4"],
       form: {},
-      loading: false
-    }
+      loading: false,
+    };
   },
   mounted() {
-    this.getConfigInfo()
+    this.getConfigInfo();
   },
   methods: {
     getConfigInfo() {
-      this.loading = true
-      const trialId = this.$route.query.trialId
-      getTrialConfigInfo(trialId).then(res => {
-        this.loading = false
-        if (Object.keys(res.Result).length) {
-          this.form = { ...res.Result }
-        }
-        this.$refs['logicalConfig'].initForm(res.Result)
-        this.$refs['processConfig'].initForm(res.Result)
-        this.$refs['urgentConfig'].initForm(res.Result)
-      }).catch(_ => { this.loading = false })
-    }
-
-  }
-}
+      this.loading = true;
+      const trialId = this.$route.query.trialId;
+      getTrialConfigInfo(trialId)
+        .then((res) => {
+          this.loading = false;
+          if (Object.keys(res.Result).length) {
+            this.form = { ...res.Result };
+          }
+          this.$refs["logicalConfig"].initForm(res.Result);
+          this.$refs["processConfig"].initForm(res.Result);
+          this.$refs["urgentConfig"].initForm(res.Result);
+          this.$refs["dicomConfig"].initForm(res.Result);
+        })
+        .catch((_) => {
+          this.loading = false;
+        });
+    },
+  },
+};
 </script>
 <style lang="scss">
-.setting-config{
-  .el-collapse-item__header{
-    background:#e5ecef;
-    padding-left:10px;
+.setting-config {
+  .el-collapse-item__header {
+    background: #e5ecef;
+    padding-left: 10px;
   }
 }
-
 </style>

src/views/trials/trials-panel/subject/reading-period/components/AddOrEditCD.vue

@@ -83,6 +83,19 @@
             width="190"
             show-overflow-tooltip
           />
+          <!-- 文件大小 -->
+          <el-table-column
+            prop="size"
+            :label="$t('trials:uploadClinicalData:table:fileSize')"
+          >
+            <template slot-scope="scope">
+              <span>{{
+                scope.row.size && scope.row.size > 0
+                  ? `${(scope.row.size / 1024 / 1024).toFixed(2)}MB`
+                  : 0
+              }}</span>
+            </template>
+          </el-table-column>
           <el-table-column
             :label="$t('common:action:action')"
             width="100"
@@ -276,7 +289,7 @@ export default {
         const fileName = files[i].name
         var extendName = fileName.substring(fileName.lastIndexOf('.')).toLocaleLowerCase()
         if (this.faccept.indexOf(extendName) !== -1) {
-          this.fileList.push({ FileName: fileName, Path: '', Status: 0, Files: files[i] })
+          this.fileList.push({ FileName: fileName, Path: '', Status: 0, Files: files[i], size:files[i].size, type:fileName.split('.')[1] })
         }
       }
     },

src/views/trials/trials-panel/trial-summary/image-inspect/components/view-study.vue

@@ -0,0 +1,281 @@
+<template>
+  <el-dialog
+    :visible.sync="visible"
+    :close-on-click-modal="false"
+    :fullscreen="true"
+    custom-class="upload-dialog"
+    :before-close="beforeCloseStudyDig"
+  >
+    <span slot="title"
+      >{{ $t("trials:imageInspect:viewStudy:message:viewStudy") }}（{{
+        $t("trials:imageInspect:viewStudy:message:patientInfo")
+      }}：{{ Patient.PatientIdStr }}，{{ Patient.PatientName }}）</span
+    >
+    <div class="search">
+      <el-form :inline="true" class="base-search-form">
+        <!-- 检查类型 -->
+        <el-form-item
+          :label="$t('trials:imageInspect:viewStudy:table:modality')"
+        >
+          <el-select
+            v-model="searchData.Modalities"
+            clearable
+            style="width: 140px"
+          >
+            <el-option
+              v-for="item of $d.modalType"
+              :key="item.id"
+              :label="item.label"
+              :value="item.label"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <!-- 检查日期 -->
+        <el-form-item
+          :label="$t('trials:imageInspect:viewStudy:table:studyDate')"
+        >
+          <el-date-picker
+            v-model="dateValue"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            :default-time="['00:00:00', '23:59:59']"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <!-- 查询 -->
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+            {{ $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>
+    <!--检查列表-->
+    <el-table
+      ref="viewStudyList"
+      v-loading="loading"
+      v-adaptive="{ bottomOffset: 60 }"
+      :data="list"
+      stripe
+      height="100"
+      @sort-change="handleSortByColumn"
+      :default-sort="{ prop: 'StudyTime', order: 'descending' }"
+    >
+      <el-table-column type="index" width="40" />
+      <!--检查描述-->
+      <el-table-column
+        align="center"
+        prop="Description"
+        :label="$t('trials:imageInspect:viewStudy:table:studyDescription')"
+        show-overflow-tooltip
+        min-width="120"
+        sortable="custom"
+      ></el-table-column>
+      <!--检查类型-->
+      <el-table-column
+        align="center"
+        prop="Modalities"
+        :label="$t('trials:imageInspect:viewStudy:table:modality')"
+        show-overflow-tooltip
+        min-width="120"
+        sortable="custom"
+      ></el-table-column>
+      <!--Called AE-->
+      <el-table-column
+        prop="CalledAE"
+        :label="$t('trials:imageInspect:viewStudy:table:CalledAE')"
+        show-overflow-tooltip
+        min-width="120"
+      >
+      </el-table-column>
+      <!--Calling AE-->
+      <el-table-column
+        prop="CallingAE"
+        :label="$t('trials:imageInspect:viewStudy:table:CallingAE')"
+        show-overflow-tooltip
+        min-width="120"
+      >
+      </el-table-column>
+      <!--序列数量-->
+      <el-table-column
+        align="center"
+        prop="SeriesCount"
+        :label="$t('trials:imageInspect:viewStudy:table:seriesCount')"
+        show-overflow-tooltip
+        min-width="100"
+        sortable="custom"
+      ></el-table-column>
+      <!--图像数量-->
+      <el-table-column
+        align="center"
+        prop="InstanceCount"
+        :label="$t('trials:imageInspect:viewStudy:table:instanceCount')"
+        show-overflow-tooltip
+        min-width="100"
+        sortable="custom"
+      ></el-table-column>
+      <!--检查日期-->
+      <el-table-column
+        align="center"
+        prop="StudyTime"
+        :label="$t('trials:imageInspect:viewStudy:table:studyDate')"
+        show-overflow-tooltip
+        min-width="180"
+        sortable="custom"
+      ></el-table-column>
+      <!--操作-->
+      <el-table-column :label="$t('common:action:action')" min-width="150">
+        <template slot-scope="scope">
+          <!-- 影像 -->
+          <el-button
+            circle
+            icon="el-icon-view"
+            :title="$t('trials:imageInspect:viewStudy:button:image')"
+            @click.stop="image(scope.row)"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 分页组件 -->
+    <!-- <pagination
+      class="page"
+      :total="total"
+      :page.sync="searchData.PageIndex"
+      :limit.sync="searchData.PageSize"
+      @pagination="getList"
+    /> -->
+  </el-dialog>
+</template>
+<script>
+import Pagination from "@/components/Pagination";
+import { getPatientStudyList } from "@/api/trials.js";
+import { getToken } from "@/utils/auth";
+
+const defaultSearchData = () => {
+  return {
+    Modalities: null,
+    EarliestStudyTime: null,
+    LatestStudyTime: null,
+    PatientId: null,
+    Asc: false,
+    SortField: "StudyTime",
+  };
+};
+export default {
+  name: "viewStudyList",
+  components: { Pagination },
+  props: {
+    visible: {
+      required: true,
+      default: false,
+    },
+    Patient: {
+      required: true,
+      default: () => {
+        return {};
+      },
+    },
+  },
+  data() {
+    return {
+      // 查询
+      searchData: defaultSearchData(),
+      dateValue: [],
+      // 可加入项目列表
+      loading: false,
+      list: [],
+      newWindow: null,
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    // 关闭弹框
+    beforeCloseStudyDig() {
+      if (this.newWindow) {
+        this.newWindow.close();
+      }
+      this.$emit("update:visible", false);
+    },
+    // 获取列表
+    async getList() {
+      let data = {};
+      Object.keys(this.searchData).forEach((key) => {
+        data[key] = this.searchData[key];
+      });
+      data.PatientId = this.Patient.PatientId;
+      if (this.dateValue && this.dateValue[0] && this.dateValue[1]) {
+        data.EarliestStudyTime = this.$moment(this.dateValue[0]).format(
+          "YYYY-MM-DD HH:mm:ss"
+        );
+        data.LatestStudyTime = this.$moment(this.dateValue[1]).format(
+          "YYYY-MM-DD HH:mm:ss"
+        );
+      } else {
+        data.EarliestStudyTime = null;
+        data.LatestStudyTime = null;
+      }
+
+      try {
+        this.loading = true;
+        let res = await getPatientStudyList(data);
+        this.loading = false;
+        if (res.IsSuccess) {
+          this.list = res.Result;
+        }
+      } catch (err) {
+        this.loading = false;
+        console.log(err);
+      }
+    },
+    // 查询
+    handleSearch() {
+      this.searchData.PageIndex = 1;
+      this.getList();
+    },
+    // 重置
+    handleReset() {
+      this.reset();
+      this.getList();
+    },
+    // 初始化
+    reset() {
+      this.searchData = defaultSearchData();
+      this.dateValue = [];
+    },
+    // 查看影像
+    image(item) {
+      let token = getToken();
+      const routeData = this.$router.resolve({
+        path: `/showdicom?studyId=${item.SCPStudyId}&TokenKey=${token}&type=Patient`,
+      });
+      this.newWindow = window.open(routeData.href, "_blank");
+    },
+    // 查看报告
+    report() {},
+    // 表格排序
+    handleSortByColumn(sort) {
+      this.searchData.SortField = sort.prop;
+      if (sort.order === "ascending") this.searchData.Asc = true;
+      if (sort.order === "descending") this.searchData.Asc = false;
+      if (!sort.order) this.searchData.SortField = null;
+      this.getList();
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+</style>

src/views/trials/trials-panel/trial-summary/image-inspect/index.vue

@@ -0,0 +1,369 @@
+<template>
+  <BaseContainer>
+    <template slot="search-container">
+      <el-form :inline="true">
+        <!--病历号-->
+        <el-form-item
+          :label="$t('trials:imageInspect:table:patientIdStr')"
+          prop="PatientIdStr"
+        >
+          <el-input
+            v-model="searchData.PatientIdStr"
+            size="small"
+            clearable
+            style="width: 120px"
+          />
+        </el-form-item>
+        <!--患者姓名-->
+        <el-form-item
+          :label="$t('trials:imageInspect:table:patientName')"
+          prop="PatientName"
+        >
+          <el-input
+            v-model="searchData.PatientName"
+            size="small"
+            clearable
+            style="width: 120px"
+          />
+        </el-form-item>
+        <!--接收端AE-->
+        <el-form-item
+          :label="$t('trials:imageInspect:table:calledAE')"
+          prop="CalledAE"
+        >
+          <el-select
+            v-model="searchData.CalledAE"
+            clearable
+            style="width: 120px"
+          >
+            <el-option
+              v-for="item of calledAEList"
+              :key="item"
+              :value="item"
+              :label="item"
+            />
+          </el-select>
+        </el-form-item>
+        <!--发送端AE-->
+        <el-form-item
+          :label="$t('trials:imageInspect:table:callingAE')"
+          prop="CallingAE"
+        >
+          <el-select
+            v-model="searchData.CallingAE"
+            clearable
+            style="width: 120px"
+          >
+            <el-option
+              v-for="item of callingAEList"
+              :key="item"
+              :value="item"
+              :label="item"
+            />
+          </el-select>
+        </el-form-item>
+        <!--所在中心-->
+        <el-form-item
+          :label="$t('trials:imageInspect:table:trialSiteKeyInfo')"
+          prop="TrialSiteKeyInfo"
+        >
+          <el-input
+            v-model="searchData.TrialSiteKeyInfo"
+            size="small"
+            clearable
+            style="width: 150px"
+            :placeholder="
+              $t('trials:imageInspect:placeholder:trialSiteKeyInfo')
+            "
+          />
+        </el-form-item>
+        <!--最新接受日期-->
+        <el-form-item :label="$t('trials:imageInspect:table:createTime')">
+          <el-date-picker
+            v-model="datetimerange"
+            type="datetimerange"
+            :default-time="['00:00:00', '23:59:59']"
+            :start-placeholder="$t('trials:loginLog:table:beginTime')"
+            :end-placeholder="$t('trials:loginLog:table:endTime')"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            @change="handleDatetimeChange"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+            {{ $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>
+    </template>
+    <template slot="main-container">
+      <el-table
+        v-loading="loading"
+        v-adaptive="{ bottomOffset: 60 }"
+        height="100"
+        :data="list"
+        class="table"
+        @sort-change="handleSortByColumn"
+        :default-sort="{ prop: 'LatestPushTime', order: 'descending' }"
+      >
+        <el-table-column type="index" width="50" />
+        <!--病历号-->
+        <el-table-column
+          :label="$t('trials:imageInspect:table:patientIdStr')"
+          prop="PatientIdStr"
+          min-width="90"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <!--患者姓名-->
+        <el-table-column
+          :label="$t('trials:imageInspect:table:patientName')"
+          prop="PatientName"
+          min-width="90"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <!--出生日期-->
+        <el-table-column
+          :label="$t('trials:imageInspect:table:patientBirthDate')"
+          prop="PatientBirthDate"
+          min-width="90"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <!--性别-->
+        <el-table-column
+          :label="$t('trials:imageInspect:table:patientSex')"
+          prop="PatientSex"
+          min-width="90"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <!--接收端AE-->
+        <el-table-column
+          :label="$t('trials:imageInspect:table:calledAEList')"
+          prop="CalledAEList"
+          min-width="90"
+          show-overflow-tooltip
+          sortable="custom"
+          ><template slot-scope="scope">
+            {{ scope.row.CallingAEList.join(", ") }}
+          </template>
+        </el-table-column>
+        <!--发送端AE-->
+        <el-table-column
+          :label="$t('trials:imageInspect:table:callingAEList')"
+          prop="CallingAEList"
+          min-width="90"
+          show-overflow-tooltip
+          sortable="custom"
+        >
+          <template slot-scope="scope">
+            {{ scope.row.CallingAEList.join(", ") }}
+          </template>
+        </el-table-column>
+        <!--检查-->
+        <el-table-column
+          :label="$t('trials:imageInspect:table:studyCount')"
+          prop="StudyCount"
+          min-width="160"
+          show-overflow-tooltip
+          sortable="custom"
+        >
+          <template slot-scope="scope">
+            <el-button
+              v-if="scope.row.StudyCount >= 1"
+              type="text"
+              @click="handleOpenDialog(scope.row, 'study')"
+            >
+              <span>{{ scope.row.StudyCount }}</span>
+            </el-button>
+            <span v-else>{{ scope.row.StudyCount }}</span>
+          </template>
+        </el-table-column>
+        <!--所在中心-->
+        <el-table-column
+          :label="$t('trials:imageInspect:table:trialSiteCodeAndName')"
+          prop="TrialSiteCode"
+          min-width="160"
+          show-overflow-tooltip
+          sortable="custom"
+        >
+          <template slot-scope="scope">
+            {{ scope.row.trialSiteCode }},{{ scope.row.trialSiteName }}
+          </template>
+        </el-table-column>
+        <!--受试者ID-->
+        <el-table-column
+          :label="$t('trials:imageInspect:table:subjectCode')"
+          prop="SubjectCode"
+          min-width="90"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <!--最新接收时间-->
+        <el-table-column
+          :label="$t('trials:imageInspect:table:lastestPushTime')"
+          prop="LatestPushTime"
+          min-width="90"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+      </el-table>
+      <!-- 分页组件 -->
+      <pagination
+        class="page"
+        :total="total"
+        :page.sync="searchData.PageIndex"
+        :limit.sync="searchData.PageSize"
+        @pagination="getList"
+      />
+    </template>
+    <!--查看检查列表-->
+    <viewStudy
+      v-if="visible"
+      :visible.sync="visible"
+      :Patient="selectPatient"
+      @getList="getList"
+    />
+  </BaseContainer>
+</template>
+  <script>
+import {
+  getPatientList,
+  getDicomCalledAEList,
+  getDicomCallingAEList,
+} from "@/api/trials";
+import BaseContainer from "@/components/BaseContainer";
+import Pagination from "@/components/Pagination";
+import moment from "moment";
+import viewStudy from "./components/view-study";
+const searchDataDefault = () => {
+  return {
+    PatientIdStr: null,
+    PatientName: null,
+    CallingAE: null,
+    CalledAE: null,
+    BeginPushTime: null,
+    EndPushTime: null,
+    SubejctCode: null,
+    TrialSiteKeyInfo: null,
+    PageIndex: 1,
+    PageSize: 20,
+    Asc: true,
+    SortField: "LatestPushTime",
+  };
+};
+export default {
+  components: { BaseContainer, Pagination, viewStudy },
+  data() {
+    return {
+      moment,
+      searchData: searchDataDefault(),
+      list: [],
+      total: 0,
+      loading: false,
+      datetimerange: [],
+      calledAEList: [],
+      callingAEList: [],
+      visible: false,
+      selectPatient: {},
+    };
+  },
+  created() {
+    this.getCalledAEList();
+    this.getCallingAEList();
+  },
+  mounted() {
+    this.getList();
+  },
+  methods: {
+    // 打开弹框
+    handleOpenDialog(item) {
+      this.visible = true;
+      this.selectPatient = item;
+    },
+    // 获取接收端AE列表
+    async getCalledAEList() {
+      try {
+        let params = {
+          TrialId: this.$route.query.trialId,
+        };
+        let res = await getDicomCalledAEList(params);
+        if (res.IsSuccess) {
+          this.calledAEList = res.Result;
+        }
+      } catch (err) {
+        console.log(err);
+      }
+    },
+    // 获取发送端端AE列表
+    async getCallingAEList() {
+      try {
+        let params = {
+          TrialId: this.$route.query.trialId,
+        };
+        let res = await getDicomCallingAEList(params);
+        if (res.IsSuccess) {
+          this.callingAEList = res.Result;
+        }
+      } catch (err) {
+        console.log(err);
+      }
+    },
+    getList() {
+      this.loading = true;
+      this.searchData.TrialId = this.$route.query.trialId;
+      getPatientList(this.searchData)
+        .then((res) => {
+          this.loading = false;
+          this.list = res.Result.CurrentPageData;
+          this.total = res.Result.TotalCount;
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+    handleDatetimeChange(val) {
+      if (val) {
+        this.searchData.BeginPushTime = val[0];
+        this.searchData.EndPushTime = val[1];
+      } else {
+        this.searchData.BeginPushTime = "";
+        this.searchData.EndPushTime = "";
+      }
+    },
+    handleSearch() {
+      this.searchData.PageIndex = 1;
+      this.getList();
+    },
+    // 重置列表查询
+    handleReset() {
+      this.datetimerange = null;
+      this.handleDatetimeChange();
+      this.searchData = searchDataDefault();
+      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();
+    },
+  },
+};
+</script>
+  

src/views/trials/trials-panel/trial-summary/push-record/index.vue

@@ -0,0 +1,311 @@
+<template>
+  <BaseContainer>
+    <template slot="search-container">
+      <el-form :inline="true">
+        <!--所在中心-->
+        <el-form-item
+          :label="$t('trials:pushRecord:table:trialSiteKeyInfo')"
+          prop="TrialSiteKeyInfo"
+        >
+          <el-input
+            v-model="searchData.TrialSiteKeyInfo"
+            size="small"
+            clearable
+            style="width: 150px"
+            :placeholder="$t('trials:pushRecord:placeholder:trialSiteKeyInfo')"
+          />
+        </el-form-item>
+        <!--接收端AE-->
+        <el-form-item
+          :label="$t('trials:pushRecord:table:calledAE')"
+          prop="CalledAE"
+        >
+          <el-select
+            v-model="searchData.CalledAE"
+            clearable
+            style="width: 120px"
+          >
+            <el-option
+              v-for="item of calledAEList"
+              :key="item"
+              :value="item"
+              :label="item"
+            />
+          </el-select>
+        </el-form-item>
+        <!--发送端AE-->
+        <el-form-item
+          :label="$t('trials:pushRecord:table:callingAE')"
+          prop="CallingAE"
+        >
+          <el-select
+            v-model="searchData.CallingAE"
+            clearable
+            style="width: 120px"
+          >
+            <el-option
+              v-for="item of callingAEList"
+              :key="item"
+              :value="item"
+              :label="item"
+            />
+          </el-select>
+        </el-form-item>
+        <!--最新接受日期-->
+        <el-form-item :label="$t('trials:pushRecord:table:createTime')">
+          <el-date-picker
+            v-model="datetimerange"
+            type="datetimerange"
+            :default-time="['00:00:00', '23:59:59']"
+            :start-placeholder="$t('trials:loginLog:table:beginTime')"
+            :end-placeholder="$t('trials:loginLog:table:endTime')"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            @change="handleDatetimeChange"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+            {{ $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>
+    </template>
+    <template slot="main-container">
+      <el-table
+        v-loading="loading"
+        v-adaptive="{ bottomOffset: 60 }"
+        height="100"
+        :data="list"
+        class="table"
+        @sort-change="handleSortByColumn"
+        :default-sort="{ prop: 'StartTime', order: 'descending' }"
+      >
+        <el-table-column type="index" width="50" />
+        <!--中心编号-->
+        <el-table-column
+          :label="$t('trials:pushRecord:table:trialSiteCode')"
+          prop="TrialSiteCode"
+          min-width="160"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <!--中心名称-->
+        <el-table-column
+          :label="$t('trials:pushRecord:table:trialSiteAliasName')"
+          prop="TrialSiteAliasName"
+          min-width="160"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <!--发送端AE-->
+        <el-table-column
+          :label="$t('trials:pushRecord:table:callingAEList')"
+          prop="CallingAEList"
+          min-width="90"
+          show-overflow-tooltip
+          sortable="custom"
+        >
+          <template slot-scope="scope">
+            {{ scope.row.CallingAEList.join(", ") }}
+          </template>
+        </el-table-column>
+        <!--发送端IP-->
+        <el-table-column
+          :label="$t('trials:pushRecord:table:callingAEIP')"
+          prop="CallingAEIP"
+          min-width="160"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <!--接收端AE-->
+        <el-table-column
+          :label="$t('trials:pushRecord:table:calledAEList')"
+          prop="CalledAEList"
+          min-width="90"
+          show-overflow-tooltip
+          sortable="custom"
+          ><template slot-scope="scope">
+            {{ scope.row.CallingAEList.join(", ") }}
+          </template>
+        </el-table-column>
+
+        <!--检查数-->
+        <el-table-column
+          :label="$t('trials:pushRecord:table:studyCount')"
+          prop="StudyCount"
+          min-width="160"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <!--图像数量-->
+        <el-table-column
+          :label="$t('trials:pushRecord:table:fileCount')"
+          prop="FileCount"
+          min-width="160"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <!--图像大小-->
+        <el-table-column
+          :label="$t('trials:pushRecord:table:fileSize')"
+          prop="FileSize"
+          min-width="160"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <!--推送开始时间-->
+        <el-table-column
+          :label="$t('trials:pushRecord:table:startTime')"
+          prop="StartTime"
+          min-width="160"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <!--推送结束时间-->
+        <el-table-column
+          :label="$t('trials:pushRecord:table:endTime')"
+          prop="EndTime"
+          min-width="160"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+      </el-table>
+      <!-- 分页组件 -->
+      <pagination
+        class="page"
+        :total="total"
+        :page.sync="searchData.PageIndex"
+        :limit.sync="searchData.PageSize"
+        @pagination="getList"
+      />
+    </template>
+  </BaseContainer>
+</template>
+    <script>
+import {
+  getSCPImageUploadList,
+  getDicomCalledAEList,
+  getDicomCallingAEList,
+} from "@/api/trials";
+import BaseContainer from "@/components/BaseContainer";
+import Pagination from "@/components/Pagination";
+import moment from "moment";
+const searchDataDefault = () => {
+  return {
+    CallingAE: null,
+    CalledAE: null,
+    StartTime: null,
+    EndTime: null,
+    TrialSiteKeyInfo: null,
+    PageIndex: 1,
+    PageSize: 20,
+    Asc: true,
+    SortField: "StartTime",
+  };
+};
+export default {
+  components: { BaseContainer, Pagination },
+  data() {
+    return {
+      moment,
+      searchData: searchDataDefault(),
+      list: [],
+      total: 0,
+      loading: false,
+      datetimerange: [],
+      calledAEList: [],
+      callingAEList: [],
+    };
+  },
+  created() {
+    this.getCalledAEList();
+    this.getCallingAEList();
+  },
+  mounted() {
+    this.getList();
+  },
+  methods: {
+    // 获取接收端AE列表
+    async getCalledAEList() {
+      try {
+        let params = {
+          TrialId: this.$route.query.trialId,
+        };
+        let res = await getDicomCalledAEList(params);
+        if (res.IsSuccess) {
+          this.calledAEList = res.Result;
+        }
+      } catch (err) {
+        console.log(err);
+      }
+    },
+    // 获取发送端端AE列表
+    async getCallingAEList() {
+      try {
+        let params = {
+          TrialId: this.$route.query.trialId,
+        };
+        let res = await getDicomCallingAEList(params);
+        if (res.IsSuccess) {
+          this.callingAEList = res.Result;
+        }
+      } catch (err) {
+        console.log(err);
+      }
+    },
+    getList() {
+      this.loading = true;
+      this.searchData.TrialId = this.$route.query.trialId;
+      getSCPImageUploadList(this.searchData)
+        .then((res) => {
+          this.loading = false;
+          this.list = res.Result.CurrentPageData;
+          this.total = res.Result.TotalCount;
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+    handleDatetimeChange(val) {
+      if (val) {
+        this.searchData.StartTime = val[0];
+        this.searchData.EndTime = val[1];
+      } else {
+        this.searchData.StartTime = "";
+        this.searchData.EndTime = "";
+      }
+    },
+    handleSearch() {
+      this.searchData.PageIndex = 1;
+      this.getList();
+    },
+    // 重置列表查询
+    handleReset() {
+      this.datetimerange = null;
+      this.handleDatetimeChange();
+      this.searchData = searchDataDefault();
+      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();
+    },
+  },
+};
+</script>
+    

src/views/trials/trials-panel/visit/crc-question/components/chatForm.vue

@@ -92,6 +92,14 @@
         >
           {{ $t('trials:crcQuestion:button:close') }}
         </el-button>
+        <!-- 下一任务 -->
+        <el-button
+          v-hasPermi="['trials:trials-panel:visit:crc-upload:nextTask']"
+          type="primary"
+          @click="getNextTask"
+        >
+          {{ $t('trials:crcQuestion:button:nextTask') }}
+        </el-button>
       </div>
     </div>
 
@@ -255,9 +263,11 @@ export default {
           UserTypeEnum: this.data.UserTypeEnum
         }
       )
-      this.data.DialogList.forEach(element => {
-        recordContent.push(element)
-      })
+      if (this.data.DialogList && this.data.DialogList.length > 0) {
+        this.data.DialogList.forEach(element => {
+          recordContent.push(element)
+        })
+      }
       this.recordContent = recordContent
       this.setScrollHeight()
     },
@@ -350,6 +360,11 @@ export default {
         this.uploadBtnLoading = false
       })
     },
+    // 获取下一任务
+    getNextTask() {
+      this.loading = true
+      this.$emit('getNextTask', this.data.Id)
+    },
     close() {
       this.$emit('close')
     },

src/views/trials/trials-panel/visit/crc-question/index.vue

@@ -128,7 +128,7 @@
           prop="QCProcessEnum"
           :label="$t('trials:crcQuestion:table:qCProcessEnum')"
           show-overflow-tooltip
-          min-width="80"
+          min-width="130"
           sortable="custom"
         >
           <template slot-scope="scope">
@@ -258,12 +258,12 @@
       width="800px"
       :title="$t('trials:crcQuestion:dialogTitle:message1') + `(${currentQCRow.SubjectCode} ${currentQCRow.VisitName})`"
     >
-      <chat-form ref="chatForm" :data="currentQCRow" user-type="crc" :body-parts="otherInfo.BodyPartTypes" :modalities="otherInfo.Modalitys" :subject-visit-id="currentQCRow.Id" :clinical-enum="otherInfo.ClinicalInformationTransmissionEnum" @close="close" @getDialogList="getDialogList" />
+      <chat-form ref="chatForm" :data="currentQCRow" user-type="crc" :body-parts="otherInfo.BodyPartTypes" :modalities="otherInfo.Modalitys" :subject-visit-id="currentQCRow.Id" :clinical-enum="otherInfo.ClinicalInformationTransmissionEnum" @close="close" @getDialogList="getDialogList" @getNextTask="getNextTask"/>
     </el-dialog>
   </BaseContainer>
 </template>
 <script>
-import { getCRCChallengeList, getTrialSiteSelect, getTrialVisitStageSelect, getQCChallengeDialogList } from '@/api/trials'
+import { getCRCChallengeList, getTrialSiteSelect, getTrialVisitStageSelect, getQCChallengeDialogList, getNextCRCChallenge } from '@/api/trials'
 import { getQCChallengeList_Export } from '@/api/export'
 import ChatForm from './components/chatForm'
 import BaseContainer from '@/components/BaseContainer'
@@ -332,6 +332,29 @@ export default {
     close() {
       this.chatVisible = false
     },
+    async getNextTask(qcChallengeId) {
+      try {
+        const params = {
+          trialId: this.trialId,
+          qcChallengeId: qcChallengeId
+        }
+        const res = await getNextCRCChallenge(params)
+        if (res.IsSuccess) {
+          const res2 =  await getQCChallengeDialogList(res.Result.Id)
+          if (res2.IsSuccess) {
+            Object.assign(res.Result, res2.Result[0])
+            this.chatVisible = false
+            this.currentQCRow = res.Result
+            this.$nextTick(() => {
+              this.chatVisible = true
+            })
+          }
+        }
+      } catch (e) {
+        this.chatVisible = false
+        console.log(e)
+      }
+    },
     getDialogList() {
       this.loading = true
       getQCChallengeDialogList(this.currentQCRow.Id).then(res => {

src/views/trials/trials-panel/visit/crc-upload/components/uploadClinicalData.vue

@@ -4,21 +4,27 @@
       <el-tab-pane
         v-for="cd in clinicalDatas"
         :key="cd.ClinicalDataTrialSetId"
-        :label="$i18n.locale === 'zh' ? cd.ClinicalDataSetName : cd.ClinicalDataSetEnName"
+        :label="
+          $i18n.locale === 'zh'
+            ? cd.ClinicalDataSetName
+            : cd.ClinicalDataSetEnName
+        "
       >
         <!-- 格式化录入 -->
         <div v-if="cd.ClinicalUploadType === 0">
           <!-- 既往放疗史 -->
-          <h4>{{ $t('trials:uploadClinicalData:title:pastTreatment') }}</h4>
-          <div v-if="(allowAddOrEdit)" style="text-align:right">
+          <h4>{{ $t("trials:uploadClinicalData:title:pastTreatment") }}</h4>
+          <div v-if="allowAddOrEdit" style="text-align: right">
             <!-- 新增 -->
             <el-button
               type="primary"
               icon="el-icon-plus"
               size="small"
-              @click.native.prevent="addPreviousHistory(cd.ClinicalDataTrialSetId)"
+              @click.native.prevent="
+                addPreviousHistory(cd.ClinicalDataTrialSetId)
+              "
             >
-              {{ $t('common:button:new') }}
+              {{ $t("common:button:new") }}
             </el-button>
           </div>
 
@@ -26,10 +32,7 @@
             :data="cd.ClinicalTableData.PreviousHistoryList"
             style="width: 100%"
           >
-            <el-table-column
-              type="index"
-              width="50"
-            />
+            <el-table-column type="index" width="50" />
             <!-- 放疗部位 -->
             <el-table-column
               prop="Position"
@@ -41,7 +44,11 @@
               :label="$t('trials:uploadClinicalData:table:beginDate')"
             >
               <template slot-scope="scope">
-                {{ scope.row.StartTime?moment(scope.row.StartTime).format('YYYY-MM-DD'):'' }}
+                {{
+                  scope.row.StartTime
+                    ? moment(scope.row.StartTime).format("YYYY-MM-DD")
+                    : ""
+                }}
               </template>
             </el-table-column>
             <!-- 结束日期 -->
@@ -50,7 +57,11 @@
               :label="$t('trials:uploadClinicalData:table:endDate')"
             >
               <template slot-scope="scope">
-                {{ scope.row.EndTime?moment(scope.row.EndTime).format('YYYY-MM-DD'):'' }}
+                {{
+                  scope.row.EndTime
+                    ? moment(scope.row.EndTime).format("YYYY-MM-DD")
+                    : ""
+                }}
               </template>
             </el-table-column>
             <!-- 病灶是否PD -->
@@ -59,7 +70,7 @@
               :label="$t('trials:uploadClinicalData:table:isPD')"
             >
               <template slot-scope="scope">
-                {{ $fd('IsPdEnum', scope.row.IsPD) }}
+                {{ $fd("IsPdEnum", scope.row.IsPD) }}
               </template>
             </el-table-column>
             <el-table-column
@@ -70,16 +81,19 @@
               <template slot-scope="scope">
                 <!-- 编辑 -->
                 <el-button
-                  v-if="( allowAddOrEdit)"
+                  v-if="allowAddOrEdit"
                   icon="el-icon-edit-outline"
                   circle
                   :title="$t('common:button:edit')"
                   size="small"
-                  @click.native.prevent="editRow(scope.row,1)"
+                  @click.native.prevent="editRow(scope.row, 1)"
                 />
                 <!-- 移除 -->
                 <el-button
-                  v-if="(data.SubmitState*1 < 2 || (data.SubmitState === 2 && data.IsQCConfirmedReupload))"
+                  v-if="
+                    data.SubmitState * 1 < 2 ||
+                    (data.SubmitState === 2 && data.IsQCConfirmedReupload)
+                  "
                   icon="el-icon-delete"
                   circle
                   :title="$t('common:button:delete')"
@@ -90,25 +104,22 @@
             </el-table-column>
           </el-table>
           <!-- 既往手术史 -->
-          <h4>{{ $t('trials:uploadClinicalData:title:pastSurgery') }}</h4>
-          <div v-if="( allowAddOrEdit)" style="text-align:right">
+          <h4>{{ $t("trials:uploadClinicalData:title:pastSurgery") }}</h4>
+          <div v-if="allowAddOrEdit" style="text-align: right">
             <el-button
               type="primary"
               icon="el-icon-plus"
               size="small"
               @click="addPreviousSurgery(cd.ClinicalDataTrialSetId)"
             >
-              {{ $t('common:button:new') }}
+              {{ $t("common:button:new") }}
             </el-button>
           </div>
           <el-table
             :data="cd.ClinicalTableData.PreviousSurgeryList"
             style="width: 100%"
           >
-            <el-table-column
-              type="index"
-              width="50"
-            />
+            <el-table-column type="index" width="50" />
             <!-- 手术名称 -->
             <el-table-column
               prop="OperationName"
@@ -120,7 +131,11 @@
               :label="$t('trials:uploadClinicalData:table:surgeryDate')"
             >
               <template slot-scope="scope">
-                {{ scope.row.OperationTime?moment(scope.row.OperationTime).format('YYYY-MM-DD'):'' }}
+                {{
+                  scope.row.OperationTime
+                    ? moment(scope.row.OperationTime).format("YYYY-MM-DD")
+                    : ""
+                }}
               </template>
             </el-table-column>
 
@@ -132,7 +147,7 @@
               <template slot-scope="scope">
                 <!-- 编辑 -->
                 <el-button
-                  v-if="(allowAddOrEdit)"
+                  v-if="allowAddOrEdit"
                   icon="el-icon-edit-outline"
                   circle
                   :title="$t('common:button:edit')"
@@ -141,7 +156,10 @@
                 />
                 <!-- 移除 -->
                 <el-button
-                  v-if="data.SubmitState*1 < 2 || (data.SubmitState === 2 && data.IsQCConfirmedReupload)"
+                  v-if="
+                    data.SubmitState * 1 < 2 ||
+                    (data.SubmitState === 2 && data.IsQCConfirmedReupload)
+                  "
                   icon="el-icon-delete"
                   circle
                   :title="$t('common:button:delete')"
@@ -152,8 +170,8 @@
             </el-table-column>
           </el-table>
           <!-- 既往其他治疗史 -->
-          <h4>{{ $t('trials:uploadClinicalData:title:others') }}</h4>
-          <div v-if="(allowAddOrEdit)" style="text-align:right">
+          <h4>{{ $t("trials:uploadClinicalData:title:others") }}</h4>
+          <div v-if="allowAddOrEdit" style="text-align: right">
             <!-- 新增 -->
             <el-button
               type="primary"
@@ -161,17 +179,14 @@
               size="small"
               @click="addPreviousOther(cd.ClinicalDataTrialSetId)"
             >
-              {{ $t('common:button:new') }}
+              {{ $t("common:button:new") }}
             </el-button>
           </div>
           <el-table
             :data="cd.ClinicalTableData.PreviousOtherList"
             style="width: 100%"
           >
-            <el-table-column
-              type="index"
-              width="50"
-            />
+            <el-table-column type="index" width="50" />
             <!-- 治疗类型 -->
             <el-table-column
               prop="TreatmentType"
@@ -183,7 +198,11 @@
               :label="$t('trials:uploadClinicalData:table:treatmentbeginDate')"
             >
               <template slot-scope="scope">
-                {{ scope.row.StartTime?moment(scope.row.StartTime).format('YYYY-MM-DD'):'' }}
+                {{
+                  scope.row.StartTime
+                    ? moment(scope.row.StartTime).format("YYYY-MM-DD")
+                    : ""
+                }}
               </template>
             </el-table-column>
             <!-- 结束日期 -->
@@ -192,7 +211,11 @@
               :label="$t('trials:uploadClinicalData:table:treatmentendDate')"
             >
               <template slot-scope="scope">
-                {{ scope.row.EndTime?moment(scope.row.EndTime).format('YYYY-MM-DD'):'' }}
+                {{
+                  scope.row.EndTime
+                    ? moment(scope.row.EndTime).format("YYYY-MM-DD")
+                    : ""
+                }}
               </template>
             </el-table-column>
 
@@ -204,7 +227,7 @@
               <template slot-scope="scope">
                 <!-- 编辑 -->
                 <el-button
-                  v-if="( allowAddOrEdit)"
+                  v-if="allowAddOrEdit"
                   icon="el-icon-edit-outline"
                   circle
                   :title="$t('common:button:edit')"
@@ -213,7 +236,10 @@
                 />
                 <!-- 移除 -->
                 <el-button
-                  v-if="(data.SubmitState*1 < 2 || (data.SubmitState === 2 && data.IsQCConfirmedReupload))"
+                  v-if="
+                    data.SubmitState * 1 < 2 ||
+                    (data.SubmitState === 2 && data.IsQCConfirmedReupload)
+                  "
                   icon="el-icon-delete"
                   circle
                   :title="$t('common:button:delete')"
@@ -226,7 +252,7 @@
         </div>
         <!-- PDF录入 -->
         <div v-if="cd.ClinicalUploadType === 1">
-          <div v-if="(allowAddOrEdit)" style="text-align:right">
+          <div v-if="allowAddOrEdit" style="text-align: right">
             <!-- 下载模板 -->
             <el-button
               v-if="cd.Path"
@@ -236,42 +262,78 @@
               :loading="downloadLoading"
               @click.native.prevent="handleDownloadTpl(cd)"
             >
-              {{ $t('trials:uploadClinicalData:button:downloadTemplate') }}
+              {{ $t("trials:uploadClinicalData:button:downloadTemplate") }}
             </el-button>
-            <!-- 新增 -->
-            <el-button
-              icon="el-icon-plus"
-              type="primary"
-              size="small"
-              @click.native.prevent="addFile(cd.Id,cd.ClinicalDataTrialSetId)"
+            <div
+              id="directoryInputWrapper"
+              class="btn btn-link"
+              style="
+                position: relative;
+                overflow: hidden;
+                display: inline-block;
+              "
             >
-              {{ $t('common:button:new') }}
-            </el-button>
+              <!-- 新增 -->
+              <el-button
+                icon="el-icon-plus"
+                type="primary"
+                size="small"
+                :disabled="btnLoading"
+                :loading="btnLoading"
+              >
+                {{ $t("common:button:new") }}
+              </el-button>
+              <input
+                type="file"
+                name="file"
+                multiple
+                ref="file"
+                style="
+                  position: absolute;
+                  top: 0;
+                  left: 0;
+                  width: 100%;
+                  height: 100%;
+                  opacity: 0;
+                  cursor: pointer;
+                "
+                :accept="faccept.join(',')"
+                @change="
+                  ($event) =>
+                    beginScanFiles($event, cd.Id, cd.ClinicalDataTrialSetId)
+                "
+              />
+            </div>
           </div>
-          <el-table
-            :data="cd.PDFFileList"
-            style="width: 100%"
-          >
-            <el-table-column
-              type="index"
-              width="50"
-            />
+          <el-table :data="cd.PDFFileList" style="width: 100%">
+            <el-table-column type="index" width="50" />
             <!-- 文件名称 -->
             <el-table-column
               prop="FileName"
               :label="$t('trials:uploadClinicalData:table:fileName')"
               width="250"
             />
+            <!-- 文件大小 -->
+            <el-table-column
+              prop="Size"
+              :label="$t('trials:uploadClinicalData:table:fileSize')"
+              width="150"
+            >
+            <template slot-scope="scope">
+              <span>{{
+                scope.row.Size && scope.row.Size > 0
+                  ? `${(scope.row.Size / 1024 / 1024).toFixed(2)}MB`
+                  : 0
+              }}</span>
+            </template>
+            </el-table-column>
             <!-- 上传时间 -->
             <el-table-column
               prop="CreateTime"
               :label="$t('trials:uploadClinicalData:table:uploadedTime')"
               width="200"
             />
-            <el-table-column
-              :label="$t('common:action:action')"
-              width="200"
-            >
+            <el-table-column :label="$t('common:action:action')" width="200">
               <template slot-scope="scope">
                 <!-- 预览 -->
                 <el-button
@@ -283,7 +345,7 @@
                 />
                 <!-- 移除 -->
                 <el-button
-                  v-if="(allowAddOrEdit)"
+                  v-if="allowAddOrEdit"
                   icon="el-icon-delete"
                   circle
                   :title="$t('common:button:delete')"
@@ -333,7 +395,13 @@
       append-to-body
       custom-class="base-dialog-wrapper"
     >
-      <PreviousRadiotherapy v-if="prVisible" :data="currentRow" :subject-visit-id="subjectVisitId" @closePRDialog="closePRDialog" @refresh="refresh" />
+      <PreviousRadiotherapy
+        v-if="prVisible"
+        :data="currentRow"
+        :subject-visit-id="subjectVisitId"
+        @closePRDialog="closePRDialog"
+        @refresh="refresh"
+      />
     </el-dialog>
     <!-- 既往手术史  -->
     <el-dialog
@@ -345,7 +413,14 @@
       append-to-body
       custom-class="base-dialog-wrapper"
     >
-      <PreviousSurgery v-if="psVisible" :data="currentRow" :parent-data="data" :subject-visit-id="subjectVisitId" @closePSDialog="closePSDialog" @refresh="refresh" />
+      <PreviousSurgery
+        v-if="psVisible"
+        :data="currentRow"
+        :parent-data="data"
+        :subject-visit-id="subjectVisitId"
+        @closePSDialog="closePSDialog"
+        @refresh="refresh"
+      />
     </el-dialog>
     <!-- 既往其他治疗史 -->
     <el-dialog
@@ -357,7 +432,14 @@
       append-to-body
       custom-class="base-dialog-wrapper"
     >
-      <PreviousOther v-if="poVisible" :data="currentRow" :parent-data="data" :subject-visit-id="subjectVisitId" @closePODialog="closePODialog" @refresh="refresh" />
+      <PreviousOther
+        v-if="poVisible"
+        :data="currentRow"
+        :parent-data="data"
+        :subject-visit-id="subjectVisitId"
+        @closePODialog="closePODialog"
+        @refresh="refresh"
+      />
     </el-dialog>
     <!-- 上传文件 -->
     <el-dialog
@@ -369,7 +451,14 @@
       append-to-body
       custom-class="base-dialog-wrapper"
     >
-      <PreviousFiles v-if="upVisible" :data="currentRow" :parent-data="data" :subject-visit-id="subjectVisitId" @closeUpDialog="closeUpDialog" @refresh="refresh" />
+      <PreviousFiles
+        v-if="upVisible"
+        :data="currentRow"
+        :parent-data="data"
+        :subject-visit-id="subjectVisitId"
+        @closeUpDialog="closeUpDialog"
+        @refresh="refresh"
+      />
     </el-dialog>
     <!-- 预览文件 -->
     <el-dialog
@@ -380,57 +469,79 @@
       append-to-body
       custom-class="base-dialog-wrapper"
     >
-      <div class="base-modal-body" style="border:2px solid #ccc;padding: 10px">
-        <PreviewFile v-if="previewObj.visible" :file-path="previewObj.filePath" :file-type="previewObj.fileType" />
+      <div
+        class="base-modal-body"
+        style="border: 2px solid #ccc; padding: 10px"
+      >
+        <PreviewFile
+          v-if="previewObj.visible"
+          :file-path="previewObj.filePath"
+          :file-type="previewObj.fileType"
+        />
       </div>
     </el-dialog>
   </div>
 </template>
 <script>
-import { deleteReadingClinicalDataPDF, deletePreviousHistory, deletePreviousOther, deletePreviousSurgery,
-  DownloadTrialClinicalFile } from '@/api/trials'
-import { getCRCClinicalData } from '@/api/trials'
-import PreviousRadiotherapy from './previousRadiotherapy'
-import PreviousSurgery from './previousSurgery'
-import PreviousOther from './previousOther'
-import PreviousFiles from './previousFiles'
-import clinicalDataQuestions from '@/components/clinicalDataQuestions'
-import PreviewFile from '@/components/PreviewFile/index'
-import moment from 'moment'
+import {
+  deleteReadingClinicalDataPDF,
+  deletePreviousHistory,
+  deletePreviousOther,
+  deletePreviousSurgery,
+  DownloadTrialClinicalFile,
+  addOrUpdateReadingClinicalData,
+  getCRCClinicalData,
+} from "@/api/trials";
+import PreviousRadiotherapy from "./previousRadiotherapy";
+import PreviousSurgery from "./previousSurgery";
+import PreviousOther from "./previousOther";
+import PreviousFiles from "./previousFiles";
+import clinicalDataQuestions from "@/components/clinicalDataQuestions";
+import PreviewFile from "@/components/PreviewFile/index";
+import moment from "moment";
 export default {
-  name: 'ClinicalData',
-  components: { PreviousRadiotherapy, PreviousSurgery, PreviousOther, PreviousFiles, clinicalDataQuestions,PreviewFile },
+  name: "ClinicalData",
+  components: {
+    PreviousRadiotherapy,
+    PreviousSurgery,
+    PreviousOther,
+    PreviousFiles,
+    clinicalDataQuestions,
+    PreviewFile,
+  },
   props: {
     data: {
       type: Object,
       default() {
-        return {}
-      }
+        return {};
+      },
     },
     subjectVisitId: {
       type: String,
-      required: true
+      required: true,
     },
     enumType: {
       type: Number,
-      default: 0
+      default: 0,
     },
     allowAddOrEdit: {
       type: Boolean,
-      default: false
-    }
-
+      default: false,
+    },
   },
   data() {
     return {
+      faccept: [".pdf"],
       isShow: false,
-      userTypeEnumInt: zzSessionStorage.getItem('userTypeEnumInt') * 1,
+      userTypeEnumInt: zzSessionStorage.getItem("userTypeEnumInt") * 1,
       loading: false,
       PreviousHistoryList: [],
       PreviousSurgeryList: [],
       PreviousOtherList: [],
       PreviousPDFList: [],
       fileList: [],
+      addFileList: [],
+      btnLoading: false,
       currentRow: {},
       prVisible: false,
       psVisible: false,
@@ -440,186 +551,302 @@ export default {
       moment,
       downloadLoading: false,
       clinicalDatas: [],
-      previewObj:{visible:false,filePath:'',fileType:''}
-    }
+      previewObj: { visible: false, filePath: "", fileType: "" },
+    };
   },
   mounted() {
-    this.getClinicalData()
+    this.getClinicalData();
   },
   methods: {
+    beginScanFiles(e, id, clinicalDataTrialSetId) {
+      this.currentRow = {
+        Id: id,
+        ClinicalDataTrialSetId: clinicalDataTrialSetId,
+        SubjectId: this.data.SubjectId,
+      };
+      this.currentRow.TrialId = this.$route.query.trialId;
+      var files = e.target.files;
+      this.fileList= [];
+      for (var i = 0; i < files.length; ++i) {
+        const fileName = files[i].name;
+        var extendName = fileName
+          .substring(fileName.lastIndexOf("."))
+          .toLocaleLowerCase();
+        if (this.faccept.indexOf(extendName) !== -1) {
+          let obj = {
+            size:files[i].size,
+            type:extendName.split('.')[1],
+            file:files[i],
+          }
+          this.fileList.push(obj);
+        }
+      }
+      this.handleUploadFile();
+      this.$refs.file.value = null;
+    },
+    async handleUploadFile() {
+      this.btnLoading = true;
+      this.loading = true;
+      this.addFileList = [];
+      try {
+        for (var i = 0; i < this.fileList.length; ++i) {
+          const file = await this.fileToBlob(this.fileList[i].file);
+          var timestamp = Date.now();
+          const res = await this.OSSclient.put(
+            `/${this.trialId}/ClinicalData/${timestamp}_${this.fileList[i].file.name}`,
+            file
+          );
+          this.addFileList.push({
+            fileName: this.fileList[i].file.name,
+            path: this.$getObjectName(res.url),
+            url: this.$getObjectName(res.url),
+            type: this.fileList[i].type,
+            size: this.fileList[i].size,
+          });
+        }
+        this.saveClinicalData();
+      } catch (err) {
+        console.log(err);
+        this.btnLoading = false;
+        this.loading = false;
+      }
+    },
+    saveClinicalData() {
+      this.btnLoading = true;
+      this.loading = true;
+      var param = {
+        id: this.currentRow.Id,
+        trialId: this.currentRow.TrialId,
+        subjectId: this.currentRow.SubjectId,
+        readingId: this.subjectVisitId,
+        clinicalDataTrialSetId: this.currentRow.ClinicalDataTrialSetId,
+        isVisit: true,
+        deleteFileIds: [],
+        addFileList: this.addFileList,
+      };
+      // if (this.studyData.StudyId) {
+      //   param.StudyId = this.studyData.StudyId;
+      // }
+      addOrUpdateReadingClinicalData(param)
+        .then((response) => {
+          this.btnLoading = false;
+          this.loading = false;
+          // 刷新文件列表并关闭弹窗
+          this.getClinicalData();
+          this.$message.success(
+            this.$t("trials:uploadClinicalData:message:uploadSuccessfully")
+          );
+        })
+        .catch(() => {
+          this.btnLoading = false;
+          this.loading = false;
+        });
+    },
     getClinicalData() {
-      this.loading = true
-      this.data.TrialId = this.$route.query.trialId
+      this.loading = true;
+      this.data.TrialId = this.$route.query.trialId;
       var param = {
         subjectVisitId: this.subjectVisitId,
         trialId: this.trialId,
         subjectId: this.data.SubjectId,
-        isBaseLine: this.data.IsBaseLine
-      }
-      getCRCClinicalData(param).then(res => {
-        this.clinicalDatas = res.Result
-        this.loading = false
-      }).catch(() => {
-        this.loading = false
-      })
+        isBaseLine: this.data.IsBaseLine,
+      };
+      getCRCClinicalData(param)
+        .then((res) => {
+          this.clinicalDatas = res.Result;
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+        });
     },
     // 打开编辑框
     editRow(row, type) {
       if (type === 1) {
-        this.prVisible = true
+        this.prVisible = true;
       } else if (type === 2) {
-        this.psVisible = true
+        this.psVisible = true;
       } else if (type === 3) {
-        this.poVisible = true
+        this.poVisible = true;
       }
-      this.currentRow = { ...row }
-      this.currentRow.TrialId = this.$route.query.trialId
+      this.currentRow = { ...row };
+      this.currentRow.TrialId = this.$route.query.trialId;
     },
     // 根据ID删除既往放疗史
     deletePreviousHistory(row) {
-      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
-        type: 'warning',
-        distinguishCancelAndClose: true
-      })
-        .then(() => {
-          this.loading = true
-          deletePreviousHistory(this.$route.query.trialId, this.subjectVisitId, row.Id).then(res => {
-            this.loading = false
+      this.$confirm(this.$t("trials:uploadedDicoms:message:deleteMes"), {
+        type: "warning",
+        distinguishCancelAndClose: true,
+      }).then(() => {
+        this.loading = true;
+        deletePreviousHistory(
+          this.$route.query.trialId,
+          this.subjectVisitId,
+          row.Id
+        )
+          .then((res) => {
+            this.loading = false;
             if (res.IsSuccess) {
-              this.getClinicalData()
-              this.$message.success(this.$t('trials:uploadedDicoms:message:deleteSuccessfully'))
-              this.$emit('getList')
+              this.getClinicalData();
+              this.$message.success(
+                this.$t("trials:uploadedDicoms:message:deleteSuccessfully")
+              );
+              this.$emit("getList");
             }
-          }).catch(() => { this.loading = false })
-        })
+          })
+          .catch(() => {
+            this.loading = false;
+          });
+      });
     },
     // 根据ID删除既往手术史
     deletePreviousSurgery(row) {
-      console.log(this.$route.query.trialId)
-      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
-        type: 'warning',
-        distinguishCancelAndClose: true
-      })
-        .then(() => {
-          // row.Type = '既往手术史'
-          this.loading = true
-          deletePreviousSurgery(this.$route.query.trialId, this.subjectVisitId, row.Id)
-            .then(res => {
-              this.loading = false
-              if (res.IsSuccess) {
-                this.getClinicalData()
-                this.$message.success(this.$t('trials:uploadedDicoms:message:deleteSuccessfully'))
-                this.$emit('getList')
-              }
-            }).catch(() => { this.loading = false })
-        })
+      console.log(this.$route.query.trialId);
+      this.$confirm(this.$t("trials:uploadedDicoms:message:deleteMes"), {
+        type: "warning",
+        distinguishCancelAndClose: true,
+      }).then(() => {
+        // row.Type = '既往手术史'
+        this.loading = true;
+        deletePreviousSurgery(
+          this.$route.query.trialId,
+          this.subjectVisitId,
+          row.Id
+        )
+          .then((res) => {
+            this.loading = false;
+            if (res.IsSuccess) {
+              this.getClinicalData();
+              this.$message.success(
+                this.$t("trials:uploadedDicoms:message:deleteSuccessfully")
+              );
+              this.$emit("getList");
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+          });
+      });
     },
     // 根据ID删除既往其他资料史
     deletePreviousOther(row) {
-      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
-        type: 'warning',
-        distinguishCancelAndClose: true
-      })
-        .then(() => {
-          // row.Type = '既往其他治疗史'
-          this.loading = true
-          deletePreviousOther(this.$route.query.trialId, this.subjectVisitId, row.Id)
-            .then(res => {
-              this.loading = false
-              if (res.IsSuccess) {
-                this.getClinicalData()
-                this.$message.success(this.$t('trials:uploadedDicoms:message:deleteSuccessfully'))
-                this.$emit('getList')
-              }
-            }).catch(() => { this.loading = false })
-        })
+      this.$confirm(this.$t("trials:uploadedDicoms:message:deleteMes"), {
+        type: "warning",
+        distinguishCancelAndClose: true,
+      }).then(() => {
+        // row.Type = '既往其他治疗史'
+        this.loading = true;
+        deletePreviousOther(
+          this.$route.query.trialId,
+          this.subjectVisitId,
+          row.Id
+        )
+          .then((res) => {
+            this.loading = false;
+            if (res.IsSuccess) {
+              this.getClinicalData();
+              this.$message.success(
+                this.$t("trials:uploadedDicoms:message:deleteSuccessfully")
+              );
+              this.$emit("getList");
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+          });
+      });
     },
     // 文件预览
     preview(row) {
-      if (!row.Path) return
-      this.previewObj.fileName = row.FileName
-      this.previewObj.filePath = row.Path
-      this.previewObj.fileType ='pdf'
-      this.previewObj.visible = true
+      if (!row.Path) return;
+      this.previewObj.fileName = row.FileName;
+      this.previewObj.filePath = row.Path;
+      this.previewObj.fileType = "pdf";
+      this.previewObj.visible = true;
       // window.open(this.OSSclientConfig.basePath + path, '_blank')
     },
     addPreviousHistory(clinicalDataTrialSetId) {
-      console.log(clinicalDataTrialSetId)
-      this.currentRow = { ClinicalDataTrialSetId: clinicalDataTrialSetId }
-      this.currentRow.TrialId = this.$route.query.trialId
-      this.prVisible = true
+      console.log(clinicalDataTrialSetId);
+      this.currentRow = { ClinicalDataTrialSetId: clinicalDataTrialSetId };
+      this.currentRow.TrialId = this.$route.query.trialId;
+      this.prVisible = true;
     },
     addPreviousSurgery(clinicalDataTrialSetId) {
-      this.currentRow = { ClinicalDataTrialSetId: clinicalDataTrialSetId }
-      this.currentRow.TrialId = this.$route.query.trialId
-      this.psVisible = true
+      this.currentRow = { ClinicalDataTrialSetId: clinicalDataTrialSetId };
+      this.currentRow.TrialId = this.$route.query.trialId;
+      this.psVisible = true;
     },
     addPreviousOther(clinicalDataTrialSetId) {
-      this.currentRow = { ClinicalDataTrialSetId: clinicalDataTrialSetId }
-      this.currentRow.TrialId = this.$route.query.trialId
-      this.poVisible = true
+      this.currentRow = { ClinicalDataTrialSetId: clinicalDataTrialSetId };
+      this.currentRow.TrialId = this.$route.query.trialId;
+      this.poVisible = true;
     },
     // 关闭既往放疗史窗口并刷新列表
     closePRDialog() {
-      this.prVisible = false
-      this.currentRow.TrialId = this.$route.query.trialId
+      this.prVisible = false;
+      this.currentRow.TrialId = this.$route.query.trialId;
     },
     closePSDialog() {
-      this.psVisible = false
-      this.currentRow.TrialId = this.$route.query.trialId
+      this.psVisible = false;
+      this.currentRow.TrialId = this.$route.query.trialId;
     },
     closePODialog() {
-      this.poVisible = false
-      this.currentRow.TrialId = this.$route.query.trialId
+      this.poVisible = false;
+      this.currentRow.TrialId = this.$route.query.trialId;
     },
     closeUpDialog() {
-      this.upVisible = false
-      this.currentRow.TrialId = this.$route.query.trialId
+      this.upVisible = false;
+      this.currentRow.TrialId = this.$route.query.trialId;
     },
     refresh() {
-      this.getClinicalData()
-      this.$emit('getList')
+      this.getClinicalData();
+      this.$emit("getList");
     },
     // 添加文件
     addFile(id, clinicalDataTrialSetId) {
-      this.currentRow = { Id: id, ClinicalDataTrialSetId: clinicalDataTrialSetId, SubjectId: this.data.SubjectId }
-      this.currentRow.TrialId = this.$route.query.trialId
-      this.upVisible = true
+      this.currentRow = {
+        Id: id,
+        ClinicalDataTrialSetId: clinicalDataTrialSetId,
+        SubjectId: this.data.SubjectId,
+      };
+      this.currentRow.TrialId = this.$route.query.trialId;
+      this.upVisible = true;
     },
     // 删除文件
     deleteFile(id) {
-      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
-        type: 'warning',
-        distinguishCancelAndClose: true
-      })
-        .then(() => {
-          this.loading = true
-          deleteReadingClinicalDataPDF(id)
-            .then(res => {
-              this.loading = false
-              if (res.IsSuccess) {
-                this.getClinicalData()
-                this.$emit('getList')
-                this.$message.success(this.$t('trials:uploadedDicoms:message:deleteSuccessfully'))
-              }
-            }).catch(() => {
-              this.loading = false
-            })
-        })
+      this.$confirm(this.$t("trials:uploadedDicoms:message:deleteMes"), {
+        type: "warning",
+        distinguishCancelAndClose: true,
+      }).then(() => {
+        this.loading = true;
+        deleteReadingClinicalDataPDF(id)
+          .then((res) => {
+            this.loading = false;
+            if (res.IsSuccess) {
+              this.getClinicalData();
+              this.$emit("getList");
+              this.$message.success(
+                this.$t("trials:uploadedDicoms:message:deleteSuccessfully")
+              );
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+          });
+      });
     },
     handleDownloadTpl(cd) {
-      window.open(this.OSSclientConfig.basePath + cd.Path)
-    }
-  }
-
-}
+      window.open(this.OSSclientConfig.basePath + cd.Path);
+    },
+  },
+};
 </script>
 <style lang="scss">
-.clinical-data-wrapper{
-  .box-title{
-      padding: 12px;
-      margin-bottom: 10px;
-      background-color: #dcdfe6;
-    }
+.clinical-data-wrapper {
+  .box-title {
+    padding: 12px;
+    margin-bottom: 10px;
+    background-color: #dcdfe6;
+  }
 }
 </style>

src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue

@@ -193,365 +193,389 @@
       </el-table-column>
     </el-table>
     <!-- 多文件上传 -->
-    <form id="inputForm" ref="uploadForm" enctype="multipart/form-data">
-      <el-divider content-position="left">{{
-        $t("trials:uploadedDicoms:title:dicomFilesOnly")
-      }}</el-divider>
-      <div class="form-group">
-        <div id="directoryInputWrapper" class="btn btn-link file-input">
-          <el-button
-            type="primary"
-            :disabled="btnLoading"
-            :loading="btnLoading"
-            size="small"
-            >{{
-              $t("trials:uploadedDicomsicom:button:selectFolder")
-            }}</el-button
-          >
-          <input
-            type="file"
-            name="file"
-            ref="pathClear"
-            :disabled="btnLoading"
-            webkitdirectory
-            multiple
-            @change="beginScanFiles($event)"
-          />
-        </div>
-      </div>
-    </form>
-
-    <!-- 文件列表 -->
-    <el-table
-      ref="dicomFilesTable"
-      :data="uploadQueues"
-      :row-key="(row) => row.studyIndex"
-      class="dicomFiles-table"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column
-        type="selection"
-        width="55"
-        :selectable="handleSelectable"
-      />
-      <el-table-column type="index" width="40" />
-      <el-table-column min-width="200" show-overflow-tooltip>
-        <template slot="header">
-          <el-tooltip placement="top">
-            <div slot="content">
-              {{ $t("trials:uploadDicomList:table:studyDetail1") }}<br />
-              {{ $t("trials:uploadDicomList:table:studyDetail2") }}<br />
-              {{ $t("trials:uploadedDicoms:table:studyDate") }}
-            </div>
-            <span>{{ $t("trials:uploadDicomList:table:studyInfo") }}</span>
-          </el-tooltip>
-        </template>
-        <template slot-scope="scope">
-          <div style="line-height: 15px">
-            <div>
-              <div>
-                <span v-if="scope.row.dicomInfo.accNumber"
-                  ><span style="font-weight: 500">Acc:</span>
-                  {{ scope.row.dicomInfo.accNumber }}</span
-                >
-                <span v-else style="color: #f44336">N/A</span>
-              </div>
-              <div style="display: inline-block; margin-right: 2px">
-                <span v-if="scope.row.dicomInfo.modality.length > 0">
-                  {{ scope.row.dicomInfo.modality.join("、") }},</span
-                >
-                <span v-else style="color: #f44336">N/A,</span>
-              </div>
-              <div style="display: inline-block; margin-right: 2px">
-                <span v-if="scope.row.seriesList.length"
-                  >{{ scope.row.seriesList.length }} Series,</span
-                >
-                <span v-else style="color: #f44336">N/A,</span>
-              </div>
-              <div style="display: inline-block">
-                <span v-if="scope.row.fileList.length"
-                  >{{ scope.row.fileList.length }} Instances</span
-                >
-                <span v-else style="color: #f44336">N/A</span>
-              </div>
-            </div>
-
-            <div>
-              <div style="display: inline-block; margin-right: 2px">
-                <span v-if="scope.row.dicomInfo.bodyPart">
-                  {{ scope.row.dicomInfo.bodyPart }},
-                </span>
-                <span v-else style="color: #f44336">N/A, </span>
-              </div>
-              <div style="display: inline-block">
-                <span v-if="scope.row.dicomInfo.description">
-                  {{ scope.row.dicomInfo.description }}</span
-                >
-                <span v-else style="color: #f44336">N/A</span>
-              </div>
-            </div>
-            <div>
-              {{ scope.row.dicomInfo.studyTime }}
+    <el-divider content-position="left">{{
+      $t("trials:uploadedDicoms:title:dicomFilesOnly")
+    }}</el-divider>
+    <el-tabs v-model="uploadActiveName">
+      <!-- 本地上传 -->
+      <el-tab-pane
+        :label="$t('trials:uploadedDicoms:tab:uploadFile')"
+        name="file"
+      >
+        <form id="inputForm" ref="uploadForm" enctype="multipart/form-data">
+          <div class="form-group">
+            <div id="directoryInputWrapper" class="btn btn-link file-input">
+              <el-button
+                type="primary"
+                :disabled="btnLoading"
+                :loading="btnLoading"
+                size="small"
+                >{{
+                  $t("trials:uploadedDicomsicom:button:selectFolder")
+                }}</el-button
+              >
+              <input
+                type="file"
+                name="file"
+                ref="pathClear"
+                :disabled="btnLoading"
+                webkitdirectory
+                multiple
+                @change="beginScanFiles($event)"
+              />
             </div>
           </div>
-        </template>
-      </el-table-column>
-      <el-table-column min-width="130" show-overflow-tooltip>
-        <template slot="header">
-          <el-tooltip placement="top">
-            <div slot="content">
-              {{ $t("trials:uploadDicomList:table:pId") }}<br />
-              {{ $t("trials:uploadDicomList:table:patientName") }}<br />
-              {{ $t("trials:uploadDicomList:table:pInfo") }}
-            </div>
-            <span>{{ $t("trials:uploadDicomList:table:patientInfo") }}</span>
-          </el-tooltip>
-        </template>
-        <template slot-scope="scope">
-          <div style="line-height: 15px">
-            <div>
-              <span v-if="scope.row.dicomInfo.patientId"
-                ><span style="font-weight: 500">PID: </span
-                >{{ scope.row.dicomInfo.patientId }}</span
-              >
-              <span v-else style="color: #f44336">N/A</span>
-            </div>
-            <div>
-              <span
-                :class="[scope.row.dicomInfo.patientName ? '' : 'colorOfRed']"
-              >
-                {{
-                  scope.row.dicomInfo.patientName
-                    ? scope.row.dicomInfo.patientName
-                    : "N/A"
-                }}
-              </span>
-            </div>
-            <div>
-              <span
-                :class="[scope.row.dicomInfo.patientSex ? '' : 'colorOfRed']"
-              >
-                {{
-                  scope.row.dicomInfo.patientSex
-                    ? scope.row.dicomInfo.patientSex
-                    : "N/A"
-                }},
-              </span>
+        </form>
 
-              <span
-                :class="[scope.row.dicomInfo.patientAge ? '' : 'colorOfRed']"
-              >
-                {{
-                  scope.row.dicomInfo.patientAge
-                    ? scope.row.dicomInfo.patientAge
-                    : "N/A"
-                }},
-              </span>
-
-              <span
-                :class="[
-                  scope.row.dicomInfo.patientBirthDate ? '' : 'colorOfRed',
-                ]"
-              >
-                {{
-                  scope.row.dicomInfo.patientBirthDate
-                    ? scope.row.dicomInfo.patientBirthDate
-                    : "N/A"
-                }}
-              </span>
-            </div>
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        :label="$t('trials:uploadDicomList:table:failedFileCount')"
-        min-width="120"
-        show-overflow-tooltip
-      >
-        <template slot-scope="scope">
-          <el-progress
-            color="#409eff"
-            :percentage="
-              (scope.row.dicomInfo.failedFileCount * 100) /
-              scope.row.dicomInfo.fileCount
-            "
-            :show-text="false"
+        <!-- 文件列表 -->
+        <el-table
+          ref="dicomFilesTable"
+          :data="uploadQueues"
+          :row-key="(row) => row.studyIndex"
+          class="dicomFiles-table"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            :selectable="handleSelectable"
           />
-          <span
-            >{{ scope.row.dicomInfo.failedFileCount }} /
-            {{ scope.row.dicomInfo.fileCount }}</span
-          >
-        </template>
-      </el-table-column>
+          <el-table-column type="index" width="40" />
+          <el-table-column min-width="200" show-overflow-tooltip>
+            <template slot="header">
+              <el-tooltip placement="top">
+                <div slot="content">
+                  {{ $t("trials:uploadDicomList:table:studyDetail1") }}<br />
+                  {{ $t("trials:uploadDicomList:table:studyDetail2") }}<br />
+                  {{ $t("trials:uploadedDicoms:table:studyDate") }}
+                </div>
+                <span>{{ $t("trials:uploadDicomList:table:studyInfo") }}</span>
+              </el-tooltip>
+            </template>
+            <template slot-scope="scope">
+              <div style="line-height: 15px">
+                <div>
+                  <div>
+                    <span v-if="scope.row.dicomInfo.accNumber"
+                      ><span style="font-weight: 500">Acc:</span>
+                      {{ scope.row.dicomInfo.accNumber }}</span
+                    >
+                    <span v-else style="color: #f44336">N/A</span>
+                  </div>
+                  <div style="display: inline-block; margin-right: 2px">
+                    <span v-if="scope.row.dicomInfo.modality.length > 0">
+                      {{ scope.row.dicomInfo.modality.join("、") }},</span
+                    >
+                    <span v-else style="color: #f44336">N/A,</span>
+                  </div>
+                  <div style="display: inline-block; margin-right: 2px">
+                    <span v-if="scope.row.seriesList.length"
+                      >{{ scope.row.seriesList.length }} Series,</span
+                    >
+                    <span v-else style="color: #f44336">N/A,</span>
+                  </div>
+                  <div style="display: inline-block">
+                    <span v-if="scope.row.fileList.length"
+                      >{{ scope.row.fileList.length }} Instances</span
+                    >
+                    <span v-else style="color: #f44336">N/A</span>
+                  </div>
+                </div>
 
-      <el-table-column
-        :label="$t('trials:uploadDicomList:table:status')"
-        min-width="140"
-        show-overflow-tooltip
-      >
-        <template slot-scope="scope">
-          <span
-            v-if="
-              !scope.row.dicomInfo.failedFileCount &&
-              !scope.row.dicomInfo.isInit
-            "
-          >
-            {{ $t("trials:uploadDicomList:table:status1") }}</span
-          >
-          <span
-            style="color: #409eff"
-            v-else-if="
-              !scope.row.dicomInfo.failedFileCount &&
-              scope.row.dicomInfo.isInit &&
-              btnLoading
-            "
-            >{{ $t("trials:uploadDicomList:table:status2") }}</span
-          >
-          <span
-            style="color: #409eff"
-            v-else-if="
-              scope.row.dicomInfo.failedFileCount <
-                scope.row.dicomInfo.fileCount && !scope.row.uploadState.record
-            "
-            >{{ $t("trials:uploadDicomList:table:status2") }}</span
-          >
-          <span
-            style="color: #2cc368"
-            v-else-if="
-              scope.row.dicomInfo.failedFileCount ===
-              scope.row.dicomInfo.fileCount
-            "
-            >{{ $t("trials:uploadDicomList:table:status3") }}</span
-          >
-          <span
-            style="color: #f66"
-            v-else-if="
-              scope.row.uploadState.record &&
-              scope.row.uploadState.record.fileCount === 0
-            "
-            >{{ $t("trials:uploadDicomList:table:status5") }}</span
-          >
-          <span style="color: #f66" v-else>{{
-            $t("trials:uploadDicomList:table:Failed")
-          }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        :label="$t('trials:uploadDicomList:table:record')"
-        min-width="140"
-        show-overflow-tooltip
-      >
-        <template slot-scope="scope">
-          <el-tooltip placement="top" v-if="scope.row.uploadState.record">
-            <div slot="content">
-              <div style="max-height: 500px; overflow-y: auto">
-                {{ $t("trials:uploadDicomList:table:Existed") }}:
-                <div v-if="scope.row.uploadState.record.Existed.length">
-                  <div
-                    v-for="item of scope.row.uploadState.record.Existed"
-                    :key="item"
-                    style="font-size: 12px; color: #baa72a"
-                  >
-                    {{ item }}
+                <div>
+                  <div style="display: inline-block; margin-right: 2px">
+                    <span v-if="scope.row.dicomInfo.bodyPart">
+                      {{ scope.row.dicomInfo.bodyPart }},
+                    </span>
+                    <span v-else style="color: #f44336">N/A, </span>
+                  </div>
+                  <div style="display: inline-block">
+                    <span v-if="scope.row.dicomInfo.description">
+                      {{ scope.row.dicomInfo.description }}</span
+                    >
+                    <span v-else style="color: #f44336">N/A</span>
                   </div>
                 </div>
-                <div v-else>&nbsp;</div>
-                {{ $t("trials:uploadDicomList:table:Uploaded") }}:
-                <div v-if="scope.row.uploadState.record.Uploaded.length">
-                  <div
-                    v-for="item of scope.row.uploadState.record.Uploaded"
-                    :key="item"
-                    style="font-size: 12px; color: #24b837"
-                  >
-                    {{ item }}
-                  </div>
+                <div>
+                  {{ scope.row.dicomInfo.studyTime }}
                 </div>
-                <div v-else>&nbsp;</div>
-                <br />
-                {{ $t("trials:uploadDicomList:table:Failed") }}:
-                <div v-if="scope.row.uploadState.record.Failed.length">
-                  <div
-                    v-for="item of scope.row.uploadState.record.Failed"
-                    :key="item"
-                    style="font-size: 12px; color: #f66"
-                  >
-                    {{ item }}
-                  </div>
-                </div>
-                <div v-else>&nbsp;</div>
               </div>
-            </div>
-            <el-button size="mini" style="cursor: pointer">
-              <span style="font-size: 12px; color: #baa72a">{{
-                scope.row.uploadState.record.Existed.length
+            </template>
+          </el-table-column>
+          <el-table-column min-width="130" show-overflow-tooltip>
+            <template slot="header">
+              <el-tooltip placement="top">
+                <div slot="content">
+                  {{ $t("trials:uploadDicomList:table:pId") }}<br />
+                  {{ $t("trials:uploadDicomList:table:patientName") }}<br />
+                  {{ $t("trials:uploadDicomList:table:pInfo") }}
+                </div>
+                <span>{{
+                  $t("trials:uploadDicomList:table:patientInfo")
+                }}</span>
+              </el-tooltip>
+            </template>
+            <template slot-scope="scope">
+              <div style="line-height: 15px">
+                <div>
+                  <span v-if="scope.row.dicomInfo.patientId"
+                    ><span style="font-weight: 500">PID: </span
+                    >{{ scope.row.dicomInfo.patientId }}</span
+                  >
+                  <span v-else style="color: #f44336">N/A</span>
+                </div>
+                <div>
+                  <span
+                    :class="[
+                      scope.row.dicomInfo.patientName ? '' : 'colorOfRed',
+                    ]"
+                  >
+                    {{
+                      scope.row.dicomInfo.patientName
+                        ? scope.row.dicomInfo.patientName
+                        : "N/A"
+                    }}
+                  </span>
+                </div>
+                <div>
+                  <span
+                    :class="[
+                      scope.row.dicomInfo.patientSex ? '' : 'colorOfRed',
+                    ]"
+                  >
+                    {{
+                      scope.row.dicomInfo.patientSex
+                        ? scope.row.dicomInfo.patientSex
+                        : "N/A"
+                    }},
+                  </span>
+
+                  <span
+                    :class="[
+                      scope.row.dicomInfo.patientAge ? '' : 'colorOfRed',
+                    ]"
+                  >
+                    {{
+                      scope.row.dicomInfo.patientAge
+                        ? scope.row.dicomInfo.patientAge
+                        : "N/A"
+                    }},
+                  </span>
+
+                  <span
+                    :class="[
+                      scope.row.dicomInfo.patientBirthDate ? '' : 'colorOfRed',
+                    ]"
+                  >
+                    {{
+                      scope.row.dicomInfo.patientBirthDate
+                        ? scope.row.dicomInfo.patientBirthDate
+                        : "N/A"
+                    }}
+                  </span>
+                </div>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            :label="$t('trials:uploadDicomList:table:failedFileCount')"
+            min-width="120"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <el-progress
+                color="#409eff"
+                :percentage="
+                  (scope.row.dicomInfo.failedFileCount * 100) /
+                  scope.row.dicomInfo.fileCount
+                "
+                :show-text="false"
+              />
+              <span
+                >{{ scope.row.dicomInfo.failedFileCount }} /
+                {{ scope.row.dicomInfo.fileCount }}</span
+              >
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            :label="$t('trials:uploadDicomList:table:status')"
+            min-width="140"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <span
+                v-if="
+                  !scope.row.dicomInfo.failedFileCount &&
+                  !scope.row.dicomInfo.isInit
+                "
+              >
+                {{ $t("trials:uploadDicomList:table:status1") }}</span
+              >
+              <span
+                style="color: #409eff"
+                v-else-if="
+                  !scope.row.dicomInfo.failedFileCount &&
+                  scope.row.dicomInfo.isInit &&
+                  btnLoading
+                "
+                >{{ $t("trials:uploadDicomList:table:status2") }}</span
+              >
+              <span
+                style="color: #409eff"
+                v-else-if="
+                  scope.row.dicomInfo.failedFileCount <
+                    scope.row.dicomInfo.fileCount &&
+                  !scope.row.uploadState.record
+                "
+                >{{ $t("trials:uploadDicomList:table:status2") }}</span
+              >
+              <span
+                style="color: #2cc368"
+                v-else-if="
+                  scope.row.dicomInfo.failedFileCount ===
+                  scope.row.dicomInfo.fileCount
+                "
+                >{{ $t("trials:uploadDicomList:table:status3") }}</span
+              >
+              <span
+                style="color: #f66"
+                v-else-if="
+                  scope.row.uploadState.record &&
+                  scope.row.uploadState.record.fileCount === 0
+                "
+                >{{ $t("trials:uploadDicomList:table:status5") }}</span
+              >
+              <span style="color: #f66" v-else>{{
+                $t("trials:uploadDicomList:table:Failed")
               }}</span>
-              /
-              <span style="font-size: 12px; color: #24b837">{{
-                scope.row.uploadState.record.Uploaded.length
-              }}</span>
-              /
-              <span style="font-size: 12px; color: #f66">{{
-                scope.row.uploadState.record.Failed.length
-              }}</span>
-            </el-button>
-          </el-tooltip>
-        </template>
-      </el-table-column>
-      <el-table-column
-        v-show="isScan"
-        :label="$t('common:action:action')"
-        width="200"
-      >
-        <template slot-scope="scope">
-          <!-- 预览 -->
-          <!--          :disabled="scope.row.dicomInfo.failedFileCount < scope.row.dicomInfo.fileCount && scope.row.dicomInfo.failedFileCount !== 0"-->
-          <el-button
-            icon="el-icon-view"
-            circle
-            :disabled="
-              scope.row.uploadState.stateCode !== '' &&
-              scope.row.dicomInfo.failedFileCount <
-                scope.row.dicomInfo.fileCount &&
-              !scope.row.uploadState.record
-            "
-            :title="$t('trials:uploadedDicoms:action:preview')"
-            size="small"
-            @click="handlePreview(scope.row.dicomInfo.studyUid)"
-          />
-          <!-- 移除 -->
-          <el-button
-            icon="el-icon-delete"
-            circle
-            :title="$t('trials:uploadedDicoms:action:delete')"
-            size="small"
-            :disabled="
-              scope.row.uploadState.stateCode !== '' &&
-              scope.row.dicomInfo.failedFileCount <
-                scope.row.dicomInfo.fileCount &&
-              !scope.row.uploadState.record
-            "
-            @click="handleDelete(scope.$index, scope.row)"
-          />
-        </template>
-      </el-table-column>
-    </el-table>
-    <div style="text-align: right; padding: 10px 0px">
-      <!-- 关闭 -->
-      <!-- <el-button :disabled="btnLoading" size="small" type="primary" @click="cancel">
+            </template>
+          </el-table-column>
+          <el-table-column
+            :label="$t('trials:uploadDicomList:table:record')"
+            min-width="140"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <el-tooltip placement="top" v-if="scope.row.uploadState.record">
+                <div slot="content">
+                  <div style="max-height: 500px; overflow-y: auto">
+                    {{ $t("trials:uploadDicomList:table:Existed") }}:
+                    <div v-if="scope.row.uploadState.record.Existed.length">
+                      <div
+                        v-for="item of scope.row.uploadState.record.Existed"
+                        :key="item"
+                        style="font-size: 12px; color: #baa72a"
+                      >
+                        {{ item }}
+                      </div>
+                    </div>
+                    <div v-else>&nbsp;</div>
+                    {{ $t("trials:uploadDicomList:table:Uploaded") }}:
+                    <div v-if="scope.row.uploadState.record.Uploaded.length">
+                      <div
+                        v-for="item of scope.row.uploadState.record.Uploaded"
+                        :key="item"
+                        style="font-size: 12px; color: #24b837"
+                      >
+                        {{ item }}
+                      </div>
+                    </div>
+                    <div v-else>&nbsp;</div>
+                    <br />
+                    {{ $t("trials:uploadDicomList:table:Failed") }}:
+                    <div v-if="scope.row.uploadState.record.Failed.length">
+                      <div
+                        v-for="item of scope.row.uploadState.record.Failed"
+                        :key="item"
+                        style="font-size: 12px; color: #f66"
+                      >
+                        {{ item }}
+                      </div>
+                    </div>
+                    <div v-else>&nbsp;</div>
+                  </div>
+                </div>
+                <el-button size="mini" style="cursor: pointer">
+                  <span style="font-size: 12px; color: #baa72a">{{
+                    scope.row.uploadState.record.Existed.length
+                  }}</span>
+                  /
+                  <span style="font-size: 12px; color: #24b837">{{
+                    scope.row.uploadState.record.Uploaded.length
+                  }}</span>
+                  /
+                  <span style="font-size: 12px; color: #f66">{{
+                    scope.row.uploadState.record.Failed.length
+                  }}</span>
+                </el-button>
+              </el-tooltip>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-show="isScan"
+            :label="$t('common:action:action')"
+            width="200"
+          >
+            <template slot-scope="scope">
+              <!-- 预览 -->
+              <!--          :disabled="scope.row.dicomInfo.failedFileCount < scope.row.dicomInfo.fileCount && scope.row.dicomInfo.failedFileCount !== 0"-->
+              <el-button
+                icon="el-icon-view"
+                circle
+                :disabled="
+                  scope.row.uploadState.stateCode !== '' &&
+                  scope.row.dicomInfo.failedFileCount <
+                    scope.row.dicomInfo.fileCount &&
+                  !scope.row.uploadState.record
+                "
+                :title="$t('trials:uploadedDicoms:action:preview')"
+                size="small"
+                @click="handlePreview(scope.row.dicomInfo.studyUid)"
+              />
+              <!-- 移除 -->
+              <el-button
+                icon="el-icon-delete"
+                circle
+                :title="$t('trials:uploadedDicoms:action:delete')"
+                size="small"
+                :disabled="
+                  scope.row.uploadState.stateCode !== '' &&
+                  scope.row.dicomInfo.failedFileCount <
+                    scope.row.dicomInfo.fileCount &&
+                  !scope.row.uploadState.record
+                "
+                @click="handleDelete(scope.$index, scope.row)"
+              />
+            </template>
+          </el-table-column>
+        </el-table>
+        <div style="text-align: right; padding: 10px 0px">
+          <!-- 关闭 -->
+          <!-- <el-button :disabled="btnLoading" size="small" type="primary" @click="cancel">
         {{ $t('trials:uploadDicomList:button:close') }}
       </el-button> -->
-      <!-- 上传 -->
-      <el-button
-        size="small"
-        type="primary"
-        :disabled="selectArr.length == 0 || !isScan"
-        :loading="btnLoading"
-        @click="beginUploadQueues"
+          <!-- 上传 -->
+          <el-button
+            size="small"
+            type="primary"
+            :disabled="selectArr.length == 0 || !isScan"
+            :loading="btnLoading"
+            @click="beginUploadQueues"
+          >
+            {{ $t("trials:uploadDicomList:button:upload") }}
+          </el-button>
+        </div>
+      </el-tab-pane>
+      <!-- pacs上传 -->
+      <el-tab-pane
+        :label="$t('trials:uploadNonDicoms:tab:uploadPacs')"
+        name="pacs"
+        :disabled="btnLoading"
       >
-        {{ $t("trials:uploadDicomList:button:upload") }}
-      </el-button>
-    </div>
-
+        <uploadDicomPacs v-if="uploadActiveName === 'pacs'" />
+      </el-tab-pane>
+    </el-tabs>
     <!-- 预览影像模态框 -->
     <el-dialog
       v-if="previewVisible"
@@ -758,9 +782,10 @@ import { dcmUpload } from "@/utils/dcmUpload/dcmUpload";
 import { convertBytes } from "@/utils/dicom-character-set";
 import moment from "moment";
 import store from "@/store";
+import uploadDicomPacs from "./uploadDiocmPacs.vue";
 export default {
   name: "UploadDicomFiles",
-  components: { DicomPreview, uploadPetClinicalData },
+  components: { DicomPreview, uploadPetClinicalData, uploadDicomPacs },
   props: {
     data: {
       type: Object,
@@ -783,6 +808,7 @@ export default {
   },
   data() {
     return {
+      uploadActiveName: "file",
       editStudyInfoVisible: false,
       studyForm: {
         StudyCode: "",
@@ -1975,7 +2001,7 @@ export default {
       }
       var arr = bodyPart.split(separator);
       var newArr = arr.map((i) => {
-        return this.$fd("Bodypart", i.trim(), "Code", this.BodyPart,'Name');
+        return this.$fd("Bodypart", i.trim(), "Code", this.BodyPart, "Name");
       });
       return newArr.join(" | ");
     },

src/views/trials/trials-panel/visit/crc-upload/components/uploadDiocmPacs.vue

@@ -0,0 +1,311 @@
+<template>
+  <BaseContainer>
+    <template slot="search-container">
+      <el-form :inline="true">
+        <!--所在中心-->
+        <el-form-item
+          :label="$t('trials:pushRecord:table:trialSiteKeyInfo')"
+          prop="TrialSiteKeyInfo"
+        >
+          <el-input
+            v-model="searchData.TrialSiteKeyInfo"
+            size="small"
+            clearable
+            style="width: 150px"
+            :placeholder="$t('trials:pushRecord:placeholder:trialSiteKeyInfo')"
+          />
+        </el-form-item>
+        <!--接收端AE-->
+        <el-form-item
+          :label="$t('trials:pushRecord:table:calledAE')"
+          prop="CalledAE"
+        >
+          <el-select
+            v-model="searchData.CalledAE"
+            clearable
+            style="width: 120px"
+          >
+            <el-option
+              v-for="item of calledAEList"
+              :key="item"
+              :value="item"
+              :label="item"
+            />
+          </el-select>
+        </el-form-item>
+        <!--发送端AE-->
+        <el-form-item
+          :label="$t('trials:pushRecord:table:callingAE')"
+          prop="CallingAE"
+        >
+          <el-select
+            v-model="searchData.CallingAE"
+            clearable
+            style="width: 120px"
+          >
+            <el-option
+              v-for="item of callingAEList"
+              :key="item"
+              :value="item"
+              :label="item"
+            />
+          </el-select>
+        </el-form-item>
+        <!--最新接受日期-->
+        <el-form-item :label="$t('trials:pushRecord:table:createTime')">
+          <el-date-picker
+            v-model="datetimerange"
+            type="datetimerange"
+            :default-time="['00:00:00', '23:59:59']"
+            :start-placeholder="$t('trials:loginLog:table:beginTime')"
+            :end-placeholder="$t('trials:loginLog:table:endTime')"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            @change="handleDatetimeChange"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+            {{ $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>
+    </template>
+    <template slot="main-container">
+      <el-table
+        v-loading="loading"
+        v-adaptive="{ bottomOffset: 120 }"
+        height="100"
+        :data="list"
+        class="table"
+        @sort-change="handleSortByColumn"
+        :default-sort="{ prop: 'StartTime', order: 'descending' }"
+      >
+        <el-table-column type="index" width="50" />
+        <!--中心编号-->
+        <el-table-column
+          :label="$t('trials:pushRecord:table:trialSiteCode')"
+          prop="TrialSiteCode"
+          min-width="160"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <!--中心名称-->
+        <el-table-column
+          :label="$t('trials:pushRecord:table:trialSiteAliasName')"
+          prop="TrialSiteAliasName"
+          min-width="160"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <!--发送端AE-->
+        <el-table-column
+          :label="$t('trials:pushRecord:table:callingAEList')"
+          prop="CallingAEList"
+          min-width="90"
+          show-overflow-tooltip
+          sortable="custom"
+        >
+          <template slot-scope="scope">
+            {{ scope.row.CallingAEList.join(", ") }}
+          </template>
+        </el-table-column>
+        <!--发送端IP-->
+        <el-table-column
+          :label="$t('trials:pushRecord:table:callingAEIP')"
+          prop="CallingAEIP"
+          min-width="160"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <!--接收端AE-->
+        <el-table-column
+          :label="$t('trials:pushRecord:table:calledAEList')"
+          prop="CalledAEList"
+          min-width="90"
+          show-overflow-tooltip
+          sortable="custom"
+          ><template slot-scope="scope">
+            {{ scope.row.CallingAEList.join(", ") }}
+          </template>
+        </el-table-column>
+
+        <!--检查数-->
+        <el-table-column
+          :label="$t('trials:pushRecord:table:studyCount')"
+          prop="StudyCount"
+          min-width="160"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <!--图像数量-->
+        <el-table-column
+          :label="$t('trials:pushRecord:table:fileCount')"
+          prop="FileCount"
+          min-width="160"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <!--图像大小-->
+        <el-table-column
+          :label="$t('trials:pushRecord:table:fileSize')"
+          prop="FileSize"
+          min-width="160"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <!--推送开始时间-->
+        <el-table-column
+          :label="$t('trials:pushRecord:table:startTime')"
+          prop="StartTime"
+          min-width="160"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <!--推送结束时间-->
+        <el-table-column
+          :label="$t('trials:pushRecord:table:endTime')"
+          prop="EndTime"
+          min-width="160"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+      </el-table>
+      <!-- 分页组件 -->
+      <pagination
+        class="page"
+        :total="total"
+        :page.sync="searchData.PageIndex"
+        :limit.sync="searchData.PageSize"
+        @pagination="getList"
+      />
+    </template>
+  </BaseContainer>
+</template>
+      <script>
+import {
+  getSCPImageUploadList,
+  getDicomCalledAEList,
+  getDicomCallingAEList,
+} from "@/api/trials";
+import BaseContainer from "@/components/BaseContainer";
+import Pagination from "@/components/Pagination";
+import moment from "moment";
+const searchDataDefault = () => {
+  return {
+    CallingAE: null,
+    CalledAE: null,
+    StartTime: null,
+    EndTime: null,
+    TrialSiteKeyInfo: null,
+    PageIndex: 1,
+    PageSize: 20,
+    Asc: true,
+    SortField: "StartTime",
+  };
+};
+export default {
+  components: { BaseContainer, Pagination },
+  data() {
+    return {
+      moment,
+      searchData: searchDataDefault(),
+      list: [],
+      total: 0,
+      loading: false,
+      datetimerange: [],
+      calledAEList: [],
+      callingAEList: [],
+    };
+  },
+  created() {
+    this.getCalledAEList();
+    this.getCallingAEList();
+  },
+  mounted() {
+    this.getList();
+  },
+  methods: {
+    // 获取接收端AE列表
+    async getCalledAEList() {
+      try {
+        let params = {
+          TrialId: this.$route.query.trialId,
+        };
+        let res = await getDicomCalledAEList(params);
+        if (res.IsSuccess) {
+          this.calledAEList = res.Result;
+        }
+      } catch (err) {
+        console.log(err);
+      }
+    },
+    // 获取发送端端AE列表
+    async getCallingAEList() {
+      try {
+        let params = {
+          TrialId: this.$route.query.trialId,
+        };
+        let res = await getDicomCallingAEList(params);
+        if (res.IsSuccess) {
+          this.callingAEList = res.Result;
+        }
+      } catch (err) {
+        console.log(err);
+      }
+    },
+    getList() {
+      this.loading = true;
+      this.searchData.TrialId = this.$route.query.trialId;
+      getSCPImageUploadList(this.searchData)
+        .then((res) => {
+          this.loading = false;
+          this.list = res.Result.CurrentPageData;
+          this.total = res.Result.TotalCount;
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+    handleDatetimeChange(val) {
+      if (val) {
+        this.searchData.StartTime = val[0];
+        this.searchData.EndTime = val[1];
+      } else {
+        this.searchData.StartTime = "";
+        this.searchData.EndTime = "";
+      }
+    },
+    handleSearch() {
+      this.searchData.PageIndex = 1;
+      this.getList();
+    },
+    // 重置列表查询
+    handleReset() {
+      this.datetimerange = null;
+      this.handleDatetimeChange();
+      this.searchData = searchDataDefault();
+      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();
+    },
+  },
+};
+</script>
+      

src/views/trials/trials-panel/visit/crc-upload/index.vue

@@ -1045,7 +1045,7 @@ export default {
       formRow: {},
       searchData: searchDataDefault(),
       loading: false,
-      uploadVisible: false,
+      uploadVisible: true,
       qcVisible: false,
       list: [],
       total: 0,

src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue

@@ -1218,7 +1218,7 @@ import SignForm from "@/views/trials/components/newSignForm";
 import { getToken } from "@/utils/auth";
 import const_ from "@/const/sign-code";
 import uploadPetClinicalData from "@/views/trials/trials-panel/visit/crc-upload/components/uploadPetClinicalData.vue";
-import { downloadImage , resetFlag } from "@/utils/uploadZip.js";
+import { downloadImage } from "@/utils/uploadZip.js";
 export default {
   name: "QualityAssurance",
   components: {
@@ -1331,9 +1331,6 @@ export default {
       BodyPart: {},
     };
   },
-  beforeDestroy(){
-    resetFlag();
-  },
   async mounted() {
     this.BodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId);
     if (this.disabled) {

vue.config.js

@@ -25,8 +25,8 @@ module.exports = {
   devServer: {
     port: '8080',
     headers: {
-      'Cross-Origin-Opener-Policy': 'same-origin',
-      'Cross-Origin-Embedder-Policy': 'require-corp'
+      // 'Cross-Origin-Opener-Policy': 'same-origin',
+      // 'Cross-Origin-Embedder-Policy': 'require-corp'
     },
     // open: true,
     overlay: {