11月14日 库存扣减更新

src/xt_pages/dialysis/details/dialog/monitor_dialog.vue

@@ -303,12 +303,22 @@
               {{ scope.row.replacement_rate ? scope.row.replacement_rate : "" }}
             </template>
           </el-table-column>
+          <el-table-column
+            prop="displacement_quantity"
+            align="center"
+            label="置换量(ml/h)"
+            width="100"
+            v-if=" isShow('置换量') && (template_id == 43)" >
+            <template slot-scope="scope">
+              {{ scope.row.displacement_quantity ? scope.row.displacement_quantity : "" }}
+            </template>
+          </el-table-column>
           <el-table-column
             prop="displacement_quantity"
             align="center"
             label="置换量(ml)"
             width="100"
-            v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id!=10191) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29)" >
+            v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id!=10191 && template_id!=43) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29)" >
             <template slot-scope="scope">
               {{ scope.row.displacement_quantity ? scope.row.displacement_quantity : "" }}
             </template>
@@ -319,7 +329,7 @@
             align="center"
             label="置换量(L)"
             width="100"
-            v-if=" isShow('置换量') &&  ((template_id != 6 || org_id == 9919 || org_id == 10191) && template_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29)" >
+            v-if=" isShow('置换量') &&  ((template_id != 6 || org_id == 9919 || org_id == 10191) && template_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29&& template_id != 43)" >
             <template slot-scope="scope">
               {{ scope.row.displacement_quantity ? scope.row.displacement_quantity : "" }}
             </template>

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -22,6 +22,7 @@
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
           <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29) " width="92px" > 置换率(ml/min) </th>
           <th v-if=" isShow('置换率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29" width="92px" > 置换率(L/h)  </th>
+          <th v-if=" isShow('置换量') && (template_id == 43)" width="92px"> 置换量(ml/h)  </th>
           <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29)" width="92px"  > 置换量(ml)  </th>
           <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29)" width="92px" > 置换量(L) </th>
           <th v-if=" isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11  " width="92px" > SpO₂(%) </th>

src/xt_pages/qcd/basicInformationAnalysis.vue

@@ -249,6 +249,11 @@
                       <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                   </span>
 
+                 <span v-if="item.mode_id == 'CRRT'">
+                      <p>CRRT:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
+                  </span>
+
                  <span v-if="item.mode_id == '未知'">
                       <p>未知:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
                       <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>

src/xt_pages/workforce/appointment.vue

@@ -546,7 +546,7 @@
           }
           
           if(this.export_type == 1){
-            console.log("进来了吗22323323223",this.tableList,this.newDay[0])
+      
             
             //  const multiHeader = [['区号', '机号', '周一'+"("+this.newDay[0]+")" , '', '', '周二'+"("+this.newDay[1]+")", '', '', '周三'+"("+this.newDay[2]+")" , '', '', '周四'+"("+this.newDay[3]+")" , '', '', '周五'+"("+this.newDay[4]+")" , '', '', '周六'+"("+this.newDay[5]+")" , '', '', '周日'+"("+this.newDay[6]+")" , '', '', '周一'+"("+this.days[7]+")" , '', '', '周二'+"("+this.days[8]+")" , '', '', '周三'+"("+this.days[9]+")" , '', '', '周四'+"("+this.days[10]+")" , '', '', '周五'+"("+this.days[11]+")" , '', '', '周六'+"("+this.days[12]+")" , '', '', '周日'+"("+this.days[13]+")", '', '', '周一'+"("+this.days[14]+")", '', '', '周二'+"("+this.days[15]+")", '', '', '周三'+"("+this.days[16]+")", '', '', '周四'+"("+this.days[17]+")", '', '', '周五'+"("+this.days[18]+")", '', '', '周六'+"("+this.days[19]+")", '', '', '周日'+"("+this.days[20]+")", '', '']]
             //  const header = ['', '', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上']
@@ -586,7 +586,7 @@
            
             
             const filename = '排班模版'
-            console.log("multiHeaders", this.$store.getters.xt_user.org.id,)
+     
 
             if(this.$store.getters.xt_user.org.id == 10234){
               excel.export_json_to_excel1({
@@ -702,33 +702,32 @@
         if (header.length == 65) {
          
           var isHas_1 = headers.includes('区号')
-          console.log("1"+isHas_1)
+ 
           var isHas_2 = headers.includes('机号')
-          console.log("2"+isHas_2)
-
+      
 
           var isHas_3 = headers.includes('周一'+"("+this.days[0]+")")
-          console.log("3"+isHas_3)
+      
 
 
           var isHas_4 = headers.includes('')
-          console.log("4"+isHas_4)
+       
 
 
           var isHas_5 = headers.includes('_1')
-          console.log("5"+isHas_5)
+        
 
           var isHas_6 = headers.includes('周二'+"("+this.days[1]+")")
-          console.log("6"+isHas_6)
+   
 
           var isHas_7 = headers.includes('_2')
-          console.log("7"+isHas_7)
+
 
           var isHas_8 = headers.includes('_3')
-          console.log("8"+isHas_8)
+
 
           var isHas_9 = headers.includes('周三'+"("+this.days[2]+")")
-          console.log("9"+isHas_9)
+
 
           var isHas_10 = headers.includes('_4')
           console.log("10"+isHas_10)
@@ -1246,14 +1245,34 @@
 
               }
             });
+            console.log("data232332233223",datas)
+            console.log("failed_datas33332332",failed_datas)
+            var newSchedule = datas.sort((a,b)=>{ return a.schedule_date-b.schedule_date})
+            var start_time = ""
+            var type = 0
+            if(failed_datas.length> 0){
+              var oldSchedule = failed_datas.sort((a,b)=>{ return a.schedule_date-b.schedule_date})
+              start_time = oldSchedule[0].schedule_date
+              type = 0 
+            }
 
-
+            if(failed_datas.length== 0){
+              start_time = newSchedule[0].schedule_date   
+              type = 1
+            }
+           
+            console.log("newSchedule2323223",newSchedule)
+            console.log("oldSchedule344433434",oldSchedule)
+          
+            var length = newSchedule.length - 1
             let params = {
               schedule: datas,
-              failed_schedule: failed_datas
-
+              failed_schedule: failed_datas,
+              start_time:start_time,
+              end_time:newSchedule[length].schedule_date,
+              delete_type:type,
             }
-
+            console.log("param2323233223",params)
             //今天的时间
             var day2 = new Date()
             day2.setTime(day2.getTime())
@@ -1261,8 +1280,6 @@
             var day = day2.getDate() < 10 ? '0' + (day2.getDate()).toString() : (day2.getMonth() + 1).toString()
             var date = day2.getFullYear() + '-' + month + '-' + day
 
-            console.log("params",params)
-            console.log("datae",date)
             exportSchedule(params, date).then(response => {
               if (response.data.state == 0) {
                 return false
@@ -1275,6 +1292,9 @@
         }
 
       },
+      sortData(a, b) {
+        return a.schedule_date - b.schedule_date
+      },
       getInitDate() {
         initDate().then(response => {
           if (response.data.state == 0) {
@@ -2685,7 +2705,7 @@
        changeWeek(val){
        
          var start = this.getTimestamp(val) - 57600
-         console.log("val23232332323232",start)
+        
          this.start_time = this.getTime(start)
          
          this.newDay.push(this.start_time)  
@@ -2794,16 +2814,14 @@
                 let weekOfday = parseInt(moment().format('d')) 
                 start_time =  this.getTimestamp(moment().subtract(weekOfday + 6, 'days').format('YYYY-MM-DD')) -28800
                 end_time =  this.getTimestamp(moment().subtract(weekOfday, 'days').format('YYYY-MM-DD')) -28800
-                console.log("start",start_time)
-                console.log("end",end_time)
+            
              }
             
             //本周
              if(this.form.lastweek == "2"){
                 start_time = this.getTimestamp(this.weekDayArr[0])
                 end_time = this.getTimestamp(this.weekDayArr[6])
-                console.log("start",start_time)
-                console.log("end",end_time)
+              
              }
 
             var label = ""
@@ -2823,7 +2841,7 @@
               copy_endtime:copy_endtime,
             }
          
-           console.log("param22222",params)
+   
            
            this.$refs[formName].validate(valid=>{
               if(valid){
@@ -2843,7 +2861,7 @@
           getScheduleTemplate().then(response=>{
              if(response.data.state == 1){
                 var template = response.data.data.template
-                console.log("模版",template)
+                
                 this.templateObj = template
              }
           })