src/api/trials.js

@@ -3794,20 +3794,3 @@ export function getDicomCallingAEList(params) {
     params
   })
 }
-// CRCpacs上传检查列表
-export function getVisitPatientStudyFilterList(data) {
-  return request({
-    url: `/Patient/getVisitPatientStudyFilterList`,
-    method: 'post',
-    data
-  })
-}
-// CRCpacs上传检查
-export function submitVisitStudyBinding(data) {
-  return request({
-    url: `/Patient/submitVisitStudyBinding`,
-    method: 'post',
-    data
-  })
-}
-

src/views/system/login-log/index.vue

@@ -85,13 +85,13 @@
           sortable="custom"
           show-overflow-tooltip
         />
-        <el-table-column
+        <!-- <el-table-column
           :label="$t('trials:loginLog:table:IPRegion')"
           prop="IPRegion"
           min-width="120"
           show-overflow-tooltip
           sortable="custom"
-        />
+        /> -->
         <el-table-column
           :label="$t('system:loginLog:table:LoginFaildName')"
           prop="LoginFaildName"

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

@@ -573,12 +573,7 @@
         name="pacs"
         :disabled="btnLoading"
       >
-        <uploadDicomPacs
+        <uploadDicomPacs v-if="uploadActiveName === 'pacs'" />
-          v-if="uploadActiveName === 'pacs'"
-          :subjectVisitId="subjectVisitId"
-          :subjectId="subjectId"
-          @getList="getParentList"
-        />
       </el-tab-pane>
     </el-tabs>
     <!-- 预览影像模态框 -->
@@ -813,7 +808,7 @@ export default {
   },
   data() {
     return {
-      uploadActiveName: "pacs",
+      uploadActiveName: "file",
       editStudyInfoVisible: false,
       studyForm: {
         StudyCode: "",
@@ -881,9 +876,6 @@ export default {
     store.dispatch("trials/setUnLock", false);
   },
   methods: {
-    getParentList() {
-      this.$emit("getList");
-    },
     handleHistorical(row) {
       this.$router.push(
         `/trials/trials-panel/trial-summary/upload-monitor?trialId=${this.trialId}&trialCode=${this.$route.query.trialCode}&${this.$route.query.researchProgramNo}&studyCode=${row.StudyCode}`

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

@@ -2,11 +2,9 @@
   <BaseContainer>
     <template slot="search-container">
       <el-form :inline="true">
-        <!--患者信息-->
+        <!--所在中心-->
         <el-form-item
-          :label="
+          :label="$t('trials:pushRecord:table:trialSiteKeyInfo')"
-            $t('trials:visit:crcUpload:uploadDicomPacs:search:patientInfo')
-          "
           prop="TrialSiteKeyInfo"
         >
           <el-input
@@ -17,28 +15,50 @@
             :placeholder="$t('trials:pushRecord:placeholder:trialSiteKeyInfo')"
           />
         </el-form-item>
-        <!--检查技术-->
+        <!--接收端AE-->
         <el-form-item
-          :label="
+          :label="$t('trials:pushRecord:table:calledAE')"
-            $t('trials:visit:crcUpload:uploadDicomPacs:search:modalities')
-          "
           prop="CalledAE"
         >
-          <el-input
+          <el-select
-            v-model="searchData.Modalities"
+            v-model="searchData.CalledAE"
-            size="small"
             clearable
-            style="width: 150px"
+            style="width: 120px"
-          />
-        </el-form-item>
-        <!--检查日期-->
-        <el-form-item
-          :label="$t('trials:visit:crcUpload:uploadDicomPacs:search:studyTime')"
           >
+            <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"
           />
@@ -55,15 +75,6 @@
           >
             {{ $t("common:button:reset") }}
           </el-button>
-          <!-- 添加 -->
-          <el-button
-            type="primary"
-            icon="el-icon-plus"
-            :disabled="tableSelectData.length <= 0"
-            @click="handleAddList"
-          >
-            {{ $t("common:button:add") }}
-          </el-button>
         </el-form-item>
       </el-form>
     </template>
@@ -74,41 +85,49 @@
         height="100"
         :data="list"
         class="table"
-        @selection-change="handleSelectChange"
         @sort-change="handleSortByColumn"
-        :default-sort="{ prop: 'studyTime', order: 'descending' }"
+        :default-sort="{ prop: 'StartTime', order: 'descending' }"
       >
-        <el-table-column type="selection" align="center" width="45" />
         <el-table-column type="index" width="50" />
-        <!--病历号-->
+        <!--中心编号-->
         <el-table-column
-          :label="$t('trials:visit:crcUpload:uploadDicomPacs:table:patientId')"
+          :label="$t('trials:pushRecord:table:trialSiteCode')"
-          prop="PatientIdStr"
+          prop="TrialSiteCode"
           min-width="160"
           show-overflow-tooltip
           sortable="custom"
         />
-        <!--患者姓名-->
+        <!--中心名称-->
         <el-table-column
-          :label="
+          :label="$t('trials:pushRecord:table:trialSiteAliasName')"
-            $t('trials:visit:crcUpload:uploadDicomPacs:table:patientName')
+          prop="TrialSiteAliasName"
-          "
+          min-width="160"
-          prop="PatientName"
+          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:visit:crcUpload:uploadDicomPacs:table:patientSex')"
+          :label="$t('trials:pushRecord:table:callingAEIP')"
-          prop="PatientSex"
+          prop="CallingAEIP"
           min-width="160"
           show-overflow-tooltip
           sortable="custom"
         />
-        <!--出生日期-->
+        <!--接收端AE-->
         <el-table-column
-          :label="$t('trials:visit:crcUpload:uploadDicomPacs:table:patientSex')"
+          :label="$t('trials:pushRecord:table:calledAEList')"
           prop="CalledAEList"
           min-width="90"
           show-overflow-tooltip
@@ -118,47 +137,46 @@
           </template>
         </el-table-column>
 
-        <!--检查信息-->
+        <!--检查数-->
         <el-table-column
-          :label="$t('trials:visit:crcUpload:uploadDicomPacs:table:modalities')"
+          :label="$t('trials:pushRecord:table:studyCount')"
-          prop="Modalities"
+          prop="StudyCount"
-          min-width="160"
-          show-overflow-tooltip
-          sortable="custom"
-        />
-        <!--检查日期-->
-        <el-table-column
-          :label="$t('trials:visit:crcUpload:uploadDicomPacs:table:studyTime')"
-          prop="StudyTime"
           min-width="160"
           show-overflow-tooltip
           sortable="custom"
         />
         <!--图像数量-->
         <el-table-column
-          :label="
+          :label="$t('trials:pushRecord:table:fileCount')"
-            $t('trials:visit:crcUpload:uploadDicomPacs:table:instanceCount')
+          prop="FileCount"
-          "
-          prop="InstanceCount"
           min-width="160"
           show-overflow-tooltip
           sortable="custom"
         />
+        <!--图像大小-->
         <el-table-column
-          :label="$t('common:action:action')"
+          :label="$t('trials:pushRecord:table:fileSize')"
-          min-width="260"
+          prop="FileSize"
-          fixed="right"
+          min-width="160"
-        >
+          show-overflow-tooltip
-          <template slot-scope="scope">
+          sortable="custom"
-            <!-- 添加 -->
+        />
-            <el-button
+        <!--推送开始时间-->
-              icon="el-icon-view"
+        <el-table-column
-              :title="$t('common:button:add')"
+          :label="$t('trials:pushRecord:table:startTime')"
-              circle
+          prop="StartTime"
-              @click="handleAdd(scope.row)"
+          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"
         />
-          </template>
-        </el-table-column>
       </el-table>
       <!-- 分页组件 -->
       <pagination
@@ -173,17 +191,20 @@
 </template>
       <script>
 import {
-  getVisitPatientStudyFilterList,
+  getSCPImageUploadList,
-  submitVisitStudyBinding,
+  getDicomCalledAEList,
+  getDicomCallingAEList,
 } from "@/api/trials";
 import BaseContainer from "@/components/BaseContainer";
 import Pagination from "@/components/Pagination";
 import moment from "moment";
 const searchDataDefault = () => {
   return {
-    EarliestStudyTime: null,
+    CallingAE: null,
-    LatestStudyTime: null,
+    CalledAE: null,
-    Modalities: null,
+    StartTime: null,
+    EndTime: null,
+    TrialSiteKeyInfo: null,
     PageIndex: 1,
     PageSize: 20,
     Asc: true,
@@ -192,16 +213,6 @@ const searchDataDefault = () => {
 };
 export default {
   components: { BaseContainer, Pagination },
-  props: {
-    subjectVisitId: {
-      type: String,
-      required: true,
-    },
-    subjectId: {
-      type: String,
-      required: true,
-    },
-  },
   data() {
     return {
       moment,
@@ -210,59 +221,50 @@ export default {
       total: 0,
       loading: false,
       datetimerange: [],
-      tableSelectData: [],
+      calledAEList: [],
+      callingAEList: [],
     };
   },
+  created() {
+    this.getCalledAEList();
+    this.getCallingAEList();
+  },
   mounted() {
     this.getList();
   },
   methods: {
-    handleAddList() {
+    // 获取接收端AE列表
-      if (this.tableSelectData.length < 0)
+    async getCalledAEList() {
-        return this.$message.warning(
-          this.$t("trials:visit:crcUpload:uploadDicomPacs:message:notCheck")
-        );
-      let arr = this.tableSelectData.map((item) => item.ScpStudyId);
-      this.submitVisitStudyBinding(arr);
-    },
-    handleAdd(row) {
-      let arr = [row.ScpStudyId];
-      this.submitVisitStudyBinding(arr);
-    },
-    // 添加检查
-    async submitVisitStudyBinding(arr) {
       try {
-        let data = {
+        let params = {
           TrialId: this.$route.query.trialId,
-          SubjectVisitId: this.subjectVisitId,
-          SubjectId: this.subjectId,
-          ScpStudyIdList: arr,
         };
-        this.loading = true;
+        let res = await getDicomCalledAEList(params);
-        let res = await submitVisitStudyBinding(data);
-        this.loading = false;
         if (res.IsSuccess) {
-          this.getList();
+          this.calledAEList = res.Result;
-          this.$emit("getList");
         }
       } catch (err) {
-        this.loading = false;
         console.log(err);
       }
     },
-    // 表格选择
+    // 获取发送端端AE列表
-    handleSelectChange(selection) {
+    async getCallingAEList() {
-      // console.log(selection, "handleSelectChange");
+      try {
-      this.tableSelectData = selection;
+        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;
-      let data = {
+      this.searchData.TrialId = this.$route.query.trialId;
-        SubjectVisitId: this.subjectVisitId,
+      getSCPImageUploadList(this.searchData)
-        SubjectId: this.subjectId,
-        ...this.searchData,
-      };
-      getVisitPatientStudyFilterList(data)
         .then((res) => {
           this.loading = false;
           this.list = res.Result.CurrentPageData;
@@ -274,11 +276,11 @@ export default {
     },
     handleDatetimeChange(val) {
       if (val) {
-        this.searchData.EarliestStudyTime = val[0];
+        this.searchData.StartTime = val[0];
-        this.searchData.LatestStudyTime = val[1];
+        this.searchData.EndTime = val[1];
       } else {
-        this.searchData.EarliestStudyTime = "";
+        this.searchData.StartTime = "";
-        this.searchData.LatestStudyTime = "";
+        this.searchData.EndTime = "";
       }
     },
     handleSearch() {

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

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

vue.config.js

@@ -63,8 +63,8 @@ module.exports = {
         // target: 'http://123.56.94.154:8079', // 国内测试环境2
         // target: 'http://123.56.94.154:7000', // 国内测试环境2
         // target: 'http://123.56.94.154:30668',
-        target: 'http://106.14.89.110:30000',
+        // target: 'http://106.14.89.110:30000',
-        // target: 'http://47.117.164.182:7010', // uat
+        target: 'http://47.117.164.182:7010', // uat
         // target: 'http://123.56.181.144:7000',
         changeOrigin: true,
         secure: false,