Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main

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/personnel-manage/components/dicomAEList.vue

@@ -1,30 +1,66 @@
 <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'">
+      <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
+        <el-table-column
-          min-width="120" />
+          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
+        <el-table-column
-          min-width="120" />
+          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
+        <el-table-column
-          min-width="120" />
+          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')"
+        <el-table-column
-          show-overflow-tooltip min-width="120" />
+          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">
+        <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"
+            <el-button
-              :disabled="scope.row.IsDeleted" @click="delDicom(scope.row)" />
+              circle
+              :title="$t('trials:sitesList:dicomAEList:action:edit')"
+              icon="el-icon-edit-outline"
+              @click="editDicom(scope.row)"
+            />
+            <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-column>
-
       </el-table>
       <dicomForm ref="dicomForm" @getList="getList" @save="save" />
     </template>
@@ -33,10 +69,7 @@
 <script>
 import BaseModel from "@/components/BaseModel";
 import dicomForm from "./dicomForm.vue";
-import {
+import { getTrialSiteDicomAEList, deleteTrialSiteDicomAE } from "@/api/trials";
-  getTrialSiteDicomAEList,
-  deleteTrialSiteDicomAE
-} from "@/api/trials";
 const defaultSearchData = () => {
   return {
     TrialSiteId: null,
@@ -55,7 +88,7 @@ export default {
         visible: false,
         title: null,
         width: "800px",
-        appendToBody: true
+        appendToBody: true,
       },
       status: "add",
       TrialSiteId: null,
@@ -93,11 +126,15 @@ export default {
     },
     // 新增
     openAdd() {
-      this.$refs.dicomForm.open(this.siteData, null, 'add');
+      this.$refs.dicomForm.open(this.siteData, null, "add");
     },
     save() {
-      this.$emit('getList')
+      this.$emit("getList");
     },
+    // 修改dicom
+    editDicom(row) {
+      this.$refs.dicomForm.open(this.siteData, row, "edit");
+    },  
     // 删除dicom
     async delDicom(row) {
       try {
@@ -115,12 +152,12 @@ export default {
         if (res.IsSuccess) {
           this.getList();
           this.save();
-          this.$t('common:message:deletedSuccessfully');
+          this.$t("common:message:deletedSuccessfully");
         }
       } catch (err) {
         console.log(err);
       }
-    }
+    },
   },
 };
 </script>

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

@@ -3,33 +3,50 @@
     <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-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-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-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-form-item :label="$t('trials:setting:siteList:dicomForm: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-form-item :label="$t('trials:setting:siteList:dicomForm: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-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">
+      <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">
@@ -39,9 +56,7 @@
   </base-model>
 </template>
 <script>
-import {
+import { addOrUpdateTrialSiteDicomAE } from "@/api/trials";
-  addOrUpdateTrialSiteDicomAE,
-} from "@/api/trials";
 import BaseModel from "@/components/BaseModel";
 export default {
   name: "dicomForm",
@@ -59,7 +74,7 @@ export default {
         CallingAE: null,
         Ip: null,
         Port: null,
-        Description: null
+        Description: null,
       },
       rules: {
         CallingAE: [
@@ -139,21 +154,25 @@ export default {
       },
       siteData: {},
       loading: false,
-      status: 'add'
+      status: "add",
     };
   },
   methods: {
-    open(siteData, data = null, status = 'add') {
+    open(siteData, data = null, status = "add") {
       this.siteData = siteData;
       this.status = status;
       if (data) {
-        Object.keys(this.form).forEach(key => {
+        Object.keys(this.form).forEach((key) => {
           this.form[key] = data[key];
-        })
+        });
+        this.form.Ip = data.IP;
       }
       this.config.title = this.$t(
         "trials:trials-panel:setting:personnel-manage:dicomAETitle"
-      ).replace("xxx", `${siteData.TrialSiteCode}、${siteData.TrialSiteAliasName}`);
+      ).replace(
+        "xxx",
+        `${siteData.TrialSiteCode}、${siteData.TrialSiteAliasName}`
+      );
       this.config.visible = true;
     },
     // 保存
@@ -167,8 +186,10 @@ export default {
         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.status === "add"
-          this.$emit('getList');
+            ? this.$t("common:message:savedSuccessfully")
+            : this.$t("common:message:savedFail");
+          this.$emit("getList");
           this.$emit("save");
           this.config.visible = false;
         }
@@ -176,8 +197,8 @@ export default {
         console.log(err);
         this.loading = false;
       }
-    }
+    },
-  }
+  },
 };
 </script>
 <style lang="scss" scoped></style>

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="

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

@@ -258,7 +258,7 @@ const searchDataDefault = () => {
     TrialSiteKeyInfo: null,
     PageIndex: 1,
     PageSize: 20,
-    Asc: true,
+    Asc: false,
     SortField: "LatestPushTime",
   };
 };

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

@@ -208,7 +208,7 @@ const searchDataDefault = () => {
     TrialSiteKeyInfo: null,
     PageIndex: 1,
     PageSize: 20,
-    Asc: true,
+    Asc: false,
     SortField: "StartTime",
   };
 };