4月12日

src/pages/new_Patientscheduling/new_content.vue

@@ -66,7 +66,7 @@
                 >
                 <div v-if="scope.row.Mon_M.patient_id !=''" >
                   <el-button @click='patientedit(scope.row.Mon_M)'>调班</el-button>
-                  <el-button @click="delete_click(scope.row.Mon_M)">删除</el-button>
+                  <el-button @click="delete_click(scope.row.Mon_M)" v-if="scope.row.Mon_M.stage==0">删除</el-button>
                 </div>
                 <div style="text-align: center;" v-if="scope.row.Mon_M.patient_id ==''" >
                   <el-button @click='newappend(scope.row.Mon_M)'>新增</el-button>
@@ -86,7 +86,7 @@
                 >
                 <div v-if="scope.row.Mon_A.patient_id !=''">
                   <el-button @click='patientedit(scope.row.Mon_A)'>调班</el-button>
-                  <el-button @click="delete_click(scope.row.Mon_A)">删除</el-button>
+                  <el-button @click="delete_click(scope.row.Mon_A)" v-if="scope.row.Mon_A.stage==0">删除</el-button>
                 </div>
                 <div style="text-align: center;" v-if="scope.row.Mon_A.patient_id ==''">
                   <el-button @click='newappend(scope.row.Mon_A)'>新增</el-button>
@@ -108,7 +108,7 @@
                 >
                 <div v-if="scope.row.Mon_N.patient_id !=''">
                   <el-button @click='patientedit(scope.row.Mon_N)'>调班</el-button>
-                  <el-button @click="delete_click(scope.row.Mon_N)">删除</el-button>
+                  <el-button @click="delete_click(scope.row.Mon_N)" v-if="scope.row.Mon_N.stage==0">删除</el-button>
                 </div>
                 <div style="text-align: center;" v-if="scope.row.Mon_N.patient_id ==''">
                   <el-button @click='newappend(scope.row.Mon_N)'>新增</el-button>
@@ -653,8 +653,12 @@ export default{
                 name:params.name
               }
               fenqu_arr.push(fenquobj)
+              console.log('444444',params.device.sort());
               if(params.device.length>0){
+                  
                 params.device.forEach(function(device) {
+                  console.log('5555',device.sort)
+                  console.log();
                   var thisPa = {
                     area: params.name,
                     zone_id: params.id,
@@ -678,6 +682,7 @@ export default{
                       zone_id:device.zone_id,
                       area: params.name,
                       schedule_week:'',
+                      stage:''
                     },
                     Mon_A: {
                       schedule_id: 0,
@@ -694,7 +699,7 @@ export default{
                       zone_id:device.zone_id,
                       area: params.name,
                       schedule_week:'',
-
+                      stage:''
                     },
                     Mon_N: {
                       schedule_id: 0,
@@ -711,7 +716,7 @@ export default{
                       zone_id:device.zone_id,
                       area: params.name,
                       schedule_week:'',
-
+                      stage:''
                     },
                   }
                   var jihaoobj = {
@@ -738,6 +743,7 @@ export default{
                         area: params.name,
                         zone_id:device.zone_id,
                         schedule_week:item.schedule_week,
+                        stage:item.order.stage
                       }
                     }
                     if(item.schedule_type==2&&item.bed_id==device.id){
@@ -756,6 +762,7 @@ export default{
                         area: params.name,
                         zone_id:device.zone_id,
                         schedule_week:item.schedule_week,
+                        stage:item.order.stage
                       }
                     }
                     if(item.schedule_type==3&&item.bed_id==device.id){
@@ -774,9 +781,9 @@ export default{
                         area: params.name,
                         zone_id:device.zone_id,
                         schedule_week:item.schedule_week,
+                        stage:item.order.stage
                       }
                     }
-
                   })
                    arr.push(thisPa)
                    jihao.push(jihaoobj)
@@ -784,7 +791,7 @@ export default{
               }
             })
 
-            jihao.sort(this.compare('sort'))
+            arr.sort(this.compare('sort'))
               
               this.fenqu_arr=fenqu_arr
               this.jihao_arr = jihao
@@ -1075,9 +1082,9 @@ export default{
     Select_mode2(val){
       console.log('val',val);
         this.add_arr.mode_add = val.name
+        this.currentData.mode_id = val.id
         this.add_arr.modeid_add = val.id
         this.clickmode2 = false
-
     },
     // 取消分区
     fenqu_click(){