Merge branch '2022-10-17_vue_schedule_branch' of http://git.shengws.com/csx/Vue_New into 2022-10-17_vue_schedule_branch

src/xt_pages/workforce/components/editTableData.vue

@@ -208,14 +208,14 @@
           <el-table-column
               prop="area"
               label="分区"
-              width="60"
+              width="50"
               align="center"
               fixed
           ></el-table-column>
           <el-table-column
               prop="cut"
               label="机号"
-              width="60"
+              width="100"
               align="center"
               fixed
           ></el-table-column>
@@ -251,7 +251,7 @@
                 >
                   <schedule-item
                       :schedule-detail="scope.row.Mon_M"
-                      :draggable="scope.row.Mon_M ? 'true' : 'false'"
+                      :draggable="isEditForDate('Mon_M')&& scope.row.Mon_M ? 'true' : 'false'"
                       class="contitem"
                       :style="{
                       cursor: scope.row.Mon_M ? 'move' : 'default',
@@ -296,7 +296,7 @@
                 >
                   <schedule-item
                       :schedule-detail="scope.row.Mon_A"
-                      :draggable="scope.row.Mon_A ? 'true' : 'false'"
+                      :draggable="isEditForDate('Mon_A')&&scope.row.Mon_A ? 'true' : 'false'"
                       class="contitem"
                       :style="{
                       cursor: scope.row.Mon_A ? 'move' : 'default',
@@ -339,7 +339,7 @@
                 >
                   <schedule-item
                       :schedule-detail="scope.row.Mon_N"
-                      :draggable="scope.row.Mon_N ? 'true' : 'false'"
+                      :draggable="isEditForDate('Mon_N') && scope.row.Mon_N ? 'true' : 'false'"
                       class="contitem"
                       :style="{
                       cursor: scope.row.Mon_N ? 'move' : 'default',
@@ -389,7 +389,7 @@
                 >
                   <schedule-item
                       :schedule-detail="scope.row.Tue_M"
-                      :draggable="scope.row.Tue_M ? 'true' : 'false'"
+                      :draggable="isEditForDate('Tue_M')&&scope.row.Tue_M ? 'true' : 'false'"
                       class="contitem"
                       :style="{
                       cursor: scope.row.Tue_M ? 'move' : 'default',
@@ -433,7 +433,7 @@
                 >
                   <schedule-item
                       :schedule-detail="scope.row.Tue_A"
-                      :draggable="scope.row.Tue_A ? 'true' : 'false'"
+                      :draggable="isEditForDate('Tue_A')&&scope.row.Tue_A ? 'true' : 'false'"
                       class="contitem"
                       :style="{
                       cursor: scope.row.Tue_A ? 'move' : 'default',
@@ -476,7 +476,7 @@
                 >
                   <schedule-item
                       :schedule-detail="scope.row.Tue_N"
-                      :draggable="scope.row.Tue_N ? 'true' : 'false'"
+                      :draggable="isEditForDate('Tue_N')&&scope.row.Tue_N ? 'true' : 'false'"
                       class="contitem"
                       :style="{
                       cursor: scope.row.Tue_N ? 'move' : 'default',
@@ -526,7 +526,7 @@
                 >
                   <schedule-item
                       :schedule-detail="scope.row.Wed_M"
-                      :draggable="scope.row.Wed_M ? 'true' : 'false'"
+                      :draggable="isEditForDate('Wed_M')&&scope.row.Wed_M ? 'true' : 'false'"
                       class="contitem"
                       :style="{
                       cursor: scope.row.Wed_M ? 'move' : 'default',
@@ -569,7 +569,7 @@
                 >
                   <schedule-item
                       :schedule-detail="scope.row.Wed_A"
-                      :draggable="scope.row.Wed_A ? 'true' : 'false'"
+                      :draggable="isEditForDate('Wed_A')&&scope.row.Wed_A ? 'true' : 'false'"
                       class="contitem"
                       :style="{
                       cursor: scope.row.Wed_A ? 'move' : 'default',
@@ -612,7 +612,7 @@
                 >
                   <schedule-item
                       :schedule-detail="scope.row.Wed_N"
-                      :draggable="scope.row.Wed_N ? 'true' : 'false'"
+                      :draggable="isEditForDate('Wed_N')&&scope.row.Wed_N ? 'true' : 'false'"
                       class="contitem"
                       :style="{
                       cursor: scope.row.Wed_N ? 'move' : 'default',
@@ -667,7 +667,7 @@
                 >
                   <schedule-item
                       :schedule-detail="scope.row.Thurs_M"
-                      :draggable="scope.row.Thurs_M ? 'true' : 'false'"
+                      :draggable="isEditForDate('Thurs_M')&&scope.row.Thurs_M ? 'true' : 'false'"
                       class="contitem"
                       :style="{
                       cursor: scope.row.Thurs_M ? 'move' : 'default',
@@ -677,7 +677,8 @@
                         $event,
                         'Thurs_M',
                         scope.row.index,
-                        scope.row.Thurs_M
+                        scope.row.Thurs_M,
+                        scope.row
                       )
                     "
                   ></schedule-item>
@@ -714,7 +715,7 @@
                 >
                   <schedule-item
                       :schedule-detail="scope.row.Thurs_A"
-                      :draggable="scope.row.Thurs_A ? 'true' : 'false'"
+                      :draggable="isEditForDate('Thurs_A')&&scope.row.Thurs_A ? 'true' : 'false'"
                       class="contitem"
                       :style="{
                       cursor: scope.row.Thurs_A ? 'move' : 'default',
@@ -724,7 +725,9 @@
                         $event,
                         'Thurs_A',
                         scope.row.index,
-                        scope.row.Thurs_A
+                        scope.row.Thurs_A,
+                        scope.row
+
                       )
                     "
                   ></schedule-item>
@@ -761,7 +764,7 @@
                 >
                   <schedule-item
                       :schedule-detail="scope.row.Thurs_N"
-                      :draggable="scope.row.Thurs_N ? 'true' : 'false'"
+                      :draggable="isEditForDate('Thurs_N')&&scope.row.Thurs_N ? 'true' : 'false'"
                       class="contitem"
                       :style="{
                       cursor: scope.row.Thurs_N ? 'move' : 'default',
@@ -771,7 +774,8 @@
                         $event,
                         'Thurs_N',
                         scope.row.index,
-                        scope.row.Thurs_N
+                        scope.row.Thurs_N,
+                           scope.row
                       )
                     "
                   ></schedule-item>
@@ -810,7 +814,7 @@
                 >
                   <schedule-item
                       :schedule-detail="scope.row.Fri_M"
-                      :draggable="scope.row.Fri_M ? 'true' : 'false'"
+                      :draggable="isEditForDate('Fri_M')&&scope.row.Fri_M ? 'true' : 'false'"
                       class="contitem"
                       :style="{ cursor: scope.row.Fri_M ? 'move' : 'default' }"
                       @mouseover.native="
@@ -852,7 +856,7 @@
                 >
                   <schedule-item
                       :schedule-detail="scope.row.Fri_A"
-                      :draggable="scope.row.Fri_A ? 'true' : 'false'"
+                      :draggable="isEditForDate('Fri_A')&&scope.row.Fri_A ? 'true' : 'false'"
                       class="contitem"
                       :style="{ cursor: scope.row.Fri_A ? 'move' : 'default' }"
                       @mouseover.native="
@@ -894,7 +898,7 @@
                 >
                   <schedule-item
                       :schedule-detail="scope.row.Fri_N"
-                      :draggable="scope.row.Fri_N ? 'true' : 'false'"
+                      :draggable="isEditForDate('Fri_N')&&scope.row.Fri_N ? 'true' : 'false'"
                       class="contitem"
                       :style="{ cursor: scope.row.Fri_N ? 'move' : 'default' }"
                       @mouseover.native="
@@ -944,7 +948,7 @@
                 >
                   <schedule-item
                       :schedule-detail="scope.row.Sat_M"
-                      :draggable="scope.row.Sat_M ? 'true' : 'false'"
+                      :draggable="isEditForDate('Sat_M')&&scope.row.Sat_M ? 'true' : 'false'"
                       class="contitem"
                       :style="{ cursor: scope.row.Sat_M ? 'move' : 'default' }"
                       @mouseover.native="
@@ -987,7 +991,7 @@
                 >
                   <schedule-item
                       :schedule-detail="scope.row.Sat_A"
-                      :draggable="scope.row.Sat_A ? 'true' : 'false'"
+                      :draggable="isEditForDate('Sat_A')&&scope.row.Sat_A ? 'true' : 'false'"
                       class="contitem"
                       :style="{ cursor: scope.row.Sat_A ? 'move' : 'default' }"
                       @mouseover.native="
@@ -1030,7 +1034,7 @@
                 >
                   <schedule-item
                       :schedule-detail="scope.row.Sat_N"
-                      :draggable="scope.row.Sat_N ? 'true' : 'false'"
+                      :draggable="isEditForDate('Sat_N')&&scope.row.Sat_N ? 'true' : 'false'"
                       class="contitem"
                       :style="{ cursor: scope.row.Sat_N ? 'move' : 'default' }"
                       @mouseover.native="
@@ -1134,7 +1138,7 @@
                 >
                   <schedule-item
                       :schedule-detail="scope.row.Sun_A"
-                      :draggable="scope.row.Sun_A ? 'true' : 'false'"
+                      :draggable="isEditForDate('Sun_A')&&scope.row.Sun_A ? 'true' : 'false'"
                       class="contitem"
                       :style="{ cursor: scope.row.Sun_A ? 'move' : 'default' }"
                       @mouseover.native="
@@ -1147,8 +1151,7 @@
                       )
                     "
                   >
-                    </schedule-item
-                  >
+                    </schedule-item>
                 </div>
               </template>
             </el-table-column>
@@ -1182,7 +1185,7 @@
                 >
                   <schedule-item
                       :schedule-detail="scope.row.Sun_N"
-                      :draggable="scope.row.Sun_N ? 'true' : 'false'"
+                      :draggable="isEditForDate('Sun_N')&&scope.row.Sun_N ? 'true' : 'false'"
                       class="contitem"
                       :style="{ cursor: scope.row.Sun_N ? 'move' : 'default' }"
                       @mouseover.native="
@@ -1927,6 +1930,7 @@ export default {
 
   data() {
     return {
+      cur_date:"",
       dataloading:false,
       current_patient_data:[],
       week_zhongwens: ["周一", "周二", "周三", "周四", "周五", "周六", "周日"],
@@ -3205,6 +3209,7 @@ export default {
 
       this.cur_info.patient_name = row.name;
       this.cur_info.patient_id = row.id;
+      this.patient_id_hover = row.id
     },
     modeClick(row) {
 
@@ -3212,6 +3217,21 @@ export default {
       this.cur_info.mode_id = row.id;
     },
     setEditData(patients, modes, days, zones) {
+      var date = new Date()
+      this.time = date
+      var year = date.getFullYear()
+      var month = date.getMonth() + 1
+      if (month < 10) {
+        month = "0" + month
+      }
+      var day = date.getDate()
+      if (day < 10) {
+        day = "0" + day
+      }
+      var nowDate = year + "-" + month + "-" + day
+      var date = new Date(nowDate + " 00:00:00")
+      this.cur_date = date.getTime()/1000
+
 
       this.days = days;
       this.all_zones = zones;
@@ -3228,6 +3248,7 @@ export default {
       this.cur_info["mode_name"] = this.modes[0].name;
       this.cur_info["patient_id"] = this.patientList[0].id;
       this.cur_info["mode_id"] = this.modes[0].id;
+      this.patient_id_hover =  this.patientList[0].id
       this.$refs.patient_table.setCurrentRow(this.patientList[0]);
       this.$refs.mode_table.setCurrentRow(this.modes[0]);
       for (let i = 0; i < this.weeks.length; i++) {
@@ -3250,12 +3271,26 @@ export default {
     },
     dragstartTwo(event, item) {},
     dragendTwo(event) {},
+    isEditForDate(day){
+      var week = this.weekDay(day);
+      console.log(this.weekDays[week[0] - 1].valueOf())
+      console.log( new Date(this.weekDays[week[0] - 1]).valueOf() /1000 )
+      console.log(this.weekDays[week[0] - 1] >= this.cur_date)
+      if( new Date(this.weekDays[week[0] - 1]).valueOf() /1000 >= this.cur_date){
+        return true
+      }else{
+        return false
+      }
+
+    },
     drag(e, day, index, name, row) {
       e.preventDefault();
       console.log("拖动前")
-
+      console.log(row)
       for (var key in row) {
         if (key == day) {
+          console.log(row[key].patient_id)
+
           if(row[key].patient_id > 0 ) {
             this.cur_drag_obj = 2
             console.log(row)
@@ -3297,6 +3332,8 @@ export default {
           } else {
             this.$message.success("替换成功");
             this.tipDialogVisible = false
+            this.getSchedules();
+
           }
         });
 
@@ -3305,7 +3342,7 @@ export default {
         })
 
     },changeSchTwo(){
-      this.$confirm('是否将此位置排班互换?', '替换', {
+      this.$confirm('是否将此位置排班互换?', '交换', {
         confirmButtonText: '确 定',
         cancelButtonText: '取 消',
         type: 'warning'
@@ -3319,8 +3356,10 @@ export default {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg);
           } else {
-            this.$message.success("替换成功");
+            this.$message.success("交换成功");
             this.tipDialogVisible = false
+            this.getSchedules();
+
           }
         });
       })
@@ -3335,11 +3374,14 @@ export default {
     //        |                                 |
     //        -----------------------------------
     drop(e, day, index, name, row) {
+
       e.preventDefault();
       console.log("cnm")
       for (var key in row) {
         if (key == day) {
           console.log("cnm1111111")
+          console.log(this.cur_drag_obj)
+
           var week = this.weekDay(day);
           this.currentData.schedule_date = this.weekDays[week[0] - 1];
           this.currentData.schedule_type = week[1];
@@ -3352,21 +3394,12 @@ export default {
           this.currentData.id = row[key].schedule_id;
 
           this.currentData.partition_type = row.zone_type;
-          if (
-              row[key].patient.length > 0 ||
-              row[key].mode_name.length > 0 ||
-              row[key].mode_id > 0 ||
-              row[key].patient_id > 0
-          ) {
+          if (row[key].patient.length > 0 || row[key].mode_name.length > 0 || row[key].mode_id > 0 || row[key].patient_id > 0) {
             if (this.cur_drag_obj == 2){
-
-
               this.tipDialogVisible = true
-
             }else{
               this.$message.error("当前机号已有排班");
               return;
-
             }
 
           } else {
@@ -3378,10 +3411,6 @@ export default {
                     if (response.data.state == 0) {
                       this.$message.error(response.data.msg);
                     } else {
-                      this.$message({
-                        type: "success",
-                        message: "排班已取消!",
-                      });
                       var that = this;
                       var schedule = response.data.data.schedule;
                       this.scheduleZone.forEach(function (zone, index) {
@@ -3418,10 +3447,7 @@ export default {
                   this.currentData.patient = this.cur_drag_info.patient_name;
                   this.setSchedule();
                 }else{  //非空，替換或者交換位置
-
                   this.tipDialogVisible = true
-
-
                 }
 
               }else{ // 非同一天

src/xt_pages/workforce/components/tableData.vue

@@ -196,14 +196,14 @@
       <el-table-column
         prop="area"
         label="分区"
-        width="80"
+        width="50"
         align="center"
         fixed
       ></el-table-column>
       <el-table-column
         prop="cut"
         label="机号"
-        width="80"
+        width="100"
         align="center"
         fixed
       ></el-table-column>