上传文件至 'src/xt_pages/workforce/components'

src/xt_pages/workforce/components/ScheduleItem.vue

@@ -1,61 +1,61 @@
-<template>
-  <!-- 排班表填充内容 -->
-    <div >
-
-            <div>
-                <span :class='modeColor(scheduleDetail.mode_name)'>{{scheduleDetail.patient}}</span><br/>
-                <span v-if="scheduleDetail.mode_name.length>0" :class='modeColor(scheduleDetail.mode_name)'>({{scheduleDetail.mode_name}})</span>
-              <span v-if="schedulFlag">{{scheduleDetail.dialysis_machine_name}}</span>
-            </div>
-    </div>
-</template>
-
-<script>
-export default {
-  name: "scheduleItem",
-  props:{
-      scheduleDetail:{
-          type:Object,
-          default: function (){
-              return {
-                mode_id:0,
-                mode_name:'',
-                patient_id:0,
-                patient:"",
-                dialysis_machine_name:"",
-              }
-          },
-      },
-      schedulFlag:{
-        type:Boolean,
-        default:false
-      }
-  },
-  data() {
-    return {
-      schedul:false
-    }
-  },
-
-  methods:{
-        modeColor(name){
-            if(name == 'HD'){
-
-            }else if(name == 'HDF'){
-                return 'modeRed'
-            }else if(name == 'HD+HP'){
-                return 'modePurple'
-            }
-        }
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-.modeRed{
-  color:#ee780a;
-}
-.modePurple{
-  color: #53b86e;
-}
-</style>
+<template>
+  <!-- 排班表填充内容 -->
+    <div >
+
+            <div>
+                <span :class='modeColor(scheduleDetail.mode_name)'>{{scheduleDetail.patient}}</span><br/>
+                <span v-if="scheduleDetail.mode_name.length>0" :class='modeColor(scheduleDetail.mode_name)'>({{scheduleDetail.mode_name}})</span>
+                <br/><span v-if="schedulFlag">{{scheduleDetail.dialysis_machine_name}}</span>
+            </div>
+    </div>
+</template>
+
+<script>
+export default {
+  name: "scheduleItem",
+  props:{
+      scheduleDetail:{
+          type:Object,
+          default: function (){
+              return {
+                mode_id:0,
+                mode_name:'',
+                patient_id:0,
+                patient:"",
+                dialysis_machine_name:"",
+              }
+          },
+      },
+      schedulFlag:{
+        type:Boolean,
+        default:false
+      }
+  },
+  data() {
+    return {
+      schedul:false
+    }
+  },
+
+  methods:{
+        modeColor(name){
+            if(name == 'HD'){
+
+            }else if(name == 'HDF'){
+                return 'modeRed'
+            }else if(name == 'HD+HP'){
+                return 'modePurple'
+            }
+        }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.modeRed{
+  color:#ee0ad0;
+}
+.modePurple{
+  color: #53b86e;
+}
+</style>

src/xt_pages/workforce/components/editTableData.vue

@@ -181,6 +181,7 @@
                       icon="el-icon-close"
                       circle
                       @click.stop="deletePatientMode(scope.row.Mon_M)"
+                      v-show="cur_drag_info.patient_id== 0 ? false : true"
                   ></el-button>
                 </div>
                 <!--  -->
@@ -227,6 +228,7 @@
                       icon="el-icon-close"
                       circle
                       @click.stop="deletePatientMode(scope.row.Mon_A)"
+                      v-show="cur_drag_info.patient_id== 0 ? false : true"
                   ></el-button>
                 </div>
                 <div
@@ -271,6 +273,7 @@
                       icon="el-icon-close"
                       circle
                       @click.stop="deletePatientMode(scope.row.Mon_N)"
+                      v-show="cur_drag_info.patient_id== 0 ? false : true"
                   ></el-button>
                 </div>
                 <div
@@ -322,6 +325,7 @@
                       icon="el-icon-close"
                       circle
                       @click.stop="deletePatientMode(scope.row.Tue_M)"
+                      v-show="cur_drag_info.patient_id== 0 ? false : true"
                   ></el-button>
                 </div>
                 <div
@@ -366,6 +370,7 @@
                       icon="el-icon-close"
                       circle
                       @click.stop="deletePatientMode(scope.row.Tue_A)"
+                      v-show="cur_drag_info.patient_id== 0 ? false : true"
                   ></el-button>
                 </div>
                 <div
@@ -409,6 +414,7 @@
                       icon="el-icon-close"
                       circle
                       @click.stop="deletePatientMode(scope.row.Tue_N)"
+                      v-show="cur_drag_info.patient_id== 0 ? false : true"
                   ></el-button>
                 </div>
                 <div
@@ -459,6 +465,7 @@
                       icon="el-icon-close"
                       circle
                       @click.stop="deletePatientMode(scope.row.Wed_M)"
+                      v-show="cur_drag_info.patient_id== 0 ? false : true"
                   ></el-button>
                 </div>
                 <div
@@ -502,6 +509,7 @@
                       icon="el-icon-close"
                       circle
                       @click.stop="deletePatientMode(scope.row.Wed_A)"
+                      v-show="cur_drag_info.patient_id== 0 ? false : true"
                   ></el-button>
                 </div>
                 <div
@@ -545,6 +553,7 @@
                       icon="el-icon-close"
                       circle
                       @click.stop="deletePatientMode(scope.row.Wed_N)"
+                      v-show="cur_drag_info.patient_id== 0 ? false : true"
                   ></el-button>
                 </div>
                 <div
@@ -595,6 +604,7 @@
                       icon="el-icon-close"
                       circle
                       @click.stop="deletePatientMode(scope.row.Thurs_M)"
+                      v-show="cur_drag_info.patient_id== 0 ? false : true"
                   ></el-button>
                 </div>
                 <div
@@ -643,6 +653,7 @@
                       icon="el-icon-close"
                       circle
                       @click.stop="deletePatientMode(scope.row.Thurs_A)"
+                      v-show="cur_drag_info.patient_id== 0 ? false : true"
                   ></el-button>
                 </div>
                 <div
@@ -692,6 +703,7 @@
                       icon="el-icon-close"
                       circle
                       @click.stop="deletePatientMode(scope.row.Thurs_N)"
+                      v-show="cur_drag_info.patient_id== 0 ? false : true"
                   ></el-button>
                 </div>
                 <div
@@ -743,6 +755,7 @@
                       icon="el-icon-close"
                       circle
                       @click.stop="deletePatientMode(scope.row.Fri_M)"
+                      v-show="cur_drag_info.patient_id== 0 ? false : true"
                   ></el-button>
                 </div>
                 <div
@@ -784,6 +797,7 @@
                       icon="el-icon-close"
                       circle
                       @click.stop="deletePatientMode(scope.row.Fri_A)"
+                      v-show="cur_drag_info.patient_id== 0 ? false : true"
                   ></el-button>
                 </div>
         
@@ -823,6 +837,7 @@
                       icon="el-icon-close"
                       circle
                       @click.stop="deletePatientMode(scope.row.Fri_N)"
+                      v-show="cur_drag_info.patient_id== 0 ? false : true"
                   ></el-button>
                 </div>
                 <!--  -->
@@ -875,6 +890,7 @@
                       icon="el-icon-close"
                       circle
                       @click.stop="deletePatientMode(scope.row.Sat_M)"
+                      v-show="cur_drag_info.patient_id== 0 ? false : true"
                   ></el-button>
                 </div>
                 <!--  -->
@@ -920,6 +936,7 @@
                       icon="el-icon-close"
                       circle
                       @click.stop="deletePatientMode(scope.row.Sat_A)"
+                      v-show="cur_drag_info.patient_id== 0 ? false : true"
                   ></el-button>
                 </div>
                 <!--  -->
@@ -965,6 +982,7 @@
                       icon="el-icon-close"
                       circle
                       @click.stop="deletePatientMode(scope.row.Sat_N)"
+                      v-show="cur_drag_info.patient_id== 0 ? false : true"
                   ></el-button>
                 </div>
                 <!--  -->
@@ -1021,6 +1039,7 @@
                       icon="el-icon-close"
                       circle
                       @click.stop="deletePatientMode(scope.row.Sun_M)"
+                      v-show="cur_drag_info.patient_id== 0 ? false : true"
                   ></el-button>
                 </div>
                 <div
@@ -1069,6 +1088,7 @@
                       icon="el-icon-close"
                       circle
                       @click.stop="deletePatientMode(scope.row.Sun_A)"
+                      v-show="cur_drag_info.patient_id== 0 ? false : true"
                   ></el-button>
                 </div>
                 <div
@@ -1116,6 +1136,7 @@
                       icon="el-icon-close"
                       circle
                       @click.stop="deletePatientMode(scope.row.Sun_N)"
+                      v-show="cur_drag_info.patient_id== 0 ? false : true"
                   ></el-button>
                 </div>
                 <div
@@ -1436,7 +1457,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="病房: " prop="partition_id">
+          <el-form-item label="分区: " prop="partition_id">
             <el-select
                 v-model="zone_name"
                 placeholder="请选择"
@@ -3136,8 +3157,8 @@ export default {
     drag(e, day, index, name, row) {
       e.preventDefault();
       for (var key in row) {
-        if (key == day && row[key].patient_id > 0) {
-          // console.log(row[key].patient_id)
+        if (key == day) {
+          if(row[key].patient_id > 0){
             this.cur_drag_obj = 2
             var week = this.weekDay(day);
             this.cur_drag_info={
@@ -3154,6 +3175,24 @@ export default {
               patient_name : row[key].patient,
               patient_id : row[key].patient_id,
               id : row[key].schedule_id
+            }
+          }else{
+            this.cur_drag_obj = 2
+            this.cur_drag_info={
+              schedule_date : '',
+              schedule_type : '',
+              bed_id : '',
+              partition_id : '',
+              schedule_week : '',
+              type_name : '',
+              zone_name : '',
+              bed_name : '',
+              mode_id : '',
+              mode_name : '',
+              patient_name : '',
+              patient_id : '',
+              id : '',
+            }
           }
         }
       }
@@ -3215,6 +3254,7 @@ export default {
       if (row.schedule_id > 0) {
         this.CancelSchedule(row.schedule_id);
       }
+      console.log('deletePatientMode',row);
     },
     // 替换
     coverSch(){
@@ -4785,7 +4825,7 @@ export default {
             }
           }
         });
-        this.closePatientPanel();
+        // this.closePatientPanel();
       }
       this.creating_schedule = false;
     },
@@ -5568,7 +5608,6 @@ export default {
     };
   },
   created() {
-   
     var date = new Date();
     this.time = date;
     var year = date.getFullYear();

src/xt_pages/workforce/components/tableData.vue

@@ -494,7 +494,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="病房: " prop="partition_id">
+          <el-form-item label="分区: " prop="partition_id">
             <el-select
                 v-model="zone_name"
                 placeholder="请选择"
@@ -502,10 +502,10 @@
                 @change="changePartition"
             >
               <el-option
-                  v-for="(item, index) in zone_names"
-                  :key="index"
-                  :label="item"
-                  :value="item"
+                  v-for="item in zone_names"
+                  :key="item.id"
+                  :label="item.zone_name"
+                  :value="item.zone_id"
               >
               </el-option>
             </el-select>
@@ -662,7 +662,7 @@ export default {
   data() {
     return {
       tableContainHeight:null,
-      value1:true,
+      value1:false,
       // tableHeight:'window.innerHeight - 0',
       // rowClass: "table-row-new-class schedule-table-row",
       weeks:weekOptions,
@@ -762,6 +762,7 @@ export default {
       zone_name: "",
       current_devices: [],
       zone_names: [],
+      zone_namess:[],
       zone_device_options: [],
       options:[
         {id:1,name:"上午"},
@@ -2676,6 +2677,8 @@ export default {
     },
 
     changePartition(value) {
+      // this.current_devices = this.zone_device_map[value];
+      // this.device_id = this.current_devices[0].id;
       let params = {
         zone_id:  value,
         sch_type: this.currentData.schedule_type,
@@ -2687,6 +2690,7 @@ export default {
         if (response.data.state == 0) {
           return false;
         } else {
+          console.log('devices的数据',devices);
           var devices = response.data.data.devices;
           this.current_devices = [];
           this.current_devices = devices;
@@ -2861,14 +2865,14 @@ export default {
                   //   zone_device_map[device_number.zone.name].push(device_number)
                   // }
                   // this.zone_device_map = zone_device_map
-                  //
+                  
                   // this.zone_names = Object.keys(this.zone_device_map)
                   // if (this.zone_names.length > 0) {
                   //   this.zone_name = this.zone_names[0]
                   //   this.current_devices = this.zone_device_map[this.zone_name]
                   //   this.device_id = this.current_devices[0].id
                   // }
-                  //
+                  
                   // this.zone_device_options = [
                   //   { values: this.zone_names },
                   //   // { values: this.getDeviceNumberNames(this.current_devices) },
@@ -3146,7 +3150,6 @@ export default {
         "{y}-{m}-{d}"
       );
 
-
       this.zone_name = row.partition_id;
       this.device_id = row.bed_id;
       // this.current_devices = this.partitions[row.partition_id].jihaos
@@ -3163,9 +3166,19 @@ export default {
           return false;
         } else {
           var devices = response.data.data.devices;
+          console.log('getSmartDevices的数据',devices);
           this.current_devices = [];
           this.current_devices = devices;
+          // this.zone_names= [];
+          // if(devices!=null){
+          //   for(let i=0;i<devices.length;i++){
+          //     this.zone_names.push(devices[0])
+          //   }
+            
+          // }
+         this.zone_names=devices[0];
           this.device_id = devices[0].id
+          console.log('zone_namess的数据',this.zone_names);
         }
       });
 
@@ -3312,7 +3325,7 @@ export default {
   //    this.tableContainHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 160
   // },
   created() {
-    // console.log('this.$refs.schedul.scheduleDetail的数据',this.$refs.schedul);
+    console.log('this.zone_names的数据',this.zone_names);
     var date = new Date()
     this.time = date
     var year = date.getFullYear()