搜索条件

.env.development

@@ -15,7 +15,7 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = false
 VUE_APP_LOGIN_FOR_PERMISSION = false
 
 # 是否开启长时间无操作锁定弹框 true:是 false:否
-VUE_APP_LOCK_FOR_PERMISSION = true
+VUE_APP_LOCK_FOR_PERMISSION = false
 
 # 无操作锁定弹框判断时间 单位:秒
 VUE_APP_LOCK_FOR_TIME = 360

.env.production

@@ -10,10 +10,10 @@ VUE_APP_IS_TEST = true
 VUE_APP_LOGIN_FOR_PERMISSION = false
 
 # 是否开启长时间无操作锁定弹框 true:是 false:否
-VUE_APP_LOCK_FOR_PERMISSION = false
+VUE_APP_LOCK_FOR_PERMISSION = true
 
 # 无操作锁定弹框判断时间 单位:秒
-VUE_APP_LOCK_FOR_TIME = 900
+VUE_APP_LOCK_FOR_TIME = 360
 
 # 是否开启长时间无操作登出 true:是 false:否
 VUE_APP_LOGOUT_FOR_PERMISSION = false

src/App.vue

@@ -90,6 +90,7 @@ export default {
     openI18n() {
       this.tableData = []
       this.drawer = true
+      let arr = []
       let tableData = this.$tl.map(v => {
         let a = {...v}
         // if (!a.Description) {
@@ -101,7 +102,22 @@ export default {
         // return  ~this.$path.indexOf(v.Description + '_' + v.Code)
         return  ~this.$path.indexOf(v.Code)
       })
-      this.tableData = Object.assign([], tableData)
+      this.$path.forEach(v => {
+        let o = tableData.find(a => {
+          return a.Code === v
+        })
+        if (o) {
+          arr.push(o)
+        } else {
+          arr.push({
+            Code: v,
+            Description: null,
+            Value: null,
+            ValueCN: null
+          })
+        }
+      })
+      this.tableData = Object.assign([], arr)
       console.log(JSON.stringify(this.$path))
       console.log(JSON.stringify(this.tableData))
     }

src/main.js

@@ -242,7 +242,7 @@ async function VueInit () {
   Vue.prototype.$path = []
   var t = function (key) {
     // if (![Vue.prototype.toPath + '_' + key].includes(Vue.prototype.$path)) {
-    if (![key].includes(Vue.prototype.$path)) {
+    if (!~Vue.prototype.$path.indexOf(key)) {
       // Vue.prototype.$path.push(Vue.prototype.toPath + '_' + key)
       Vue.prototype.$path.push(key)
     }

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

@@ -55,6 +55,16 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item :label="$t('trials:signRecords:table:isSign')">
+          <el-select v-model="searchData.IsConfirmed" clearable style="width:120px;">
+            <el-option v-for="i of $d.YesOrNo" :key="'IsConfirmed' + i.label" :value="i.value" :label="i.label" />
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('trials:signRecords:table:isDeleted')">
+          <el-select v-model="searchData.IsDeleted" clearable style="width:120px;">
+            <el-option v-for="i of $d.YesOrNo" :key="'IsDeleted' + i.label" :value="i.value" :label="i.label" />
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <!-- 查询 -->
           <el-button icon="el-icon-search" type="primary" @click="handleSearch">
@@ -213,7 +223,9 @@ const searchDataDefault = () => {
     UserId: '',
     UserTypeId: '',
     PageIndex: 1,
-    PageSize: 20
+    PageSize: 20,
+    IsConfirmed: null,
+    IsDeleted: null
   }
 }
 export default {

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

@@ -24,6 +24,24 @@
             style="width:140px;"
           />
         </el-form-item>
+        <!-- 初审人 -->
+        <el-form-item :label="$t('trials:researchRecord:table:preliminaryUser')">
+          <el-input
+            v-model="searchData.PreliminaryUserName"
+            class="mr"
+            clearable
+            style="width:140px;"
+          />
+        </el-form-item>
+        <!-- 审核人 -->
+        <el-form-item :label="$t('trials:researchRecord:table:ReviewerUser')">
+          <el-input
+            v-model="searchData.ReviewerUserName"
+            class="mr"
+            clearable
+            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;">
@@ -287,7 +305,9 @@ const searchDataDefault = () => {
     UserKeyInfo: '',
     State: null,
     IsDeleted: '',
-    DateRange: []
+    DateRange: [],
+    PreliminaryUserName: null,
+    ReviewerUserName: null
   }
 }
 export default {

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

@@ -132,6 +132,11 @@
                   <el-option v-for="i of $d.MedicalReviewAuditState" :key="'AuditState' + i.label" :value="i.value" :label="i.label" />
                 </el-select>
               </el-form-item>
+              <el-form-item style="margin-bottom:10px" :label="$t('trials:medicalFeedback:table:DoctorUserIdeaEnum')">
+                <el-select v-model="searchData.DoctorUserIdeaEnum" clearable style="width:120px;">
+                  <el-option v-for="i of $d.MedicalReviewDoctorUserIdea" :key="'DoctorUserIdeaEnum' + i.label" :value="i.value" :label="i.label" />
+                </el-select>
+              </el-form-item>
               <el-form-item style="margin-bottom:10px">
                 <el-button
                   type="primary"
@@ -531,7 +536,8 @@ const searchDataDefault = () => {
     ReadingCategory: null,
     ReadingTaskState: null,
     AuditState: null,
-    TaskState: null
+    TaskState: null,
+    DoctorUserIdeaEnum: null
   }
 }
 export default {

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

@@ -68,6 +68,31 @@
             <el-option v-for="item of $d.MedicalReviewAuditState" :key="'AuditState' + item.label" :value="item.value" :label="item.label" />
           </el-select>
         </el-form-item>
+        <el-form-item style="margin-bottom:10px" :label="$t('trials:pmMedicalReview:table:mim')">
+          <el-select v-model="searchData.MedicalManagerUserId" clearable>
+            <el-option v-for="item of MIMOptions" :label="`${item.UserName}(${item.FullName})`" :value="item.UserId" :key="item.UserId" />
+          </el-select>
+        </el-form-item>
+        <el-form-item style="margin-bottom:10px" :label="$t('trials:pmMedicalReview:table:signTime')">
+          <el-date-picker
+            v-model="timeList"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            type="datetimerange"
+            :default-time="['00:00:00', '23:59:59']"
+            @change="changeTimeList"
+          />
+        </el-form-item>
+        <el-form-item style="margin-bottom:10px" :label="$t('trials:pmMedicalReview:table:auditAdvice')">
+          <el-select v-model="searchData.AuditAdviceEnum" clearable>
+            <el-option v-for="item of $d.AuditAdvice"  :key="'AuditAdvice' + item.label" :value="item.value" :label="item.label" />
+          </el-select>
+        </el-form-item>
+        <el-form-item style="margin-bottom:10px" :label="$t('trials:pmMedicalReview:table:whetherAgree')">
+          <el-select v-model="searchData.DoctorUserIdeaEnum" clearable>
+            <el-option v-for="item of $d.MedicalReviewDoctorUserIdea"  :key="'DoctorUserIdeaEnum' + item.label" :value="item.value" :label="item.label" />
+          </el-select>
+        </el-form-item>
+
         <el-form-item style="margin-bottom:10px">
           <el-button type="primary" icon="el-icon-search" @click="handleSearch">
             {{ $t('common:button:search') }}
@@ -427,7 +452,11 @@ const searchDataDefault = () => {
     BeginAllocateDate: null,
     EndAllocateDate: null,
     AuditState: null,
-    TrialReadingCriterionId: null
+    TrialReadingCriterionId: null,
+    BeginSignTime: null,
+    EndSignTime: null,
+    AuditAdviceEnum: null,
+    DoctorUserIdeaEnum: null
   }
 }
 export default {
@@ -459,7 +488,8 @@ export default {
       SelectMedicalList: [],
       distributionInfo: {},
       currentRow: {},
-      trialCriterionList:[]
+      trialCriterionList:[],
+      timeList:[]
     }
   },
   mounted() {
@@ -470,6 +500,15 @@ export default {
     this.getTrialCriterionList()
   },
   methods: {
+    changeTimeList() {
+      if (this.timeList) {
+        this.searchData.BeginSignTime = this.timeList[0]
+        this.searchData.EndSignTime = this.timeList[1]
+      } else {
+        this.searchData.BeginSignTime = null
+        this.searchData.EndSignTime = null
+      }
+    },
     handleExport() {
       getMedicalReviewTaskList_Export(this.searchData).then(res => {
       }).catch(() => { this.loading = false })

src/views/trials/trials-panel/reading/read-task/index.vue

@@ -25,7 +25,12 @@
                   <el-option v-for="i of $d.ReadingCategory" :key="'ReadingCategory' + i.label" :value="i.value" :label="i.label" />
                 </el-select>
               </el-form-item>
-
+              <!-- 是否加急 -->
+              <el-form-item style="margin-bottom:10px" :label="$t('trials:readTask:form:IsUrgent')">
+                <el-select v-model="searchData.IsUrgent" clearable style="width:120px;">
+                  <el-option v-for="i of $d.YesOrNo" :key="'IsUrgent' + i.label" :value="i.value" :label="i.label" />
+                </el-select>
+              </el-form-item>
               <el-form-item>
                 <!-- 查询 -->
                 <el-button type="primary" icon="el-icon-search" @click="handleSearch">
@@ -425,7 +430,8 @@ const searchDataDefault = () => {
     PageIndex: 1,
     PageSize: 20,
     TaskState: null,
-    ReadingCategory: null
+    ReadingCategory: null,
+    IsUrgent: null
   }
 }
 export default {

src/views/trials/trials-panel/reading/reading-tracking/index.vue

@@ -83,6 +83,16 @@
             @change="changeTimeList"
           />
         </el-form-item>
+        <!-- 分配时间 -->
+        <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewTrack:table:signTime')">
+          <el-date-picker
+            v-model="timeList2"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            type="datetimerange"
+            :default-time="['00:00:00', '23:59:59']"
+            @change="changeTimeList2"
+          />
+        </el-form-item>
         <el-form-item style="margin-bottom:10px">
           <el-button type="primary" icon="el-icon-search" @click="handleSearch">
             {{ $t('common:button:search') }}
@@ -904,7 +914,8 @@ const searchDataDefault = () => {
     EndAllocateDate: null,
     ReadingTaskState: null,
     CompleteClinicalDataEnum: null,
-
+    BeginSignTime: null,
+    EndSignTime: null
   }
 }
 export default {
@@ -964,6 +975,7 @@ export default {
       title: '',
       rowData: {},
       timeList: [],
+      timeList2: [],
       SubjectAssignList: [],
       SubjectAssignSelectList: [],
       TaskAllocationRuleSelectList: [],
@@ -1178,6 +1190,15 @@ export default {
         this.searchData.EndAllocateDate = null
       }
     },
+    changeTimeList2() {
+      if (this.timeList2) {
+        this.searchData.BeginSignTime = this.timeList2[0]
+        this.searchData.EndSignTime = this.timeList2[1]
+      } else {
+        this.searchData.BeginSignTime = null
+        this.searchData.EndSignTime = null
+      }
+    },
     changeUrgentStatus(row){
       this.rowData = {...row}
       this.urgentForm.VisitTaskId = row.Id

src/views/trials/trials-panel/reading/reread-task/index.vue

@@ -35,7 +35,21 @@
                   clearable
                 />
               </el-form-item>
-
+              <el-form-item :label="$t('trials:rereadTask:table:taskState')">
+                <el-select v-model="searchData.TaskState" clearable style="width:120px;">
+                  <el-option v-for="i of $d.TaskState" :key="'TaskState' + i.label" :value="i.value" :label="i.label" />
+                </el-select>
+              </el-form-item>
+              <el-form-item :label="$t('trials:rereadTask:table:readingCategory')">
+                <el-select v-model="searchData.ReadingCategory" clearable style="width:120px;">
+                  <el-option v-for="i of $d.ReadingCategory" :key="'ReadingCategory' + i.label" :value="i.value" :label="i.label" />
+                </el-select>
+              </el-form-item>
+              <el-form-item :label="$t('trials:rereadTask:table:requestReReadingResultEnum')">
+                <el-select v-model="searchData.RequestReReadingResultEnum" clearable style="width:120px;">
+                  <el-option v-for="i of $d.RequestReReadingResult" :key="'RequestReReadingResultEnum' + i.label" :value="i.value" :label="i.label" />
+                </el-select>
+              </el-form-item>
               <el-form-item>
                 <!-- 查询 -->
                 <el-button type="primary" icon="el-icon-search" @click="handleSearch">
@@ -272,7 +286,10 @@ const searchDataDefault = () => {
     SubjectCode: '',
     TaskCode: '',
     PageIndex: 1,
-    PageSize: 20
+    PageSize: 20,
+    TaskState: null,
+    ReadingCategory: null,
+    RequestReReadingResultEnum: null,
   }
 }
 export default {

src/views/trials/trials-panel/setting/attachment/index.vue

@@ -21,6 +21,20 @@
         <el-form-item :label="$t('trials:attachment:table:fileName')">
           <el-input v-model="searchData.Name" style="width:100px;" />
         </el-form-item>
+        <el-form-item :label="$t('trials:attachment:table:isDeleted')">
+          <el-select
+            clearable
+            v-model="searchData.IsDeleted"
+            style="width:150px;"
+          >
+            <el-option
+              v-for="item of $d.YesOrNo"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <!-- 查询 -->
           <el-button type="primary" icon="el-icon-search" @click="handleSearch">
@@ -200,7 +214,8 @@ const searchDataDefault = () => {
     PageIndex: 1,
     PageSize: 20,
     SortField: '',
-    Asc: false
+    Asc: false,
+    IsDeleted: null
   }
 }
 export default {

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

@@ -2,6 +2,13 @@
   <BaseContainer>
     <template slot="search-container">
       <el-form :inline="true">
+        <el-form-item :label="$t('trials:site:table:siteId')">
+          <el-input
+            v-model="searchData.TrialSiteCode"
+            style="width:130px;"
+            clearable
+          />
+        </el-form-item>
         <!-- 中心 -->
         <el-form-item :label="$t('trials:site:table:site')">
           <el-input
@@ -184,7 +191,8 @@ const searchDataDefault = () => {
     SortField: 'TrialSiteCode',
     Asc: true,
     PageIndex: 1,
-    PageSize: 20
+    PageSize: 20,
+    TrialSiteCode: null
   }
 }
 export default {

src/views/trials/trials-panel/subject/subject-list/index.vue

@@ -24,6 +24,11 @@
             <el-option v-for="item of $d.Subject_Visit_Status" :key="item.value" :value="item.value" :label="item.label" />
           </el-select>
         </el-form-item>
+        <el-form-item :label="$t('trials:subject:table:isMissingImages')">
+          <el-select v-model="searchData.IsMissingImages" clearable style="width:130px;">
+            <el-option v-for="item of $d.YesOrNo" :key="item.value" :value="item.value" :label="item.label" />
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <!-- 查询 -->
           <el-button type="primary" icon="el-icon-search" @click="handleSearch">
@@ -293,7 +298,8 @@ const searchDataDefault = () => {
     SiteId: '',
     ShortName: '',
     PageIndex: 1,
-    PageSize: 20
+    PageSize: 20,
+    IsMissingImages: null
   }
 }
 export default {

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

@@ -93,6 +93,14 @@
               <el-option v-for="item of $d.YesOrNo" v-show="item.raw.ValueCN !== '无'" :label="item.label" :value="item.value" :key="`IsSign${item.value}`"/>
             </el-select>
           </el-form-item>
+          <!-- 角色 -->
+          <el-form-item :label="$t('trials:auditRecord:table:role')">
+            <el-select v-model="searchData.RoleName" style="width:120px"  clearable>
+              <el-option v-for="item of $d.UserType" :label="item.label" :value="item.label" :key="`RoleName${item.value}`"/>
+            </el-select>
+<!--            <el-input v-model="searchData.RoleName" clearable/>-->
+<!--            RoleName-->
+          </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>
@@ -751,7 +759,8 @@ export default {
         Description: null,
         OpByUserName: null,
         BatchId: null,
-        TrialReadingCriterionId: null
+        TrialReadingCriterionId: null,
+        RoleName:null
       }
     }
     return {

src/views/trials/trials-panel/trial-summary/upload-monitor/index.vue

@@ -45,6 +45,23 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item :label="$t('trials:uploadMonitor:table:imageType')">
+          <el-select v-model="searchData.IsDicom" style="width:120px"  clearable>
+            <el-option v-for="item of $d.IsDicom" :label="item.label" :value="item.value" :key="`RoleName${item.value}`"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('trials:uploadMonitor:table:uploader')">
+          <el-input
+            v-model="searchData.Uploader"
+            style="width:120px;"
+            clearable
+          />
+        </el-form-item>
+        <el-form-item :label="$t('trials:uploadMonitor:table:uploadStatus')">
+          <el-select v-model="searchData.IsSuccess" style="width:120px"  clearable>
+            <el-option v-for="item of $d.YesOrNo" :label="item.label" :value="item.value" :key="`RoleName${item.value}`"/>
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <!-- 查询 -->
           <el-button type="primary" icon="el-icon-search" @click="handleSearch">
@@ -112,7 +129,7 @@
           sortable="custom"
         >
         <template slot-scope="scope">
-          {{scope.row.IsDicom?'DICOM':'Non-DICOM'}}
+          {{$fd('IsDicom', scope.row.IsDicom)}}
         </template>
         </el-table-column>
         <!-- 上传人 -->
@@ -268,6 +285,9 @@ const searchDataDefault = () => {
     SubjectVisitId:'',
     SubjectInfo:'',
     VisitPlanArray: [],
+    IsDicom: null,
+    Uploader: null,
+    IsSuccess: null
   }
 }
 export default {

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

@@ -58,9 +58,9 @@
           </el-select>
         </el-form-item>
         <!-- 是否重传 -->
-        <el-form-item :label="$t('trials:qcQuality:table:isReupload')">
+        <el-form-item :label="$t('trials:qcQuality:table:ReuploadEnum')">
-          <el-select v-model="searchData.NeedReUpload" clearable style="width:120px">
+          <el-select v-model="searchData.ReuploadEnum" clearable style="width:120px">
-            <el-option v-for="item of $d.YesOrNo" :value="item.value" :label="item.label" />
+            <el-option v-for="item of $d.ReuploadEnum" :value="item.value" :label="item.label" />
           </el-select>
         </el-form-item>
         <!-- 是否超限 -->
@@ -395,7 +395,8 @@ const searchDataDefault = () => {
     VisitPlanArray: [],
     IsClosed: null,
     PageIndex: 1,
-    PageSize: 20
+    PageSize: 20,
+    ReuploadEnum: null
   }
 }
 export default {