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

src/xt_pages/workforce/appointment.vue

@@ -172,11 +172,10 @@
         </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">
+                  :schedule-zone-prop="scheduleZone" title="" >
           </HistoryWeekTable>
       <el-dialog title="复制排班" width="600px" :visible.sync="newVisible">
         <el-form :model="form" ref="form" label-width="90px" :rules="rules">
@@ -286,7 +285,7 @@ export default {
         nextWeek: 0,
         nextTwoWeek: 0
       },
-      
+
       tableList: [],
       weekTime: "",
       schedule_type: 0,
@@ -446,7 +445,6 @@ export default {
         this.$nextTick(() => {
           childrenRefs.forEach(child => child.$forceUpdate())
         })
-
         var that = this
 
         if (partitions.length > 0) {
@@ -2365,7 +2363,7 @@ export default {
 
       return next_monday
     },
-    // 
+    //
     getThreeWeekList() {
       var params = {
         start_time: this.start_time,
@@ -3070,7 +3068,7 @@ export default {
     },
     getlist() {
       getScheduleTemplate().then(response => {
-        
+
         if (response.data.state == 1) {
           var template = response.data.data.template
           console.log('12243254',response.data.data);

src/xt_pages/workforce/components/editTableData.vue

@@ -5663,7 +5663,7 @@ export default {
       this.$emit("event1", val);
       this.partition_id = val;
       this.getWeekPanels();
-      // this.getSchedules();
+      this.getSchedules();
     },
     changeSchedule_type(val) {
       this.$emit("event2", val);
@@ -5774,9 +5774,9 @@ textarea{
     padding: 0 0px ;
 
 }
-//  .el-table td .cell:hover {
-//   background: #22eeddc4 !important;
-// }
+.el-table {
+    font-size: 12px !important;
+}
 
 }
 .right_contain {

src/xt_pages/workforce/components/historyWeekTable.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="table_data"> 
+  <div id="table_data">
      <div class="cell clearfix" >
       <span>选择周次:</span>
       <el-date-picker
@@ -96,7 +96,7 @@
         :data="scheduleZone"
         :span-method="objectSpanMethod"
         @cell-click="clickThis"
-        
+
         :summary-method="getSummaries"
         show-summary
         :row-class-name="tableRowClassName"
@@ -701,8 +701,6 @@ export default {
         this.isShowXiaWu = true
         this.isShowWanShang = true
       }
-      
-
 
     },
      week_type:function () {
@@ -814,7 +812,7 @@ export default {
 
   },
   methods: {
-   
+
     getData(){
       return this.scheduleZone
     },
@@ -1791,7 +1789,7 @@ export default {
       sums[22]="总人数:"+ sums[22] +"\n"+result
 
       return sums;
-      
+
     },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
 
@@ -1838,7 +1836,7 @@ export default {
       this.$refs.singleTable.setCurrentRow(row);
       this.currentData.patient_id = 0;
     },
-    
+
     getSchedulePatients() {
       getSchedulePatients(this.patientQuery).then(response => {
         if (response.data.state == 1) {
@@ -2801,13 +2799,13 @@ export default {
       this.$emit('event1', val)
       this.partition_id = val
       this.getWeekPanels()
-      
+
       this.getgetSchedules()
     },
     changeSchedule_type(val) {
       this.$emit('event2', val)
       this.schedule_type = val
-     
+
       this.getgetSchedules()
     },
     changeWeekDay(val) {
@@ -2854,7 +2852,7 @@ export default {
         patitionid: str,
         schedule_type: this.schedule_type,
       }
-      
+
       getSchedulesOne(params).then(response => {
         if (response.data.state == 1) {
           this.weekTitle = response.data.data.weekTitle;
@@ -3125,7 +3123,7 @@ export default {
       })();
     };
   },
-  
+
 };
 </script>
 

src/xt_pages/workforce/components/tableData.vue

@@ -878,12 +878,12 @@ export default {
     },
     weekTime: function() {
       // 
-      // if(this.weekTime != 'historyWeek'){
+      if(this.weekTime != 'historyWeek'){
         console.log('12343455',this.weekTime);
         var theType = this.weekType(this.weekTime);
         this.theType = theType
         this.getSchedules();
-      // }
+      }
       
     },
     scheduleZoneRow: function() {
@@ -992,10 +992,11 @@ export default {
           if (response.data.state == 0) {
             return false
           }
+          console.log("触发232332323232",response.data.data)
           var partitions = response.data.data.partitions
           console.log("partitions",partitions)
           this.theWeek.thisWeek = response.data.data.theWeek
-
+          // this.theWeek.historyWeek=this.theWeek.thisWeek - 2
           this.theWeek.lastWeek = this.theWeek.thisWeek - 1
           this.theWeek.nextWeek = this.theWeek.thisWeek + 1
           this.theWeek.nextTwoWeek = this.theWeek.thisWeek + 2
@@ -2018,7 +2019,7 @@ export default {
           this.schedulesGroup = schedulesGroup
 
           var that = this;
-
+          
           this.scheduleZone.forEach(function (zone, index) {
 
             that.scheduleZone[index].Mon_M = {
@@ -2214,7 +2215,7 @@ export default {
 
 
             that.scheduleZone[index].total = 0;
-
+            
             if (response.data.data.schdules.length > 0) {
               theSchedules.forEach(function (schedule, sindex) {
 
@@ -2249,7 +2250,7 @@ export default {
           });
 
           this.source_scheduleZone = this.scheduleZone
-          console.log("------------aaaa", this.scheduleZone)
+         
         } else {
           this.$message.error("网络错误");
           return false;
@@ -2967,9 +2968,9 @@ export default {
     weekType(weekTime) {
       var theType = 2;
       switch (weekTime) {
-        case "historyWeek":
-          theType = 0;
-          break;
+        // case "historyWeek":
+        //   theType = 0;
+        //   break;
         case "lastWeek":
           theType = 1;
           break;
@@ -3345,9 +3346,11 @@ textarea{
 .schedule-table-row td:hover {
   background: rgb(88, 162, 236) !important;
 }
-
+.el-table {
+    font-size: 12px !important;
+}
 .schedule-table-row td .cell {
-  font-size: 12px;
+  font-size: 10px;
   white-space:normal  !important;
   // normal
 }