Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/router/modules/workforce.js

       title: 'scheduleTablePrintTwo',
       noCache: true
     }
-  }
+  },
+  // {
+  //   path: '/historyWeekTable',
+  //   component: () => import('@/xt_pages/workforce/historyWeekTable'),
+  //   name: 'historyWeekTable',
+  //   hidden: true,
+  //   is_menu: false,
+  //   meta: {
+  //     title: 'historyWeekTable',
+  //     noCache: true
+  //   }
+  // }
   ]
 }

src/xt_pages/workforce/appointment.vue

         >
         </el-date-picker>
       </div>
-      <el-tabs v-model="activeName" :tab-position="tabPosition" ref="elTabs">
+      <el-tabs v-model="activeName" :tab-position="tabPosition" ref="elTabs" @tab-click="handleClick">
+        <el-tab-pane name="historyWeek">
+          <span slot="label"><i class="el-icon-date"></i> 历史周期 ({{ theWeek.historyWeek }}) </span>
+        </el-tab-pane>
         <el-tab-pane name="lastWeek">
           <span slot="label"><i class="el-icon-date"></i> 上周 ({{ theWeek.lastWeek }})</span>
         </el-tab-pane>
           <span slot="label"><i class="el-icon-date"></i> 下下周 ({{ theWeek.nextTwoWeek }})</span>
         </el-tab-pane>
       </el-tabs>
-
-      <table-data ref="tableData"  :week-time="activeName" :partitions-prop="partitions"
-                  :schedule-zone-row-prop="scheduleZoneRow"
-                  :schedule-zone-prop="scheduleZone" title="" @event1="changePartition"
-                  @event2="changeSchedule" v-if="!is_edit" @event3="changeWeekDay">
-      </table-data>
-
-      <edit-table-data ref="edittableData"  :week-time="activeName" :partitions-prop="partitions"
+      <div v-if="!is_edit">
+        <table-data ref="tableData"  :week-time="activeName" :partitions-prop="partitions"
+                    :schedule-zone-row-prop="scheduleZoneRow"
+                    :schedule-zone-prop="scheduleZone" title="" @event1="changePartition"
+                    @event2="changeSchedule"  @event3="changeWeekDay" v-show="showtableOne">
+        </table-data>
+      </div>
+       <edit-table-data ref="edittableData"  :week-time="activeName" :partitions-prop="partitions"
                         :schedule-zone-row-prop="scheduleZoneRow" :schedule-zone-prop="scheduleZone"
                          title="" @event1="changePartition"
                          @event2="changeSchedule" v-if="is_edit" @event3="changeWeekDay">
         </div>
       </div>
         </edit-table-data>
-
+       
+        <HistoryWeekTable v-show="showtable" ref="tableDataZero"  :week-time="activeName" partitions-prop="partitions"
+                  :schedule-zone-row-prop="scheduleZoneRow"
+                  :schedule-zone-prop="scheduleZone" title="" @event1="changePartition"
+                  @event2="changeSchedule"  @event3="changeWeekDay">
+          </HistoryWeekTable>
       <el-dialog title="复制排班" width="600px" :visible.sync="newVisible">
         <el-form :model="form" ref="form" label-width="90px" :rules="rules">
           <el-form-item label="周次:">
 import {generateLog} from '@/api/config'
 import {uParseTime} from '@/utils/tools'
 import EditTableData from "./components/editTableData";
-
+import HistoryWeekTable from './components/historyWeekTable'
 export default {
   name: 'appointment',
   data() {
       scheduleZone: [],
       days: [],
       logs: [],
+      showtable:false,
+      showtableOne:true,
       is_edit: false,
       schedulingTableVisible:false,//全屏
       scheduleZoneRow: [],
       isExistRepeatVisible: false,
       exportVisible: false,
       exportLogVisible: false,
+      // 周期
       theWeek: {
+        historyWeek:0,
         lastWeek: 0,
         thisWeek: 0,
         nextWeek: 0,
         nextTwoWeek: 0
       },
+      
       tableList: [],
       weekTime: "",
       schedule_type: 0,
     tableData,
     BreadCrumb,
     UploadExcel,
-
+    HistoryWeekTable
   },
   methods: {
+    handleClick(e,tab){
+      if(e.name == 'historyWeek'){
+        this.showtable=true
+        this.showtableOne=false
+        this.$nextTick(() => {
+          this.$refs.tableDataZero.getgetSchedules()
+        })
+        console.log('12343545',this.$refs.tableDataZero);
+      }else{
+        this.showtable=false
+        this.showtableOne=true
+      }
+
+      // if(e.name == 'thisWeek'){
+      //    this.$refs.tableData.getWeekPanels()
+      // }
+      // console.log(getgetSchedules);
+    },
     dragstart(event, item) {
       // console.log('start的索引',item.moveIndex)
       // 开始移动的时候将移动的索引值+图片的url存储下来
           return false
         }
         var partitions = response.data.data.partitions
-        // console.log("分区",partitions)
+        console.log("分区",response.data.data)
         this.theWeek.thisWeek = response.data.data.theWeek
         this.theWeek.lastWeek = response.data.data.theLastWeek
         this.theWeek.nextWeek = response.data.data.theNextWeek
         this.theWeek.nextTwoWeek = response.data.data.theNextSecWeek
+        // this.theWeek.historyWeek = response.data.data.theWeek - 2
         // 在控制变量改变的时候进行 强制渲染更新
         let childrenRefs = this.$refs.elTabs.$children
         this.$nextTick(() => {
 
         }
         // console.log("111111111")
-        // console.log(that.scheduleZone)
+         console.log(that.scheduleZone)
       })
     },
     changeSch(val){
       } else if (this.activeName == 'nextTwoWeek') {
         date = date + 14 * 24 * 60 * 60 * 1000
       }
-
-      if (this.templateObj.template_id == 0 || this.templateObj.template_id == 1) {
+      if (this.templateObj.template_id == 1) {
         this.$router.push({path: '/workforce/schedule/print', query: {date: date}})
       }
       if (this.templateObj.template_id == 2) {
       if (this.templateObj.template_id == 3) {
         this.$router.push({path: '/scheduleTablePrintOne?partition_id=' + this.partition_id + "&weekTime=" + this.activeName+"&week_date="+this.week_date})
       }
-
       if(this.templateObj.template_id == 4){
         this.$router.push({path: '/scheduleTablePrintTwo?partition_id=' + this.partition_id + "&weekTime=" + this.activeName+"&week_date="+this.week_date})
       }
 
       return next_monday
     },
-
+    // 
     getThreeWeekList() {
       var params = {
         start_time: this.start_time,
     },
 
     changeWeek(val) {
-
       this.start_time = ""
       this.end_time = ""
       this.newDay = []
     },
     getlist() {
       getScheduleTemplate().then(response => {
+        
         if (response.data.state == 1) {
           var template = response.data.data.template
-
+          console.log('12243254',response.data.data);
           this.templateObj = template
         }
       })

src/xt_pages/workforce/components/ScheduleItem.vue

     <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>
+                <span :class='modeColor(scheduleDetail.mode_name)'>{{scheduleDetail.patient}}</span>
+                <template v-if="schedulMode">
+                  <br/>
+                  <span v-if="scheduleDetail.mode_name.length>0"  :class='modeColor(scheduleDetail.mode_name)' >{{'('+scheduleDetail.mode_name+')'}}</span>
+                </template>
+                <template v-if="schedulFlag">
+                  <br/><span >{{scheduleDetail.dialysis_machine_name}}</span>
+                </template>
+                
             </div>
     </div>
 </template>
       schedulFlag:{
         type:Boolean,
         default:false
+      },
+      schedulMode:{
+        type:Boolean,
+        default:true
       }
   },
   data() {
     return {
-
+      
     }
   },
 

src/xt_pages/workforce/components/template_table.vue

                       icon="el-icon-close"
                       circle
                       @click.stop="
-                        deletePatientMode(scope.row['1_1'], '1_1', scope.row)
-                      "
+                        deletePatientMode(scope.row['1_1'], '1_1', scope.row)"
+                        v-show="cur_drag_info.patient_id== 0 ? false : true"
                     ></el-button>
                   </div>
                   <div
                       @click.stop="
                         deletePatientMode(scope.row['1_2'], '1_2', scope.row)
                       "
+                      v-show="cur_drag_info.patient_id== 0 ? false : true"
                     ></el-button>
                   </div>
                   <div
                       @click.stop="
                         deletePatientMode(scope.row['1_3'], '1_3', scope.row)
                       "
+                      v-show="cur_drag_info.patient_id== 0 ? false : true"
                     ></el-button>
                   </div>
                   <div
                       @click.stop="
                         deletePatientMode(scope.row['2_1'], '2_1', scope.row)
                       "
+                      v-show="cur_drag_info.patient_id== 0 ? false : true"
                     ></el-button>
                   </div>
                   <div
                       @click.stop="
                         deletePatientMode(scope.row['2_2'], '2_2', scope.row)
                       "
+                      v-show="cur_drag_info.patient_id== 0 ? false : true"
                     ></el-button>
                   </div>
                   <div
                       @click.stop="
                         deletePatientMode(scope.row['2_3'], '2_3', scope.row)
                       "
+                      v-show="cur_drag_info.patient_id== 0 ? false : true"
                     ></el-button>
                   </div>
                   <div
                       @click.stop="
                         deletePatientMode(scope.row['3_1'], '3_1', scope.row)
                       "
+                      v-show="cur_drag_info.patient_id== 0 ? false : true"
                     ></el-button>
                   </div>
                   <div
                       @click.stop="
                         deletePatientMode(scope.row['3_2'], '3_2', scope.row)
                       "
+                      v-show="cur_drag_info.patient_id== 0 ? false : true"
                     ></el-button>
                   </div>
                   <div
                       @click.stop="
                         deletePatientMode(scope.row['3_3'], '3_3', scope.row)
                       "
+                      v-show="cur_drag_info.patient_id== 0 ? false : true"
                     ></el-button>
                   </div>
                   <div
                       @click.stop="
                         deletePatientMode(scope.row['4_1'], '4_1', scope.row)
                       "
+                      v-show="cur_drag_info.patient_id== 0 ? false : true"
                     ></el-button>
                   </div>
                   <div
                       @click.stop="
                         deletePatientMode(scope.row['4_2'], '4_2', scope.row)
                       "
+                      v-show="cur_drag_info.patient_id== 0 ? false : true"
                     ></el-button>
                   </div>
                   <div
                       @click.stop="
                         deletePatientMode(scope.row['4_3'], '4_3', scope.row)
                       "
+                      v-show="cur_drag_info.patient_id== 0 ? false : true"
                     ></el-button>
                   </div>
                   <div
                       @click.stop="
                         deletePatientMode(scope.row['5_1'], '5_1', scope.row)
                       "
+                      v-show="cur_drag_info.patient_id== 0 ? false : true"
                     ></el-button>
                   </div>
                   <div
                       @click.stop="
                         deletePatientMode(scope.row['5_2'], '5_2', scope.row)
                       "
+                      v-show="cur_drag_info.patient_id== 0 ? false : true"
                     ></el-button>
                   </div>
                   <div
                       @click.stop="
                         deletePatientMode(scope.row['5_3'], '5_3', scope.row)
                       "
+                      v-show="cur_drag_info.patient_id== 0 ? false : true"
                     ></el-button>
                   </div>
                   <div
                       @click.stop="
                         deletePatientMode(scope.row['6_1'], '6_1', scope.row)
                       "
+                      v-show="cur_drag_info.patient_id== 0 ? false : true"
                     ></el-button>
                   </div>
                   <div
                       @click.stop="
                         deletePatientMode(scope.row['6_2'], '6_2', scope.row)
                       "
+                      v-show="cur_drag_info.patient_id== 0 ? false : true"
                     ></el-button>
                   </div>
                   <div
                       @click.stop="
                         deletePatientMode(scope.row['6_3'], '6_3', scope.row)
                       "
+                      v-show="cur_drag_info.patient_id== 0 ? false : true"
                     ></el-button>
                   </div>
                   <div
                       icon="el-icon-close"
                       circle
                       @click.stop="
-                        deletePatientMode(scope.row['7_1'], '7_1', scope.row)
-                      "
+                        deletePatientMode(scope.row['7_1'], '7_1', scope.row) "
+                        v-show="cur_drag_info.patient_id== 0 ? false : true"
                     ></el-button>
                   </div>
                   <div
                       icon="el-icon-close"
                       circle
                       @click.stop="
-                        deletePatientMode(scope.row['7_2'], '7_2', scope.row)
-                      "
+                        deletePatientMode(scope.row['7_2'], '7_2', scope.row) "
+                      v-show="cur_drag_info.patient_id== 0 ? false : true"
                     ></el-button>
                   </div>
                   <div
                       icon="el-icon-close"
                       circle
                       @click.stop="
-                        deletePatientMode(scope.row['7_3'], '7_3', scope.row)
-                      "
+                        deletePatientMode(scope.row['7_3'], '7_3', scope.row)"
+                      v-show="cur_drag_info.patient_id== 0 ? false : true"
                     ></el-button>
                   </div>
                   <div
     // 拖拽
     drop(e, day, index, name, row) {
       e.preventDefault();
-      console.log(row)
-
+      console.log('11111111',row)
       for (var key in row) {
         if (key == day) {
           let info = {};
           var weekday = weekday_timetype[0];
           var time_type = weekday_timetype[1];
 
-
           this.cur_temp_info.schedule_week = weekday
           this.cur_temp_info.schedule_type = time_type
           this.cur_temp_info.patient_id = info.pid
           this.cur_temp_info.id = row.id
 
-
           if (info.pid > 0 || info.treat_mode_id > 0 ) {
             if (this.cur_drag_obj == 2){
-              console.log("1111222222")
-              this.tipDialogVisible = true
+             
+              if(info.pid != this.cur_drag_info.patient_id){
+                console.log('1234132412',info.pid,this.cur_drag_info.patient_id);
+                this.tipDialogVisible = true
+              }
+                // this.tipDialogVisible = false
             }else{
               this.$message.error("当前机号已有排班2");
               return;
           } else {
             //當前類型是表格内的拖拽，如果是同一天内的表格拖拽到空床位則先刪除原先排版，后在將排班弄到空床位
             if(this.cur_drag_obj == 2){
-
               if (this.cur_drag_info.schedule_week == weekday){
                 //删除原来的排班，新增一个新的排班
-
                 let params={
                   template_id:this.template.id,
                   week_type_one:this.cur_drag_info.schedule_week,
         this.cur_drag_info.patient_name = info.name;
         this.cur_drag_info.patient_id = info.pid;
         this.cur_drag_info.id = row.id;
-      }
+      }else{
+        this.cur_drag_obj = 2
+        this.cur_drag_info.schedule_type ='';
+        this.cur_drag_info.partition_id = '';
+        this.cur_drag_info.schedule_week = '';
+        this.cur_drag_info.mode_id = '';
+        this.cur_drag_info.mode_name = '';
+        this.cur_drag_info.patient_name = '';
+        this.cur_drag_info.patient_id = 0;
+        this.cur_drag_info.id = 0;
 
-    },
+      }
+        
+        console.log('this.cur_drag_info的数据',this.cur_drag_info);
+      },
     allowDrop(e) {
       e.preventDefault();
     },
       }
       return "";
     },
-    // handleScroll: function() {
-    //     var scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop
-    //     console.log(scrollTop)
-    //     if (scrollTop >= 150) {
-    //         this.fixed_style = "background-color: red; position: fixed; top: 0px; left: 190px; right: 150px; z-index: 99;"
-    //     } else {
-    //         this.fixed_style = ""
-    //     }
-    // },
+    
     makeDeviceNumbers: function (device_numbers) {
       this.all_zones = [];
       this.devices = [];
 
           // this.getSchedules();
           this.all_template = response.data.data.items
+          console.log('替换数据',response.data.data);
           this.$emit("setTemplate",response.data.data.items)
           if(this.active_name == 'first'){
             this.GetTemplate(response.data.data.items[0])
       this.$nextTick(() => {
         this.$refs.table.doLayout();
       });
-      if(this.$store.getters.xt_user.template_info.org_id == 9671 || this.$store.getters.xt_user.template_info.org_id == 0 || this.$store.getters.xt_user.template_info.org_id == 3877 || this.$store.getters.xt_user.template_info.org_id == 10340){
+      // if(this.$store.getters.xt_user.template_info.org_id == 9671 || this.$store.getters.xt_user.template_info.org_id == 0 || this.$store.getters.xt_user.template_info.org_id == 3877 || this.$store.getters.xt_user.template_info.org_id == 10340){
           //表格某列全部数据
         var Mon_M = []
         var Mon_A = []
           result.push(str);
       }
       sums[22]="总人数:"+ sums[22] +"\n"+result
-      }
+      // }
 
       return sums;
     },
-    // 右侧表格的回调
+    // 右侧表格的列回调
     cellClass({row,column, rowIndex, columnIndex}){
       // console.log('cellClass数据',row);
       if(columnIndex==1&&row.zone.type==2){
           }
       }
     },
+    // 右侧表格的行回调
     rowClass({row,column, rowIndex, columnIndex}){
       if (row.zone.type == 1) {
         return "table-row-new-class schedule-table-row ";
         return 'highlight';
       }
     },
+    // 左侧表格的透析回调
     modeclass({row,column, rowIndex, columnIndex}){
       if(this.cur_info.mode_id == row.id){
         return 'highlight';