排版

src/api/schedule.js

@@ -269,3 +269,12 @@ export function getSolutionSchedule(params) {
     params: params
   })
 }
+
+
+export function CancelScheduleTwo(id) {
+  return request({
+    url: '/api/schedule/delete_two?id=' + id,
+    method: 'Delete'
+  })
+}
+

src/xt_pages/outpatientCharges/summary.vue

@@ -5,11 +5,7 @@
     </div>
     <div class="app-container">
       <div
-          style="
-          display: flex;
-          justify-content: space-between;
-          margin-bottom: 10px;
-        "
+          style="display: flex; justify-content: space-between;margin-bottom: 10px;"
       >
         <div>
           <!--<el-button size="small" style="margin-left:10px;" class="filter-item" type="primary"-->
@@ -109,8 +105,7 @@
           </el-button
           >
           <el-button v-if="$store.getters.xt_user.org_id == 10106 || $store.getters.xt_user.org_id == 0" size="small" type="primary" @click="export_detail_ten">报表下载2</el-button>
-          <el-button v-if="$store.getters.xt_user.org_id == 10318 || $store.getters.xt_user.org_id == 0" size="small" type="primary" @click="export_detail_ten_two">报表下载3</el-button>
-
+          <el-button v-if="$store.getters.xt_user.org_id == 10318 || $store.getters.xt_user.org_id == 0" size="small" type="primary" @click="export_detail_ten_two">报表下载2</el-button>
           <!--          <el-button size="small" type="primary" @click="export_detail_two"-->
           <!--          >报表下载2-->
           <!--          </el-button-->
@@ -121,8 +116,6 @@
           <!--          <el-button size="small" type="primary" @click="export_detail_five">报表下载3</el-button>-->
 <!--                    <el-button size="small" type="primary" @click="export_detail_six">报表下载9</el-button>-->
           <!--          <el-button size="small" type="primary" @click="export_detail_seven">报表下载4</el-button>-->
-
-
         </div>
       </div>
       <el-table

src/xt_pages/workforce/components/ScheduleItem.vue

@@ -1,20 +1,11 @@
 <template>
     <div >
-        <el-tooltip placement="right" :disabled="scheduleDetail.patient.length>0?false:true" >
-            <div slot="content">
-                {{scheduleDetail.patient}}
-                <br/>
-                <span v-if="scheduleDetail.mode_name.length>0">({{scheduleDetail.mode_name}})</span>
-              <span >{{scheduleDetail.dialysis_machine_name}}</span>
-
-            </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 >{{scheduleDetail.dialysis_machine_name}}</span>
 
             </div>
-        </el-tooltip>
     </div>
 </template>
 

src/xt_pages/workforce/components/editTableData.vue

@@ -1827,17 +1827,53 @@
       </div>
       <span slot="footer" class="dialog-footer">
          <el-button
-           type="primary"
-           @click="coverSch()"
+           type="danger"
+           @click="tipDialogVisibleTwo = true"
          >替换</el-button>
             <el-button
               type="primary"
-              @click="changeSchTwo()"
+              @click="tipDialogVisibleThree = true"
             >交换</el-button>
         <el-button @click="tipDialogVisible = false">取 消</el-button>
       </span>
     </el-dialog>
 
+    <el-dialog
+      title="提示"
+      :visible.sync="tipDialogVisibleTwo"
+      width="300px"
+    >
+      <div>
+        是否将此位置排班替换
+      </div>
+      <span slot="footer" class="dialog-footer">
+         <el-button
+           type="primary"
+           @click="coverSch()"
+         >确定</el-button>
+
+        <el-button @click="tipDialogVisibleTwo = false">取 消</el-button>
+      </span>
+    </el-dialog>
+
+
+    <el-dialog
+      title="提示"
+      :visible.sync="tipDialogVisibleThree"
+      width="300px"
+    >
+      <div>
+        是否将此位置排班互换
+      </div>
+      <span slot="footer" class="dialog-footer">
+         <el-button
+           type="primary"
+           @click="changeSchTwo()"
+         >确定</el-button>
+        <el-button @click="tipDialogVisibleThree = false">取 消</el-button>
+      </span>
+    </el-dialog>
+
 
   </div>
 </template>
@@ -1857,6 +1893,7 @@ import {
   BatchSmartSch,
 } from "@/api/schedule_template/sch_template";
 import {
+  CancelScheduleTwo,
   CancelSchedule,
   ChangeSchedule,
   CreateSchedule,
@@ -1930,6 +1967,8 @@ export default {
 
   data() {
     return {
+      tipDialogVisibleTwo:false,
+      tipDialogVisibleThree:false,
       cur_date:"",
       dataloading:false,
       current_patient_data:[],
@@ -1938,6 +1977,7 @@ export default {
       saveloading: false,
       zones: [],
       weeks: weekOptions,
+      first_weeks:[],
       smart_keyword: "",
       cur_smart_patient_id: 0,
       cur_smart_patient_name: "",
@@ -2352,6 +2392,11 @@ export default {
     },
     handleClick() {
       if (this.editableTabsValue == "1") {
+
+        console.log(this.first_weeks)
+        console.log(this.weeks)
+
+
         for (let i = 0; i < this.weeks.length; i++) {
           var tempDate = new Date();
           var day = tempDate.getDay();
@@ -2364,6 +2409,22 @@ export default {
             this.weeks[i].is_edit = false;
           }
         }
+
+        for(let i = 0; i < this.weeks.length; i++){
+          for(let b = 0; b < this.first_weeks.length; b++){
+            if(this.weeks[i].week_type == this.first_weeks[b].week_type && this.first_weeks[b].order_id > 0){
+              console.log(this.weeks[i].week_type)
+              console.log(this.first_weeks[b].week_type)
+              console.log(this.first_weeks[b].order_id)
+
+              this.weeks[i].is_edit = false
+            }
+
+          }
+        }
+
+
+
       } else {
         for (let i = 0; i < this.weeks.length; i++) {
           this.weeks[i].is_edit = true;
@@ -2531,16 +2592,16 @@ export default {
       console.log(delTempData)
 
 
-
-      for (let i = 0; i < delTempData.length; i++) {
-        for (let  b = 0; b < saveOrEditTempData.length; b++) {
-          if(delTempData[i].sch_id == saveOrEditTempData[b].sch_id){
-            delTempData.splice(i,1)
+      if(saveOrEditTempData.length > 0 ){
+        for (let i = 0; i < delTempData.length; i++) {
+          for (let  b = 0; b < saveOrEditTempData.length; b++) {
+            if(saveOrEditTempData[b].sch_id&&delTempData[i].sch_id&&delTempData[i].sch_id == saveOrEditTempData[b].sch_id){
+              delTempData.splice(i,1)
+            }
           }
         }
-      }
-      console.log(delTempData)
 
+      }
       for (let i = 0; i < saveOrEditTempData.length; i++) {
         if (saveOrEditTempData[i].bed_id == "" || saveOrEditTempData[i].zone_id == "") {
           this.$message.error("分区或者床位不能空");
@@ -2549,8 +2610,7 @@ export default {
       }
 
 
-      if (saveOrEditTempData.length > 0 ) {
-
+      if (saveOrEditTempData.length > 0 || delTempData.length > 0) {
 
         let obj = {
           smart_schs: saveOrEditTempData,
@@ -2624,7 +2684,8 @@ export default {
       return "";
     },
     handleSelect(val) {
-      this.dataloading = true
+      this.first_weeks = []
+        this.dataloading = true
       getSmartSchByPatient(val.id).then((response) => {
         this.dataloading = false
         var sch = response.data.data.sch
@@ -2685,6 +2746,11 @@ export default {
                   ) {
                     this.weeks[b].is_edit = true;
                   } else {
+                    let obj = {
+                      week_type:this.weeks[b].week_type,
+                      order_id:schedules[i].order.id,
+                    }
+                    this.first_weeks.push(obj)
                     this.weeks[b].is_edit = false;
                   }
                   this.editableTabs[0].checkedWeek.push(this.weeks[b]);
@@ -2946,7 +3012,7 @@ export default {
           tableWeekArrage: [],
         },
       ];
-
+      this.first_weeks = []
       getPatientSmartSch(params).then((response) => {
         if (response.data.state == 0) {
           return false;
@@ -2998,7 +3064,9 @@ export default {
                 is_edit = true;
               }
               obj.is_edit = is_edit;
+              console.log("schedules[i].order.id")
 
+              console.log(schedules[i].order.id)
 
               for (let b = 0; b < this.weeks.length; b++) {
                 if (schedules[i].schedule_week == this.weeks[b].week_type) {
@@ -3006,9 +3074,13 @@ export default {
                       this.weeks[b].week_type >= day &&
                       schedules[i].order.id == 0
                   ) {
-
                     this.weeks[b].is_edit = true;
                   } else {
+                    let obj = {
+                      week_type:this.weeks[b].week_type,
+                      order_id:schedules[i].order.id,
+                    }
+                    this.first_weeks.push(obj)
                     this.weeks[b].is_edit = false;
                   }
 
@@ -3273,9 +3345,6 @@ export default {
     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{
@@ -3285,15 +3354,12 @@ export default {
     },
     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)
             var week = this.weekDay(day);
             this.cur_drag_info.schedule_date = this.weekDays[week[0] - 1];
             this.cur_drag_info.schedule_type = week[1];
@@ -3316,37 +3382,24 @@ export default {
     allowDrop(e) {
       e.preventDefault();
     },coverSch(){
-      this.$confirm('是否将此位置排班替换?', '替换', {
-        confirmButtonText: '确 定',
-        cancelButtonText: '取 消',
-        type: 'warning'
-      }).then(() => {
-        let params={
-          id_one:this.cur_drag_info.id,
-          id_two:this.currentData.id
-
-        }
-        CoverSch(params).then((response) => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg);
-          } else {
-            this.$message.success("替换成功");
-            this.tipDialogVisible = false
-            this.getSchedules();
+      let params={
+        id_one:this.cur_drag_info.id,
+        id_two:this.currentData.id
 
-          }
-        });
-
-      })
-        .catch(() => {
-        })
+      }
+      CoverSch(params).then((response) => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          this.tipDialogVisibleTwo = false
 
+        } else {
+          this.$message.success("替换成功");
+          this.tipDialogVisible = false
+          this.tipDialogVisibleTwo = false
+          this.getSchedules();
+        }
+      });
     },changeSchTwo(){
-      this.$confirm('是否将此位置排班互换?', '交换', {
-        confirmButtonText: '确 定',
-        cancelButtonText: '取 消',
-        type: 'warning'
-      }).then(() => {
         let params={
           id_one:this.cur_drag_info.id,
           id_two:this.currentData.id
@@ -3355,17 +3408,15 @@ export default {
         ExchangeSch(params).then((response) => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg);
+            this.tipDialogVisibleThree = false
           } else {
             this.$message.success("交换成功");
             this.tipDialogVisible = false
+            this.tipDialogVisibleThree = false
             this.getSchedules();
 
           }
         });
-      })
-        .catch(() => {
-        })
-
     },
     //        ----------------------------------
     //        | !在html里面的chedule-item里绑定的|
@@ -3407,7 +3458,7 @@ export default {
             if(this.cur_drag_obj == 2 ){
               if(this.cur_drag_info.schedule_date == this.currentData.schedule_date){ //同一天
                 if(row[key].patient_id == 0) { //空床位
-                  CancelSchedule(this.cur_drag_info.id).then((response) => {
+                  CancelScheduleTwo(this.cur_drag_info.id).then((response) => {
                     if (response.data.state == 0) {
                       this.$message.error(response.data.msg);
                     } else {
@@ -3437,15 +3488,16 @@ export default {
                           }
                         }
                       });
+                      //接口提交排班数据
+                      that.currentData.mode_id = that.cur_drag_info.mode_id;
+                      that.currentData.id = 0;
+                      that.currentData.contagions = [];
+                      that.currentData.patient_id = that.cur_drag_info.patient_id;
+                      that.currentData.patient = that.cur_drag_info.patient_name;
+                      that.setSchedule();
                     }
                   });
-                  //接口提交排班数据
-                  this.currentData.mode_id = this.cur_drag_info.mode_id;
-                  this.currentData.id = 0;
-                  this.currentData.contagions = [];
-                  this.currentData.patient_id = this.cur_drag_info.patient_id;
-                  this.currentData.patient = this.cur_drag_info.patient_name;
-                  this.setSchedule();
+
                 }else{  //非空，替換或者交換位置
                   this.tipDialogVisible = true
                 }
@@ -4343,7 +4395,7 @@ export default {
 
     // 删除某一单元格内的患者透析排班
     deletePatientMode(row) {
-
+      console.log(row)
       if (row.schedule_id > 0) {
         this.CancelSchedule(row.schedule_id);
       }

src/xt_pages/workforce/components/template_table.vue

@@ -1594,8 +1594,8 @@ export default {
 
       this.smartVisible = true;
     },
-    SetSmartSch(tempData,delData) {
-        this.saveActionThree(tempData,delData);
+    SetSmartSch(tempData) {
+        this.saveActionThree(tempData);
     },
     check(tempData) {
       let isJiXu = true;
@@ -1647,7 +1647,7 @@ export default {
     batchSetSch() {
       this.smartSaveLoading = true;
       var tempData = [];
-      var delData = [];
+      // var delData = [];
       for (let b = 0; b < this.editableTabs.length; b++) {
         for (let c = 0; c < this.editableTabs[b].tableWeekArrage.length; c++) {
           let obj = {
@@ -1667,36 +1667,35 @@ export default {
         }
       }
 
-      for (let b = 0; b < this.current_patient_data.length; b++) {
-        for (let c = 0; c < this.current_patient_data[b].tableWeekArrage.length; c++) {
-          let obj = {
-            time_type: this.current_patient_data[b].tableWeekArrage[c].time_type,
-            jihao_id: this.current_patient_data[b].tableWeekArrage[c].device_number_id,
-            schedule_week: this.getWeekByzhongwen(
-              this.current_patient_data[b].tableWeekArrage[c].week
-            ),
-            mode_id: this.current_patient_data[b].tableWeekArrage[c].treat_mode,
-            sch_id: this.current_patient_data[b].tableWeekArrage[c].id,
-            zone_id: this.current_patient_data[b].tableWeekArrage[c].zone_id,
-            t_id: this.current_patient_data[b].name,
-            title:this.current_patient_data[b].title,
-            patient_id: this.cur_smart_patient_id,
-          };
-          delData.push(obj);
-        }
-      }
-      console.log(tempData)
-      console.log(delData)
+      // for (let b = 0; b < this.current_patient_data.length; b++) {
+      //   for (let c = 0; c < this.current_patient_data[b].tableWeekArrage.length; c++) {
+      //     let obj = {
+      //       time_type: this.current_patient_data[b].tableWeekArrage[c].time_type,
+      //       jihao_id: this.current_patient_data[b].tableWeekArrage[c].device_number_id,
+      //       schedule_week: this.getWeekByzhongwen(
+      //         this.current_patient_data[b].tableWeekArrage[c].week
+      //       ),
+      //       mode_id: this.current_patient_data[b].tableWeekArrage[c].treat_mode,
+      //       sch_id: this.current_patient_data[b].tableWeekArrage[c].id,
+      //       zone_id: this.current_patient_data[b].tableWeekArrage[c].zone_id,
+      //       t_id: this.current_patient_data[b].name,
+      //       title:this.current_patient_data[b].title,
+      //       patient_id: this.cur_smart_patient_id,
+      //     };
+      //     delData.push(obj);
+      //   }
+      // }
+      // console.log(tempData)
+      // console.log(delData)
 
-      for (let i = 0; i < delData.length; i++) {
-        for (let  b = 0; b < tempData.length; b++) {
-          if(delData[i].sch_id == tempData[b].sch_id){
-            delData.splice(i,1)
-          }
-        }
-      }
+      // for (let i = 0; i < delData.length; i++) {
+      //   for (let  b = 0; b < tempData.length; b++) {
+      //     if(delData[i].sch_id == tempData[b].sch_id){
+      //       delData.splice(i,1)
+      //     }
+      //   }
+      // }
 
-      console.log(delData)
       for (let i = 0; i < tempData.length; i++) {
         if (tempData[i].jihao_id == "" || tempData[i].zone_id == "") {
           this.$message.error("分区或者床位不能空");
@@ -1706,11 +1705,11 @@ export default {
         }
       }
       this.isEdit = true
-      this.$emit("saveData", tempData,delData);
+      console.log("saveData")
+      console.log(tempData)
+      this.$emit("saveData", tempData);
     },changeJihao(){
-
       this.$forceUpdate()
-
     },
     changeSch(row) {
 
@@ -2711,7 +2710,7 @@ export default {
         if (device_number.id == device_number_id) {
           var item = device_number[weekday + "_" + time_type];
           item.pid = 0;
-          item.name = "";
+          item.name = "";saveOrEdditTempData
           item.treat_mode_id = 0;
           item.treat_mode = "";
         }
@@ -2940,10 +2939,10 @@ export default {
         });
       }
     },
-    saveActionThree: function (val,delData) {
+    saveActionThree: function (val) {
       updateEditSchedules(
         JSON.stringify(val),
-        JSON.stringify(delData),
+        JSON.stringify([]),
       ).then((rs) => {
         var resp = rs.data;
         if (resp.state == 1) {

src/xt_pages/workforce/template.vue

@@ -3188,14 +3188,12 @@ export default {
       })
 
 
-    },saveData(val,del_data){
+    },saveData(val){
       var tempDataOne = []
       for(let i = 0; i < val.length; i++){
           tempDataOne.push(val[i])
       }
-      if(tempDataOne.length > 0){
-        this.$refs.table.SetSmartSch(tempDataOne,del_data)
-      }
+      this.$refs.table.SetSmartSch(tempDataOne)
     },
     getWeekPanels(val) {
       getWeekPanels(1,val).then(response => {