阅片跟踪反馈弹窗添加确认取消

src/components/feedBack/index.vue

@@ -124,12 +124,12 @@
             :active-text="$fd('FeedBackStatus', 1)"
             :inactive-text="$fd('FeedBackStatus', 0)"
             :disabled="level < 8 || !isStateChange || form.State === 1"
-            @change="changeState"
+            @change="visitTaskId ? () => false : changeState"
           >
           </el-switch>
         </el-form-item>
       </el-form>
-      <div slot="footer" v-if="type !== 'detail'">
+      <div slot="footer" v-if="type !== 'detail' || visitTaskId">
         <!-- 取消 -->
         <el-button size="small" @click.stop="cancel">
           {{ $t("feedBack:button:cancel") }}
@@ -138,7 +138,7 @@
         <el-button
           type="primary"
           size="small"
-          @click.stop="save"
+          @click.stop="visitTaskId ? changeState : save"
           :loading="loading"
         >
           {{ $t("feedBack:button:save") }}
@@ -290,7 +290,7 @@ export default {
       try {
         let data = {
           IdList: [this.Id],
-          State: 1,
+          State: this.form.State,
         };
         let res = await batchUpdateFeedBackState(data);
         if (res.IsSuccess) {

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

@@ -65,6 +65,7 @@
         <el-form-item
           :label="$t('trials:dicomCfg:form:IsTestOK')"
           prop="IsTestOK"
+          style="position: relative"
         >
           <el-tag
             :type="form.IsTestOK ? 'success' : 'danger'"
@@ -73,21 +74,22 @@
           >
             {{ $fd("DicomTest", form.IsTestOK) }}
           </el-tag>
+          <!-- 测试DICOM AE -->
+          <el-button
+            v-if="
+              isEdit &&
+              hasPermi(['trials:trials-panel:setting:trial-config:save']) &&
+              form.IsPACSConnect
+            "
+            type="primary"
+            style="position: absolute; right: 100px; top: 0"
+            @click.stop="testSCPServerConnect"
+          >
+            {{ $t("common:button:DicomTest") }}
+          </el-button>
         </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="