From 426faba24c6646752f20ed5a74b5a74651559a97 Mon Sep 17 00:00:00 2001
From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com>
Date: Wed, 24 Jul 2024 14:29:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8F=96=E6=B6=88=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=95=B0=E6=8D=AE=E9=87=8D=E7=BD=AE=E3=80=81=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5=E9=83=A8=E4=BD=8D=E7=BC=96=E8=BE=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trial-config/components/dicomConfig.vue   | 17 +++++++++++++++++
 .../trial-config/components/logicalConfig.vue | 19 ++++++++++++++++---
 .../trial-config/components/urgentConfig.vue  |  7 ++++++-
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/src/views/trials/trials-panel/setting/trial-config/components/dicomConfig.vue b/src/views/trials/trials-panel/setting/trial-config/components/dicomConfig.vue
index b71b9fa0..23c903d4 100644
--- a/src/views/trials/trials-panel/setting/trial-config/components/dicomConfig.vue
+++ b/src/views/trials/trials-panel/setting/trial-config/components/dicomConfig.vue
@@ -134,6 +134,18 @@
         >
           {{ $t("trials:trialCfg:button:updateAndConfirm") }}
         </el-button>
+        <!-- 取消 -->
+        <el-button
+          v-if="
+            form.IsTrialPACSConfirmed === true &&
+            isEdit &&
+            hasPermi(['trials:trials-panel:setting:trial-config:save'])
+          "
+          type="primary"
+          @click.stop="confirmCancel"
+        >
+          {{ $t("common:button:cancel") }}
+        </el-button>
       </el-form-item>
     </el-form>
     <!-- 配置信息签名框 -->
@@ -377,6 +389,11 @@ export default {
     initForm(res) {
       this.getInfo();
     },
+    // 取消配置更新
+    confirmCancel() {
+      this.isEdit = false;
+      this.form = { ...this.initialForm };
+    },
     // 测试dicomAE
     async testSCPServerConnect() {
       try {
diff --git a/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue b/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue
index 854c399b..3d0117f0 100644
--- a/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue
+++ b/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue
@@ -270,7 +270,7 @@
             hasPermi(['trials:trials-panel:setting:trial-config:save'])
           "
           type="primary"
-          @click="isEdit = false"
+          @click="confirmCancel"
         >
           {{ $t("common:button:cancel") }}
         </el-button>
@@ -928,6 +928,11 @@ export default {
   //   this.getTrialBodyPartList();
   // },
   methods: {
+    // 取消配置更新
+    confirmCancel() {
+      this.isEdit = false;
+      this.form = { ...this.initialForm };
+    },
     handleConfirmModality() {
       this.form.ModalityList = Object.assign(
         [],
@@ -983,6 +988,12 @@ export default {
                 );
                 this.$refs.bodyPartTable.toggleRowSelection(obj[0]);
               });
+              var bodyPartTypes = this.form.BodyPartTypeList.map((i) => {
+                return this.changeBodyPart(i.trim());
+              });
+              this.form.BodyPartTypes = bodyPartTypes
+                .toString()
+                .replaceAll(",", " | ");
             }
           }
           return true;
@@ -1006,8 +1017,9 @@ export default {
           NameCN: str,
           TrialId: this.$route.query.trialId,
         };
-        if(this.addBodyPartForm.Id){
+        if (this.addBodyPartForm.Id) {
           data.Id = this.addBodyPartForm.Id;
+          data.Code = this.addBodyPartForm.Code;
         }
         let res = await addOrUpdateTrialBodyPart(data);
         if (res.IsSuccess) {
@@ -1029,7 +1041,8 @@ export default {
     },
     // 编辑检查部位
     handleEditBodyPart(item) {
-      this.addBodyPartForm.bodyPartStr = item.Code;
+      this.addBodyPartForm.bodyPartStr = item.Name;
+      this.addBodyPartForm.Code = item.Code;
       this.addBodyPartForm.Id = item.Id;
       this.addBodyPart_model.title = this.$t("trials:setting:button:edit");
       this.addBodyPart_model.visible = true;
diff --git a/src/views/trials/trials-panel/setting/trial-config/components/urgentConfig.vue b/src/views/trials/trials-panel/setting/trial-config/components/urgentConfig.vue
index 7ecedc31..f8021e39 100644
--- a/src/views/trials/trials-panel/setting/trial-config/components/urgentConfig.vue
+++ b/src/views/trials/trials-panel/setting/trial-config/components/urgentConfig.vue
@@ -83,7 +83,7 @@
         <el-button
           v-if="form.IsTrialUrgentConfirmed === true && isEdit && hasPermi(['trials:trials-panel:setting:trial-config:save'])"
           type="primary"
-          @click="isEdit = false"
+          @click="confirmCancel"
         >
           {{ $t('common:button:cancel') }}
         </el-button>
@@ -238,6 +238,11 @@ export default {
     }
   },
   methods: {
+    // 取消配置更新
+    confirmCancel() {
+      this.isEdit = false;
+      this.form = { ...this.initialForm }; 
+    },
     // 配置信息保存
     handleSave() {
       this.$refs['urgentConfigForm'].validate((valid) => {