From 4b746ff678b16ffeaaada0987fa7f190c4f42180 Mon Sep 17 00:00:00 2001
From: bianyaqi <bianyaqi>
Date: Fri, 26 May 2023 14:24:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html                             |  3 +-
 src/components/patient-search/index.vue       | 20 ++++++-------
 .../subjectMgt/doctor/index.vue               | 30 +++++++++----------
 .../scientificManagement/subjectMgt/index.vue | 16 ++++++++--
 .../subjectMgt/patient-search/index.vue       |  6 ++++
 .../subjectMgt/patient-subject/index.vue      |  3 +-
 6 files changed, 47 insertions(+), 31 deletions(-)

diff --git a/public/index.html b/public/index.html
index f449c2f..58cd68b 100644
--- a/public/index.html
+++ b/public/index.html
@@ -39,8 +39,9 @@
   <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
     <script>
       //http://121.36.16.195:9002/huimu-admin/swagger-ui/index.html
-    window.SITE_CONFIG['apiURL'] = 'http://47.110.224.240:8036/xiangan-crf';
+    // window.SITE_CONFIG['apiURL'] = 'http://47.110.224.240:8036/xiangan-crf';
     // window.SITE_CONFIG['apiURL'] = 'http://192.168.0.167:8036/xiangan-crf';
+    window.SITE_CONFIG['apiURL'] = 'http://192.168.4.174:8036/xiangan-crf';
     </script>
   <% } %>
   <!-- 测试环境 -->
diff --git a/src/components/patient-search/index.vue b/src/components/patient-search/index.vue
index e8fef43..bf74278 100644
--- a/src/components/patient-search/index.vue
+++ b/src/components/patient-search/index.vue
@@ -67,14 +67,14 @@
         </div>
       </el-card>
       <!-- 底部全选反选 -->
-<!--      <checked-footer ref="checkfooter" table-ref="multipleTable" :current-table-list="currentTableList" :data-list="dataList">-->
-<!--        <div class="batch_button">-->
-<!--          <div class="batch_button">-->
-<!--            <el-button type="primary" size="small" :disabled="currentTableList.length > 0 ? false :true">加入分组-->
-<!--            </el-button>-->
-<!--          </div>-->
-<!--        </div>-->
-<!--      </checked-footer>-->
+      <!--      <checked-footer ref="checkfooter" table-ref="multipleTable" :current-table-list="currentTableList" :data-list="dataList">-->
+      <!--        <div class="batch_button">-->
+      <!--          <div class="batch_button">-->
+      <!--            <el-button type="primary" size="small" :disabled="currentTableList.length > 0 ? false :true">加入分组-->
+      <!--            </el-button>-->
+      <!--          </div>-->
+      <!--        </div>-->
+      <!--      </checked-footer>-->
     </div>
     <detail-view v-if="detailViewVisible" ref="viewRef" :only-read="onlyRead" :is-search="'1'" :patient-id="patientId" @detailViewVisible="detailViewVisible=false" />
   </div>
@@ -220,9 +220,6 @@ export default {
 </script>
 
 <style lang='scss' scoped>
-.project-main{
-  height: 100%;
-}
 .search-wrapper-top {
   display: flex;
   align-items: center;
@@ -252,6 +249,7 @@ export default {
 
 <style lang="scss">
 .project-main {
+  height: 100%;
   .search-wrapper-top {
     .el-form-item__content {
       width: 100%;
diff --git a/src/page-subspecialty/views/modules/scientificManagement/subjectMgt/doctor/index.vue b/src/page-subspecialty/views/modules/scientificManagement/subjectMgt/doctor/index.vue
index 7b0fc18..642d97b 100644
--- a/src/page-subspecialty/views/modules/scientificManagement/subjectMgt/doctor/index.vue
+++ b/src/page-subspecialty/views/modules/scientificManagement/subjectMgt/doctor/index.vue
@@ -26,29 +26,29 @@
         <el-table-column prop="mobile" label="手机号" header-align="center" align="center" />
         <el-table-column prop="roleNameList" label="角色" header-align="center" align="center">
           <template slot-scope="scope">
-            <div v-if="scope.row.roleNameList.length>0">
+            <div v-if="scope.row.roleNameList && scope.row.roleNameList.length>0">
               <p v-for="(item,index) in scope.row.roleNameList" :key="index" style="margin:0">{{ item }}
               </p>
             </div>
           </template>
         </el-table-column>
-<!--        <el-table-column prop="status" label="状态" header-align="center" align="center">-->
-<!--          <template slot-scope="scope">-->
-<!--            <span-->
-<!--              :class="scope.row.status=='1' ? 'state-circle state-circle-green' :'state-circle state-circle-red'"-->
-<!--            />-->
-<!--            <span>{{ scope.row.status == '1' ? '正常':'停用' }}</span>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
+        <!--        <el-table-column prop="status" label="状态" header-align="center" align="center">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <span-->
+        <!--              :class="scope.row.status=='1' ? 'state-circle state-circle-green' :'state-circle state-circle-red'"-->
+        <!--            />-->
+        <!--            <span>{{ scope.row.status == '1' ? '正常':'停用' }}</span>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
         <el-table-column prop="operation" label="操作" header-align="center" align="center">
           <template slot-scope="scope">
             <span v-if="opPermission(scope.row)">
-<!--              <el-dropdown trigger="click" @command="handleRoleCommand(scope.row,$event)">-->
-<!--                <span class="el-dropdown-link" style="padding-right:8px;cursor: pointer;">更改角色</span>-->
-<!--                <el-dropdown-menu slot="dropdown">-->
-<!--                  <el-dropdown-item v-for="item in roleList" :key="item.roleId" :command="item.id">{{ item.name }}</el-dropdown-item>-->
-<!--                </el-dropdown-menu>-->
-<!--              </el-dropdown>-->
+              <!--              <el-dropdown trigger="click" @command="handleRoleCommand(scope.row,$event)">-->
+              <!--                <span class="el-dropdown-link" style="padding-right:8px;cursor: pointer;">更改角色</span>-->
+              <!--                <el-dropdown-menu slot="dropdown">-->
+              <!--                  <el-dropdown-item v-for="item in roleList" :key="item.roleId" :command="item.id">{{ item.name }}</el-dropdown-item>-->
+              <!--                </el-dropdown-menu>-->
+              <!--              </el-dropdown>-->
               <span
                 style="color:#FF4D4F"
                 class="operation-delete"
diff --git a/src/page-subspecialty/views/modules/scientificManagement/subjectMgt/index.vue b/src/page-subspecialty/views/modules/scientificManagement/subjectMgt/index.vue
index 6dd4442..d4a4a74 100644
--- a/src/page-subspecialty/views/modules/scientificManagement/subjectMgt/index.vue
+++ b/src/page-subspecialty/views/modules/scientificManagement/subjectMgt/index.vue
@@ -8,13 +8,13 @@
         <doctor />
       </el-tab-pane>
       <el-tab-pane label="eCRF管理" name="third">
-        <eCrf></eCrf>
+        <eCrf />
       </el-tab-pane>
       <el-tab-pane label="受试者管理" name="fourth">
-        <patientSubject></patientSubject>
+        <patientSubject />
       </el-tab-pane>
       <el-tab-pane label="日志" name="five">
-        <operateLog></operateLog>
+        <operateLog />
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -46,5 +46,15 @@ export default {
 
 <style lang='scss' scoped>
 .template-container {
+  height: 100%;
+}
+.el-tabs--top{
+  height: 100%;
+}
+::v-deep .el-tab-pane{
+  height: 100%;
+}
+::v-deep .el-tabs__content{
+  height: calc(100% - 50px);
 }
 </style>
diff --git a/src/page-subspecialty/views/modules/scientificManagement/subjectMgt/patient-search/index.vue b/src/page-subspecialty/views/modules/scientificManagement/subjectMgt/patient-search/index.vue
index e3694f4..ac74f15 100644
--- a/src/page-subspecialty/views/modules/scientificManagement/subjectMgt/patient-search/index.vue
+++ b/src/page-subspecialty/views/modules/scientificManagement/subjectMgt/patient-search/index.vue
@@ -32,6 +32,7 @@ export default {
     }
   },
   created() {
+    this.projectId = this.$route.query.projectId
     this.getSubjectIdNumberList()
   },
   mounted() {
@@ -69,3 +70,8 @@ export default {
   }
 }
 </script>
+<style lang='scss' scoped>
+.search{
+  height: 100%;
+}
+</style>
diff --git a/src/page-subspecialty/views/modules/scientificManagement/subjectMgt/patient-subject/index.vue b/src/page-subspecialty/views/modules/scientificManagement/subjectMgt/patient-subject/index.vue
index 360f5a8..46df657 100644
--- a/src/page-subspecialty/views/modules/scientificManagement/subjectMgt/patient-subject/index.vue
+++ b/src/page-subspecialty/views/modules/scientificManagement/subjectMgt/patient-subject/index.vue
@@ -69,7 +69,7 @@
           </el-table-column>
           <el-table-column label="分组信息" header-align="center" align="center">
             <template slot-scope="scope">
-              <div v-show="scope.row.groupList.length > 0">
+              <div v-show="scope.row.groupList && scope.row.groupList.length > 0">
                 <span v-for="item in scope.row.groupList" :key="item.id">{{ item.name }}</span>
               </div>
             </template>
@@ -325,6 +325,7 @@ export default {
     this.refresh()
   },
   created() {
+    this.formGroup.projectId = this.$route.query.projectId
     this.getDataList()
     this.getGroupList()
   },