修改

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

   },
   computed: {
     dialysis_date: function() {
-      return uParseTime(this.$route.query.date, '{y}/{m}/{d}')
+      if(this.$route.query.date){
+        return uParseTime(this.$route.query.date, '{y}/{m}/{d}')
+      }else{
+        return this.record_date
+      }
+      
     }
   },
   data() {

src/xt_pages/dialysis/details/index.vue

       <el-tabs v-model="activeName" @tab-click="handleClick">
         <el-tab-pane label="候诊区" name="first">
           <div class="cell clearfix" style="margin-bottom:10px;">
-            <el-date-picker v-model="selected_date" prefix-icon="el-icon-date" @change="handleScheduleDateChange" :editable="false" :clearable="false" style="width: 130px;" type="date" placeholder="选择日期时间" align="right" ></el-date-picker>
-            <el-input size="small" style="width:80px;" v-model.trim="search_input" class="filter-item"/>
-            <el-button size="small" class="filter-item" type="primary" @click="searchAction">搜索</el-button>
+            <el-date-picker v-model="selected_date" prefix-icon="el-icon-date" @change="handleScheduleDateChange" :editable="false" :clearable="false" style="width: 45%;margin-right:10px;" type="date" placeholder="选择日期时间" align="right" ></el-date-picker>
+            <el-input size="small" style="width:24%;" v-model.trim="search_input" class="filter-item"/>
+            <el-button size="small" class="filter-item" type="primary" style="margin-right:20px;" @click="searchAction">搜索</el-button>
           </div>
-          <div class="cell clearfix" style="margin-bottom:10px;">
-            <el-select v-model="patientStateVal" placeholder="全部患者状态" style="width:130px;" @change="handleStateChange">
+          <div class="cell clearfix" style="margin-bottom:10px;display:flex;">
+            <el-select v-model="patientStateVal" placeholder="全部患者状态" style="margin-right:10px;" @change="handleStateChange">
               <el-option
                 v-for="item in patient_state"
                 :key="item.value"
                 :value="item.value">
               </el-option>
             </el-select>
-            <el-select v-model="treatStateVal" placeholder="全部治疗状态" style="width:130px;" @change="handleTreatChange">
+            <el-select v-model="treatStateVal" placeholder="全部治疗状态" style="margin-right:20px;" @change="handleTreatChange">
               <el-option
                 v-for="item in treat_state"
                 :key="item.value"
               </el-option>
             </el-select>
           </div>
-          <div class="cell clearfix" style="margin-bottom:10px;">
-            <el-select v-model="scheduleStateVal" placeholder="班次" style="width:130px;" @change="handletimeType">
+          <div class="cell clearfix" style="margin-bottom:10px;display:flex;">
+            <el-select v-model="scheduleStateVal" placeholder="班次" style="margin-right:10px;" @change="handletimeType">
               <el-option
                 v-for="item in schedule_options"
                 :key="item.value"
                 :value="item.value">
               </el-option>
             </el-select>
-            <el-select v-model="zoneVal" placeholder="分区" style="width:130px;" @change="handleZoneChange">
+            <el-select v-model="zoneVal" placeholder="分区" style="margin-right:20px;" @change="handleZoneChange">
               <el-option
                 v-for="item in zone_options"
                 :key="item.id"
           arr = patientArr
           for (let i = 0; i <arr.length; i++) {
             for (let j = 0; j < arr[i].schedules.length; j++) {
-              if (arr[i].schedules.length > 0 && (arr[i].schedules[j].assessment_before_dislysis == null || arr[i].schedules[j].assessment_before_dislysis.weight_before == '' || arr[i].schedules[j].assessment_before_dislysis.diastolic_blood_pressure == '' || arr[i].schedules[j].assessment_before_dislysis.systolic_blood_pressure == '')) {
+              if (arr[i].schedules.length > 0 && (arr[i].schedules[j].assessment_before_dislysis == null || (arr[i].schedules[j].assessment_before_dislysis.weight_before == '' && arr[i].schedules[j].assessment_before_dislysis.diastolic_blood_pressure == '' && arr[i].schedules[j].assessment_before_dislysis.systolic_blood_pressure == ''))) {
                 // 删除元素后改变i的值
                 arr[i].schedules.splice(j--, 1);
               }

src/xt_pages/dialysis/dialysisPrintOrder.vue

       <!--</div>-->
 
       <!--<dialysis-print-order-two :patientInfo="patientInfo" :receiverTreatmentAccess="receiverTreatmentAccess" :predialysis="predialysis"></dialysis-print-order-two>-->
+      <el-container class="newContainer">
+        <div style="width:270px;margin-right:20px;">
+            <div class="cell clearfix" style="margin-bottom:10px;">
+            <el-date-picker v-model="selected_date" prefix-icon="el-icon-date" @change="handleScheduleDateChange" :editable="false" :clearable="false" style="width: 130px;margin-right:10px;" type="date" placeholder="选择日期时间" align="right" ></el-date-picker>
+            <el-input size="small" style="width:80px;" v-model.trim="search_input" class="filter-item"/>
+            <el-button size="small" class="filter-item" type="primary" @click="searchAction">搜索</el-button>
+          </div>
+          <div class="cell clearfix" style="margin-bottom:10px;">
+            <el-select v-model="patientStateVal" placeholder="全部患者状态" style="width:130px;margin-right:10px;" @change="handleStateChange">
+              <el-option
+                v-for="item in patient_state"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+            <el-select v-model="treatStateVal" placeholder="全部治疗状态" style="width:130px;margin-right:10px;" @change="handleTreatChange">
+              <el-option
+                v-for="item in treat_state"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </div>
+          <div class="cell clearfix" style="margin-bottom:10px;">
+            <el-select v-model="scheduleStateVal" placeholder="班次" style="width:130px;margin-right:10px;" @change="handletimeType">
+              <el-option
+                v-for="item in schedule_options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+            <el-select v-model="zoneVal" placeholder="分区" style="width:130px;margin-right:10px;" @change="handleZoneChange">
+              <el-option
+                v-for="item in zone_options"
+                :key="item.id"
+                :label="item.text"
+                :value="item.id">
+              </el-option>
+            </el-select>
+          </div>
+          <div style="padding-right:20px;">
+            <el-table
+              ref="tab"
+              @row-click="changePatient"
+              highlight-current-row
+              :data="tableData"
+              height="500"
+              border
+              style="width: 100%">
+              <el-table-column
+                prop="date"
+                label="患者"
+                >
+                <template slot-scope="scope">
+                  {{ scope.row.patient.name }}
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="name"
+                label="透析号"
+                >
+                <template slot-scope="scope">
+                  {{ scope.row.patient.dialysis_no }}
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </div>
+        <div>
+          <DialysisPrintOrderOne
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 1"
+          >
+          </DialysisPrintOrderOne>
+
+          <DialysisPrintOrderTwo
+            v-bind:childResponse="childResponse"
+            v-if="
+              org_template_info.template_id == 2 ||
+                org_template_info.template_id == 0
+            "
+          ></DialysisPrintOrderTwo>
+
+          <DialysisPrintOrderThree
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 3"
+          >
+          </DialysisPrintOrderThree>
 
-      <DialysisPrintOrderOne
-        v-bind:childResponse="childResponse"
-        v-if="org_template_info.template_id == 1"
-      >
-      </DialysisPrintOrderOne>
-
-      <DialysisPrintOrderTwo
-        v-bind:childResponse="childResponse"
-        v-if="
-          org_template_info.template_id == 2 ||
-            org_template_info.template_id == 0
-        "
-      ></DialysisPrintOrderTwo>
-
-      <DialysisPrintOrderThree
-        v-bind:childResponse="childResponse"
-        v-if="org_template_info.template_id == 3"
-      >
-      </DialysisPrintOrderThree>
-
-      <DialysisPrintOrderFour
-        v-bind:childResponse="childResponse"
-        v-if="org_template_info.template_id == 4"
-      >
-      </DialysisPrintOrderFour>
+          <DialysisPrintOrderFour
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 4"
+          >
+          </DialysisPrintOrderFour>
 
-      <DialysisPrintOrderFive
-        v-bind:childResponse="childResponse"
-        v-if="org_template_info.template_id == 5"
-      >
-      </DialysisPrintOrderFive>
+          <DialysisPrintOrderFive
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 5"
+          >
+          </DialysisPrintOrderFive>
 
-      <DialysisPrintOrderSix
-        v-bind:childResponse="childResponse"
-        v-if="org_template_info.template_id == 6"
-      >
-      </DialysisPrintOrderSix>
+          <DialysisPrintOrderSix
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 6"
+          >
+          </DialysisPrintOrderSix>
 
-      <DialysisPrintOrderSeven
-        v-bind:childResponse="childResponse"
-        v-if="org_template_info.template_id == 7"
-      >
-      </DialysisPrintOrderSeven>
+          <DialysisPrintOrderSeven
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 7"
+          >
+          </DialysisPrintOrderSeven>
 
-      <DialysisPrintOrderEight
-        v-bind:childResponse="childResponse"
-        v-if="org_template_info.template_id == 8"
-      >
-      </DialysisPrintOrderEight>
-
-      <!--<DialysisPrintOrderTen></DialysisPrintOrderTen>-->
-      <DialysisPrintOrderTen
-        v-bind:childResponse="childResponse"
-        v-if="org_template_info.template_id == 10"
-      ></DialysisPrintOrderTen>
-
-      <DialysisPrintOrderNine
-        v-bind:childResponse="childResponse"
-        v-if="org_template_info.template_id == 9"
-      ></DialysisPrintOrderNine>
-
-      <DialysisPrintOrderEleven
-        v-bind:childResponse="childResponse"
-        v-if="org_template_info.template_id == 11"
-      ></DialysisPrintOrderEleven>
-      <DialysisPrintOrderTwelve
-        v-bind:childResponse="childResponse"
-        v-if="org_template_info.template_id == 12"
-      ></DialysisPrintOrderTwelve>
-      <DialysisPrintOrderThirteen
-        v-bind:childResponse="childResponse"
-        v-if="org_template_info.template_id == 13"
-      ></DialysisPrintOrderThirteen>
-      <DialysisPrintOrderFourteen
-        v-bind:childResponse="childResponse"
-        v-if="org_template_info.template_id == 14"
-      ></DialysisPrintOrderFourteen>
-      <DialysisPrintOrderFifteen
-        v-bind:childResponse="childResponse"
-        v-if="org_template_info.template_id == 15"
-      ></DialysisPrintOrderFifteen>
-      <DialysisPrintOrderSixteen
-        v-bind:childResponse="childResponse"
-        v-if="org_template_info.template_id == 16"
-      ></DialysisPrintOrderSixteen>
+          <DialysisPrintOrderEight
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 8"
+          >
+          </DialysisPrintOrderEight>
+
+          <!--<DialysisPrintOrderTen></DialysisPrintOrderTen>-->
+          <DialysisPrintOrderTen
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 10"
+          ></DialysisPrintOrderTen>
+
+          <DialysisPrintOrderNine
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 9"
+          ></DialysisPrintOrderNine>
+
+          <DialysisPrintOrderEleven
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 11"
+          ></DialysisPrintOrderEleven>
+          <DialysisPrintOrderTwelve
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 12"
+          ></DialysisPrintOrderTwelve>
+          <DialysisPrintOrderThirteen
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 13"
+          ></DialysisPrintOrderThirteen>
+          <DialysisPrintOrderFourteen
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 14"
+          ></DialysisPrintOrderFourteen>
+          <DialysisPrintOrderFifteen
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 15"
+          ></DialysisPrintOrderFifteen>
+          <DialysisPrintOrderSixteen
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 16"
+          ></DialysisPrintOrderSixteen>
+        </div>
+      </el-container>
     </div>
   </div>
 </template>
 
 <script>
+
+import {
+  getDialysisRecordInitData,
+  getDialysisSchedules
+} from "@/api/dialysis_record";
+import { parseTime } from "@/utils";
 import { getDialysisRecord } from "@/api/dialysis";
 import { getDataConfig } from "@/utils/data";
 import { jsGetAge, uParseTime } from "@/utils/tools";
         zongliang_unit: "mg",
         gaimingcheng_unit: "",
         gaijiliang_unit: ""
-      }
+      },
+
+
+      //
+      tableData: [],
+      selected_date: new Date(),
+      // search_input 和 search_keyword，使输入关键字时不会经常刷新 filtedSchedules
+      search_keyword: '', // 确定用于搜索的关键字
+      search_input: '', // 输入中的关键字
+      patient_state:[
+          {value: 0,label: '全部'},
+          {value: 1,label: '已签到'},
+          {value: 2,label: '未签到'},
+          {value: 3,label: '已上机'},
+          {value: 4,label: '已下机'},
+      ],
+      patientStateVal: 0,
+      treat_state:[
+          {value: 0,label: '全部'},
+          {value: 1,label: '待开处方'},
+          {value: 2,label: '待开小结'},
+      ],
+      treatStateVal: 0,
+      schedule_options:[
+          {value: 0,label: '全部'},
+          {value: 1,label: '上午'},
+          {value: 2,label: '下午'},
+          {value: 3,label: '晚上'},
+      ],
+      scheduleStateVal: 0,
+      zone_options:[
+          { id: 0, text: '全部' }
+      ],
+      zoneVal:0,
     };
   },
   methods: {
           // checker: 0,
         }
       );
-    }
+    },
+    //日期
+        handleScheduleDateChange: function() {
+            this.treatStateVal = 0
+            this.patientStateVal = 0
+            this.zoneVal = 0
+            this.scheduleStateVal = 0
+            this.search_keyword = this.search_input = ''
+            // this.$store.dispatch("SaveDialysisAreaSelectIndexs", {
+            //   zone: this.zone_selected,
+            //   schedule_type: this.schedule_type_selected,
+            //   schedule_date: this.selected_date,
+            // })
+            this.requestDialysisSchedules()
+        },
+        //初始化数据
+        getInitData: function() {
+            getDialysisRecordInitData().then(rs => {
+                var resp = rs.data
+                if (resp.state == 1) {
+                var zones = resp.data.zones
+                var schedules = resp.data.schedules
+                var zone_options = [{ id: 0, text: '全部' }]
+                for (let z_i = 0; z_i < zones.length; z_i++) {
+                    const zone = zones[z_i]
+                    zone_options.push({ id: zone.id, text: zone.name })
+                }
+                this.zone_options = zone_options
+                this.zone_schedules = this.processedDialysisSchedules(schedules, this.zone_options)
+                this.arr = this.processedDialysisSchedules(schedules, this.zone_options)
+                this.getData()
+                } else {
+                this.$message.error(resp.msg)
+                }
+            })
+        },
+        // 班次
+        handletimeType: function(index) {
+            this.scheduleStateVal = index
+            // this.$store.dispatch('SetScheduleTypeSelected', { schedule_type_selected: index })
+            this.search_keyword = this.search_input = ''
+            this.getData()
+        },
+        //分区
+        handleZoneChange: function(index) {
+            this.zoneVal = index
+            // this.$store.dispatch('SetZoneSelected', { zone_selected: index })
+            this.search_keyword = this.search_input = ''
+            this.getData()
+        },
+        //患者状态
+        handleStateChange: function(index) {
+            this.patientStateVal = index
+            // this.$store.dispatch('SetPatientStateSelected', { patient_state_selected: index })
+            this.search_keyword = this.search_input = ''
+            this.getData()
+        },
+        handleTreatChange: function(index) {
+            this.treatStateVal = index
+            // this.$store.dispatch('SetTreatStateSelected', { treat_state_selected: index })
+            this.search_keyword = this.search_input = ''
+            this.getData()
+        },
+        processedDialysisSchedules: function(schedules, zone_options) {
+            var zoneMap = {}
+            var scheduleMap = {}
+            for (let z_i = 0; z_i < zone_options.length; z_i++) {
+                const zone = zone_options[z_i]
+                if (zone.id == 0) {
+                continue
+                }
+                scheduleMap[zone.id] = []
+            }
+            for (let index = 0; index < schedules.length; index++) {
+                const schedule = schedules[index]
+                scheduleMap[schedule.device_number.zone.id].push(schedule)
+            }
+            var zone_schedules = []
+            for (let index = 0; index < zone_options.length; index++) {
+                const zone = zone_options[index]
+                if (zone.id == 0) {
+                continue
+                }
+                var schedules = scheduleMap[zone.id]
+                zone_schedules.push({ zone_id: zone.id, zone_name: zone.text, schedules: schedules })
+            }
+            return zone_schedules
+        },
+        searchAction: function() {
+            this.search_keyword = this.search_input
+            this.scheduleStateVal = 0
+            this.zoneVal = 0
+            this.treatStateVal = 0
+            this.patientStateVal = 0
+            if(this.search_input != ''){
+                let arr = []
+                this.filtedSchedules.map(item => {
+                arr.push(...item.schedules)
+                })
+                if(this.activeName == "first"){
+                this.tableData = arr
+                }else if(this.activeName == "second"){
+                this.tableData1 = arr
+                }
+                
+            }else{
+                this.getData()
+            }
+        },
+        requestDialysisSchedules: function() {
+            var ymd = parseTime(this.selected_date, '{y}-{m}-{d}')
+            getDialysisSchedules(ymd).then(rs => {
+                var resp = rs.data
+                if (resp.state == 1) {
+                var schedules = resp.data.schedules
+                this.zone_schedules = this.processedDialysisSchedules(schedules, this.zone_options)
+                let newArr = []
+                this.zone_schedules.map(item => {
+                    newArr.push(...item.schedules)
+                })
+                this.tableData = newArr
+                } else {
+                this.$message.error(resp.msg)
+                }
+            })
+        },
+        changePatient(schedual){
+              console.log(schedual)
+              var xtdate = parseTime(schedual.schedule_date, '{y}-{m}-{d}')
+              this.$router.push(
+                '/dialysis/print?xtdate=' + xtdate + '&xtno=' + schedual.patient.dialysis_no
+              )
+            //   this.patient_id = schedual.patient_id;
+            //   this.date = schedual.schedule_date;
+            //   // this.getScheduleDetail();
+            //   // this.getLongAdvice();
+            
+            //   var patient_id = schedual.patient_id;
+            //   var date = schedual.schedule_date;
+            //   this.$router.push({
+            //     path: "/dialysis/details",
+            //     query: {
+            //       patient_id: patient_id,
+            //       date: date,
+            //       patient_name: schedual.patient.name
+            //     }
+            //   });
+        },
+        getData(){
+            let patientArr = []
+            patientArr = JSON.parse(JSON.stringify(this.zone_schedules))
+            console.log('patientArr',patientArr)
+            let arr1 = []
+            if(this.patientStateVal == 0){
+                arr1 = patientArr
+                console.log(arr1)
+            }else if(this.patientStateVal == 1){
+                let arr = []
+                arr = patientArr
+                for (let i = 0; i <arr.length; i++) {
+                    for (let j = 0; j < arr[i].schedules.length; j++) {
+                        if (arr[i].schedules.length > 0 && (arr[i].schedules[j].assessment_before_dislysis == null || (arr[i].schedules[j].assessment_before_dislysis.weight_before == '' && arr[i].schedules[j].assessment_before_dislysis.diastolic_blood_pressure == '' && arr[i].schedules[j].assessment_before_dislysis.systolic_blood_pressure == ''))) {
+                            // 删除元素后改变i的值
+                            arr[i].schedules.splice(j--, 1);
+                        }
+                    }
+                }
+                console.log("执行1",arr)
+                arr1 = arr
+            }else if(this.patientStateVal == 2){
+                let arr = []
+                arr = patientArr
+                for (let i = 0; i < arr.length; i++) {
+                    for (let j = 0; j < arr[i].schedules.length; j++) {
+                        if (arr[i].schedules.length > 0 && (arr[i].schedules[j].assessment_before_dislysis != null && (arr[i].schedules[j].assessment_before_dislysis.weight_before != 0 || arr[i].schedules[j].assessment_before_dislysis.diastolic_blood_pressure != 0 || arr[i].schedules[j].assessment_before_dislysis.systolic_blood_pressure != 0))) {
+                            // 删除元素后改变i的值
+                            console.log('几次')
+                            arr[i].schedules.splice(j--, 1);
+                        }
+                    }
+                }
+                console.log("执行2",arr)
+                arr1 = arr
+            }else if(this.patientStateVal == 3){
+                let arr = []
+                arr = patientArr
+                for (let i = 0; i <arr.length; i++) {
+                    for (let j = 0; j < arr[i].schedules.length; j++) {
+                        if (arr[i].schedules.length > 0 && (arr[i].schedules[j].dialysis_order == null || (arr[i].schedules[j].dialysis_order != null && arr[i].schedules[j].dialysis_order.stage != 1))) {
+                            // 删除元素后改变i的值
+                            arr[i].schedules.splice(j--, 1);
+                        }
+                    }
+                }
+                console.log("执行1",arr)
+                arr1 = arr
+            }else if(this.patientStateVal == 4){
+                let arr = []
+                arr = patientArr
+                for (let i = 0; i < arr.length; i++) {
+                    for (let j = 0; j < arr[i].schedules.length; j++) {
+                        if (arr[i].schedules.length > 0 && (arr[i].schedules[j].dialysis_order == null || (arr[i].schedules[j].dialysis_order != null && arr[i].schedules[j].dialysis_order.stage != 2))) {
+                            // 删除元素后改变i的值
+                            arr[i].schedules.splice(j--, 1);
+                        }
+                    }
+                }
+                console.log("执行2",arr)
+                arr1 = arr
+            }
+
+            let arr2 = []
+            if(this.treatStateVal == 0){
+                arr2 = JSON.parse(JSON.stringify(arr1))
+            }else if(this.treatStateVal == 1){
+                let arr = []
+                arr = JSON.parse(JSON.stringify(arr1))
+                for (let i = 0; i < arr.length; i++) {
+                    for (let j = 0; j < arr[i].schedules.length; j++) {
+                        if (arr[i].schedules.length > 0 && (arr[i].schedules[j].prescription != null || arr[i].schedules[j].prescription != null ? arr[i].schedules[j].prescription.creater != 0 : false)) {
+                            // 删除元素后改变i的值
+                            arr[i].schedules.splice(j--, 1);
+                        }
+                    }
+                }
+                arr2 = arr
+            }else if(this.treatStateVal == 2){
+                let arr = []
+                arr = JSON.parse(JSON.stringify(arr1))
+                for (let i = 0; i < arr.length; i++) {
+                    for (let j = 0; j < arr[i].schedules.length; j++) {
+                        if (arr[i].schedules.length > 0 && arr[i].schedules[j].treatment_summary != null && arr[i].schedules[j].treatment_summary.dialysis_summary != '') {
+                            // 删除元素后改变i的值
+                            arr[i].schedules.splice(j--, 1);
+                        }
+                    }
+                }
+                arr2 = arr
+            }
+            
+
+            let arr3 = []
+            if(this.scheduleStateVal == 0){
+                arr3 = JSON.parse(JSON.stringify(arr2))
+            }else{
+                let arr = []
+                arr = JSON.parse(JSON.stringify(arr2))
+                for (let i = 0; i < arr.length; i++) {
+                    for (let j = 0; j < arr[i].schedules.length; j++) {
+                        if (this.scheduleStateVal != arr[i].schedules[j].schedule_type) {
+                            // 删除元素后改变i的值
+                            arr[i].schedules.splice(j--, 1);
+                        }
+                    }
+                }
+                arr3 = arr
+                console.log("上午",arr)
+            }
+            
+
+            let arr4 = []
+            if(this.zoneVal == 0){
+                arr4 = JSON.parse(JSON.stringify(arr3))
+            }else{
+                let arr = []
+                arr = JSON.parse(JSON.stringify(arr3))
+                for (let i = 0; i < arr.length; i++) {
+                    if (this.zoneVal != arr[i].zone_id) {
+                    // 删除元素后改变i的值
+                    arr.splice(i--, 1);
+                    }
+                }
+                arr4 = arr
+            }
+            let newArr = []
+            arr4.map(item => {
+            newArr.push(...item.schedules)
+            })
+            this.tableData = newArr
+            console.log('table',this.tableData)
+        },
   },
   watch: {
     "patientInfo.gender": function() {
     }
   },
   created() {
+    this.getInitData();
+
     var xtuser = this.$store.getters.xt_user;
     this.orgname = xtuser.org.org_name;
     // this.orgname = "遂溪方济医院";
       this.$message.error("参数不齐");
       return false;
     }
-  }
+  },
+  computed:{
+    filtedSchedules: function() {
+      var search_keyword = this.search_keyword
+      if (search_keyword.length > 0) {
+        var schedules = []
+        for (let o_i = 0; o_i < this.zone_schedules.length; o_i++) {
+        const scheduleInfo = this.zone_schedules[o_i]
+        var originSchedules = scheduleInfo.schedules
+        if (originSchedules.length == 0) {
+            continue
+        }
+        var filtedSchedules = []
+        for (let s_i = 0; s_i < originSchedules.length; s_i++) {
+            const schedule = originSchedules[s_i]
+            if (schedule.patient.name.indexOf(search_keyword) != -1) {
+            filtedSchedules.push(schedule)
+            // break
+            }
+        }
+        if (filtedSchedules.length > 0) {
+            schedules.push({ zone_id: scheduleInfo.zone_id, zone_name: scheduleInfo.zone_name, schedules: filtedSchedules })
+        }
+        }
+        return schedules
+      }
+    }
+  },
 };
 </script>
 
 .table-box1 tr {
   border-bottom: 1px solid #000;
 }
+
+</style>
+
+<style lang="scss">
+.newContainer{
+  .el-date-editor{
+    .el-input__inner{
+      padding-right:0px;
+    }
+  }
+  .el-table td, .el-table th{
+    text-align: center;
+  }
+}
 </style>

src/xt_pages/dialysis/schedualPatient.vue

           arr = patientArr
           for (let i = 0; i <arr.length; i++) {
             for (let j = 0; j < arr[i].schedules.length; j++) {
-              if (arr[i].schedules.length > 0 && (arr[i].schedules[j].assessment_before_dislysis == null || arr[i].schedules[j].assessment_before_dislysis.weight_before == '' || arr[i].schedules[j].assessment_before_dislysis.diastolic_blood_pressure == '' || arr[i].schedules[j].assessment_before_dislysis.systolic_blood_pressure == '')) {
+              if (arr[i].schedules.length > 0 && (arr[i].schedules[j].assessment_before_dislysis == null || (arr[i].schedules[j].assessment_before_dislysis.weight_before == '' && arr[i].schedules[j].assessment_before_dislysis.diastolic_blood_pressure == '' && arr[i].schedules[j].assessment_before_dislysis.systolic_blood_pressure == ''))) {
                 // 删除元素后改变i的值
                 arr[i].schedules.splice(j--, 1);
               }

src/xt_pages/upload/fast/FastProvince.vue

               border
               style="width: 100%">
               <el-table-column
-                prop="date"
                 label="患者"
                 >
                 <template slot-scope="scope">
-                  {{ scope.row.patient.name }}
+                  {{ scope.row.patient ? scope.row.patient.name : '' }}
                 </template>
               </el-table-column>
               <el-table-column
-                prop="name"
-                label="状态"
+                label="透析号"
                 >
                 <template slot-scope="scope">
-                  <div style="display:flex;align-items:center;justify-content:space-around;">
-                    <span class="tip1" v-if="scope.row.prescription == null || scope.row.prescription.creater == 0">
-                      待开处方
-                    </span>
-                    <span class="tip2" v-if="scope.row.assessment_before_dislysis == null || scope.row.assessment_before_dislysis.weight_before == ''">
-                      待称重
-                    </span>
-                  </div>
+                  {{ scope.row.patient ? scope.row.patient.dialysis_no : '' }}
                 </template>
               </el-table-column>
             </el-table>
       }
     }, 
     computed:{
-        filtedSchedules: function() {
-            var search_keyword = this.search_keyword
-            if (search_keyword.length > 0) {
-                var schedules = []
-                for (let o_i = 0; o_i < this.zone_schedules.length; o_i++) {
-                const scheduleInfo = this.zone_schedules[o_i]
-                var originSchedules = scheduleInfo.schedules
-                if (originSchedules.length == 0) {
-                    continue
-                }
-                var filtedSchedules = []
-                for (let s_i = 0; s_i < originSchedules.length; s_i++) {
-                    const schedule = originSchedules[s_i]
-                    if (schedule.patient.name.indexOf(search_keyword) != -1) {
-                    filtedSchedules.push(schedule)
-                    // break
-                    }
-                }
-                if (filtedSchedules.length > 0) {
-                    schedules.push({ zone_id: scheduleInfo.zone_id, zone_name: scheduleInfo.zone_name, schedules: filtedSchedules })
-                }
-                }
-                return schedules
+      filtedSchedules: function() {
+        var search_keyword = this.search_keyword
+        if (search_keyword.length > 0) {
+          var schedules = []
+          for (let o_i = 0; o_i < this.zone_schedules.length; o_i++) {
+            const scheduleInfo = this.zone_schedules[o_i]
+            var originSchedules = scheduleInfo.schedules
+            if (originSchedules.length == 0) {
+              continue
+            }
+            var filtedSchedules = []
+            for (let s_i = 0; s_i < originSchedules.length; s_i++) {
+              const schedule = originSchedules[s_i]
+              if (schedule.patient.name.indexOf(search_keyword) != -1) {
+                filtedSchedules.push(schedule)
+                // break
+              }
+            }
+            if (filtedSchedules.length > 0) {
+              schedules.push({ zone_id: scheduleInfo.zone_id, zone_name: scheduleInfo.zone_name, schedules: filtedSchedules })
             }
+          }
+          return schedules
         }
+      }
     },
     created() {
       this.getDistricts()
       } else {
         this.form.province = parseInt(province)
       }
+      
 
       this.getInitData();
 
       chooseWay(way) {
         this.wayType = way;
       },
+      onSearch(){},
       //日期
         handleScheduleDateChange: function() {
             this.treatStateVal = 0
             this.treatStateVal = 0
             this.patientStateVal = 0
             if(this.search_input != ''){
-                let arr = []
-                this.filtedSchedules.map(item => {
+              let arr = []
+              this.filtedSchedules.map(item => {
                 arr.push(...item.schedules)
-                })
-                if(this.activeName == "first"){
-                this.tableData = arr
-                }else if(this.activeName == "second"){
-                this.tableData1 = arr
-                }
-                
+              })
+              this.tableData = arr
             }else{
                 this.getData()
             }
                 arr = patientArr
                 for (let i = 0; i <arr.length; i++) {
                     for (let j = 0; j < arr[i].schedules.length; j++) {
-                        if (arr[i].schedules.length > 0 && (arr[i].schedules[j].assessment_before_dislysis == null || arr[i].schedules[j].assessment_before_dislysis.weight_before == '' || arr[i].schedules[j].assessment_before_dislysis.diastolic_blood_pressure == '' || arr[i].schedules[j].assessment_before_dislysis.systolic_blood_pressure == '')) {
+                        if (arr[i].schedules.length > 0 && (arr[i].schedules[j].assessment_before_dislysis == null || (arr[i].schedules[j].assessment_before_dislysis.weight_before == '' && arr[i].schedules[j].assessment_before_dislysis.diastolic_blood_pressure == '' && arr[i].schedules[j].assessment_before_dislysis.systolic_blood_pressure == ''))) {
                             // 删除元素后改变i的值
                             arr[i].schedules.splice(j--, 1);
                         }
             console.log('table',this.tableData)
         },
 
+    },
+    mounted(){
+      setTimeout(()=>{
+        this.$refs.tab.setCurrentRow(this.tableData[0]);
+      },10)
     }
   }
 </script>
             padding-right:0px;
         }
     }
+    .el-table td, .el-table th{
+      text-align: center;
+    }
 }
 </style>