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

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -1711,8 +1711,11 @@
               }
               this.curStatus = 1
             }
+            console.log("~~~~222222~~~~~~~")
+            console.log(temp2)
 
             if (temp2.length > 0) {
+              console.log("~~~~11111~~~~~~~")
               for (let b = 0; b < temp2.length; b++) {
                 let obj = {
                   id: 0,
@@ -1765,7 +1768,7 @@
         this.teamList = row
       },
       selectChange(selection, row) {
-        if ( this.org_id == 10206 && row.zuobiao_stock_num <= 0) {
+        if (this.org_id == 10206 && row.zuobiao_stock_num <= 0) {
           if (row.type == 3) {
             if (selection) {
               selection.forEach(row => {
@@ -1776,15 +1779,11 @@
             } else {
               this.$refs.tables.clearSelection()
             }
-
             this.$message.error(row.project_name + '库存不足')
             return
-          }else{
-            this.teamList = row
           }
-        }else{
-          this.teamList = row
         }
+        this.teamList = selection
       }, getPrescriptionTemplateInfo() {
         let params = {
           id: this.$route.query.id

src/xt_pages/workforce/components/editTableData.vue

@@ -1163,6 +1163,13 @@
               </template>
             </el-table-column>
           </el-table-column>
+          <el-table-column
+            prop="total"
+            label="合计"
+            width="30"
+            align="center"
+            >
+        </el-table-column>
         </el-table>
       </div>
     </div>
@@ -2109,7 +2116,8 @@ export default {
       schedulesGroup:[],
       numberList:[],
       newschedules:[],
-      newArr:[]
+      newArr:[],
+      count_num:null
     };
   },
 

src/xt_pages/workforce/components/tableData.vue

@@ -254,7 +254,6 @@
           width="50"
           align="center"
           fixed
-          
         >
         </el-table-column>
         <el-table-column
@@ -474,7 +473,6 @@
         </el-table-column>
         <el-table-column
           :label="'周日 (' + weekTitle[6] + ')'"
-
           align="center"
           v-if="isShowSeven"
 
@@ -509,6 +507,13 @@
           </schedule-item>
           </el-table-column>
         </el-table-column>
+        <el-table-column
+        prop="total"
+        label="合计"
+        width="30"
+        align="center"
+        >
+        </el-table-column>
       </el-table>
     </div>
 
@@ -895,7 +900,8 @@ export default {
       isShowShangWu:true,
       isShowXiaWu:true,
       isShowWanShang:true,
-      schedulesGroup:[]
+      schedulesGroup:[],
+      count_num:null
     };
   },
 
@@ -991,6 +997,7 @@ export default {
     }
   },
   created() {
+    
     // sessionStorage.setItem('value1',!this.value1);
     sessionStorage.removeItem('value1')
     var date = new Date()
@@ -1034,9 +1041,13 @@ export default {
     if (this.weekday == 0) {
       this.weekday = 7;
     }
-
+    // this.getnum()
+    // console.log('22222');
   },
   methods: {
+    // getnum(row,column, rowIndex, columnIndex){
+    //   console.log(row);
+    // },
     switchThis(flag){
       if(this.value1==false){
          sessionStorage.removeItem('value1')
@@ -1336,7 +1347,13 @@ export default {
      },
     //  单元格样式的回调
     cellClass({ row, column, rowIndex, columnIndex }) {
-      
+      // if(row[column.property].patient_id>0){
+      //   console.log('qqqqq',row[column.property])
+      // }
+     
+      // console.log('wwwww',column)
+      // console.log('eeeee',rowIndex)
+      // console.log('rrrrr',columnIndex)
       if(columnIndex==1&&row.zone_type!=1){
         return "table-row-new-class schedule-table-row Infectious_disease";
       }
@@ -1412,6 +1429,7 @@ export default {
     getSummaries(param) {
       const { columns, data } = param;
       const sums = [];
+      console.log();
       columns.forEach((column, index) => {
         if (index === 0 ) {
           sums[index] = "总数";
@@ -1421,6 +1439,10 @@ export default {
           sums[index] = data.length;
           return;
         }
+        if(index ===23){
+          sums[index]= this.count_num
+          return
+        }
 
         const values = data.map(item => item[column.property]);
 
@@ -1499,7 +1521,7 @@ export default {
         var Sun_M_One = []
         var Sun_A_One = []
         var Sun_N_One= []
-
+    
       for(let j in data){
         if(data[j].hasOwnProperty ('Mon_A') == true){
           Mon_A.push(data[j].Mon_A.mode_name)
@@ -2056,7 +2078,7 @@ export default {
           result.push(str);
       }
       sums[22]="总人数:"+ sums[22] +"\n"+result
-
+      // sums[23]= sums[23]
       return sums;
 
     },
@@ -2125,11 +2147,11 @@ export default {
       getSchedulesOne(params).then(response => {
         if (response.data.state == 1) {
           this.weekTitle = response.data.data.weekTitle;
-
+          console.log('ffffff',response.data.data.schdules.length);
           this.weekDays = response.data.data.days;
           this.toDay = response.data.data.today;
           var theSchedules = response.data.data.schdules;
-
+          this.count_num=response.data.data.schdules.length
           var schedulesGroup = response.data.data.schedulesGroup
           this.schedulesGroup = schedulesGroup
 

src/xt_pages/workforce/scheduleTablePrint.vue

@@ -621,7 +621,6 @@ export default {
                             total: 0
                             }
                             that.scheduleZone.push(thisPa)
-
                         })
                     })
                 }

src/xt_pages/workforce/scheduleTablePrintTwo.vue

@@ -47,207 +47,214 @@
                 <td style="min-width:50px;">{{ item.cut }}</td>
                 <td style="min-width:50px;" v-if="first_day == 1">
                   <span v-if="item.Mon_M.patient_id">
-                    <span>{{ item.Mon_M.patient }} </span>
-                    <span >{{ item.Mon_M.mode_name }}</span>
-                    <!-- <span v-if="org_id ==0">{{getAnticoagulant(item.Mon_M.anticoagulant)}}</span><br/> -->
-                    <span v-show="showflag">{{item.Mon_M.dialysis_machine_name}}</span>
+                    <span>{{ item.Mon_M.patient }} </span><br/>
+                    <span >{{ item.Mon_M.mode_name }}</span><br/>
+                    <span v-if="org_id ==0">{{getAnticoagulant(item.Mon_M.anticoagulant)}}</span><br/>
+                    <span v-show="showflag">{{item.Mon_M.dialysis_machine_name}}
+                   
+                    </span>
                   </span>
                 </td>
                 <td style="min-width:50px;" v-if="first_day == 1">
                   <span v-if="item.Mon_A.patient_id">
-                    <span>{{ item.Mon_A.patient }} </span>
-                    <span >{{ item.Mon_A.mode_name }}</span>
-                     <!-- <span v-if="org_id == 0">{{getAnticoagulant(item.Mon_A.anticoagulant)  }}</span> -->
+                    <span>{{ item.Mon_A.patient }} </span><br/>
+                    <span >{{ item.Mon_A.mode_name }}</span><br/>
+                     <span v-if="org_id == 0">{{getAnticoagulant(item.Mon_A.anticoagulant)  }}</span>
                     <span v-show="showflag">{{item.Mon_A.dialysis_machine_name}}
-
+                     
                     </span>
                   </span>
                 </td>
                 <td style="min-width:50px;" v-if="first_day == 1" >
                     <span v-if="item.Mon_N.patient_id">
-                        <span>{{ item.Mon_N.patient }} </span>
-                        <span >{{ item.Mon_N.mode_name }}</span>
-                        <!-- <span v-if="org_id == 0">{{getAnticoagulant(item.Mon_N.anticoagulant)  }}</span> -->
+                        <span>{{ item.Mon_N.patient }} </span><br/>
+                        <span >{{ item.Mon_N.mode_name }}</span><br/>
+                        <span v-if="org_id == 0">{{getAnticoagulant(item.Mon_N.anticoagulant)  }}</span>
                         <span v-show="showflag">{{item.Mon_N.dialysis_machine_name}}
-
+                         
                         </span>
                     </span>
                 </td>
                 <td style="min-width:50px;"  v-if="second_day == 2">
                     <span v-if="item.Tue_M.patient_id">
-                        <span>{{ item.Tue_M.patient }} </span>
-                        <span >{{ item.Tue_M.mode_name }}</span>
-                        <!-- <span v-if="org_id==0">{{getAnticoagulant(item.Tue_M.anticoagulant )  }}</span><br/> -->
+                        <span>{{ item.Tue_M.patient }} </span><br/>
+                        <span >{{ item.Tue_M.mode_name }}</span><br/>
+                        <span v-if="org_id==0">{{getAnticoagulant(item.Tue_M.anticoagulant )  }}</span><br/>
                         <span v-show="showflag">{{item.Tue_M.dialysis_machine_name}}
-
+                         
                         </span>
                     </span>
                 </td>
                 <td style="min-width:50px;"  v-if="second_day == 2">
                     <span v-if="item.Tue_A.patient_id">
-                      <span>{{ item.Tue_A.patient }} </span>
-                        <span >{{ item.Tue_A.mode_name }}</span>
-                        <!-- <span v-if="org_id ==0">{{ getAnticoagulant(item.Tue_A.anticoagulant)}}</span> -->
+                      <span>{{ item.Tue_A.patient }} </span><br/>
+                        <span >{{ item.Tue_A.mode_name }}</span><br/>
+                        <span v-if="org_id ==0">{{ getAnticoagulant(item.Tue_A.anticoagulant)}}</span>
                         <span v-show="showflag">{{item.Tue_A.dialysis_machine_name}}
-
+                         
                         </span>
 
                     </span>
                 </td>
                 <td style="min-width:50px;"  v-if="second_day == 2">
                     <span v-if="item.Tue_N.patient_id">
-                      <span>{{ item.Tue_N.patient }} </span>
-                        <span >{{ item.Tue_N.mode_name }}</span>
-                        <!-- <span v-if="org_id==0">{{getAnticoagulant(item.Tue_N.anticoagulant)  }}</span> -->
+                      <span>{{ item.Tue_N.patient }} </span><br/>
+                        <span >{{ item.Tue_N.mode_name }}</span><br/>
+                        <span v-if="org_id==0">{{getAnticoagulant(item.Tue_N.anticoagulant)  }}</span>
                         <span v-show="showflag">{{item.Tue_N.dialysis_machine_name}}
-
+                          
                         </span>
                     </span>
                 </td>
                 <td style="min-width:50px;" v-if="three_day == 3">
                     <span v-if="item.Wed_M.patient_id">
-                      <span>{{ item.Wed_M.patient }} </span>
-                        <span >{{ item.Wed_M.mode_name }}</span>
-                        <!-- <span v-if="org_id == 0">{{getAnticoagulant(item.Wed_M.anticoagulant)  }}</span><br/> -->
+                      <span>{{ item.Wed_M.patient }} </span><br/>
+                        <span >{{ item.Wed_M.mode_name }}</span><br/>
+                        <span v-if="org_id == 0">{{getAnticoagulant(item.Wed_M.anticoagulant)  }}</span><br/>
                         <span v-show="showflag">{{item.Wed_M.dialysis_machine_name}}
-
+                          
                         </span>
                     </span>
                 </td>
                 <td style="min-width:50px;" v-if="three_day == 3">
                     <span v-if="item.Wed_A.patient_id">
-                      <span>{{ item.Wed_A.patient }} </span>
-                        <span >{{ item.Wed_A.mode_name }}</span>
-                        <!-- <span v-if="org_id ==0">{{getAnticoagulant(item.Wed_A.anticoagulant)}}</span> -->
+                      <span>{{ item.Wed_A.patient }} </span><br/>
+                        <span >{{ item.Wed_A.mode_name }}</span><br/>
+                        <span v-if="org_id ==0">{{getAnticoagulant(item.Wed_A.anticoagulant)}}</span>
                         <span v-show="showflag">{{item.Wed_A.dialysis_machine_name}}
-
+                         
                         </span>
                     </span>
                 </td>
                 <td style="min-width:50px;" v-if="three_day == 3">
                     <span v-if="item.Wed_N.patient_id">
-                      <span>{{ item.Wed_N.patient }} </span>
-                        <span >{{ item.Wed_N.mode_name }}</span>
-                        <!-- <span v-if="org_id ==0">{{ getAnticoagulant(item.Wed_N.anticoagulant) }}</span> -->
+                      <span>{{ item.Wed_N.patient }} </span><br/>
+                        <span >{{ item.Wed_N.mode_name }}</span><br/>
+                        <span v-if="org_id ==0">{{ getAnticoagulant(item.Wed_N.anticoagulant) }}</span>
                         <span v-show="showflag">{{item.Wed_N.dialysis_machine_name}}
-
+                         
                         </span>
                     </span>
                 </td>
                 <td style="min-width:50px;" v-if="four_day == 4">
                     <span v-if="item.Thurs_M.patient_id">
-                      <span>{{ item.Thurs_M.patient }} </span>
-                        <span >{{ item.Thurs_M.mode_name }}</span>
-                        <!-- <span v-if="org_id == 0">{{ getAnticoagulant(item.Thurs_M.anticoagulant) }}</span> -->
+                      <span>{{ item.Thurs_M.patient }} </span><br/>
+                        <span >{{ item.Thurs_M.mode_name }}</span><br/>
+                        <span v-if="org_id == 0">{{ getAnticoagulant(item.Thurs_M.anticoagulant) }}</span>
                         <span v-show="showflag">{{item.Thurs_M.dialysis_machine_name}}
-
+                         
                         </span>
                     </span>
                 </td>
                 <td style="min-width:50px;" v-if="four_day == 4">
                     <span v-if="item.Thurs_A.patient_id">
-                      <span>{{ item.Thurs_A.patient }} </span>
-                        <span >{{ item.Thurs_A.mode_name }}</span>
-                        <!-- <span v-if="org_id ==0">{{getAnticoagulant(item.Thurs_A.anticoagulant) }}</span> -->
+                      <span>{{ item.Thurs_A.patient }} </span><br/>
+                        <span >{{ item.Thurs_A.mode_name }}</span><br/>
+                        <span v-if="org_id ==0">{{getAnticoagulant(item.Thurs_A.anticoagulant) }}</span> 
 
                         <span v-show="showflag">{{item.Thurs_A.dialysis_machine_name}}
-
+                        
                         </span>
                     </span>
                 </td>
                 <td style="min-width:50px;" v-if="four_day == 4">
                     <span v-if="item.Thurs_N.patient_id">
-                      <span>{{ item.Thurs_N.patient }} </span>
-                        <span >{{ item.Thurs_N.mode_name }}</span>
-                        <!-- <span v-if="org_id ==0" >{{ getAnticoagulant(item.Thurs_N.anticoagulant) }}</span> -->
+                      <span>{{ item.Thurs_N.patient }} </span><br/>
+                        <span >{{ item.Thurs_N.mode_name }}</span><br/>
+                        <span v-if="org_id ==0" >{{ getAnticoagulant(item.Thurs_N.anticoagulant) }}</span> 
                         <span v-show="showflag">{{item.Thurs_N.dialysis_machine_name}}
-
+                         
                         </span>
                     </span>
                 </td>
                 <td style="min-width:50px;" v-if="five_day == 5">
                     <span v-if="item.Fri_M.patient_id">
-                      <span>{{ item.Fri_M.patient }} </span>
-                        <span >{{ item.Fri_M.mode_name }}</span>
-                        <!-- <span v-if="org_id ==1">{{ getAnticoagulant(item.Fri_M.anticoagulant) }} </span><br/> -->
-                        <span >{{item.Fri_M.dialysis_machine_name}}
+                      <span>{{ item.Fri_M.patient }} </span><br/>
+                        <span >{{ item.Fri_M.mode_name }}</span><br/>
+                        <span v-if="org_id ==0">{{ getAnticoagulant(item.Fri_M.anticoagulant) }} </span><br/>
+                        <span v-show="showflag">{{item.Fri_M.dialysis_machine_name}}
+                          
                         </span>
                     </span>
                 </td>
                 <td style="min-width:50px;" v-if="five_day == 5">
                     <span v-if="item.Fri_A.patient_id">
-                      <span>{{ item.Fri_A.patient }} </span>
-                        <span >{{ item.Fri_A.mode_name }}</span>
-                        <!-- <span v-if="org_id ==0">{{ getAnticoagulant(item.Fri_A.anticoagulant) }}</span> -->
-                        <span>{{item.Fri_A.dialysis_machine_name}}</span>
+                      <span>{{ item.Fri_A.patient }} </span><br/>
+                        <span >{{ item.Fri_A.mode_name }}</span><br/>
+                        <span v-if="org_id ==0">{{ getAnticoagulant(item.Fri_A.anticoagulant) }}</span> 
+                        <span v-show="showflag">{{item.Fri_A.dialysis_machine_name}}
+                          
+                        </span>
                     </span>
                 </td>
                 <td style="min-width:50px;" v-if="five_day == 5">
                     <span v-if="item.Fri_N.patient_id">
-                      <span>{{ item.Fri_N.patient }} </span>
-                        <span >{{ item.Fri_N.mode_name }}</span>
-                        <!-- <span v-if="org_id == 0">{{getAnticoagulant(item.Fri_N.anticoagulant)  }}</span> -->
-                        <span>{{item.Fri_N.dialysis_machine_name}} </span>
+                      <span>{{ item.Fri_N.patient }} </span><br/>
+                        <span >{{ item.Fri_N.mode_name }}</span><br/>
+                        <span v-if="org_id == 0">{{getAnticoagulant(item.Fri_N.anticoagulant)  }}</span>
+                        <span v-show="showflag">{{item.Fri_N.dialysis_machine_name}}
+                          
+                        </span>
                     </span>
                 </td>
                 <td style="min-width:50px;" v-if="six_day == 6">
                     <span v-if="item.Sat_M.patient_id">
-                      <span>{{ item.Sat_M.patient }} </span>
-                        <span >{{ item.Sat_M.mode_name }}</span>
-                        <!-- <span v-if="org_id ==0">{{ getAnticoagulant(item.Sat_M.anticoagulant) }}</span> -->
+                      <span>{{ item.Sat_M.patient }} </span><br/>
+                        <span >{{ item.Sat_M.mode_name }}</span><br/>
+                        <span v-if="org_id ==0">{{ getAnticoagulant(item.Sat_M.anticoagulant) }}</span> 
                         <span v-show="showflag">{{item.Sat_M.dialysis_machine_name}}
-
+                         
                         </span>
                     </span>
                 </td>
                 <td style="min-width:50px;" v-if="six_day == 6">
                     <span v-if="item.Sat_A.patient_id">
-                      <span>{{ item.Sat_A.patient }} </span>
-                        <span >{{ item.Sat_A.mode_name }}</span>
-                        <!-- <span v-if="org_id ==0">{{ getAnticoagulant(item.Sat_A.anticoagulant) }}</span> -->
+                      <span>{{ item.Sat_A.patient }} </span><br/>
+                        <span >{{ item.Sat_A.mode_name }}</span><br/>
+                        <span v-if="org_id ==0">{{ getAnticoagulant(item.Sat_A.anticoagulant) }}</span> 
                         <span v-show="showflag">{{item.Sat_A.dialysis_machine_name}}
-
+                          
                         </span>
                     </span>
                 </td>
                 <td style="min-width:50px;" v-if="six_day == 6">
                     <span v-if="item.Sat_N.patient_id">
-                      <span>{{ item.Sat_N.patient }} </span>
-                        <span >{{ item.Sat_N.mode_name }}</span>
-                        <!-- <span v-if="org_id ==0">{{ getAnticoagulant(item.Sat_N.anticoagulant) }}</span> -->
+                      <span>{{ item.Sat_N.patient }} </span><br/>
+                        <span >{{ item.Sat_N.mode_name }}</span><br/>
+                        <span v-if="org_id ==0">{{ getAnticoagulant(item.Sat_N.anticoagulant) }}</span> 
                         <span v-show="showflag">{{item.Sat_N.dialysis_machine_name}}
-
+                         
                         </span>
                     </span>
                 </td>
                 <td style="min-width:50px;" v-if="seven_day == 7">
                     <span v-if="item.Sun_M.patient_id">
-                      <span>{{ item.Sun_M.patient }} </span>
-                        <span >{{ item.Sun_M.mode_name }}</span>
-                        <!-- <span v-if="org_id ==0">{{ getAnticoagulant(item.Sun_M.anticoagulant) }}</span> -->
+                      <span>{{ item.Sun_M.patient }} </span><br/>
+                        <span >{{ item.Sun_M.mode_name }}</span><br/>
+                        <span v-if="org_id ==0">{{ getAnticoagulant(item.Sun_M.anticoagulant) }}</span>
                         <span v-show="showflag">{{item.Sun_M.dialysis_machine_name}}
-
+                         
                         </span>
                     </span>
                 </td>
                 <td style="min-width:50px;" v-if="seven_day == 7">
                     <span v-if="item.Sun_A.patient_id">
-                      <span>{{ item.Sun_A.patient }} </span>
-                        <span >{{ item.Sun_A.mode_name }}</span>
-                        <!-- <span v-if="org_id ==0">{{getAnticoagulant(item.Sun_A.anticoagulant)}}</span> -->
+                      <span>{{ item.Sun_A.patient }} </span><br/>
+                        <span >{{ item.Sun_A.mode_name }}</span><br/>
+                        <span v-if="org_id ==0">{{getAnticoagulant(item.Sun_A.anticoagulant)}}</span>
                         <span v-show="showflag">{{item.Sun_A.dialysis_machine_name}}
-
+                         
                         </span>
 
                     </span>
                 </td>
                 <td style="min-width:50px;" v-if="seven_day == 7">
                     <span v-if="item.Sun_N.patient_id">
-                      <span>{{ item.Sun_N.patient }} </span>
-                        <span >{{ item.Sun_N.mode_name }}</span>
-                        <!-- <span v-if="org_id ==0">{{ getAnticoagulant(item.Sun_N.anticoagulant ) }}</span> -->
+                      <span>{{ item.Sun_N.patient }} </span><br/>
+                        <span >{{ item.Sun_N.mode_name }}</span><br/>
+                        <span v-if="org_id ==0">{{ getAnticoagulant(item.Sun_N.anticoagulant ) }}</span>
                         <span v-show="showflag">{{item.Sun_N.dialysis_machine_name}}
-
+                          
                         </span>
                     </span>
                 </td>
@@ -257,7 +264,7 @@
       </div>
     </div>
   </div>
-</template>
+</template> 
 
 <script>
 import {getSchedulesTwo,getWeekPanelsOne,getPatientSheduleCount,getAllZones,getSolutionSchedule} from "@/api/schedule";
@@ -378,10 +385,9 @@ export default {
               this.getWeekPanels()
               //统计患者排班数量
               this.getPatientSheduleCount()
-              console.log('2222222',response.data.data);
           }
         })
-      },
+      },  
       compare(p) { //这是比较函数
       return function (m, n) {
         var a = m[p];
@@ -405,7 +411,7 @@ export default {
                   return false
               }
               var partitions = response.data.data.partitions
-              console.log("分区2222",response.data.data)
+              console.log("分区",partitions)
               this.theWeek.thisWeek = response.data.data.theWeek
               this.theWeek.lastWeek = this.theWeek.thisWeek - 1
               this.theWeek.nextWeek = this.theWeek.thisWeek + 1
@@ -1319,12 +1325,12 @@ export default {
       // 投屏
       touping(){
         if(this.Screencasting ==false){
-
+         
           return this.Screencasting =true
         }else{
           return this.Screencasting =false
         }
-
+        
       },
       getAnticoagulant(val){
         var name= ""
@@ -1398,7 +1404,7 @@ export default {
       }
     }
   }
-
+  
 }
 </style>
 <style lang="scss" scoped>