Merge remote-tracking branch 'origin/master'

src/views/medical-record-management/medical-record-management.vue

@@ -110,11 +110,11 @@
       </el-form>
 
       <el-table
+        ref="table"
         v-loading="loading"
         :data="recordList"
         :header-cell-style="{background:'#E8E9E8'}"
         border
-        ref="table"
         @selection-change="handleSelectionChange"
       >
         <el-table-column align="center" type="selection" width="55"/>
@@ -292,7 +292,7 @@ export default {
      */
     async changeTableSelect(notIncludeIds = []) {
       // 获取反选的数据
-      //需要一个可以根据条件和params.notIncludeIds排除部分数据的不分页查询的接口
+      // 需要一个可以根据条件和params.notIncludeIds排除部分数据的不分页查询的接口
       const { data } = await listAllArticle({
         ...this.queryParams,
         params: {
@@ -334,7 +334,7 @@ export default {
       this.loading = true
       listRecord(this.queryParams).then(response => {
         console.log('病历列表的数据：', response)
-        this.recordList = response.rows
+        this.recordList = response.rows.rows
         console.log('这是病历，我要开始取字段了！', this.recordList)
         this.total = response.total
         this.loading = false

src/views/service-management/registration-queue/registration-queue.vue

@@ -364,6 +364,7 @@ export default {
         console.log('这是我要调的挂号列表内容：', this.registerList)
         this.total = response.total
         this.loading = false
+        this.manualCheck()
       })
     },
     // 取消按钮
@@ -458,6 +459,8 @@ export default {
     },
     // 反向选择(把永久临时集合和变化的临时集合做减法重新赋给变化的临时集合赋给)
     reverseSelection() {
+      console.log('永久的集合', this.registerIdsForever)
+      console.log('临时集合', this.registerEmptyIds)
       if (this.isCheckAll) {
         this.registerEmptyIds = this.registerIdsForever.filter(id => !this.registerIds.includes(id))
       } else {
@@ -501,10 +504,10 @@ export default {
         // 重置选择
         .then(_ => this.effectTableSelect([]))
     },
-    /** 列表区--多选框选中数据 */
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-    },
+    // /** 列表区--多选框选中数据 */
+    // handleSelectionChange(selection) {
+    //   this.ids = selection.map(item => item.id)
+    // },
     /** 详情按钮操作--跳转文章详情页 */
     handleDetail(row, type = 'detail') {
       this.reset()