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

src/router/index_路由未分离前.js

@@ -645,6 +645,7 @@ export const xt_asyncRouterMap = [
         name: 'CourseOfDiseaseManage',
         meta: { title: 'CourseOfDiseaseManage', noCache: true }
       },
+      
       {
         path: '/patients/rescue',
         component: () => import('@/xt_pages/user/rescueRecord'),

src/xt_pages/device/airDisinfectTwo.vue

@@ -49,7 +49,7 @@
                 </el-table-column>
                 <el-table-column prop="dwaiod" label="累计时间" align="center" min-width="50">
                     <template slot-scope="scope">
-                      {{scope.row.first_total_time }}
+                      {{scope.row.first_total_time?scope.row.first_total_time:"" }}
                     </template>
                 </el-table-column>
                 <el-table-column prop="date" label="责任人" align="center" min-width="50">
@@ -65,7 +65,7 @@
                 </el-table-column>
                 <el-table-column prop="province" label="累计时间" align="center" min-width="50">
                     <template slot-scope="scope">
-                      {{ scope.row.sencond_total_time }}
+                      {{ scope.row.sencond_total_time?scope.row.sencond_total_time:"" }}
                     </template>
                 </el-table-column>
                 <el-table-column prop="city" label="负责人" align="center" min-width="50">
@@ -81,7 +81,7 @@
                 </el-table-column>
                 <el-table-column prop="province" label="累计时间" align="center" min-width="45">
                     <template slot-scope="scope">
-                       {{scope.row.third_total_time }}
+                       {{scope.row.third_total_time?scope.row.third_total_time:"" }}
                     </template>
                 </el-table-column>
                 <el-table-column prop="city" label="负责人" align="center" min-width="50">
@@ -805,16 +805,63 @@
         saveNewAirDisinfect(formName){
           this.$refs[formName].validate((valid)=>{
             if(valid){
+                if(this.form.first_is_check!=""){
+                 this.form.first_is_check = parseInt(this.form.first_is_check)
+                }else{
+                  this.form.first_is_check = 0
+                }
+                
+                if( this.form.sencond_is_check!=""){
+                    this.form.sencond_is_check = parseInt(this.form.sencond_is_check)
+                }else{
+                    this.form.sencond_is_check = ""
+                }
+                
+                if( this.form.third_is_check!=""){
+                   this.form.third_is_check = parseInt(this.form.third_is_check)
+                }else{
+                    this.form.third_is_check = 0
+                }
+                if(this.form.last_is_check!=""){
+                  this.form.last_is_check = parseInt(this.form.last_is_check)
+                }else{
+                  this.form.last_is_check = 0
+                }
+                
+                if(this.form.first_modifications!=""){
+                  this.form.first_modifications = parseInt(this.form.first_modifications)
+                }else{
+                    this.form.first_modifications =0  
+                }
+
+                if(this.form.sencond_modifications!=""){
+                  this.form.sencond_modifications = parseInt(this.form.sencond_modifications)  
+                }else{
+                    this.form.sencond_modifications =0
+                }
                 
-                this.form.first_is_check = parseInt(this.form.first_is_check)
-                this.form.sencond_is_check = parseInt(this.form.sencond_is_check)
-                this.form.third_is_check = parseInt(this.form.third_is_check)
-                this.form.last_is_check = parseInt(this.form.last_is_check)
+                if(this.form.third_modifications!=""){
+                   this.form.third_modifications = parseInt(this.form.third_modifications)
+                }else{
+                    this.form.third_modifications= 0   
+                }
+                
+                if(this.form.last_modifications!=""){
+                    this.form.last_modifications = parseInt(this.form.last_modifications)
+                }else{
+                    this.form.last_modifications= 0
+                }
+            
+            
+            
+              
+              console.log("this232322323",this.form)
               saveNewAirDisinfect(this.form).then(response=>{
                  if(response.data.state == 1 ){
                    var disinfect = response.data.data.disinfect
                    this.$message.success("保存成功！")
                    this.dialogFormVisible = false
+                   this.getNewAirDisinfectList()
                  }
               })
             }
@@ -863,38 +910,38 @@
               console.log("list",list)
               this.form.id = list.id
               this.form.record_date = this.getTimes(list.record_date)
-              this.form.first_disinfection_water = list.first_disinfection_water
-              this.form.first_disinfection_methods = list.first_disinfection_methods
-              this.form.first_disinfection_time = list.first_disinfection_time
+              this.form.first_disinfection_water = list.first_disinfection_water?list.first_disinfection_water:""
+              this.form.first_disinfection_methods = list.first_disinfection_methods?list.first_disinfection_methods:""
+              this.form.first_disinfection_time = list.first_disinfection_time?list.first_disinfection_time:""
               this.form.first_start_time = this.getTimeThree(list.first_start_time)
               this.form.first_end_time = this.getTimeThree(list.first_end_time)
-              this.form.first_total_time = list.first_total_time
+              this.form.first_total_time = list.first_total_time?list.first_total_time:""
               this.form.first_is_check = list.first_is_check.toString()
-              this.form.first_modifications = list.first_modifications
+              this.form.first_modifications = list.first_modifications?list.first_modifications:""
               this.form.first_creator = list.first_creator
-              this.form.sencond_disinfection_water = list.sencond_disinfection_water
-              this.form.sencond_disinfection_methods = list.sencond_disinfection_methods
-              this.form.sencond_disinfection_time = list.sencond_disinfection_time
+              this.form.sencond_disinfection_water = list.sencond_disinfection_water?list.sencond_disinfection_water:""
+              this.form.sencond_disinfection_methods = list.sencond_disinfection_methods? list.sencond_disinfection_methods:""
+              this.form.sencond_disinfection_time = list.sencond_disinfection_time?list.sencond_disinfection_time:""
               this.form.sencond_start_time = this.getTimeThree(list.sencond_start_time)
               this.form.sencond_end_time = this.getTimeThree(list.sencond_end_time)
-              this.form.sencond_total_time = list.sencond_total_time
+              this.form.sencond_total_time = list.sencond_total_time?list.sencond_total_time:""
               this.form.sencond_is_check = list.sencond_is_check.toString()
-              this.form.sencond_modifications = list.sencond_modifications
+              this.form.sencond_modifications = list.sencond_modifications?list.sencond_modifications:""
               this.form.sencond_creator = list.sencond_creator
-              this.form.third_disinfection_water = list.third_disinfection_water
-              this.form.third_disinfection_methods = list.third_disinfection_methods
-              this.form.third_disinfection_time = list.third_disinfection_time
+              this.form.third_disinfection_water = list.third_disinfection_water?list.third_disinfection_water:""
+              this.form.third_disinfection_methods = list.third_disinfection_methods?list.third_disinfection_methods:""
+              this.form.third_disinfection_time = list.third_disinfection_time?list.third_disinfection_time:""
               this.form.third_start_time  =this.getTimeThree(list.third_start_time)
               this.form.third_end_time = this.getTimeThree(list.third_end_time)
-              this.form.third_total_time = list.third_total_time
+              this.form.third_total_time = list.third_total_time?list.third_total_time:""
               this.form.third_is_check = list.third_is_check.toString()
-              this.form.third_modifications = list.third_modifications
+              this.form.third_modifications = list.third_modifications?list.third_modifications:""
               this.form.third_creator = list.third_creator
               this.form.last_start_time = this.getTimeThree(list.last_start_time)
               this.form.last_end_time = this.getTimeThree(list.last_end_time)
-              this.form.last_total_time = list.last_total_time
+              this.form.last_total_time = list.last_total_time?list.last_total_time:""
               this.form.last_is_check = list.last_is_check.toString()
-              this.form.last_modifications = list.last_modifications
+              this.form.last_modifications = list.last_modifications?list.last_modifications:""
               this.form.last_creator = list.last_creator
               this.editDialogFormVisible = true
              
@@ -905,10 +952,53 @@
         
          this.$refs[formName].validate((valid)=>{
             if(valid){
-                this.form.first_is_check = parseInt(this.form.first_is_check)
-                this.form.sencond_is_check = parseInt(this.form.sencond_is_check)
-                this.form.third_is_check = parseInt(this.form.third_is_check)
-                this.form.last_is_check = parseInt(this.form.last_is_check)
+                if(this.form.first_is_check!=""){
+                 this.form.first_is_check = parseInt(this.form.first_is_check)
+                }else{
+                  this.form.first_is_check = 0
+                }
+                
+                if( this.form.sencond_is_check!=""){
+                    this.form.sencond_is_check = parseInt(this.form.sencond_is_check)
+                }else{
+                    this.form.sencond_is_check = ""
+                }
+                
+                if( this.form.third_is_check!=""){
+                   this.form.third_is_check = parseInt(this.form.third_is_check)
+                }else{
+                    this.form.third_is_check = 0
+                }
+                if(this.form.last_is_check!=""){
+                  this.form.last_is_check = parseInt(this.form.last_is_check)
+                }else{
+                  this.form.last_is_check = 0
+                }
+                
+                if(this.form.first_modifications!=""){
+                  this.form.first_modifications = parseInt(this.form.first_modifications)
+                }else{
+                    this.form.first_modifications =0  
+                }
+
+                if(this.form.sencond_modifications!=""){
+                  this.form.sencond_modifications = parseInt(this.form.sencond_modifications)  
+                }else{
+                    this.form.sencond_modifications =0
+                }
+                
+                if(this.form.third_modifications!=""){
+                   this.form.third_modifications = parseInt(this.form.third_modifications)
+                }else{
+                    this.form.third_modifications= 0   
+                }
+                
+                if(this.form.last_modifications!=""){
+                    this.form.last_modifications = parseInt(this.form.last_modifications)
+                }else{
+                    this.form.last_modifications= 0
+                }
+            
               updateAirDisinfect(this.form).then(response=>{
                 if(response.data.state == 1){
                   var disinfect =  response.data.data.disinfect

src/xt_pages/device/objectTableDisinfectTwo.vue

@@ -28,7 +28,7 @@
           <div class="tab_air">
             <el-table  :data="tableData" :fit="true" stripe>
                 <el-table-column prop="year" label="名称" width="150" align="center">
-                    <el-table-column prop="year" label="消毒时间/min" align="center" width="150">
+                    <el-table-column prop="year" label="消毒时间" align="center" width="150">
                         <el-table-column prop="year" label="日期" align="center" width="150">
                             <template slot-scope="scope">
                                 {{getTimes(scope.row.record_date) }}
@@ -39,7 +39,7 @@
                 </el-table-column>
                 <el-table-column prop="fenopda" :label="'湿化瓶'+'\n'+'500mg/l含氯制剂'" align="center" min-width="60">
                     <template slot-scope="scope">
-                        {{scope.row.first_total_time}}
+                        {{scope.row.first_total_time?scope.row.first_total_time:""}}
                     </template>
                 </el-table-column>
                 <el-table-column prop="dwaiod" label="责任人" align="center" min-width="60">
@@ -50,7 +50,7 @@
 
                 <el-table-column prop="date" :label="'止血带'+'\n'+'500mg/l含氯制剂'" align="center" min-width="60">
                     <template slot-scope="scope">
-                        {{scope.row.sencond_total_time}}
+                        {{scope.row.sencond_total_time?scope.row.sencond_total_time:""}}
                     </template>
                 </el-table-column>
                 <el-table-column prop="name" label="责任人" align="center" min-width="60">
@@ -61,7 +61,7 @@
 
                 <el-table-column prop="province" :label="'医疗垃圾桶'+'\n'+'1000mg/l含氯制剂'" align="center" min-width="60">
                     <template slot-scope="scope">
-                        {{scope.row.third_total_time}}
+                        {{scope.row.third_total_time?scope.row.third_total_time:""}}
                     </template>
                 </el-table-column>
                 <el-table-column prop="city" label="负责人" align="center" min-width="60">
@@ -72,7 +72,7 @@
 
                 <el-table-column prop="name" :label="'体温计'+'\n'+'75%酒精擦拭'" align="center" min-width="60">
                     <template slot-scope="scope">
-                        {{scope.row.fourth_total_time}}
+                        {{scope.row.fourth_total_time?scope.row.fourth_total_time:""}}
                     </template>
                 </el-table-column>
                 <el-table-column prop="province" label="负责人" align="center" min-width="60">
@@ -83,7 +83,7 @@
 
                 <el-table-column prop="city" :label="'体温枪'+'\n'+'75%酒精擦拭'" align="center" min-width="60">
                     <template slot-scope="scope">
-                        {{scope.row.fourth_total_time}}
+                        {{scope.row.fourth_total_time?scope.row.fourth_total_time:""}}
                     </template>
                 </el-table-column>
                 <el-table-column prop="province" label="负责人" align="center" min-width="60">
@@ -976,16 +976,75 @@
         saveObjectTableDisinfect(formName){
           this.$refs[formName].validate((valid=>{
             if(valid){
-                this.form.first_is_check = parseInt(this.form.first_is_check) 
-                this.form.sencond_is_check = parseInt(this.form.sencond_is_check) 
-                this.form.third_is_check = parseInt(this.form.third_is_check)
-                this.form.fourth_is_check = parseInt(this.form.fourth_is_check)
-                this.form.last_is_check = parseInt(this.form.last_is_check)
+                if(this.form.first_is_check!=""){
+                  this.form.first_is_check = parseInt(this.form.first_is_check) 
+                }else{
+                    this.form.first_is_check=0
+                }
+
+                if(this.form.sencond_is_check!=""){
+                  this.form.sencond_is_check = parseInt(this.form.sencond_is_check) 
+                }else{
+                    this.form.sencond_is_check=0  
+                }
+
+                if(this.form.third_is_check!=""){
+                  this.form.third_is_check = parseInt(this.form.third_is_check)
+                }else{
+                    this.form.third_is_check = 0
+                }
+                
+                if(this.form.fourth_is_check!=""){
+                  this.form.fourth_is_check = parseInt(this.form.fourth_is_check)
+                }else{
+                    this.form.fourth_is_check =0  
+                }
+
+                if(this.form.last_is_check!=""){
+                    this.form.last_is_check = parseInt(this.form.last_is_check)
+                }else{
+                    this.form.last_is_check = 0
+                }
+
+
+                if(this.form.first_modifications!=""){
+                  this.form.first_modifications = parseInt(this.form.first_modifications) 
+                }else{
+                    this.form.first_modifications=0
+                }
+
+                if(this.form.sencond_modifications!=""){
+                  this.form.sencond_modifications = parseInt(this.form.sencond_modifications) 
+                }else{
+                    this.form.sencond_modifications=0  
+                }
+
+                if(this.form.third_modifications!=""){
+                  this.form.third_modifications = parseInt(this.form.third_modifications)
+                }else{
+                    this.form.third_modifications = 0
+                }
+                
+                if(this.form.fourth_modifications!=""){
+                  this.form.fourth_modifications = parseInt(this.form.fourth_modifications)
+                }else{
+                    this.form.fourth_modifications =0  
+                }
+
+                if(this.form.last_modifications!=""){
+                    this.form.last_modifications = parseInt(this.form.last_modifications)
+                }else{
+                    this.form.last_modifications = 0
+                }
+              
+              
+               
               saveObjectTableDisinfect(this.form).then(response=>{
                  if(response.data.state == 1){
                    var objectDisinfect =  response.data.data.objectDisinfect
                    this.$message.success("保存成功!")
                    this.dialogFormVisible = false
+                   this.getObjectTableDisInfectList()
                  }
               })
             }
@@ -1013,53 +1072,53 @@
               console.log("list",list)
               this.form.id = list.id
               this.form.record_date = this.getTimes(list.record_date)
-              this.form.first_disinfection_water = list.first_disinfection_water
-              this.form.first_disinfection_methods = list.first_disinfection_methods
-              this.form.first_disinfection_time = list.first_disinfection_time
+              this.form.first_disinfection_water = list.first_disinfection_water? list.first_disinfection_water:""
+              this.form.first_disinfection_methods = list.first_disinfection_methods? list.first_disinfection_methods:""
+              this.form.first_disinfection_time = list.first_disinfection_time?list.first_disinfection_time:""
               this.form.first_start_time = this.getTimeThree(list.first_start_time)
               this.form.first_end_time = this.getTimeThree(list.first_end_time)
-              this.form.first_total_time = list.first_total_time
+              this.form.first_total_time = list.first_total_time?list.first_total_time:""
               this.form.first_is_check = list.first_is_check.toString()
-              this.form.first_modifications = list.first_modifications
+              this.form.first_modifications = list.first_modifications?list.first_modifications:""
               this.form.first_creator = list.first_creator
-              this.form.sencond_disinfection_water = list.sencond_disinfection_water
-              this.form.sencond_disinfection_methods = list.sencond_disinfection_methods
-              this.form.sencond_disinfection_time = list.sencond_disinfection_time
+              this.form.sencond_disinfection_water = list.sencond_disinfection_water?list.sencond_disinfection_water:""
+              this.form.sencond_disinfection_methods = list.sencond_disinfection_methods?list.sencond_disinfection_methods:""
+              this.form.sencond_disinfection_time = list.sencond_disinfection_time?list.sencond_disinfection_time:""
               this.form.sencond_start_time = this.getTimeThree(list.sencond_start_time)
               this.form.sencond_end_time = this.getTimeThree(list.sencond_end_time)
-              this.form.sencond_total_time = list.sencond_total_time
+              this.form.sencond_total_time = list.sencond_total_time?list.sencond_total_time:""
               this.form.sencond_is_check = list.sencond_is_check.toString()
-              this.form.sencond_modifications = list.sencond_modifications
+              this.form.sencond_modifications = list.sencond_modifications?list.sencond_modifications:""
               this.form.sencond_creator = list.sencond_creator
-              this.form.third_disinfection_water = list.third_disinfection_water
-              this.form.third_disinfection_methods = list.third_disinfection_methods
-              this.form.third_disinfection_time = list.third_disinfection_time
+              this.form.third_disinfection_water = list.third_disinfection_water?list.third_disinfection_water:""
+              this.form.third_disinfection_methods = list.third_disinfection_methods?list.third_disinfection_methods:""
+              this.form.third_disinfection_time = list.third_disinfection_time?list.third_disinfection_time:""
               this.form.third_start_time  =this.getTimeThree(list.third_start_time)
               this.form.third_end_time = this.getTimeThree(list.third_end_time)
-              this.form.third_total_time = list.third_total_time
+              this.form.third_total_time = list.third_total_time?list.third_total_time:""
               this.form.third_is_check = list.third_is_check.toString()
-              this.form.third_modifications = list.third_modifications
+              this.form.third_modifications = list.third_modifications?list.third_modifications:""
               this.form.third_creator = list.third_creator
 
-              this.form.fourth_disinfection_water = list.third_disinfection_water
-              this.form.fourth_disinfection_methods = list.third_disinfection_methods
-              this.form.fourth_disinfection_time = list.third_disinfection_time
+              this.form.fourth_disinfection_water = list.third_disinfection_water?list.third_disinfection_water:""
+              this.form.fourth_disinfection_methods = list.third_disinfection_methods?list.third_disinfection_methods:""
+              this.form.fourth_disinfection_time = list.third_disinfection_time?list.third_disinfection_time:""
               this.form.fourth_start_time  =this.getTimeThree(list.third_start_time)
               this.form.fourth_end_time = this.getTimeThree(list.third_end_time)
-              this.form.fourth_total_time = list.third_total_time
+              this.form.fourth_total_time = list.third_total_time? list.third_total_time:""
               this.form.fourth_is_check = list.third_is_check.toString()
-              this.form.fourth_modifications = list.third_modifications
+              this.form.fourth_modifications = list.third_modifications?list.third_modifications:""
               this.form.fourth_creator = list.third_creator
 
               this.form.last_start_time = this.getTimeThree(list.last_start_time)
               this.form.last_end_time = this.getTimeThree(list.last_end_time)
-              this.form.last_total_time = list.last_total_time
+              this.form.last_total_time = list.last_total_time?list.last_total_time:""
               this.form.last_is_check = list.last_is_check.toString()
-              this.form.last_modifications = list.last_modifications
+              this.form.last_modifications = list.last_modifications?list.last_modifications:""
               this.form.last_creator = list.last_creator
-              this.form.last_disinfection_water = list.last_disinfection_water
-              this.form.last_disinfection_methods = list.last_disinfection_methods
-              this.form.last_disinfection_time = list.last_disinfection_time
+              this.form.last_disinfection_water = list.last_disinfection_water?list.last_disinfection_water:""
+              this.form.last_disinfection_methods = list.last_disinfection_methods?list.last_disinfection_methods:""
+              this.form.last_disinfection_time = list.last_disinfection_time?list.last_disinfection_time:""
               this.editDialogFormVisible = true
             }
           })
@@ -1067,11 +1126,66 @@
         updateObjectTableDisinfect(formName){
           this.$refs[formName].validate((valid=>{
             if(valid){
-                this.form.first_is_check = parseInt(this.form.first_is_check) 
-                this.form.sencond_is_check = parseInt(this.form.sencond_is_check) 
-                this.form.third_is_check = parseInt(this.form.third_is_check)
-                this.form.fourth_is_check = parseInt(this.form.fourth_is_check)
-                this.form.last_is_check = parseInt(this.form.last_is_check)
+                if(this.form.first_is_check!=""){
+                  this.form.first_is_check = parseInt(this.form.first_is_check) 
+                }else{
+                    this.form.first_is_check=0
+                }
+
+                if(this.form.sencond_is_check!=""){
+                  this.form.sencond_is_check = parseInt(this.form.sencond_is_check) 
+                }else{
+                    this.form.sencond_is_check=0  
+                }
+
+                if(this.form.third_is_check!=""){
+                  this.form.third_is_check = parseInt(this.form.third_is_check)
+                }else{
+                    this.form.third_is_check = 0
+                }
+                
+                if(this.form.fourth_is_check!=""){
+                  this.form.fourth_is_check = parseInt(this.form.fourth_is_check)
+                }else{
+                    this.form.fourth_is_check =0  
+                }
+
+                if(this.form.last_is_check!=""){
+                    this.form.last_is_check = parseInt(this.form.last_is_check)
+                }else{
+                    this.form.last_is_check = 0
+                }
+
+
+                if(this.form.first_modifications!=""){
+                  this.form.first_modifications = parseInt(this.form.first_modifications) 
+                }else{
+                    this.form.first_modifications=0
+                }
+
+                if(this.form.sencond_modifications!=""){
+                  this.form.sencond_modifications = parseInt(this.form.sencond_modifications) 
+                }else{
+                    this.form.sencond_modifications=0  
+                }
+
+                if(this.form.third_modifications!=""){
+                  this.form.third_modifications = parseInt(this.form.third_modifications)
+                }else{
+                    this.form.third_modifications = 0
+                }
+                
+                if(this.form.fourth_modifications!=""){
+                  this.form.fourth_modifications = parseInt(this.form.fourth_modifications)
+                }else{
+                    this.form.fourth_modifications =0  
+                }
+
+                if(this.form.last_modifications!=""){
+                    this.form.last_modifications = parseInt(this.form.last_modifications)
+                }else{
+                    this.form.last_modifications = 0
+                }
                 console.log("hhahdhfhahdf",this.form)
                 updateObjectTableDisinfect(this.form).then(response=>{
                  if(response.data.state == 1){

src/xt_pages/dialysis/PatientBox.vue

@@ -358,6 +358,7 @@ export default {
       date: "",
       modedata: 0,
       stockType: [],
+      dryWeightList:[],
     };
   },
   props: {
@@ -594,6 +595,8 @@ export default {
           this.stockType = stockType;
           console.log("元单快乐222222", this.stockType);
 
+          this.dryWeightList = resp.data.dryWeightList
+
           this.$refs.prescription.setLastRecord(
             schedual,
             lastAssessmentAfterDislysis,

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -823,6 +823,21 @@
                           }}
                         </div>
                       </div>
+
+                      <div class="inline_block" style="flex: 1" v-if="org_id ==0 || org_id ==10440">
+                        衣物重：
+                        <div
+                          class="under_line"
+                          style="width: 70px; text-align: center"
+                        >
+                          {{
+                            record.assessment_before_dislysis &&
+                            record.assessment_before_dislysis.additional_weight
+                              ? record.assessment_before_dislysis.additional_weight
+                              : "/"
+                          }}
+                        </div>
+                      </div>
                       <div
                         class="inline_block"
                         style="flex: 1"
@@ -874,10 +889,12 @@
                     </div>
 
                     <div
+                    
                       class="row"
                       style="padding: 2px 0; line-height: 23px; display: flex"
                     >
-                      <div class="inline_block" style="flex: 1">
+                      <div class="inline_block" style="flex: 1"
+                        v-if="org_id!=10440 && org_id !=0">
                         上次透后体重：
                         <div
                           class="under_line"
@@ -2442,6 +2459,35 @@
                           }}
                         </div>
                       </div>
+                    </div>
+                     <div
+                     v-if="org_id ==0 || org_id ==10440"
+                      class="row"
+                      style="padding: 2px 0; line-height: 23px; display: flex"
+                    >
+                      <div
+                        class="inline_block"
+                        style="flex: 1; display: inline-block"
+                      >
+                        衣物重：
+                        <div
+                          class="under_line"
+                          style="
+                            width: 100px;
+                            line-height: 25px;
+                            text-align: left;
+                            margin-left: 2px;
+                            display: inline-block;
+                            white-space: normal;
+                          "
+                        >
+                          {{
+                            record.assessment_after_dislysis && record.assessment_after_dislysis.additional_weight
+                              ? record.assessment_after_dislysis.additional_weight
+                              : "/"
+                          }}
+                        </div>
+                      </div>
                     </div>
                     <div
                       class="row"

src/xt_pages/dialysis/batch_print/batch_print_order_thirteen.vue

@@ -57,7 +57,7 @@
                         岁
                     </div>
                     <div class="inline_block" style="margin-right:5px;">
-                        机器编号
+                        床位号
                         <div class="inline_block under_line" style="width:80px;">
                           {{ record.device_zone.name && record.device_number.number ? getNewNumber(record.device_zone.name,record.device_number.number) : '' }}
                         <!-- {{ record.device_zone.name && record.device_number.number ? record.device_zone.name + record.device_number.number : '' }} -->

src/xt_pages/dialysis/batch_print/batch_print_order_twentyEight.vue

@@ -743,8 +743,8 @@
                       <table class="table-box">
                         <tbody>
                           <tr>
-                            <td width="70">穿刺方式:</td>
-                            <td width="220">
+                            <td width="80">穿刺方式:</td>
+                            <td width="250">
                               <div>
                                 <label-box
                                   showValue="绳梯"
@@ -782,9 +782,21 @@
                               </div>
                             </td>
                             <td width="60"></td>
-                            <td width="60">穿刺针:</td>
-                            <td width="200">
+                            <td width="70">穿刺针:</td>
+                            <td width="290">
                               <div>
+                                <label-box
+                                  :isChecked="
+                                    record.assessment_before_dislysis
+                                      .puncture_needle &&
+                                    record.assessment_before_dislysis.puncture_needle.indexOf(
+                                      '15G'
+                                    ) > -1
+                                      ? true
+                                      : false
+                                  "
+                                  showValue="15G"
+                                ></label-box>
                                 &nbsp;
                                 <label-box
                                   :isChecked="

src/xt_pages/dialysis/details/NavIgation.vue

@@ -122,6 +122,8 @@
       :dry_weight="last_dryWeight_dislysis"
       :lastAssessment="lastAssessment"
        :prescription="prescription"
+       :dryWeightList="dryWeightList"
+       :docList="docList"
     ></assessment-before-dislysis-dialog>
 
     <treatment-summary-dialog
@@ -185,6 +187,7 @@
       :prescription="prescription"
       :predialysis_evaluation="predialysis_evaluation"
       :dialysis_order="dialysis_order"
+    
     ></assessment-after-dislysis>
   </div>
 </template>
@@ -565,6 +568,18 @@ export default {
         return { id: 0 };
       }
     },
+    dryWeightList:{
+      type:Array,
+      default:()=>{
+        return [];
+      } 
+    },
+    docList:{
+      type:Array,
+      default:()=>{
+        return [];
+      } 
+    }
   },
   methods: {
     getUnReadNum: function() {

src/xt_pages/dialysis/details/consumable/dialysisDrug.vue

@@ -192,7 +192,7 @@
   import { GetAllZone,getDialysisAdviceTemplateList,getDialysisAdviceSchedudeList } from '@/api/dialysis'
 
   import { uParseTime } from "@/utils/tools";
-
+  const moment = require('moment')
   export default {
     components: {
       
@@ -661,13 +661,64 @@
             }
           }
         }
-        if(newArr!=null && newArr.length > 0){
-          for(let i=0;i<newArr.length;i++){
-            his_str += newArr[i].advice_name +' '+newArr[i].advice_desc  +newArr[i].drug_spec_unit +' ' +newArr[i].prescribing_number  +newArr[i].prescribing_number_unit + "。"
+
+        if(this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 0){
+          //  console.log("----------------------",this.selected_date)
+            console.log("星期",this.getweekday(this.selected_date))
+            var newArrList = []
+            // var total_day = ""
+            // if(moment().weekday() == 1){
+            //   total_day ="周一"
+            // }
+            // if(moment().weekday() == 2){
+            //   total_day ="周二"
+            // }
+            // if(moment().weekday() == 3){
+            //   total_day ="周三"
+            // }
+            // if(moment().weekday() == 4){
+            //   total_day ="周四"
+            // }
+            // if(moment().weekday() == 5){
+            //   total_day ="周五"
+            // }
+            // if(moment().weekday() == 6){
+            //   total_day ="周六"
+            // }
+            // if(moment().weekday() == 7){
+            //   total_day ="周日"
+            // }
+          if(newArr!=null && newArr.length >0){
+            for(let i=0;i<newArr.length;i++){
+              if((newArr[i].frequency_type == 1) || (newArr[i].frequency_type == 3 && newArr[i].week_day.indexOf(this.getweekday(this.selected_date))!=-1)){
+                console.log("药品名称",newArr[i].advice_name)
+                 newArrList.push(newArr[i])
+              }
+              newArrList = this.unique(newArrList)
+              
+            }
+            if(newArrList!=null && newArrList.length > 0){
+              for(let i=0;i<newArrList.length;i++){
+                his_str += newArrList[i].advice_name +' '+newArrList[i].advice_desc  +newArrList[i].drug_spec_unit +' ' +newArrList[i].prescribing_number  +newArrList[i].prescribing_number_unit + "。"
+              }
+            }
+          }
+        }
+        if(this.$store.getters.xt_user.org_id != 9671 && this.$store.getters.xt_user.org_id != 0){
+         
+          if(newArr!=null && newArr.length > 0){
+            for(let i=0;i<newArr.length;i++){
+              his_str += newArr[i].advice_name +' '+newArr[i].advice_desc  +newArr[i].drug_spec_unit +' ' +newArr[i].prescribing_number  +newArr[i].prescribing_number_unit + "。"
+            }
           }
         }
+      
         return his_str
       },
+      unique (arr) {
+        const res = new Map()
+        return arr.filter((arr) => !res.has(arr.id) && res.set(arr.id, 1))
+      },
       getHisAdviceContent(patient_id){
         var arr = []
         for(let i=0;i<this.templateList.length;i++){
@@ -750,7 +801,14 @@
      changePartionType(){
       this.tableList = []
       this.statistics()
-     }
+     },
+     getweekday(date){
+        var weekArray = new Array("周日", "周一", "周二", "周三", "周四", "周五", "周六");
+
+        var week = weekArray[new Date(date).getDay()];//注意此处必须是先new一个Date
+
+        return week;
+      }
     }
   }
 </script>

src/xt_pages/dialysis/details/consumable/dialysisDrugPrint.vue

@@ -57,6 +57,7 @@
 </template>
 
 <script>
+ const moment = require('moment')
  import { getDialysisAdviceTemplateList } from '@/api/dialysis'
   import { parseTime } from '@/utils'
   import { uParseTime } from '@/utils/tools'
@@ -195,11 +196,56 @@
             }
           }
         }
-        if(newArr!=null && newArr.length > 0){
-          for(let i=0;i<newArr.length;i++){
-            his_str += newArr[i].advice_name +' '+newArr[i].advice_desc + newArr[i].drug_spec_unit +' ' +newArr[i].prescribing_number  +newArr[i].prescribing_number_unit + "。"
+
+        if(this.$store.getters.xt_user.org_id == 10469 || this.$store.getters.xt_user.org_id == 0){
+            var newArrList = []
+            // var total_day = ""
+            // if(moment().weekday() == 1){
+            //   total_day ="周一"
+            // }
+            // if(moment().weekday() == 2){
+            //   total_day ="周二"
+            // }
+            // if(moment().weekday() == 3){
+            //   total_day ="周三"
+            // }
+            // if(moment().weekday() == 4){
+            //   total_day ="周四"
+            // }
+            // if(moment().weekday() == 5){
+            //   total_day ="周五"
+            // }
+            // if(moment().weekday() == 6){
+            //   total_day ="周六"
+            // }
+            // if(moment().weekday() == 7){
+            //   total_day ="周日"
+            // }
+          if(newArr!=null && newArr.length >0){
+            for(let i=0;i<newArr.length;i++){
+              if((newArr[i].frequency_type == 1) || (newArr[i].frequency_type == 3 && newArr[i].week_day.indexOf(this.getweekday(this.$route.query.schedule_date))!=-1)){
+                
+                 newArrList.push(newArr[i])
+              }
+              newArrList = this.unique(newArrList)
+              
+            }
+            if(newArrList!=null && newArrList.length > 0){
+              for(let i=0;i<newArrList.length;i++){
+                his_str += newArrList[i].advice_name +' '+newArrList[i].advice_desc  +newArrList[i].drug_spec_unit +' ' +newArrList[i].prescribing_number  +newArrList[i].prescribing_number_unit + "。"
+              }
+            }
+          }
+        }
+        if(this.$store.getters.xt_user.org_id != 10469 && this.$store.getters.xt_user.org_id != 0){
+         
+          if(newArr!=null && newArr.length > 0){
+            for(let i=0;i<newArr.length;i++){
+              his_str += newArr[i].advice_name +' '+newArr[i].advice_desc  +newArr[i].drug_spec_unit +' ' +newArr[i].prescribing_number  +newArr[i].prescribing_number_unit + "。"
+            }
           }
         }
+      
         return his_str
       },
       getHisAdviceContent(patient_id){
@@ -217,7 +263,20 @@
         }
         return str 
       },
-    
+      unique (arr) {
+        const res = new Map()
+        return arr.filter((arr) => !res.has(arr.id) && res.set(arr.id, 1))
+      },
+
+      getweekday(date){
+        var weekArray = new Array("周日", "周一", "周二", "周三", "周四", "周五", "周六");
+
+        var week = weekArray[new Date(date).getDay()];//注意此处必须是先new一个Date
+
+        return week;
+      }
+
+      
     }
   }
 </script>

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

@@ -223,7 +223,7 @@
         :cell-class-name="adviceNameShow"
         :modal-append-to-body="false"
         highlight-current-row
-
+        
       >
       <!-- @selection-change="handleSelectionChange" -->
         <!-- <el-table-column type="selection"  width="55"></el-table-column> -->
@@ -257,6 +257,7 @@
             <el-dropdown trigger="click" v-if="scope.row.parent_id > 0">
               <span class="el-dropdown-link">
                 &emsp;{{ getAdviceContent(scope.row, 2)}}
+               
                 <i class="el-icon-arrow-down el-icon--right"></i>
               </span>
               <el-dropdown-menu slot="dropdown">
@@ -290,7 +291,7 @@
           </template>
         </el-table-column>
         <el-table-column
-          v-if="template_id != 6 && org_id!=10223 && org_id!=10445"
+          v-if="template_id != 6 && org_id!=10223 && org_id!=10445 && org_id!=0"
           prop="checker"
           min-width="30px"
           align="center"
@@ -304,7 +305,7 @@
         </el-table-column>
       </el-table>
 
-
+     
 
       <el-table
         v-if="his_is_open  == 1 || is_advice_open == 1"
@@ -359,6 +360,7 @@
             <el-dropdown trigger="click" v-if="scope.row.parent_id > 0">
               <span class="el-dropdown-link">
                 &emsp;{{ getAdviceContent(scope.row, 2)}}
+                 
                 <i class="el-icon-arrow-down el-icon--right"></i>
               </span>
               <el-dropdown-menu slot="dropdown">
@@ -781,6 +783,7 @@
         src_type:"",
         org_id:0,
         schedulePatient:{},
+        tempArrOne:[],
       }
     },
     watch: {
@@ -795,12 +798,40 @@
         this.form['dialysis_order_id'] = this.dialysis_order.id
       },
 
+      'doctor_advices': function() {
+      
+        this.handleSpanTempArrOne();
+      },
+     
     },
     methods: {
+      handleSpanTempArrOne() {
+          this.tempArrOne = [];
+          console.log("hhahhahahahahah",this.doctor_advices)
+          for (let i = 0; i < this.doctor_advices.length; i++) {
+            if (i === 0) {
+              this.tempArrOne.push(1);
+              this.pos = 0;
+            } else {
+              // 判断当前元素与上一个元素是否相同
+              if (
+                this.doctor_advices[i].groupno ===
+                this.doctor_advices[i - 1].groupno
+              ) {
+                this.tempArrOne[this.pos] += 1;
+                this.tempArrOne.push(0);
+              } else {
+                this.tempArrOne.push(1);
+                this.pos = i;
+              }
+            }
+          }
+      },
       handleSelectionChange(){
 
       },
-
+     
+    
       //调试
       lili(index,row){
         // console.log("==index==",index)
@@ -918,6 +949,7 @@
           return ''
         }
       },
+     
       submitEditAdvice() {
         // console.log()
         console.log("保存22222222222222")
@@ -1304,6 +1336,12 @@
                 return false
               }
 
+              if(msg == 6){
+                this.$message.error("执行失败,请重新执行")
+                this.execTimeDialogVisible = false
+                return false
+              }
+
             }
           })
           .catch(() => {
@@ -2088,17 +2126,8 @@
         return true
       }
       ,
-      mergeSpan({ row, column, rowIndex, columnIndex }) {
-        if (columnIndex != 2) {
-          const _row = this.tempArr[rowIndex]
-          const _col = _row > 0 ? 1 : 0
-          return {
-            rowspan: _row,
-            colspan: _col
-          }
-        }
-      }
-      ,
+    
+      
       handleSpanTempArr() {
         this.tempArr = []
 
@@ -2261,34 +2290,45 @@
         // });
       },
       objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+        console.log("hhhhhhhhhh",this.tempArrOne)
+        //合并单元格
+        if (columnIndex === 0 || columnIndex === 1 ) {
+          const _row = this.tempArrOne[rowIndex];
+          const _col = _row > 0 ? 1 : 0;
+          console.log("_row====",_row)
+          console.log("_row----------",_col)
+          return {
+            rowspan: _row,
+            colspan: _col
+          };
+        }
+        // if (columnIndex === 0) {
+        //   if (rowIndex % 2 === 0) {
+        //     return {
+        //       rowspan: 2,
+        //       colspan: 1
+        //     }
+        //   } else {
+        //     return {
+        //       rowspan: 0,
+        //       colspan: 0
+        //     }
+        //   }
+        // }
 
-        if (columnIndex === 0) {
-          if (rowIndex % 2 === 0) {
-            return {
-              rowspan: 2,
-              colspan: 1
-            }
-          } else {
-            return {
-              rowspan: 0,
-              colspan: 0
-            }
-          }
-        }
-
-        if (columnIndex === 1) {
-          if (rowIndex % 2 === 0) {
-            return {
-              rowspan: 2,
-              colspan: 1
-            }
-          } else {
-            return {
-              rowspan: 0,
-              colspan: 0
-            }
-          }
-        }
+        // if (columnIndex === 1) {
+        //   if (rowIndex % 2 === 0) {
+        //     return {
+        //       rowspan: 2,
+        //       colspan: 1
+        //     }
+        //   } else {
+        //     return {
+        //       rowspan: 0,
+        //       colspan: 0
+        //     }
+        //   }
+        // }
       }
       ,
       GetLastOrNextDoctorAdvice(params) {
@@ -2594,7 +2634,7 @@
       }
     },
     created() {
-    
+     
       var date = this.$route.query && this.$route.query.date
       this.record_date = uParseTime(date, '{y}-{m}-{d}')
       this.form.advice_date = this.record_date

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

@@ -711,33 +711,31 @@
         </el-form-item>
       </el-form>
       <!-- 六次干体重调整记录 -->
-      <!-- <div  style="margin: 10px 50px;"><span style="font-weight: bold;">近六次干体重调整记录</span></div>
+      <div  style="margin: 10px 50px;"><span style="font-weight: bold;">近六次干体重调整记录</span></div>
       <div class="gantizhong">
-        <el-table
-          :data="tableData"
-          stripe
-          style="width: 100%">
-          <el-table-column
-            prop=""
-            label="时间"
-            width="180">
+        <el-table :data="dryWeightList" stripe style="width: 100%">
+          <el-table-column prop="" label="时间"  width="180">
+            <template slot-scope="scope">
+                {{ getTime(scope.row.ctime) }}
+            </template>
           </el-table-column>
-          <el-table-column
-            prop=""
-            label="干体重"
-            width="180">
+          <el-table-column prop="" label="干体重" width="180">
+            <template slot-scope="scope">
+              {{scope.row.dry_weight }}
+            </template>
           </el-table-column>
-          <el-table-column
-            prop=""
-            label="医生"
-            width="180">
+          <el-table-column  prop=""  label="医生"  width="180">
+            <template slot-scope="scope">
+              {{getUserName(scope.row.creator) }}
+            </template>
           </el-table-column>
-          <el-table-column
-            prop=""
-            label="备注">
+          <el-table-column prop="" label="备注">
+            <template slot-scope="scope">
+              {{scope.row.remakes }}
+            </template>
           </el-table-column>
         </el-table>
-      </div> -->
+      </div>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancleDryWeight()">取 消</el-button>
         <el-button type="primary" @click="submitDryWeight()">保 存</el-button>
@@ -895,6 +893,7 @@
         thrombuShow:false,
         body_weight_before:"",
         point_punctures:[],
+       
       }
     },
     props: {
@@ -931,6 +930,18 @@
           return { id: 0 }
         }
       },
+      dryWeightList:{
+        type:Array,
+        default:()=>{
+          return [];
+        } 
+       },
+      docList:{
+        type:Array,
+        default:()=>{
+          return [];
+        } 
+       }
 
     },
     methods: {
@@ -987,6 +998,8 @@
       },
 
       show(assessment, lastDryWeightDislysis,last_predialysis_evaluation) {
+        console.log("dryWeightList",this.dryWeightList)
+        console.log("doclist",this.docList)
         let filedList = store.getters.xt_user.fileds;
         console.log(filedList,'filedList')
         this.lastPredialysisEvaluation = last_predialysis_evaluation
@@ -1531,12 +1544,27 @@
         if(val == 2){
          this.thrombuShow = false
         }
-      }
+      },
 
+      getTime(value, temp) {
+        if (value != undefined) {
+          return uParseTime(value, temp)
+        }
+        return ''
+      },
+      getUserName(admin_user_id){
+        var user_name = ""
+        for(let i=0;i<this.docList.length;i++){
+          if(admin_user_id == this.docList[i].admin_user_id){
+            user_name = this.docList[i].user_name
+          }
+        }
+        return user_name
+      }
       
     },
     created() {
-  
+      
       this.last_dialysis_after = getDataConfig('hemodialysis', 'last_dialysis_after')
       this.dialysis_interphase = getDataConfig('hemodialysis', 'dialysis_duration')
       this.symptom_before_dialysis = getDataConfig('hemodialysis', 'dialysis_before')

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

@@ -1074,7 +1074,7 @@ export default {
     changeBloodAccessOpion(id){
       var name = ""
       for(let i=0;i<this.blood_access_option.length;i++){
-        console.log("id9999",this.blood_access_option[i].id)
+        // console.log("id9999",this.blood_access_option[i].id)
         if(id == this.blood_access_option[i].id){
            name = this.blood_access_option[i].name
         }
@@ -1085,7 +1085,7 @@ export default {
     changeBloodAccessOpionOne(id){
       var name = ""
       for(let i=0;i<this.blood_access_option.length;i++){
-        console.log("id9999",this.blood_access_option[i].id)
+        // console.log("id9999",this.blood_access_option[i].id)
         if(id == this.blood_access_option[i].id){
            name = this.blood_access_option[i].name
         }

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

@@ -2597,8 +2597,8 @@ mu
         if(moment().weekday() == 6){
            total_day ="周六"
         }
-        if(moment().weekday() == 6){
-           total_day ="周七"
+        if(moment().weekday() == 7){
+           total_day ="周日"
         }
         console.log("---------",this.targetAdvices)
         if(this.targetAdvices!=null && this.targetAdvices.length >0){

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

@@ -236,10 +236,11 @@
                 template_id == 56 ||
                 template_id == 60 ||
                 org_id == 10210 ||
-                org_id == 9555 || org_id == 10387
+                org_id == 9555 
                 || org_id == 10432
                 || org_id == 10445
-                || org_id == 10410)
+                || org_id == 10410) &&
+                org_id!=10387
             "
           >
             <template slot-scope="scope">
@@ -266,7 +267,7 @@
             width="110"
             v-if="
               isShow('超滤量') &&
-              template_id != 6 &&
+              (template_id != 6 &&
               template_id != 9 &&
               template_id != 10 &&
               template_id != 11 &&
@@ -304,9 +305,10 @@
               template_id != 56 &&
               template_id != 60 &&
               org_id!= 10210 &&
-              org_id != 9555 && org_id!=10387
+              org_id != 9555 
               && org_id!=10432 && org_id!=10445
-              && org_id!=10410
+              && org_id!=10410)
+              || org_id == 10387
             "
           >
             <template slot-scope="scope">
@@ -358,6 +360,7 @@
                 org_id == 10432 ||
                 org_id == 10445 ||
                 org_id == 10410)
+                && org_id!=10387
             "
           >
             <template slot-scope="scope">
@@ -375,7 +378,7 @@
             width="100"
             v-if="
               isShow('超滤率') &&
-              template_id != 6 &&
+              (template_id != 6 &&
               template_id != 10 &&
               template_id != 11 &&
               template_id != 12 &&
@@ -407,7 +410,8 @@
               template_id != 60 &&
               org_id!=10432 &&
               org_id!=10445 &&
-              org_id!=10410
+              org_id!=10410) || 
+              org_id == 10387
             "
           >
             <template slot-scope="scope">
@@ -1098,7 +1102,8 @@
                 template_id == 60 ||
                 org_id== 10432 || 
                 org_id== 10445 ||
-                org_id== 10410)
+                org_id== 10410) &&
+                org_id!=10387
             "
           >
             <el-form-item label="超滤率(ml/h)" :prop="isName('超滤率')"
@@ -1110,7 +1115,7 @@
             :span="8"
             v-if="
               isShow('超滤率') &&
-              template_id != 6 &&
+              (template_id != 6 &&
               template_id != 10 &&
               template_id != 11 &&
               template_id != 12 &&
@@ -1142,7 +1147,8 @@
               template_id != 60 &&
               org_id!=10432 && 
               org_id!=10445 &&
-              org_id!=10410
+              org_id!=10410)
+              || org_id == 10387
             "
           >
             <el-form-item label="超滤率(L/h)" :prop="isName('超滤率')"
@@ -1193,10 +1199,10 @@
                 org_id == 10210 ||
                 org_id == 9555 ||
                 org_id == 10340 ||
-                org_id == 10387 ||
                 org_id == 10432 ||
                 org_id == 10445 ||
-                org_id == 10410)
+                org_id == 10410) 
+                && org_id!=10387
             "
           >
             <el-form-item label="超滤量(ml)：" :prop="isName('超滤量')"
@@ -1209,7 +1215,7 @@
             :span="8"
             v-if="
               isShow('超滤量') &&
-              template_id != 6 &&
+              (template_id != 6 &&
               template_id != 9 &&
               template_id != 10 &&
               template_id != 11 &&
@@ -1247,10 +1253,10 @@
               org_id !=  10210 &&
               org_id !=  10340 &&
               org_id != 9555 &&
-              org_id!=10387&&
               org_id!=10432 && 
               org_id!=10445 && 
-              org_id!=10410
+              org_id!=10410)
+              || org_id == 10387
             "
           >
             <el-form-item label="超滤量(L)：" :prop="isName('超滤量')"

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -14,10 +14,10 @@
           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410)" width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10387 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410"  width="76px"> 超滤量(L) </th>
-          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410)" width="50px"> 超滤率 <br />(ml/h) </th>
-          <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410" width="50px"> 超滤率 <br />(L/h) </th>
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410) &&this.$store.getters.xt_user.template_info.org_id!=10387 " width="76px" > 超滤量(ml)</th>
+          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410) || this.$store.getters.xt_user.template_info.org_id == 10387"  width="76px"> 超滤量(L) </th>
+          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
+          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <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 || template_id == 46  || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445) " width="92px" > 置换率(ml/min) </th>

src/xt_pages/dialysis/details/index.vue

@@ -623,6 +623,8 @@
         :stockType="stockType"
         :his_doctor_advices="his_doctor_advices"
         :lastOrder="lastOrder"
+        :dryWeightList="dryWeightList"
+        :docList="docList"
       >
       </nav-igation>
 
@@ -1049,6 +1051,8 @@ export default {
       printDate:'',
       assessmentAfterDislysis:{},
       lastOrder:{},
+      dryWeightList:[],
+      docList:[],
     }
   },
   created() {
@@ -1537,8 +1541,10 @@ export default {
 
           var stockType =  resp.data.stockType
           this.stockType = stockType
-
-
+          
+          this.dryWeightList = resp.data.dryWeightList
+          this.docList = resp.data.docList
+          console.log("doclist-----",this.docList)
           var prepare = resp.data.prepare
           if(prepare!=null){
             this.preparestock = prepare
@@ -1605,7 +1611,7 @@ export default {
     printOrder() {
       var xtdate = parseTime(this.date, '{y}-{m}-{d}')
       this.$router.push(
-        '/dialysis/print?xtdate=' + xtdate + '&xtno=' + this.patient.dialysis_no
+        '/dialysis/print?xtdate=' + xtdate + '&xtno=' + this.patient.dialysis_no +"&patient_id="+this.patient.id
       )
     },
     printOrderOne(){

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -111,7 +111,8 @@
           org_template_info.template_id == 50 ||
           org_template_info.template_id == 52 ||
           org_template_info.template_id == 53  ||
-          $store.getters.xt_user.org.id == 0
+          org_template_info.template_id == 64  ||
+          $store.getters.xt_user.org.id == 0 
         "
       >
       <div>
@@ -796,7 +797,7 @@
           >
         </div>
       </template>
-      
+
     </div>
     <div class="app-container" style="min-height: 0">
       <!--<div class="order-print-btn"-->
@@ -1239,6 +1240,11 @@
           v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 63">
           </DialysisPrintOrderSixtyThree> -->
+          <DialysisPrintOrderSixtyfour
+          v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 64">
+
+          </DialysisPrintOrderSixtyfour>
         </div>
       </el-container>
     </div>
@@ -1320,6 +1326,7 @@ import DialysisPrintOrderSixty from "./template/DialysisPrintOrderSixty";
 import DialysisPrintOrderSixtyOne from "./template/DialysisPrintOrderSixtyOne"
 import DialysisPrintOrderSixtyTwo from "./template/DialysisPrintOrderSixtyTwo"
 // import DialysisPrintOrderSixtyThree from "./template/DialysisPrintOrderSixtyThree"
+import DialysisPrintOrderSixtyfour from './template/DialysisPrintOrderSixtyfour'
 export default {
   name: "dialysisPrintOrder",
   components: {
@@ -1386,7 +1393,7 @@ export default {
     DialysisPrintOrderSeven,
     DialysisPrintOrderEight,
     DialysisPrintOrderNine,
-
+    DialysisPrintOrderSixtyfour,
     LabelBox,
     BreadCrumb,
   },
@@ -1937,6 +1944,16 @@ export default {
           style: style2,
           scanStyles: false,
         });
+      }else if (
+        this.org_template_info.template_id == 64
+      ) {
+        printJS({
+          printable: "dialysis-print-box-64",
+          type: "html",
+          style: style12,
+          scanStyles: false,
+        });
+        
       }else if (
         this.org_template_info.template_id == 53
       ) {
@@ -1947,7 +1964,8 @@ export default {
           scanStyles: false,
         });
         
-      }else if (
+      }
+      else if (
         this.org_template_info.template_id == 54 || this.org_template_info.template_id == 57
       ) {
         printJS({
@@ -2032,7 +2050,7 @@ export default {
           style: style,
           scanStyles: false,
         });
-      }
+      } 
     },
     printThisTwoPage() {
       var ptime = Math.round(new Date().getTime() / 1000);
@@ -2160,6 +2178,7 @@ export default {
       getDialysisRecord(this.queryParams).then((response) => {
         if (response.data.state == 1) {
           this.childResponse = response;
+          console.log('this.org_template_info是数据',response.data.data);
           this.org_template_info = response.data.data.org_template_info;
           this.loading = false;
           //   this.adminUser = response.data.data.users
@@ -2861,6 +2880,7 @@ export default {
 
     const xtdate = this.$route.query && this.$route.query.xtdate;
     const xtno = this.$route.query && this.$route.query.xtno;
+    const patient_id = this.$route.query && this.$route.query.patient_id;
     if (
       typeof xtdate === "string" &&
       xtdate.length > 0 &&
@@ -2869,6 +2889,7 @@ export default {
     ) {
       this.queryParams.xtdate = xtdate;
       this.queryParams.xtno = xtno;
+      this.queryParams.patient_id = patient_id
       this.getDialysisRecord();
     } else {
       this.$message.error("参数不齐");

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyThree.vue

@@ -1201,6 +1201,8 @@
       </table>
     </div>
   </div>
+
+  
   <div id="dialysis-print-box-1-2">
     <div class="dialysis-print-order">
       <table class="print-table">

src/xt_pages/dialysis/template/DialysisPrintOrderFortyThree.vue

@@ -814,7 +814,7 @@
                                   : "mmHg"
                               }})
                             </td>
-                            <td width="60">透析液温度(°C)</td>
+                            <td width="60">动脉压</td>
                             <!-- <td width="50">电导度<br />(ms/cm)</td> -->
                             <td width="50">超滤率<br />ml/h</td>
                             <td width="50">超滤量<br />(ml)</td>
@@ -884,8 +884,8 @@
                             <!-- 透析液温度 -->
                             <td>
                               {{
-                                monitor.dialysate_temperature
-                                  ? monitor.dialysate_temperature
+                                monitor.arterial_pressure
+                                  ? monitor.arterial_pressure
                                   : ""
                               }}
                             </td>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -832,6 +832,20 @@
                         }}
                       </div>
                     </div>
+
+                     <div class="inline_block" style="flex: 1" v-if="org_id ==0 || org_id ==10440">
+                      衣物重：
+                      <div
+                        class="under_line"
+                        style="width: 70px; text-align: center"
+                      >
+                        {{
+                          predialysis.additional_weight
+                            ? predialysis.additional_weight
+                            : "/"
+                        }}
+                      </div>
+                    </div>
                     <div class="inline_block" style="flex: 1" v-if="org_id==10290">
                       透析器/灌流器：
                       <div
@@ -901,7 +915,7 @@
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
                   >
-                    <div class="inline_block" style="flex: 1">
+                    <div class="inline_block" style="flex: 1" v-if="org_id!=0 && org_id!=10440">
                       上次透后体重：
                       <div
                         class="under_line"
@@ -1493,8 +1507,8 @@
                       
 
                         <td>
-                          <span v-if="org_id!=9671 && org_id!=10440 && org_id!=10471"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</span>
-                          <span v-if="org_id==9671 || org_id==10440 || org_id == 10471"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span>
+                          <span v-if="org_id!=9671 && org_id!=10440"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</span>
+                          <span v-if="org_id==9671 || org_id==10440"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span>
                         </td>
                         <!-- <td style="width:50px">
                           <span v-if="(prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12) && ((dialysisOrder && monitor.operate_time <= dialysisOrder.end_time) && (dialysisOrder && monitor.operate_time >= dialysisOrder.start_time))">
@@ -2468,6 +2482,37 @@
                     </div>
                   </div>
 
+
+                   <div
+                    v-if="org_id == 10440 || org_id == 0"
+                    class="row"
+                    style="padding: 2px 0; line-height: 23px; display: flex"
+                  >
+                    <div
+                      class="inline_block"
+                      style="flex: 1; display: inline-block"
+                    >
+                      衣物重：
+                      <div
+                        class="under_line"
+                        style="
+                          width: 100px;
+                          line-height: 25px;
+                          text-align: left;
+                          margin-left: 2px;
+                          display: inline-block;
+                          white-space: normal;
+                        "
+                      >
+                        {{
+                          afterdialysis.additional_weight
+                            ? afterdialysis.additional_weight
+                            : "/"
+                        }}
+                      </div>
+                    </div>
+                  </div>
+
                   <div
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
@@ -2596,7 +2641,7 @@
                           }}</span
                         >
                         <img
-                          style="height: 30px"
+                          style="height: 40px"
                           :src="
                             setAdminUserES(
                               dialysisOrder == null
@@ -2639,7 +2684,7 @@
                           }}</span
                         >
                         <img
-                          style="height: 30px"
+                          style="height: 40px"
                           :src="
                             setAdminUserES(
                               dialysisOrder == null
@@ -2667,7 +2712,7 @@
                       >
                     
                         <span
-                          style="height: 30px; display: inline-block"
+                          style="height: 40px; display: inline-block"
                           v-if="
                             setAdminUserES(
                               dialysisOrder == null
@@ -2685,7 +2730,7 @@
                           }}</span
                         >
                         <img
-                          style="height: 30px"
+                          style="height: 40px"
                           :src="
                             setAdminUserES(
                               dialysisOrder == null
@@ -2732,7 +2777,7 @@
                           }}</span
                         >
                         <img
-                          style="height: 30px"
+                          style="height: 40px"
                           :src="
                             setAdminUserES(
                               dialysisOrder == null
@@ -2768,7 +2813,7 @@
                           {{ getAdminUser(check == null ? 0 : check.creater) }}
                         </span>
                         <img
-                          style="height: 30px"
+                          style="height: 40px"
                           :src="
                             setAdminUserES(check == null ? 0 : check.creater)
                           "
@@ -2795,7 +2840,7 @@
                           {{ getAdminUser(check == null ? 0 : check.creater) }}
                         </span>
                         <img
-                          style="height: 30px"
+                          style="height: 40px"
                           :src="
                             setAdminUserES(check == null ? 0 : check.creater)
                           "
@@ -2823,7 +2868,7 @@
                           {{ getAdminUser(check == null ? 0 : check.modifier) }}
                         </span>
                         <img
-                          style="height: 30px"
+                          style="height: 40px"
                           :src="
                             setAdminUserES(check == null ? 0 : check.modifier)
                           "
@@ -2851,7 +2896,7 @@
                           {{ getAdminUser(check == null ? 0 : check.creater) }}
                         </span>
                         <img
-                          style="height: 30px"
+                          style="height: 40px"
                           :src="
                             setAdminUserES(check == null ? 0 : check.creater)
                           "
@@ -2886,7 +2931,7 @@
                           }}
                         </span>
                         <img
-                          style="height: 30px"
+                          style="height: 40px"
                           :src="
                             setAdminUserES(
                               dialysisOrder == null
@@ -2913,7 +2958,7 @@
                           {{ getAdminUser(prescription.creater) }}
                         </span>
                         <img
-                          style="height: 30px"
+                          style="height: 40px"
                           :src="setAdminUserES(prescription.creater)"
                           alt=""
                           srcset=""
@@ -3008,6 +3053,7 @@ export default {
       queryParams: {
         xtdate: "",
         xtno: "",
+        patient_id:""
       },
       patientInfo: {
         birth: "",
@@ -3699,7 +3745,7 @@ export default {
         for (let index = 0; index < this.doctor_advices.length; index++) {
           this.doctor_advices[index]["isShow"] = 2;
         }
-       console.log("total--------------------------",this.doctor_advices)
+    
         // if (this.doctor_advices.length > 0) {
         //   var group = this.newAdviceGroupObject()
         //   var initGroupBlock = function(group, advice) {
@@ -3932,7 +3978,7 @@ export default {
       "vascular_access_desc"
     );
     this.org_id = this.$store.getters.xt_user.org.id;
-    console.log("org_id-----------------------------------------",this.org_id)
+   
     // this.bloodAccessParOpera = getDataConfig('hemodialysis', 'vascular_access_desc')
 
     var bloodAccessParOpera = getDataConfig(

src/xt_pages/dialysis/template/DialysisPrintOrderThirteen.vue

@@ -47,7 +47,7 @@
             岁
           </div>
           <div class="inline_block" style="margin-right:5px;">
-              机器编号
+              床位号
               <div class="inline_block under_line" style="width:80px;">
               {{ getNumber() }}
               </div>

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyEight.vue

@@ -378,8 +378,10 @@
                   </td>
                   <td width='20'></td>
                   <td width="70">穿刺针:</td>
-                  <td width="260" style="text-align:left;">
+                  <td width="300" style="text-align:left;">
                     <div>
+                      <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle.indexOf('15G') > -1 ? true : false" showValue="15G"></label-box>
+                      &nbsp;
                       <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle.indexOf('16G') > -1 ? true : false" showValue="16G"></label-box>
                       &nbsp;
                       <label-box :isChecked="predialysis.puncture_needle && predialysis.puncture_needle.indexOf('17G') > -1 ? true : false" showValue="17G"></label-box>

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -2430,6 +2430,7 @@ export default {
               if (num == 0) {
                   var arr = []//新增处方
                   var arr_one = []
+                  var arr_Two = []
                 for(let i=0;i<this.prescriptions.length;i++){
                   if(this.prescriptions[i].id == 0){
 
@@ -2440,6 +2441,7 @@ export default {
                     if(arr.length > 0){
                       let objInfo = {};
                       arr.forEach((item, index) => {
+                    
                       let { id } = item.id;
                       if (!objInfo[id]) {
                           objInfo[id] = {
@@ -2502,6 +2504,7 @@ export default {
                      if(arr_one.length > 0){
                       let objInfo = {};
                       arr_one.forEach((item, index) => {
+                     
                       let { id } = item.id;
                       if (!objInfo[id]) {
                           objInfo[id] = {
@@ -2565,6 +2568,52 @@ export default {
                     }
                   }
 
+                if(arr.length > 0){
+                  for(let i =0;i<arr.length;i++){
+                    if(arr[i].drug!=null){
+                      if(arr[i].drug.is_user == 2){
+                        if(arr[i].prescribing_number_unit != arr[i].drug.max_unit && arr[i].prescribing_number_unit!=arr[i].drug.min_unit){
+                          this.$message.error(arr[i].drug.drug_name + " " +arr[i].drug.dose + arr[i].drug.dose_unit + "*" + arr[i].drug.min_number + arr[i].drug.min_unit+"/"+arr[i].drug.max_unit +" "+ "总量单位不匹配,保存失败!")
+                          isLoading = false
+                          this.$emit('editKeepLoad', false)
+                          return
+                        }
+                      }
+                    }
+                  }
+                }
+
+
+                if(arr_one.length > 0){
+                  for(let i =0;i<arr_one.length;i++){
+                    if(arr_one[i].drug!=null){
+                      if(arr_one[i].drug.is_user == 2){
+                        if(arr_one[i].prescribing_number_unit != arr_one[i].drug.max_unit && arr_one[i].prescribing_number_unit!=arr_one[i].drug.min_unit){
+                          this.$message.error(arr_one[i].drug.drug_name + " " +arr_one[i].drug.dose + arr_one[i].drug.dose_unit + "*" + arr_one[i].drug.min_number + arr_one[i].drug.min_unit+"/"+arr_one[i].drug.max_unit +" "+ "总量单位不匹配,保存失败!")
+                          isLoading = false
+                          this.$emit('editKeepLoad', false)
+                          return
+                        }
+                      }
+                    }
+                  }
+                }
+
+                if(arr_Two.length > 0){
+                  for(let i =0;i<arr_Two.length;i++){
+                    if(arr_Two[i].drug!=null){
+                      if(arr_Two[i].drug.is_user == 2){
+                        if(arr_Two[i].prescribing_number_unit != arr_Two[i].drug.max_unit && arr_Two[i].prescribing_number_unit!=arr_Two[i].drug.min_unit){
+                          this.$message.error(arr_Two[i].drug.drug_name + " " +arr_Two[i].drug.dose + arr_Two[i].drug.dose_unit + "*" + arr_Two[i].drug.min_number + arr_Two[i].drug.min_unit+"/"+arr_Two[i].drug.max_unit +" "+ "总量单位不匹配,保存失败!")
+                          isLoading = false
+                          this.$emit('editKeepLoad', false)
+                          return
+                        }
+                      }
+                    }
+                  }
+                }
+
 
               if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 9679){
                   var project_arr = []

src/xt_pages/management/components/ManageForm.vue

@@ -16,7 +16,7 @@
               ></el-input>
             </el-form-item>
           </el-col>
-
+          
           <el-col :span="8">
             <el-form-item label="设备类型:" required prop="device_type">
               <el-select
@@ -851,7 +851,7 @@ export default {
     padding: 0;
   }
   .el-form-item__error {
-    margin-left: 210px;
+    margin-left: 60px;
   }
 }
 .el-checkbox {

src/xt_pages/management/components/RepairForm.vue

@@ -12,7 +12,7 @@
           ></el-option>
         </el-select>
       </el-col> -->
-      <el-col :span="11">
+      <el-col :span="10">
         <span class="machineClass">日期查询:</span>
         <el-date-picker
           v-model="forms.start_time"
@@ -52,7 +52,6 @@
           <el-button type="primary" @click="printCard">打印</el-button>
       </el-col>
     </el-row>
-    <el-row>
 
       <el-table
         ref="multipleTable"
@@ -81,9 +80,9 @@
 
         <el-table-column prop="date" label= "型号" width="80" align="center">
           <template slot-scope="scope">
-            <span v-if="getRepairName(scope.row.equitment_id) == 1">透析机</span> 
-            <span v-if="getRepairName(scope.row.equitment_id) == 2">水处理机</span> 
-            <span v-if="getRepairName(scope.row.equitment_id) == 3">其他</span> 
+            <span v-if="getRepairName(scope.row.equitment_id) == 1">透析机</span>
+            <span v-if="getRepairName(scope.row.equitment_id) == 2">水处理机</span>
+            <span v-if="getRepairName(scope.row.equitment_id) == 3">其他</span>
           </template>
         </el-table-column>
 
@@ -136,9 +135,9 @@
               {{ scope.row.reason }}
               </template>
            </el-table-column>
- 
-      
-        
+
+
+
         <el-table-column label="操作" align="center" min-width="150px">
           <template slot-scope="scope">
             <el-tooltip
@@ -333,7 +332,7 @@
             </el-tooltip>
           </template>
         </el-table-column>
-      </el-table> -->
+      </el-table>
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
@@ -346,7 +345,7 @@
       ></el-pagination>
     </el-row>
 
-    <!-- 编辑维修记录 -->
+    <-- 编辑维修记录 -->
     <el-dialog
       title="编辑维修记录"
       :visible.sync="dialogVisible"
@@ -415,32 +414,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="24">
-              <el-form-item class="formItem" label="功能及附件检查:">
-                  <el-input
-                    type="textarea"
-                    :rows="2"
-                      placeholder="请输入内容"
-                      v-model="guaForm.function_accessories_inspection"
-                    style="width:85%">
-                  </el-input>
-              </el-form-item>
-            </el-col>
-        </el-row>
-        <el-row>
-        <el-col :span="24">
-            <el-form-item class="formItem" label="其他:">
-                <el-input
-                  type="textarea"
-                  :rows="2"
-                    placeholder="请输入内容"
-                    v-model="guaForm.other_information"
-                  style="width:85%">
-                </el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="故障发生阶段">
@@ -471,7 +444,7 @@
         </el-row>
         <el-row>
           <el-col :span="8">
-            <el-form-item label="故障现象:" required prop="fault_description">
+            <el-form-item label="故障描述:" required prop="fault_description">
               <el-input
                 type="textarea"
                 :rows="2"
@@ -482,7 +455,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="维修内容:">
+            <el-form-item label="原因分析:">
               <el-input
                 type="textarea"
                 :rows="2"
@@ -493,7 +466,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="维修结果:">
+            <el-form-item label="处理过程:">
               <el-input
                 type="textarea"
                 :rows="2"
@@ -543,7 +516,7 @@
         </el-row>
         <el-row>
           <el-col :span="20">
-            <el-form-item label="备注:">
+            <el-form-item label="原因:">
               <el-input
                 type="textarea"
                 :rows="2"
@@ -554,21 +527,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="20">
-            <el-form-item label="维修者:">
-              <el-select v-model="guaForm.admin_user_id" placeholder="请选择" >
-                      <el-option
-                      v-for="item in docList"
-                      :key="item.admin_user_id"
-                      :label="item.user_name"
-                      :value="item.admin_user_id"
-                      style="width:185px">
-                      </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
 <!--        <button @click="lili">调试</button>-->
@@ -616,7 +574,7 @@
                 >
                  保养维护内容
                 </td>
-              
+
                 <td
                   :colspan="3"
                   style="text-align:center;width:60px;font-size:15px;"
@@ -630,7 +588,7 @@
                 >
                  维修者
                 </td>
-              
+
                 <td
                   :rowspan="2"
                   style="text-align:center;width:120px;font-size:15px;"
@@ -646,11 +604,11 @@
                 </td>
 
 
-               
-               
+
+
               </tr>
               <tr>
-              
+
                 <td style="text-align:center;font-size:15px;height:30px">
                   功能及附件检查
                 </td>
@@ -659,7 +617,7 @@
                   其他
                 </td>
 
-                 
+
                 <td style="text-align:center;font-size:15px;height:30px">
                   故障现象
                 </td>
@@ -671,9 +629,9 @@
                 <td style="text-align:center;font-size:15px;height:30px">
                   维修结果
                 </td>
-           
-               
-            
+
+
+
               </tr>
               <tr v-for="item in this.tableData" :key="item.id">
                 <td style="text-align:center;font-size:15px;height:30px">
@@ -681,11 +639,11 @@
                 </td>
 
                 <td style="text-align:center;font-size:15px;height:30px">
-                  <span v-if="getRepairName(item.equitment_id) == 1">透析机</span> 
-                  <span v-if="getRepairName(item.equitment_id) == 2">水处理机</span> 
-                  <span v-if="getRepairName(item.equitment_id) == 3">其他</span> 
+                  <span v-if="getRepairName(item.equitment_id) == 1">透析机</span>
+                  <span v-if="getRepairName(item.equitment_id) == 2">水处理机</span>
+                  <span v-if="getRepairName(item.equitment_id) == 3">其他</span>
                 </td>
-                
+
                 <td style="text-align:center;font-size:15px;height:30px">
                   {{item.function_accessories_inspection }}
                 </td>
@@ -693,11 +651,11 @@
                 <td style="text-align:center;font-size:15px;height:30px">
                   {{ item.other_information }}
                 </td>
-                 
+
                 <td style="text-align:center;font-size:15px;height:30px">
                   {{ item.fault_description }}
                 </td>
-                
+
                 <td style="text-align:center;font-size:15px;height:30px">
                    {{item.cause_analysis }}
                 </td>
@@ -710,7 +668,7 @@
                 <td style="text-align:center;font-size:15px;height:30px">
                   {{ getName(item.admin_user_id) }}
                 </td>
-                
+
                 <td style="text-align:center;font-size:15px;height:30px">
                   {{ getTime(item.guarantee_date) }}
                 </td>
@@ -718,7 +676,7 @@
                 <td style="text-align:center;font-size:15px;height:30px">
                   {{item.reason }}
                 </td>
-             
+
               </tr>
             </table>
           </div>
@@ -745,7 +703,6 @@ export default {
   name: "RepairForm",
   data() {
     return {
-      nowTime: moment(new Date()).format("YYYY-MM-DD HH:MM:SS"),
       dialogVisible: false,
       selectCulture: [],
       forms: {
@@ -770,9 +727,7 @@ export default {
         reason: "",
         code_information: "",
         image_name: "",
-        admin_user_id:this.$store.getters.xt_user.user.id,
-        function_accessories_inspection:"",
-        other_information:"",
+        admin_user_id:"",
       },
       isIndeterminate: false,
       checkAllStatus: false,
@@ -800,9 +755,10 @@ export default {
       limit: 10,
       page: 1,
       total: 0,
-      macherList:[],
-      docList:[],
       hiddenShow:false,
+      nowTime: moment(new Date()).format("YYYY-MM-DD HH:MM:SS"),
+      docList:[],
+      macherList:[]
     };
   },
   methods: {
@@ -835,9 +791,7 @@ export default {
         if (response.data.state === 1) {
           var repair = response.data.data.repair;
           console.log("repair是", repair);
-          var macherList = response.data.data.macherList
-         
-          this.macherList = macherList
+          this.macherList = response.data.data.macherList
           this.docList = response.data.data.docList
           // eslint-disable-next-line no-unused-vars
           var total = response.data.data.total;
@@ -877,7 +831,6 @@ export default {
               repair[index].exclude = "未解决";
             }
           }
-          console.log("repair------",repair)
           this.tableData = repair;
         }
       });
@@ -900,7 +853,6 @@ export default {
         if (response.data.state === 1) {
           var repair = response.data.data.repair;
           console.log("repair", repair);
-          this.docList = response.data.data.docList
           this.guaForm.guarantee_date = uParseTime(
             repair.guarantee_date,
             "{y}-{m}-{d}"
@@ -928,9 +880,6 @@ export default {
           this.guaForm.code_information = repair.code_information;
           this.guaForm.id = repair.id;
           this.filename = repair.image_name;
-          this.guaForm.admin_user_id = repair.admin_user_id
-          this.guaForm.function_accessories_inspection = repair.function_accessories_inspection
-          this.guaForm.other_information= repair.other_information
         }
       });
     },
@@ -1137,26 +1086,26 @@ export default {
         });
       });
     },
-    getDeviceName(id){
-      var device_name= ""
+    getDeviceName(equimentid){
+      var equitname = ""
       for(let i=0;i<this.macherList.length;i++){
-        if(id == this.macherList[i].id){
-           device_name = this.macherList[i].device_name
+        if(equimentid == this.macherList[i].id){
+           equitname = this.macherList[i].device_name
         }
       }
-      return device_name
+      return equitname
     },
-    getRepairName(id){
-      var device_type= ""
+    getRepairName(equimentid){
+      var equitname = ""
       for(let i=0;i<this.macherList.length;i++){
-        if(id == this.macherList[i].id){
-          device_type = this.macherList[i].device_type
+        if(equimentid == this.macherList[i].id){
+           equitname = this.macherList[i].device_type
         }
       }
-      return device_type
+      return equitname
     },
     getName(admin_user_id){
-      var user_name = ""
+      var user_name=  ""
       for(let i=0;i<this.docList.length;i++){
         if(admin_user_id == this.docList[i].admin_user_id){
            user_name = this.docList[i].user_name
@@ -1164,23 +1113,23 @@ export default {
       }
       return user_name
     },
-    printCard() {
-        this.hiddenShow = true;
-        var ptime = Math.round(new Date().getTime() / 1000);
-        this.print_time = uParseTime(ptime, "{y}年{m}月{d}日");
+    printCard(){
+      this.hiddenShow = true;
+      var ptime = Math.round(new Date().getTime() / 1000);
+      this.print_time = uParseTime(ptime, "{y}年{m}月{d}日");
 
-        const style =
-          "@media print { .print_main_content { background-color: white; width:960px; margin:0 auto; padding: 0 0 20px 0;font-size:15px } .print_main_content .order_title { text-align: center; font-size: 15px; line-height: 50px;} .print_main_content table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px;font-size:15px } .print_main_content table tbody tr td { border: 1px solid; text-align: center; padding: 10px 8px;font-size:15px } .td_proj_title { font-size: 15px; line-height: 25px;} .td_proj_content { font-size: 15px; line-height: 25px; } .td_align_left { text-align: left; } .print_footnote_panel { font-size: 15px; line-height: 40px; } .print_footnote_panel .proj { display: inline-block; width: 49%; } .print_footnote_panel .proj}";
+      const style =
+        "@media print { .print_main_content { background-color: white; width:960px; margin:0 auto; padding: 0 0 20px 0;font-size:15px } .print_main_content .order_title { text-align: center; font-size: 15px; line-height: 50px;} .print_main_content table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px;font-size:15px } .print_main_content table tbody tr td { border: 1px solid; text-align: center; padding: 10px 8px;font-size:15px } .td_proj_title { font-size: 15px; line-height: 25px;} .td_proj_content { font-size: 15px; line-height: 25px; } .td_align_left { text-align: left; } .print_footnote_panel { font-size: 15px; line-height: 40px; } .print_footnote_panel .proj { display: inline-block; width: 49%; } .print_footnote_panel .proj}";
 
-        setTimeout(() => {
-          printJS({
-            printable: "print-card-info-one",
-            type: "html",
-            style: style,
-            scanStyles: false
-          });
-        }, 1);
-      },
+      setTimeout(() => {
+        printJS({
+          printable: "print-card-info-one",
+          type: "html",
+          style: style,
+          scanStyles: false
+        });
+      }, 1);
+    }
   },
   created() {
     this.getAllSubregion();

src/xt_pages/management/components/UserForm.vue

@@ -362,7 +362,7 @@
                 value-format="yyyy-MM-dd HH:mm"
                 placeholder="选择时间"
                 v-model="userform.start_time"
-                style="width:185px"
+
               ></el-date-picker>
             </el-form-item>
           </el-col>
@@ -374,7 +374,6 @@
                 value-format="yyyy-MM-dd HH:mm"
                 placeholder="选择时间"
                 v-model="userform.end_time"
-                style="width:185px"
               ></el-date-picker>
             </el-form-item>
           </el-col>
@@ -634,7 +633,7 @@
                 value-format="yyyy-MM-dd HH:mm"
                 placeholder="选择时间"
                 v-model="userform.starttime"
-                style="width:185px"
+
               ></el-date-picker>
             </el-form-item>
           </el-col>
@@ -646,7 +645,7 @@
                 value-format="yyyy-MM-dd HH:mm"
                 placeholder="选择时间"
                 v-model="userform.endtime"
-                style="width:185px"
+
               ></el-date-picker>
             </el-form-item>
           </el-col>
@@ -800,37 +799,37 @@
               <tr>
                 <td
                   :rowspan="2"
-                  style="text-align:center;width:60px;font-size:15px;"
+                  style="text-align:center;min-width:40px; font-size:15px;"
                 >
                   机号
                 </td>
                 <td
                   :rowspan="2"
-                  style="text-align:center;width:100px;font-size:15px"
+                  style="text-align:center;min-width:40px;font-size:15px"
                 >
                   日期
                 </td>
                 <td
                   :rowspan="2"
-                  style="text-align:center;width:50px;font-size:15px"
+                  style="text-align:center;min-width:40px;font-size:15px"
                 >
                   班次
                 </td>
                 <td
                   :rowspan="2"
-                  style="text-align:center;width:70px;font-size:15px"
+                  style="text-align:center;min-width:40px;font-size:15px"
                 >
                   患者
                 </td>
                 <td
                   :rowspan="2"
-                  style="text-align:center;width:60px;font-size:15px"
+                  style="text-align:center;min-width:40px;font-size:15px"
                 >
                   透析方式
                 </td>
                 <td
                   :rowspan="2"
-                  style="text-align:center;width:60px;font-size:15px"
+                  style="text-align:center;min-width:40px;font-size:15px"
                 >
                   使用次数
                 </td>
@@ -842,19 +841,19 @@
                 </td>
                 <td
                   :colspan="4"
-                  style="text-align:center;width:60px;font-size:15px"
+                  style="text-align:center;font-size:15px"
                 >
                   机表(床单元、床旁桌)消毒
                 </td>
                 <td
-                  :colspan="5"
-                  style="text-align:center;width:80px;font-size:15px"
+                  :colspan="6"
+                  style="text-align:center;font-size:15px"
                 >
                   液路消毒
                 </td>
                 <td
                   :rowspan="2"
-                  style="text-align:center;width:80px;font-size:15px"
+                  style="text-align:center;min-width:40px;font-size:15px"
                 >
                  透析机消毒液(更换)
                 </td>
@@ -878,31 +877,34 @@
                 </td>
               </tr>
               <tr>
-                <td style="text-align:center;width:70px;font-size:15px">
+                <td style="text-align:center;min-width:40px;font-size:15px">
                   消毒方式
                 </td>
-                <td style="text-align:center;width:50px;font-size:15px">
+                <td style="text-align:center;min-width:40px;font-size:15px">
                   消毒液
                 </td>
-                <td style="text-align:center;width:70px;font-size:15px">
+                <td style="text-align:center;min-width:40px;font-size:15px">
                   消毒状态
                 </td>
-                <td style="text-align:center;width:95px;font-size:15px">
+                <td style="text-align:center;min-width:40px;font-size:15px">
                   消毒液浓度
                 </td>
-                <td style="text-align:center;width:70px;font-size:15px">
+                <td style="text-align:center;min-width:40px;font-size:15px">
                   消毒方式
                 </td>
-                <td style="text-align:center;width:50px;font-size:15px">
+                <td style="text-align:center;min-width:40px;font-size:15px">
                   消毒液
                 </td>
-                <td style="text-align:center;width:70px;font-size:15px">
+                <td style="text-align:center;min-width:40px;font-size:15px">
+                  开始消毒时间
+                </td>
+                <td style="text-align:center;min-width:40px;font-size:15px">
                   消毒时长/min
                 </td>
-                <td style="text-align:center;width:70px;font-size:15px">
+                <td style="text-align:center;min-width:40px;font-size:15px">
                   消毒状态
                 </td>
-                <td style="text-align:center;width:70px;font-size:15px">
+                <td style="text-align:center;min-width:40px;font-size:15px">
                   消毒液残留
                 </td>
               </tr>
@@ -946,6 +948,10 @@
                 <td style="text-align:center;font-size:15px;height:30px">
                   {{ item.disinfectant }}
                 </td>
+                <td style="text-align:center;font-size:15px;height:30px">
+                  {{ getTimesTwo(item.disinfec_startime) }}
+                </td>
+               
                 <td style="text-align:center;font-size:15px;height:30px">
                   {{ item.long_time }}
                 </td>
@@ -1555,8 +1561,6 @@ export default {
       });
     },
     EditUser(id, patientid) {
-       console.log("hh2h333232332233232323322323",id)
-       console.log("patient_id2323223323223322332323322323",patientid)
       EditUser(id, patientid).then(response => {
         if (response.data.state === 1) {
           this.dialogVisible = true;
@@ -1568,7 +1572,7 @@ export default {
            if(macher.user_total == ''){
              macher.user_total = 0
            }
-          var totals = count[0].Total + parseInt(macher.user_total)
+          // var totals = count[0].Total + parseInt(macher.user_total)
           this.userform.id = device.id;
           this.userform.spling_date = uParseTime(
               device.date,
@@ -1646,7 +1650,7 @@ export default {
           if (device.disinfection === 0) {
             this.userform.disinfection = "";
           }
-          this.userform.user_total = totals.toString()
+          this.userform.user_total = device.user_total.toString()
         }
       });
     },
@@ -2507,9 +2511,10 @@ export default {
           }else{
             this.form.bed = ""
             this.bedNumberTwo = []
+            this.getAllSubregion()
 
           }
-          
+
         }
       });
     },
@@ -2593,7 +2598,6 @@ export default {
       this.getBedForm(newvalue);
       this.value = newvalue;
     }
-
   }
 };
 </script>
@@ -2635,7 +2639,7 @@ export default {
     text-align: right;
   }
   .el-input--prefix .el-input__inner {
-    padding-left: 15px;
+    // padding-left: 15px;
   }
   .el-input--prefix .el-input__inner {
     padding-right: 15px;

src/xt_pages/management/components/WaterForm.vue

@@ -36,19 +36,31 @@
          </el-row>
          <el-row>
             <el-col :span="8">
-                <el-form-item label="原水电导度(μs/cm):"   class="st" label-width="100px">
-                    <el-input  v-model="form.water_conductivity" style="width:100px" oninput="value=value.replace(/[^\d^\.]/g,'')" maxlength='4'></el-input>
-                    <!-- <el-input-number v-model="form.water_conductivity" :controls="false" :precision="2" ></el-input-number> -->
+                <el-form-item label="原水电导度(μs/cm):" prop="water_conductivity"  class="st" label-width="100px">
+                    <el-input  v-model="form.water_conductivity" style="width:100px"
+                        oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"
+                    >
+                    </el-input>
+                    <!-- <el-input  v-model="form.water_conductivity" style="width:100px" oninput="value=value.replace(/[^\d+(.\d{1,2})?$]/g,'')" ></el-input> /[^\d^\.]/g,''-->
+                    <!-- <el-input  v-model="form.water_conductivity" style="width:100px" onkeyup="value=value.match(/^\d+(.\d{1,2})?$/g,'')" ></el-input> -->
+                    <!-- <el-input-number  auto-complete="off" v-model.number="form.water_conductivity" :precision="2" :controls="false"></el-input-number> -->
                 </el-form-item>
             </el-col>
             <el-col :span="8">
                 <el-form-item label="原水压力(Mpa):"  class="st">
-                    <el-input  v-model="form.water_pressure" style="width:100px" oninput="value=value.replace(/[^\d^\.]/g,'')" maxlength='4'></el-input>
+                    <el-input  v-model="form.water_pressure" style="width:100px"
+                    oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"
+                    >
+                    </el-input>
+                    <!-- <el-input-number  auto-complete="off" v-model.number="form.water_pressure" :precision="2" :controls="false"></el-input-number> -->
                 </el-form-item>
             </el-col>
             <el-col :span="8">
                 <el-form-item label="温度:"  class="st">
-                    <el-input  v-model="form.temperature" style="width:100px" oninput="value=value.replace(/[^\d^\.]/g,'')" maxlength='4'></el-input>
+                    <el-input  v-model="form.temperature" style="width:100px"
+                    oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"
+                     ></el-input>
+                    <!-- <el-input-number  auto-complete="off" v-model.number="form.temperature" :precision="2" :controls="false"></el-input-number> -->
                 </el-form-item>
             </el-col>
          </el-row>
@@ -60,93 +72,87 @@
                 </el-form-item>
             </el-col>
          </el-row>
-         <el-row>
-            <span>反渗一级</span>
-         </el-row>
-         <el-row>
-            <el-col :span="8">
-                <el-form-item label="RO膜进水:"  class="st">
-                    <el-input  v-model="form.first_ro_membrane_water" type="number" style="width:100px"></el-input>
-                </el-form-item>
+         <el-row :gutter="20">
+            <el-col :span="4" style="text-align: center;">
+                <span >反渗</span>
             </el-col>
-            <el-col :span="8">
-                <el-form-item label="RO膜浓水:"  class="st">
-                    <el-input  v-model="form.first_ro_film_thick_water" type="number" style="width:100px"></el-input>
-                </el-form-item>
+            <el-col :span="4">
+                <span >RO膜进水</span>
             </el-col>
-            <el-col :span="8">
-                <el-form-item label="RO膜出水:"  class="st">
-                    <el-input  v-model="form.first_ro_membrane_effluent" type="number" style="width:100px"></el-input>
-                </el-form-item>
+            <el-col :span="4">
+                <span >RO膜浓水</span>
             </el-col>
-         </el-row>
-         <el-row>
-            <el-col :span="8">
-                <el-form-item label="产水电导度(μs/cm):"  class="st">
-                    <el-input  v-model="form.first_production_of_water_conductivity" type="number" style="width:100px"></el-input>
-                </el-form-item>
+            <el-col :span="4">
+                <span >RO膜出水</span>
             </el-col>
-            <el-col :span="8">
-                <el-form-item label="产水量(L/h):"  class="st">
-                    <el-input  v-model="form.first_water_yield" style="width:100px" type="number"></el-input>
-                </el-form-item>
+            <el-col :span="4">
+                <span >产水电导度(μs/cm)</span>
+            </el-col>
+            <el-col :span="4">
+                <span >产水量(L/h)</span>
             </el-col>
-         
-         </el-row>
-         <el-row>
-            <span>反渗二级</span>
          </el-row>
-         <el-row>
-            <el-col :span="8">
-                <el-form-item label="RO膜进水:"  class="st">
-                    <el-input  v-model="form.last_ro_membrane_water" type="number" style="width:100px"></el-input>
-                </el-form-item>
+         <el-row :gutter="20">
+            <el-col :span="4" style="text-align: center;">
+                <span>一级</span>
             </el-col>
-            <el-col :span="8">
-                <el-form-item label="RO膜浓水:"  class="st">
-                    <el-input  v-model="form.last_ro_film_thick_water" type="number" style="width:100px"></el-input>
-                </el-form-item>
+            <el-col :span="4">
+                <el-input v-model="form.first_ro_membrane_water" style="width:100px"  oninput="value=value.replace(/[^\d^\.]/g, '')"></el-input>
             </el-col>
-            <el-col :span="8">
-                <el-form-item label="RO膜出水:"  class="st">
-                    <el-input  v-model="form.last_ro_membrane_effluent" type="number" style="width:100px"></el-input>
-                </el-form-item>
+            <el-col :span="4">
+                <el-input v-model="form.first_ro_film_thick_water" style="width:100px"  oninput="value=value.replace(/[^\d^\.]/g, '')"></el-input>
+            </el-col>
+            <el-col :span="4">
+                <el-input v-model="form.first_ro_membrane_effluent" style="width:100px"  oninput="value=value.replace(/[^\d^\.]/g, '')"></el-input>
+            </el-col>
+            <el-col :span="4">
+                <el-input v-model="form.first_production_of_water_conductivity" style="width:100px"  oninput="value=value.replace(/[^\d^\.]/g, '')"></el-input>
+            </el-col>
+            <el-col :span="4">
+                <el-input v-model="form.first_water_yield" style="width:100px"  oninput="value=value.replace(/[^\d^\.]/g, '')"></el-input>
             </el-col>
          </el-row>
-         <el-row>
-            <el-col :span="8">
-                <el-form-item label="产水电导度(μs/cm):"  class="st">
-                    <el-input  v-model="form.last_production_of_water_conductivity" type="number" style="width:100px"></el-input>
-                </el-form-item>
+         <el-row :gutter="20">
+            <el-col :span="4" style="text-align: center;">
+                <span>二级</span>
             </el-col>
-            <el-col :span="8">
-                <el-form-item label="产水量(L/h):"  class="st">
-                    <el-input  v-model="form.last_water_yield" type="number" style="width:100px"></el-input>
-                </el-form-item>
+            <el-col :span="4">
+                <el-input v-model="form.last_ro_membrane_water"  style="width:100px"  oninput="value=value.replace(/[^\d^\.]/g, '')"></el-input>
+            </el-col>
+            <el-col :span="4">
+                <el-input v-model="form.last_ro_film_thick_water"  style="width:100px"  oninput="value=value.replace(/[^\d^\.]/g, '')"></el-input>
+            </el-col>
+            <el-col :span="4">
+                <el-input  v-model="form.last_ro_membrane_effluent"  style="width:100px"  oninput="value=value.replace(/[^\d^\.]/g, '')"></el-input>
+            </el-col>
+            <el-col :span="4">
+                <el-input v-model="form.last_production_of_water_conductivity"  style="width:100px"  oninput="value=value.replace(/[^\d^\.]/g, '')"></el-input>
+            </el-col>
+            <el-col :span="4">
+                <el-input v-model="form.last_water_yield"  style="width:100px"  oninput="value=value.replace(/[^\d^\.]/g, '')"></el-input>
             </el-col>
          </el-row>
-
          <el-row>
             <el-col :span="8">
                 <el-form-item label="碳罐(MPa):"  class="st">
-                    <el-input  v-model="form.carbon_tank" type="number" style="width:100px"></el-input>
+                    <el-input  v-model="form.carbon_tank"  style="width:100px" oninput="value=value.replace(/[^\d^\.]/g, '')"></el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="8">
                 <el-form-item label="砂罐(MPa):"  class="st">
-                    <el-input  v-model="form.snd_tank" type="number" style="width:100px"></el-input>
+                    <el-input  v-model="form.snd_tank"  style="width:100px" oninput="value=value.replace(/[^\d^\.]/g, '')"></el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="8">
                 <el-form-item label="树脂罐(MPa):"  class="st">
-                    <el-input  v-model="form.resin_tank" type="number" style="width:100px"></el-input>
+                    <el-input  v-model="form.resin_tank"  style="width:100px" oninput="value=value.replace(/[^\d^\.]/g, '')"></el-input>
                 </el-form-item>
             </el-col>
          </el-row>
          <el-row>
             <el-col :span="8">
                 <el-form-item label="精密过滤器（MPa):"  class="st">
-                    <el-input  v-model="form.ultrafilter" type="number" style="width:100px"></el-input>
+                    <el-input  v-model.number="form.ultrafilter"  style="width:100px" oninput="value=value.replace(/[^\d^\.]/g, '')"></el-input>
                 </el-form-item>
             </el-col>
          </el-row>
@@ -159,19 +165,23 @@
             <el-col :span="8">
                 <el-form-item label="硬度监测(mg/l):"  class="st">
                     <el-input  v-model="form.hardness_monitoring" style="width:100px"
-                     oninput="value=value.replace(/[^\d^\.]/g,'')" maxlength='4'></el-input>
+                    oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"
+                     ></el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="8">
                 <el-form-item label="总氯检测(mg/l):"  class="st">
                     <el-input  v-model="form.total_chlorine_detection" style="width:100px"
-                     oninput="value=value.replace(/[^\d^\.]/g,'')" maxlength='4'></el-input>
+                    oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"
+                     ></el-input>
+
                 </el-form-item>
             </el-col>
             <el-col :span="8">
                 <el-form-item label="PH值检测:"  class="st">
                     <el-input  v-model="form.ph_detection" style="width:100px"
-                     oninput="value=value.replace(/[^\d^\.]/g,'')" maxlength='4'></el-input>
+                    oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"
+                     ></el-input>
                 </el-form-item>
             </el-col>
          </el-row>
@@ -180,7 +190,8 @@
             <el-col :span="8">
                 <el-form-item label="过氧乙酸浓度(mg/l):"  class="st">
                     <el-input  v-model="form.concentration_of_peroxyacetic_acid" style="width:100px"
-                     oninput="value=value.replace(/[^\d^\.]/g,'')" maxlength='4'></el-input>
+                    oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"
+                     ></el-input>
                 </el-form-item>
             </el-col>
          </el-row>
@@ -203,7 +214,7 @@
             </el-col>
             <el-col :span="8">
                 <el-form-item label="时长(h):"  class="st">
-                    <el-input  v-model="form.first_disinfection_time" type="number" style="width:100px"></el-input>
+                    <el-input  v-model="form.first_disinfection_time" style="width:100px" oninput="value=value.replace(/[^\d^\.]/g, '')"></el-input>
                 </el-form-item>
             </el-col>
          </el-row>
@@ -226,17 +237,18 @@
             </el-col>
             <el-col :span="8">
                 <el-form-item label="时长(h):"  class="st">
-                    <el-input  v-model="form.last_disinfection_time" type="number" style="width:100px"></el-input>
+                    <el-input  v-model="form.last_disinfection_time" style="width:100px" oninput="value=value.replace(/[^\d^\.]/g, '')"></el-input>
                 </el-form-item>
             </el-col>
          </el-row>
 
          <el-row>
-          
+
             <el-col :span="8">
                 <el-form-item label="过滤器更换(只):"  class="st">
-                    <el-input  v-model="form.filter_replacement" style="width:100px" 
-                    oninput="value=value.replace(/[^\d^\.]/g,'')" maxlength='4'></el-input>
+                    <el-input  v-model="form.filter_replacement" style="width:100px"
+                    oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"
+                    ></el-input>
                 </el-form-item>
             </el-col>
 
@@ -261,15 +273,15 @@
               </el-form-item>
           </el-col>
 
-        
+
         </el-row>
-       
+
         </el-form>
         <div style="float:right">
             <el-button type="primary" @click="saveWater('form')">保存</el-button>
         </div>
 
-      
+
     </div>
 </template>
 <script>
@@ -302,7 +314,7 @@ import {getAllDoctorList,saveWaterList} from "@/api/manage";
               last_ro_membrane_effluent:"",
               last_production_of_water_conductivity:"",//产水电导度
               last_water_yield:"",//产水量
-             
+
               carbon_tank:"",//碳罐
               snd_tank:"",//砂罐,
               resin_tank:"",//树脂罐
@@ -320,12 +332,12 @@ import {getAllDoctorList,saveWaterList} from "@/api/manage";
               remark:"",//备注
               filter_replacement:"",//过滤器更换
               admin_user_id:"",//记录人
-              
+
             },
             machineType:[
-               {id:0,name:"全部"}, 
-               {id:1,name:"正常"}, 
-               {id:2,name:"故障"}, 
+               {id:0,name:"全部"},
+               {id:1,name:"正常"},
+               {id:2,name:"故障"},
             ],
             forcePumpList:[
               {id:0,name:"全部"},
@@ -335,11 +347,11 @@ import {getAllDoctorList,saveWaterList} from "@/api/manage";
             disinfectionType:[
             { id: 0, name: "请选择" },
             { id: 1, name: "热消毒" },
-            { id: 2, name: "化学消毒" }   
+            { id: 2, name: "化学消毒" }
             ],
             checked:"",
             rules: {
-             admin_user_id: [{ required: true, message: '请选择记录人' }],
+                admin_user_id: [{ required: true, message: '请选择记录人' }],
            },
            nurseList:[],
         }
@@ -354,8 +366,8 @@ import {getAllDoctorList,saveWaterList} from "@/api/manage";
         if(this.form.machine_status!=""){
           this.form.machine_status = parseInt(this.form.machine_status)
         }
-      
-       
+
+
         if(this.form.reverse_osmosis_membrane_disinfection == true){
            this.form.reverse_osmosis_membrane_disinfection = 1
         }
@@ -371,9 +383,9 @@ import {getAllDoctorList,saveWaterList} from "@/api/manage";
         if(this.form.water_conductivity!=""){
           this.form.water_conductivity = parseFloat(this.form.water_conductivity)== NaN ? 0:parseFloat(this.form.water_conductivity)
         }else{
-           this.form.water_conductivity = 0 
+           this.form.water_conductivity = 0
         }
-        
+
         if(this.form.water_pressure!=""){
           this.form.water_pressure = parseFloat(this.form.water_pressure) == NaN ? 0:parseFloat(this.form.water_pressure)
         }else{
@@ -383,15 +395,15 @@ import {getAllDoctorList,saveWaterList} from "@/api/manage";
         if(this.form.temperature!=""){
           this.form.temperature = parseFloat(this.form.temperature)== NaN ? 0:parseFloat(this.form.temperature)
         }else{
-          this.form.temperature = 0    
+          this.form.temperature = 0
         }
-        
+
         if(this.form.force_pump_status!=""){
           this.form.force_pump_status = parseFloat(this.form.force_pump_status) ==  NaN ? 0: parseFloat(this.form.force_pump_status)
         }else{
             this.form.force_pump_status = 0
         }
-        
+
         if(this.form.first_ro_membrane_water!=""){
           this.form.first_ro_membrane_water = parseFloat(this.form.first_ro_membrane_water) == NaN?0:parseFloat(this.form.first_ro_membrane_water)
         }else{
@@ -403,11 +415,11 @@ import {getAllDoctorList,saveWaterList} from "@/api/manage";
         }else{
           this.form.first_ro_film_thick_water = 0
         }
-        
+
         if(this.form.first_ro_membrane_effluent!=""){
-          this.form.first_ro_membrane_effluent =parseFloat(this.form.first_ro_membrane_effluent) == NaN?0:parseFloat(this.form.first_ro_membrane_effluent) 
+          this.form.first_ro_membrane_effluent =parseFloat(this.form.first_ro_membrane_effluent) == NaN?0:parseFloat(this.form.first_ro_membrane_effluent)
         }else{
-           this.form.first_ro_membrane_effluent = 0 
+           this.form.first_ro_membrane_effluent = 0
         }
 
         if(this.form.first_production_of_water_conductivity!=""){
@@ -415,37 +427,37 @@ import {getAllDoctorList,saveWaterList} from "@/api/manage";
         }else{
           this.form.first_production_of_water_conductivity = 0
         }
-        
+
         if(this.form.first_water_yield !=""){
-           this.form.first_water_yield = parseFloat(this.form.first_water_yield) == NaN?0:parseFloat(this.form.first_water_yield)  
+           this.form.first_water_yield = parseFloat(this.form.first_water_yield) == NaN?0:parseFloat(this.form.first_water_yield)
         }else{
             this.form.first_water_yield =0
         }
-       
+
         if(this.form.last_ro_membrane_water!=""){
-          this.form.last_ro_membrane_water = parseFloat(this.form.last_ro_membrane_water) ==NaN?0:parseFloat(this.form.last_ro_membrane_water)  
+          this.form.last_ro_membrane_water = parseFloat(this.form.last_ro_membrane_water) ==NaN?0:parseFloat(this.form.last_ro_membrane_water)
         }else{
           this.form.last_ro_membrane_water = 0
         }
-      
+
         if(this.form.last_ro_membrane_effluent!=""){
           this.form.last_ro_membrane_effluent = parseFloat(this.form.last_ro_membrane_effluent) == NaN?0:parseFloat(this.form.last_ro_membrane_effluent)
         }else{
           this.form.last_ro_membrane_effluent = 0
         }
-      
+
         if(this.form.last_ro_film_thick_water!=""){
             this.form.last_ro_film_thick_water = parseFloat(this.form.last_ro_film_thick_water) == NaN?0:parseFloat(this.form.last_ro_film_thick_water)
         }else{
           this.form.last_ro_film_thick_water = 0
         }
-   
+
         if( this.form.last_production_of_water_conductivity!=""){
             this.form.last_production_of_water_conductivity = parseFloat(this.form.last_production_of_water_conductivity) == NaN?0:parseFloat(this.form.last_production_of_water_conductivity)
         }else{
             this.form.last_production_of_water_conductivity =0
         }
-       
+
         if(this.form.last_water_yield!=""){
             this.form.last_water_yield = parseFloat(this.form.last_water_yield)==NaN?0: parseFloat(this.form.last_water_yield)
         }else{
@@ -457,25 +469,25 @@ import {getAllDoctorList,saveWaterList} from "@/api/manage";
         }else{
             this.form.carbon_tank = 0
         }
-        
+
         if( this.form.snd_tank!=""){
             this.form.snd_tank = parseFloat(this.form.snd_tank) == NaN?0:parseFloat(this.form.snd_tank)
         }else{
             this.form.snd_tank = 0
         }
-         
+
         if(this.form.resin_tank!=""){
             this.form.resin_tank= parseFloat(this.form.resin_tank) ==NaN?0:parseFloat(this.form.resin_tank)
         }else{
             this.form.resin_tank= 0
         }
-      
+
         if( this.form.ultrafilter!=""){
             this.form.ultrafilter = parseFloat(this.form.ultrafilter)== NaN?0:parseFloat(this.form.ultrafilter)
         }else{
           this.form.ultrafilter = 0
         }
-        
+
         if(this.form.hardness_monitoring !=""){
             this.form.hardness_monitoring = parseFloat(this.form.hardness_monitoring) ==NaN?0: parseFloat(this.form.hardness_monitoring)
         }else{
@@ -487,7 +499,7 @@ import {getAllDoctorList,saveWaterList} from "@/api/manage";
         }else{
             this.form.total_chlorine_detection = 0
         }
-        
+
         if( this.form.ph_detection!=""){
             this.form.ph_detection = parseFloat(this.form.ph_detection) == NaN?0:parseFloat(this.form.ph_detection)
         }else{
@@ -495,7 +507,7 @@ import {getAllDoctorList,saveWaterList} from "@/api/manage";
         }
 
         if(this.form.concentration_of_peroxyacetic_acid!="" ){
-            this.form.concentration_of_peroxyacetic_acid = parseFloat(this.form.concentration_of_peroxyacetic_acid) == NaN?0: parseFloat(this.form.concentration_of_peroxyacetic_acid)   
+            this.form.concentration_of_peroxyacetic_acid = parseFloat(this.form.concentration_of_peroxyacetic_acid) == NaN?0: parseFloat(this.form.concentration_of_peroxyacetic_acid)
         }else{
             this.form.concentration_of_peroxyacetic_acid = 0
         }
@@ -511,26 +523,26 @@ import {getAllDoctorList,saveWaterList} from "@/api/manage";
         }else{
             this.form.first_disinfection_method = 0
         }
-      
-       
+
+
         if(this.form.last_disinfection_method !=""){
            this.form.last_disinfection_method = parseFloat(this.form.last_disinfection_method) == NaN?0:parseFloat(this.form.last_disinfection_method)
         }else{
             this.form.last_disinfection_method = 0
         }
-       
+
         if(this.form.first_disinfection_time !=""){
           this.form.first_disinfection_time = parseFloat(this.form.first_disinfection_time) == NaN?0:parseFloat(this.form.first_disinfection_time)
         }else{
             this.form.first_disinfection_time = 0
         }
-        
+
         if( this.form.last_disinfection_time!=""){
             this.form.last_disinfection_time = parseFloat(this.form.last_disinfection_time) == NaN?0:parseFloat(this.form.last_disinfection_time)
         }else{
-            this.form.last_disinfection_time = 0  
+            this.form.last_disinfection_time = 0
         }
-      
+
         if(this.form.filter_replacement!=""){
             this.form.filter_replacement = parseFloat(this.form.filter_replacement) == NaN?0:parseFloat(this.form.filter_replacement)
         }else{
@@ -542,14 +554,14 @@ import {getAllDoctorList,saveWaterList} from "@/api/manage";
         }else{
             this.form.admin_user_id =0
         }
-        
+
         if(this.form.disinfection_of_water_pipeline !=""){
             this.form.disinfection_of_water_pipeline = parseFloat(this.form.disinfection_of_water_pipeline) == NaN?0:parseFloat(this.form.disinfection_of_water_pipeline)
         }else{
             this.form.disinfection_of_water_pipeline =0
         }
-      
-       
+
+
         console.log("233223232323",this.form)
          this.$refs[formName].validate((valid) => {
           if (valid) {
@@ -558,7 +570,135 @@ import {getAllDoctorList,saveWaterList} from "@/api/manage";
                 var deviceWater =  response.data.data.deviceWater
                 console.log("保存成功!",deviceWater)
                 this.$message.success("保存成功!")
+                console.log("2333333333333333333333333w",this.form.water_conductivity)
+                if(this.form.water_conductivity == 0){
+                   this.form.water_conductivity = ""
+                }
+                if(this.form.fault_description == 0){
+                   this.form.fault_description = ""
+                }
+
+                if(this.form.water_conductivity == 0){
+                   this.form.water_conductivity = ""
+                }
+
+                if(this.form.water_pressure == 0){
+                  this.form.water_pressure = ""
+                }
+
+                if(this.form.temperature == 0){
+                   this.form.temperature = ""
+                }
+
+                if(this.form.first_ro_membrane_water == 0){
+                   this.form.first_ro_membrane_water = ""
+                }
+
+                if(this.form.first_ro_film_thick_water ==0 ){
+                   this.form.first_ro_film_thick_water = ""
+                }
+
+                if(this.form.first_ro_membrane_effluent == 0){
+                   this.form.first_ro_membrane_effluent=""
+                }
+
+                if(this.form.first_production_of_water_conductivity == 0){
+                   this.form.first_production_of_water_conductivity = ""
+                }
+
+                if(this.form.first_water_yield == 0){
+                   this.form.first_water_yield = ""
+                }
+
+                if(this.form.last_ro_membrane_water == 0){
+                  this.form.last_ro_membrane_water= ""
+                }
+
+                if(this.form.last_ro_film_thick_water== 0){
+                   this.form.last_ro_film_thick_water = ""
+                }
+
+                if(this.form.last_ro_membrane_effluent == 0){
+                  this.form.last_ro_membrane_effluent = ""
+                }
+
+                if(this.form.last_production_of_water_conductivity == 0){
+                  this.form.last_production_of_water_conductivity = ""
+                }
+
+                if(this.form.last_water_yield  == 0){
+                  this.form.last_water_yield = ""
+                }
 
+                if(this.form.carbon_tank == 0){
+                   this.form.carbon_tank = ""
+                }
+
+                if(this.form.snd_tank == 0){
+                  this.form.snd_tank = ""
+                }
+
+                if(this.form.resin_tank == 0){
+                  this.form.resin_tank= ""
+                }
+
+                if(this.form.ultrafilter == 0){
+                   this.form.ultrafilter= ""
+                }
+
+                if(this.form.hardness_monitoring  ==0){
+                    this.form.hardness_monitoring = ""
+                }
+
+                if(this.form.total_chlorine_detection == 0){
+                  this.form.total_chlorine_detection= ""
+                }
+                if(this.form.concentration_of_peroxyacetic_acid == 0){
+                  this.form.concentration_of_peroxyacetic_acid = ""
+                }
+
+                if(this.form.reverse_osmosis_membrane_disinfection ==0){
+                  this.form.reverse_osmosis_membrane_disinfection = ""
+                }
+
+                if(this.form.disinfection_of_water_pipeline == 0){
+                  this.form.disinfection_of_water_pipeline= ""
+                }
+
+                if(this.form.first_disinfection_method == 0){
+                    this.form.first_disinfection_method = ""
+                }
+
+                if(this.form.last_disinfection_method  == 0){
+                    this.form.last_disinfection_method = ""
+                }
+
+                if(this.form.first_disinfection_time == 0){
+                  this.form.first_disinfection_time = ""
+                }
+
+                if(this.form.last_disinfection_time == 0){
+                  this.form.last_disinfection_time = ""
+                }
+
+                if(this.form.remark == 0){
+                  this.form.remark = ""
+                }
+
+                if(this.form.filter_replacement == 0){
+                    this.form.filter_replacement = ""
+                }
+
+                if(this.form.admin_user_id == 0){
+                   this.form.admin_user_id = ""
+                }
+
+
+
+
+                // this.$parent.toParent()
+
+             }else{
                 this.form.fault_description = ""
                 this.form.water_conductivity = ""
                 this.form.water_pressure = ""
@@ -600,23 +740,52 @@ import {getAllDoctorList,saveWaterList} from "@/api/manage";
              var doctorList = response.data.data.list
              console.log("dcotorlist",doctorList)
              for(let i=0;i<doctorList.length;i++){
-              if(doctorList[i].user_type == 3){
-                 this.nurseList.push(doctorList[i])
-              }
+            //   if(doctorList[i].user_type == 3){
+            //      this.nurseList.push(doctorList[i])
+            //   }
+               this.nurseList.push(doctorList[i])
              }
-
+             console.log("nurseLisrt===============",this.nurseList)
            }
          })
-       }
+       },
+    //    limitInput (e) {
+    //     e.target.value = e.target.value.replace(/(^\s*)|(\s*$)/g, "");
+    //     const reg = /[^\d.]/g;
+
+    //     // 只能是数字和小数点，不能是其他输入
+    //     e.target.value = e.target.value.replace(reg, "");
+
+    //     // 保证第一位只能是数字，不能是点
+    //     e.target.value = e.target.value.replace(/^\./g, "");
+    //     // 小数只能出现1位
+    //     e.target.value = e.target.value
+    //       .replace(".", "$#$")
+    //       .replace(/\./g, "")
+    //       .replace("$#$", ".");
+    //     // 小数点后面保留2位
+    //     e.target.value = e.target.value.replace(
+    //       /^(\-)*(\d+)\.(\d\d).*$/,
+    //       "$1$2.$3"
+    //     );
+    //     }
     },
     created(){
-      
+       this.form.admin_user_id = this.$store.getters.xt_user.user.id
+    //    this.form.admin_user_id = 829
        this.getAllDoctorList()
+    },
+    mounted(){
+
     }
  }
+
 </script>
-<style >
+<style scoped>
+.el-row {
+    margin-bottom: 20px;
+}
 .newMain .el-form-item__label {
     width: 110px !important;
 }
-</style>
+</style>

src/xt_pages/management/components/WaterFormList.vue

@@ -5,6 +5,7 @@
           <span class="machineClass">日期查询:</span>
           <el-date-picker
             v-model="form.start_time"
+            @change="changeStartime"
             prefix-icon="none"
             type="date"
             placeholder="请选择"
@@ -14,6 +15,7 @@
           ></el-date-picker
           >-
           <el-date-picker
+           @change="changeEndtime"
             v-model="form.end_time"
             prefix-icon="none"
             type="date"
@@ -141,7 +143,7 @@
               </template>
          </el-table-column>
 
-         <el-table-column label="静谧过滤器(MPa)" align="center" min-width="110px">
+         <el-table-column label="精密过滤器(MPa)" align="center" min-width="110px">
               <template slot-scope="scope">
                 {{ scope.row.ultrafilter?scope.row.ultrafilter:"" }}
               </template>
@@ -588,7 +590,7 @@
                  :rowspan="2"
                   style="text-align:center;width:60px;font-size:15px"
                 >
-                  静谧过滤器（MPa）
+                  精密过滤器（MPa）
                 </td>
 
                 <td
@@ -879,6 +881,14 @@
         }
       },
       methods:{
+        changeStartime(){
+         this.tableData = []
+         this.getlist()
+        },
+        changeEndtime(){
+         this.tableData = []
+         this.getlist()
+        },
          getlist(){
            var params = {
              start_time:this.form.start_time,
@@ -1018,29 +1028,29 @@
             this.form.id = detail.id
             this.form.record_date = this.getTime(detail.record_date)
             this.form.machine_status = detail.machine_status.toString()
-            this.form.fault_description = detail.fault_description
-            this.form.water_pressure= detail.water_pressure
-            this.form.water_conductivity = detail.water_conductivity
-            this.form.temperature = detail.temperature
+            this.form.fault_description = detail.fault_description?detail.fault_description:""
+            this.form.water_pressure= detail.water_pressure? detail.water_pressure:""
+            this.form.water_conductivity = detail.water_conductivity?detail.water_conductivity:""
+            this.form.temperature = detail.temperature?detail.temperature:""
             this.form.force_pump_status = detail.force_pump_status.toString()
-            this.form.first_ro_membrane_water = detail.first_ro_membrane_water
-            this.form.first_ro_film_thick_water = detail.first_ro_film_thick_water
-            this.form.first_ro_membrane_effluent = detail.first_ro_membrane_effluent
-            this.form.first_production_of_water_conductivity = detail.first_production_of_water_conductivity
-            this.form.first_water_yield = detail.first_water_yield
-            this.form.last_ro_membrane_water = detail.last_ro_membrane_water
-            this.form.last_ro_membrane_effluent  =detail.last_ro_membrane_effluent
-            this.form.last_ro_film_thick_water = detail.last_ro_film_thick_water
-            this.form.last_production_of_water_conductivity = detail.last_production_of_water_conductivity
-            this.form.last_water_yield= detail.last_water_yield
-            this.form.carbon_tank = detail.carbon_tank
-            this.form.snd_tank = detail.snd_tank
-            this.form.resin_tank = detail.resin_tank
-            this.form.ultrafilter = detail.ultrafilter
-            this.form.hardness_monitoring = detail.hardness_monitoring
-            this.form.total_chlorine_detection= detail.total_chlorine_detection
-            this.form.ph_detection = detail.ph_detection
-            this.form.concentration_of_peroxyacetic_acid = detail.concentration_of_peroxyacetic_acid
+            this.form.first_ro_membrane_water = detail.first_ro_membrane_water?detail.first_ro_film_thick_water:""
+            this.form.first_ro_film_thick_water = detail.first_ro_film_thick_water?detail.first_ro_film_thick_water:""
+            this.form.first_ro_membrane_effluent = detail.first_ro_membrane_effluent?detail.first_ro_membrane_effluent:""
+            this.form.first_production_of_water_conductivity = detail.first_production_of_water_conductivity?detail.first_production_of_water_conductivity:""
+            this.form.first_water_yield = detail.first_water_yield?detail.first_water_yield:""
+            this.form.last_ro_membrane_water = detail.last_ro_membrane_water?detail.last_ro_membrane_water:""
+            this.form.last_ro_membrane_effluent  = detail.last_ro_membrane_effluent?detail.last_ro_membrane_effluent:""
+            this.form.last_ro_film_thick_water = detail.last_ro_film_thick_water?detail.last_ro_film_thick_water:""
+            this.form.last_production_of_water_conductivity = detail.last_production_of_water_conductivity? detail.last_production_of_water_conductivity:""
+            this.form.last_water_yield= detail.last_water_yield?detail.last_water_yield:""
+            this.form.carbon_tank = detail.carbon_tank?detail.carbon_tank:""
+            this.form.snd_tank = detail.snd_tank?detail.snd_tank:""
+            this.form.resin_tank = detail.resin_tank?detail.resin_tank:""
+            this.form.ultrafilter = detail.ultrafilter?detail.ultrafilter:""
+            this.form.hardness_monitoring = detail.hardness_monitoring?detail.hardness_monitoring:""
+            this.form.total_chlorine_detection= detail.total_chlorine_detection?detail.total_chlorine_detection:""
+            this.form.ph_detection = detail.ph_detection?detail.ph_detection:""
+            this.form.concentration_of_peroxyacetic_acid = detail.concentration_of_peroxyacetic_acid?detail.concentration_of_peroxyacetic_acid:""
             if(detail.reverse_osmosis_membrane_disinfection == 1){
               this.form.reverse_osmosis_membrane_disinfection  = true
             }else{
@@ -1052,12 +1062,12 @@
             }else{
               this.form.disinfection_of_water_pipeline = false
             }
-            this.form.first_disinfection_method = detail.first_disinfection_method
-            this.form.last_disinfection_method = detail.last_disinfection_method
-            this.form.first_disinfection_time = detail.first_disinfection_time
-            this.form.last_disinfection_time = detail.last_disinfection_time
-            this.form.remark = detail.remark
-            this.form.filter_replacement = detail.filter_replacement
+            this.form.first_disinfection_method = detail.first_disinfection_method?detail.first_disinfection_method:""
+            this.form.last_disinfection_method = detail.last_disinfection_method?detail.last_disinfection_method:""
+            this.form.first_disinfection_time = detail.first_disinfection_time?detail.first_disinfection_time:""
+            this.form.last_disinfection_time = detail.last_disinfection_time?detail.last_disinfection_time:""
+            this.form.remark = detail.remark? detail.remark:""
+            this.form.filter_replacement = detail.filter_replacement?detail.filter_replacement:""
             this.form.admin_user_id = detail.admin_user_id
             var adminRole = response.data.data.adminRole
             for(let i=0;i<adminRole.length;i++){
@@ -1073,8 +1083,14 @@
 
       UpdateDilaysisWater(formName){
         console.log("form",this.form,this.equimentid)
-        this.form.force_pump_status = parseInt(this.form.force_pump_status)
-        this.form.machine_status = parseInt(this.form.machine_status)
+        if(this.form.force_pump_status!=""){
+          this.form.force_pump_status = parseInt(this.form.force_pump_status)
+        }
+        if(this.form.machine_status!=""){
+          this.form.machine_status = parseInt(this.form.machine_status)
+        }
+      
+       
         if(this.form.reverse_osmosis_membrane_disinfection == true){
            this.form.reverse_osmosis_membrane_disinfection = 1
         }
@@ -1087,37 +1103,187 @@
         if(this.form.disinfection_of_water_pipeline == false){
           this.form.disinfection_of_water_pipeline = 2
         }
+        if(this.form.water_conductivity!=""){
+          this.form.water_conductivity = parseFloat(this.form.water_conductivity)== NaN ? 0:parseFloat(this.form.water_conductivity)
+        }else{
+           this.form.water_conductivity = 0 
+        }
+        
+        if(this.form.water_pressure!=""){
+          this.form.water_pressure = parseFloat(this.form.water_pressure) == NaN ? 0:parseFloat(this.form.water_pressure)
+        }else{
+            this.form.water_pressure=  0
+        }
+
+        if(this.form.temperature!=""){
+          this.form.temperature = parseFloat(this.form.temperature)== NaN ? 0:parseFloat(this.form.temperature)
+        }else{
+          this.form.temperature = 0    
+        }
+        
+        if(this.form.force_pump_status!=""){
+          this.form.force_pump_status = parseFloat(this.form.force_pump_status) ==  NaN ? 0: parseFloat(this.form.force_pump_status)
+        }else{
+            this.form.force_pump_status = 0
+        }
+        
+        if(this.form.first_ro_membrane_water!=""){
+          this.form.first_ro_membrane_water = parseFloat(this.form.first_ro_membrane_water) == NaN?0:parseFloat(this.form.first_ro_membrane_water)
+        }else{
+          this.form.first_ro_membrane_water = 0
+        }
+
+        if(this.form.first_ro_film_thick_water!=""){
+          this.form.first_ro_film_thick_water = parseFloat(this.form.first_ro_film_thick_water) ==NaN?0:parseFloat(this.form.first_ro_film_thick_water)
+        }else{
+          this.form.first_ro_film_thick_water = 0
+        }
+        
+        if(this.form.first_ro_membrane_effluent!=""){
+          this.form.first_ro_membrane_effluent =parseFloat(this.form.first_ro_membrane_effluent) == NaN?0:parseFloat(this.form.first_ro_membrane_effluent) 
+        }else{
+           this.form.first_ro_membrane_effluent = 0 
+        }
+
+        if(this.form.first_production_of_water_conductivity!=""){
+          this.form.first_production_of_water_conductivity = parseFloat(this.form.first_production_of_water_conductivity) == NaN?0: parseFloat(this.form.first_production_of_water_conductivity)
+        }else{
+          this.form.first_production_of_water_conductivity = 0
+        }
+        
+        if(this.form.first_water_yield !=""){
+           this.form.first_water_yield = parseFloat(this.form.first_water_yield) == NaN?0:parseFloat(this.form.first_water_yield)  
+        }else{
+            this.form.first_water_yield =0
+        }
+       
+        if(this.form.last_ro_membrane_water!=""){
+          this.form.last_ro_membrane_water = parseFloat(this.form.last_ro_membrane_water) ==NaN?0:parseFloat(this.form.last_ro_membrane_water)  
+        }else{
+          this.form.last_ro_membrane_water = 0
+        }
+      
+        if(this.form.last_ro_membrane_effluent!=""){
+          this.form.last_ro_membrane_effluent = parseFloat(this.form.last_ro_membrane_effluent) == NaN?0:parseFloat(this.form.last_ro_membrane_effluent)
+        }else{
+          this.form.last_ro_membrane_effluent = 0
+        }
+      
+        if(this.form.last_ro_film_thick_water!=""){
+            this.form.last_ro_film_thick_water = parseFloat(this.form.last_ro_film_thick_water) == NaN?0:parseFloat(this.form.last_ro_film_thick_water)
+        }else{
+          this.form.last_ro_film_thick_water = 0
+        }
+   
+        if( this.form.last_production_of_water_conductivity!=""){
+            this.form.last_production_of_water_conductivity = parseFloat(this.form.last_production_of_water_conductivity) == NaN?0:parseFloat(this.form.last_production_of_water_conductivity)
+        }else{
+            this.form.last_production_of_water_conductivity =0
+        }
+       
+        if(this.form.last_water_yield!=""){
+            this.form.last_water_yield = parseFloat(this.form.last_water_yield)==NaN?0: parseFloat(this.form.last_water_yield)
+        }else{
+            this.form.last_water_yield = 0
+        }
 
-        this.form.water_conductivity = parseFloat(this.form.water_conductivity)
-        this.form.water_pressure = parseFloat(this.form.water_pressure)
-        this.form.temperature = parseFloat(this.form.temperature)
-        this.form.force_pump_status = parseFloat(this.form.force_pump_status)
-        this.form.first_ro_membrane_water = parseFloat(this.form.first_ro_membrane_water)
-        this.form.first_ro_film_thick_water = parseFloat(this.form.first_ro_film_thick_water)
-        this.form.first_ro_membrane_effluent =parseFloat(this.form.first_ro_membrane_effluent)
-        this.form.first_production_of_water_conductivity = parseFloat(this.form.first_production_of_water_conductivity)
-        this.form.first_water_yield = parseFloat(this.form.first_water_yield)
-        this.form.last_ro_membrane_water = parseFloat(this.form.last_ro_membrane_water)
-        this.form.last_ro_membrane_effluent = parseFloat(this.form.last_ro_membrane_effluent)
-        this.form.last_ro_film_thick_water = parseFloat(this.form.last_ro_film_thick_water)
-        this.form.last_production_of_water_conductivity = parseFloat(this.form.last_production_of_water_conductivity)
-        this.form.last_water_yield = parseFloat(this.form.last_water_yield)
-        this.form.carbon_tank = parseFloat(this.form.carbon_tank)
-        this.form.snd_tank = parseFloat(this.form.snd_tank)
-        this.form.resin_tank= parseFloat(this.form.resin_tank)
-        this.form.ultrafilter = parseFloat(this.form.ultrafilter)
-        this.form.hardness_monitoring = parseFloat(this.form.hardness_monitoring)
-        this.form.total_chlorine_detection = parseFloat(this.form.total_chlorine_detection)
-        this.form.ph_detection = parseFloat(this.form.ph_detection)
-        this.form.concentration_of_peroxyacetic_acid = parseFloat(this.form.concentration_of_peroxyacetic_acid)
-        this.form.reverse_osmosis_membrane_disinfection= parseFloat(this.form.reverse_osmosis_membrane_disinfection)
-        this.form.first_disinfection_method = parseFloat(this.form.first_disinfection_method)
-        this.form.last_disinfection_method = parseFloat(this.form.last_disinfection_method)
-        this.form.first_disinfection_time = parseFloat(this.form.first_disinfection_time)
-        this.form.last_disinfection_time = parseFloat(this.form.last_disinfection_time)
-        this.form.filter_replacement = parseFloat(this.form.filter_replacement)
-        this.form.admin_user_id = parseFloat(this.form.admin_user_id)
-        this.form.disinfection_of_water_pipeline = parseFloat(this.form.disinfection_of_water_pipeline)
+        if(this.form.carbon_tank!=""){
+            this.form.carbon_tank = parseFloat(this.form.carbon_tank) == NaN?0:parseFloat(this.form.carbon_tank)
+        }else{
+            this.form.carbon_tank = 0
+        }
+        
+        if( this.form.snd_tank!=""){
+            this.form.snd_tank = parseFloat(this.form.snd_tank) == NaN?0:parseFloat(this.form.snd_tank)
+        }else{
+            this.form.snd_tank = 0
+        }
+         
+        if(this.form.resin_tank!=""){
+            this.form.resin_tank= parseFloat(this.form.resin_tank) ==NaN?0:parseFloat(this.form.resin_tank)
+        }else{
+            this.form.resin_tank= 0
+        }
+      
+        if( this.form.ultrafilter!=""){
+            this.form.ultrafilter = parseFloat(this.form.ultrafilter)== NaN?0:parseFloat(this.form.ultrafilter)
+        }else{
+          this.form.ultrafilter = 0
+        }
+        
+        if(this.form.hardness_monitoring !=""){
+            this.form.hardness_monitoring = parseFloat(this.form.hardness_monitoring) ==NaN?0: parseFloat(this.form.hardness_monitoring)
+        }else{
+           this.form.hardness_monitoring= 0
+        }
+
+        if( this.form.total_chlorine_detection!=""){
+            this.form.total_chlorine_detection = parseFloat(this.form.total_chlorine_detection)==NaN?0: parseFloat(this.form.total_chlorine_detection)
+        }else{
+            this.form.total_chlorine_detection = 0
+        }
+        
+        if( this.form.ph_detection!=""){
+            this.form.ph_detection = parseFloat(this.form.ph_detection) == NaN?0:parseFloat(this.form.ph_detection)
+        }else{
+            this.form.ph_detection = 0
+        }
+
+        if(this.form.concentration_of_peroxyacetic_acid!="" ){
+            this.form.concentration_of_peroxyacetic_acid = parseFloat(this.form.concentration_of_peroxyacetic_acid) == NaN?0: parseFloat(this.form.concentration_of_peroxyacetic_acid)   
+        }else{
+            this.form.concentration_of_peroxyacetic_acid = 0
+        }
+
+        if( this.form.reverse_osmosis_membrane_disinfection!=""){
+            this.form.reverse_osmosis_membrane_disinfection= parseFloat(this.form.reverse_osmosis_membrane_disinfection) == NaN?0:parseFloat(this.form.reverse_osmosis_membrane_disinfection)
+        }else{
+            this.form.reverse_osmosis_membrane_disinfection=  0
+        }
+
+        if(this.form.first_disinfection_method !=""){
+            this.form.first_disinfection_method = parseFloat(this.form.first_disinfection_method) == NaN?0:parseFloat(this.form.first_disinfection_method)
+        }else{
+            this.form.first_disinfection_method = 0
+        }
+      
+       
+        if(this.form.last_disinfection_method !=""){
+           this.form.last_disinfection_method = parseFloat(this.form.last_disinfection_method) == NaN?0:parseFloat(this.form.last_disinfection_method)
+        }else{
+            this.form.last_disinfection_method = 0
+        }
+       
+        if(this.form.first_disinfection_time !=""){
+          this.form.first_disinfection_time = parseFloat(this.form.first_disinfection_time) == NaN?0:parseFloat(this.form.first_disinfection_time)
+        }else{
+            this.form.first_disinfection_time = 0
+        }
+        
+        if( this.form.last_disinfection_time!=""){
+            this.form.last_disinfection_time = parseFloat(this.form.last_disinfection_time) == NaN?0:parseFloat(this.form.last_disinfection_time)
+        }else{
+            this.form.last_disinfection_time = 0  
+        }
+      
+        if(this.form.filter_replacement!=""){
+            this.form.filter_replacement = parseFloat(this.form.filter_replacement) == NaN?0:parseFloat(this.form.filter_replacement)
+        }else{
+            this.form.filter_replacement= 0
+        }
+
+        if( this.form.admin_user_id != ""){
+            this.form.admin_user_id = parseFloat(this.form.admin_user_id) == NaN?0:parseFloat(this.form.admin_user_id)
+        }else{
+            this.form.admin_user_id =0
+        }
+        
+        if(this.form.disinfection_of_water_pipeline !=""){
+            this.form.disinfection_of_water_pipeline = parseFloat(this.form.disinfection_of_water_pipeline) == NaN?0:parseFloat(this.form.disinfection_of_water_pipeline)
+        }else{
+            this.form.disinfection_of_water_pipeline =0
+        }
+      
          this.$refs[formName].validate((valid) => {
           if (valid) {
             UpdateDilaysisWater(this.form,this.equimentid).then(response=>{
@@ -1148,7 +1314,7 @@
             }
             import('@/vendor/Export2Excel').then(excel => {
 
-              const multiHeader = [['序号', '日期', '原水参数' , '', '','', '一级反渗', '', '二级反渗' , '', '碳罐(MPa)','砂罐(MPa)', '树脂罐(MPa)','静谧过滤器(MPa)','水质监测','','','','消毒','','过滤器更换','记录人' ]]
+              const multiHeader = [['序号', '日期', '原水参数' , '', '','', '一级反渗', '', '二级反渗' , '', '碳罐(MPa)','砂罐(MPa)', '树脂罐(MPa)','精密过滤器(MPa)','水质监测','','','','消毒','','过滤器更换','记录人' ]]
               const header = ['', '', '原水电导度', '原水压力', '温度','加压泵', '产水电导度', '产水量', '产水电导度', '产水量', '','','','','硬度(mg/l)','总氯(mg/l)','PH值','过氧乙酸(mg/l)','反渗膜消毒','输水管道消毒','','',]
               const merges = ['A1:A2', 'B1:B2', 'C1:F1','G1:H1','I1:J1','K1:K2','L1:L2','M1:M2','N1:N2','O1:R1','S1:T1','U1:U2','V1:V2']
               const filterVal = ['index','record_date','water_conductivity','water_pressure','temperature','force_pump_status','first_ro_membrane_effluent','first_water_yield','last_production_of_water_conductivity','last_water_yield','carbon_tank','snd_tank','resin_tank','ultrafilter','hardness_monitoring','ph_detection','total_chlorine_detection','concentration_of_peroxyacetic_acid','reverse_osmosis_membrane_disinfection_name','disinfection_of_water_pipeline_name','filter_replacement','user_name']
@@ -1172,6 +1338,7 @@
         },
       },
       created(){
+        console.log("list+++++++++++++++++++++++")
         this.getlist()
       }
     }

src/xt_pages/management/home.vue

@@ -893,7 +893,7 @@
                                         </el-table-column>
                                         <el-table-column label="床单位更换" align="center" min-width="100px" >
                                                 <template slot-scope="scope">
-                                                  
+
                                                    <span v-if="scope.row.bed_way ==0">/</span>
                                                    <span v-if="scope.row.bed_way ==1">床单</span>
                                                    <span v-if="scope.row.bed_way ==2">被套</span>
@@ -1368,8 +1368,8 @@
                           </el-tab-pane>
 
                            <el-tab-pane label="使用登记列表" name="second" >
-                             <user-form ref="userForm" :userdata="userdata" v-if="device_type == 1"></user-form>
-                             <water-form-list ref="waterFormList" v-if="device_type == 2" :equimentid="equimentid"></water-form-list>
+                             <user-form ref="childFive" :userdata="userdata" v-if="device_type == 1"></user-form>
+                             <water-form-list ref="childSix" v-if="device_type == 2" :equimentid="equimentid"></water-form-list>
                            </el-tab-pane>
                        </el-tabs>
                      </div>
@@ -1382,7 +1382,7 @@
                       <div v-show="zhiShow">
                        <el-tabs type="border-card" v-model="activeNameSix" @tab-click="handleClick">
                          <el-tab-pane label="新增质量控制" name="first">
-  
+
                            <span style="margin-bottom: 20px;display: block;">细菌培养</span>
                            <el-form :model="qualityForm" ref="qualityForm" :rules="qualitRules">
                              <el-row>
@@ -1579,7 +1579,7 @@
                                     </el-date-picker>
                                   </el-form-item>
                                 </el-col>
-                               
+
                                 <el-col :span="8">
                                   <el-form-item label="顺序号:" required prop="sort">
                                      <el-input style="width:150px" v-model="qualityFormTwo.sort" ></el-input>
@@ -1632,9 +1632,9 @@
                               </el-row>
                             </el-form>
                             <el-divider></el-divider>
-                           
 
-                          
+
+
                           <div v-if="device_type == 1">
                            <span style="margin-bottom: 20px;display: block;">透析液离子浓度检测</span>
                             <el-form ref="qualityFormThree" :model="qualityFormThree" :rules="ruleThree">
@@ -1689,9 +1689,9 @@
                                         </el-date-picker>
                                     </el-form-item>
                                 </el-col>
-                                
+
                               </el-row>
-                            
+
                               <el-row>
                                 <el-col :span="8">
                                   <!-- <span>Na<sup>+</sup></span> -->
@@ -1791,11 +1791,11 @@
 
 
 
-                           
+
                             <el-divider></el-divider>
-                         </div>     
-                             
-                        
+                         </div>
+
+
                             <span style="margin-bottom: 20px;display: block;">有毒化合物检测</span>
                             <el-form ref="qualityFormFour" :model="qualityFormFour" :rules="diaRules">
                               <el-row>
@@ -1866,7 +1866,7 @@
                                     </el-date-picker>
                                   </el-form-item>
                                 </el-col>
-                               
+
                                 <el-col :span="8">
                                   <el-form-item label="顺序号:" required prop="sort">
                                      <el-input style="width:150px" v-model="qualityFormFour.sort" ></el-input>
@@ -1993,7 +1993,7 @@
                                     </el-date-picker>
                                   </el-form-item>
                                 </el-col>
-                               
+
                                 <el-col :span="8">
                                   <el-form-item label="顺序号:" required prop="sort">
                                      <el-input style="width:150px" v-model="qualityFormFive.sort" ></el-input>
@@ -2046,7 +2046,7 @@
                               </el-row>
                             </el-form>
                             <el-divider></el-divider>
-                            
+
 
 
 
@@ -2120,7 +2120,7 @@
                                       </el-date-picker>
                                     </el-form-item>
                                   </el-col>
-                                
+
                                   <el-col :span="8">
                                     <el-form-item label="顺序号:" required prop="sort">
                                       <el-input style="width:150px" v-model="qualityFormSix.sort" ></el-input>
@@ -2174,8 +2174,8 @@
                               </el-form>
                             <el-divider></el-divider>
 
-                           
-                           
+
+
                             <span style="margin-bottom: 20px;display: block;">PH值检测</span>
                             <el-form ref="qualityFormSeven" :model="qualityFormSeven" :rules="diaRules">
                               <el-row>
@@ -2246,7 +2246,7 @@
                                     </el-date-picker>
                                   </el-form-item>
                                 </el-col>
-                               
+
                                 <el-col :span="8">
                                   <el-form-item label="顺序号:" required prop="sort">
                                      <el-input style="width:150px" v-model="qualityFormSeven.sort" ></el-input>
@@ -2302,7 +2302,7 @@
 
 
 
-                          
+
 
                          </el-tab-pane>
 
@@ -2316,7 +2316,7 @@
                           暂无数据
                         </div>
                    </el-tab-pane>
-                   
+
                     <el-tab-pane label="维修维护" name="five">
                        <el-tabs type="border-card" v-model="activeNameFive" @tab-click="handleClick">
                          <el-tab-pane label="新增维修维护" name="first">
@@ -2351,7 +2351,7 @@
                              <el-row>
                                  <el-col :span="8">
                                   <el-form-item label="到达时间:">
-                                   
+
                                          <el-date-picker
                                           type="datetime"
                                           format="yyyy-MM-dd HH:mm"
@@ -2848,7 +2848,7 @@ export default {
           device_name: [{ required: true, message: '请填写序列号' }],
           devicetype: [{ required: true, message: '请填写设备类型' }],
           unit_type: [{ required: true, message: '请填写设备型号' }],
-        
+
         },
         qualitRules: {
           detection_unit: [{ required: true, message: '请填写检测单位' }],
@@ -2868,7 +2868,7 @@ export default {
         },
         repirRules: {
           guarantee_date: [{ required: true, message: '请填写保修日期' }],
-          fault_description: [{ required: true, message: '请填写故障描述' }]
+          fault_description: [{ required: true, message: '请填写故障描述', trigger: ['blur', 'change']}]
         },
         ruleThree: {
           detection_unit: [{ required: true, message: '请填写检测单位' }],
@@ -2885,10 +2885,10 @@ export default {
           patient_name: [{ required: true, message: '请填写患者', trigger: ['blur', 'change'] }],
           disinfect_type: [{ required: true, message: '请填写消毒方式' }],
           disinfectant_type: [{ required: true, message: '请填写消毒液' }],
-          disinfection: [{ required: true, message: '请填写消毒状态' }],
+          disinfection: [{ required: true, message: '请填写消毒状态', trigger: ['blur','change'] }],
           fluid_path: [{ required: true, message: '请填写消毒方式' }],
           disinfectant: [{ required: true, message: '请填写消毒液' }],
-          disinfection_status: [{ required: true, message: '消毒状态' }],
+          disinfection_status: [{ required: true, message: '请填写消毒状态', trigger: ['blur','change'] }],
           sign_name: [{ required: true, message: '请填写签名', trigger: ['blur','change'] }],
           classtype: [{ required: true, message: '请填写班次', trigger: ['blur','change']  }],
           reporting_date:[{required:true,message:"请填写出报告日期"}]
@@ -3093,7 +3093,7 @@ export default {
           { id:29, name:"PE"},
         ],
         disinfection: [
-          { id: 0, name: '请选择' },
+          // { id: 0, name: '请选择' },
           { id: 1, name: '已消毒' },
           { id: 2, name: '未消毒' },
           { id: 3, name: '消毒未完成' }
@@ -3252,6 +3252,7 @@ export default {
           imageName: '',
           function_accessories_inspection:"",
           other_information:'',
+          admin_user_id:this.$store.getters.xt_user.user.id,
         },
 
         filename: '',
@@ -3382,11 +3383,15 @@ export default {
         this.getAllMachine()
       },
       changeDeviceId(val) {
+       
         if (val === 1) {
           this.zoneDisabled = false
         } else {
           this.zoneDisabled = true
         }
+        if(val == 0){
+          this.zoneDisabled = false
+        }
         this.forms.device_type = val
         this.getAllMachine()
       },
@@ -3415,7 +3420,7 @@ export default {
               }
 
             }
-            
+
           }
         })
       },
@@ -3423,7 +3428,7 @@ export default {
         this.tabIndex = index
       },
       handleCurrentChange(val) {
-       console.log("val232323232323------",val)
+        console.log("val3223323223",val)
         // 通过设备型号区分质量控制
         this.device_type = val.device_type
         this.unitType = val.unit_type
@@ -3441,6 +3446,14 @@ export default {
         this.GetUserTotalCount(val.bed_id)
         this.getTimeBeteen(val.id)
         this.getData(val.bed_id)
+        if(val.device_type == 2){
+          this.$refs.childSix.getlist()
+        }
+       
+      },
+      toParent(){
+        console.log("处方23322332")
+        this.$refs.childSix.getlist()
       },
       getAutoData(id) {
         getAutoData(id).then(response => {
@@ -3454,16 +3467,16 @@ export default {
           if (response.data.state === 1) {
             var addmacher = response.data.data.addmacher
             var warning = response.data.data.warning
-          
+
             var time = this.getTimestamp(this.userform.date) - warning.stime
             var germ = response.data.data.germ
-          
+
             var timetwo = this.getTimestamp(this.userform.date) - germ.stime
-           
+
             var clean = response.data.data.clean
             var timethree = this.getTimestamp(this.userform.date) - clean.stime
             var number = response.data.data.number
-          
+
             this.Number = number
             if (addmacher.device_type === 1) {
               this.sShow = false
@@ -3504,7 +3517,7 @@ export default {
             var zone = response.data.data.zone
 
             const arr1 = []
-          
+
             for (let index = 0; index < mode.length; index++) {
               if (mode[index].treate_mode === 1) {
                 mode[index] = 'HD'
@@ -3593,7 +3606,7 @@ export default {
             this.form.machine_status = addmacher.machine_status
             this.form.user_total = addmacher.user_total
             this.form.remarks = addmacher.remarks
-           
+
             if (addmacher.rubbish_date !== 0) {
               this.form.rubbish_date = uParseTime(addmacher.rubbish_date, '{y}-{m}-{d}')
             }
@@ -3700,16 +3713,16 @@ export default {
         var bed_numberss = parseInt(bed_numbers)
         this.form.bed_number = bed_numberss
         this.$refs[formName].validate(valid => {
-          UpdateMachineInfo(this.form).then(response => {         
+          UpdateMachineInfo(this.form).then(response => {
             if (response.data.state === 1) {
-              var addmacher = response.data.data.addmacher         
-              this.$message.success('修改成功')           
+              var addmacher = response.data.data.addmacher
+              this.$message.success('修改成功')
               for (let i = 0; i < this.tableDatatwo.length; i++) {
                 if (this.tableDatatwo[i].id == addmacher.id) {
                   for (let j = 0; j < this.deviceMode.length; j++) {
                     if (this.deviceMode[j].id === parseInt(addmacher.unit_type)) {
                       addmacher.device_mode = this.deviceMode[j].device_mode
-                    
+
                     }
                   }
 
@@ -4370,7 +4383,7 @@ export default {
             }
             this.userform.date = uParseTime(patients.schedule_date, '{y}-{m}-{d}')
             this.userform.patient_name = patients.name
-            this.userform.patient_id = patients.patient_id 
+            this.userform.patient_id = patients.patient_id
             var zone = response.data.data.zone
             this.userform.zone = zone.id
             var number = response.data.data.number
@@ -4479,22 +4492,22 @@ export default {
         }
 
         // eslint-disable-next-line eqeqeq
-        if (this.userform.start_time == '') {
-          this.userform.start_time = '0'
-        }
-        // eslint-disable-next-line eqeqeq
-        if (this.userform.end_time == '') {
-          this.userform.end_time = '0'
-        }
+        // if (this.userform.start_time == '') {
+        //   this.userform.start_time = '0'
+        // }
+        // // eslint-disable-next-line eqeqeq
+        // if (this.userform.end_time == '') {
+        //   this.userform.end_time = '0'
+        // }
 
-        // eslint-disable-next-line eqeqeq
-        if (this.userform.starttime == '') {
-          this.userform.starttime = '0'
-        }
-        // eslint-disable-next-line eqeqeq
-        if (this.userform.endtime == '') {
-          this.userform.endtime = '0'
-        }
+        // // eslint-disable-next-line eqeqeq
+        // if (this.userform.starttime == '') {
+        //   this.userform.starttime = '0'
+        // }
+        // // eslint-disable-next-line eqeqeq
+        // if (this.userform.endtime == '') {
+        //   this.userform.endtime = '0'
+        // }
 
         if (this.userform.hyperfiltratio === '') {
           this.userform.hyperfiltratio = 0
@@ -4519,7 +4532,7 @@ export default {
         this.userform.user_total = parseInt(this.userform.user_total)
 
         console.log("user_form",this.userform)
-      
+
         this.$refs[formName].validate((valid) => {
           if (valid) {
             SaveInformation(this.equimentid, this.userform).then(response => {
@@ -4581,8 +4594,18 @@ export default {
             this.userform.patient_id = information.patient_id
             this.userform.contagion = information.contagion
             this.userform.dialysis_mode = information.dialysis_mode
-            this.userform.start_time = this.updateTimes(information.start_time)
-            this.userform.end_time = this.updateTimes(information.end_time)
+            if(information.start_time > 0){
+              this.userform.start_time = this.updateTimes(information.start_time)
+            }else{
+              this.userform.start_time =  ""
+            }
+            if(information.end_time >0){
+              this.userform.end_time = this.updateTimes(information.end_time)
+            }else{
+              this.userform.end_time = ""
+            }
+          
+           
             // this.userform.end_time = uParseTime(information.end_time, '{y}-{m}-{d} {h}:{i}')
             if (information.hyperfiltratio === '') {
               this.userform.hyperfiltratio = dislysis.actual_ultrafiltration
@@ -4611,15 +4634,36 @@ export default {
             this.userform.fault_description = information.fault_description
             this.userform.code_information = information.code_information
             this.userform.disinfect_type = information.disinfect_type
-            this.userform.disinfection = information.disinfection
+            if(information.disinfection == 0){
+              this.userform.disinfection = ""
+            }else{
+              this.userform.disinfection = information.disinfection
+            }
+           
             this.userform.machine_run = information.machine_run
             this.userform.fluid_path = information.fluid_path
             this.userform.disinfectant = information.disinfectant
-            this.userform.disinfection_status = information.disinfection_status
+            if(information.disinfection_status == 0){
+               this.userform.disinfection_status = ""
+            }else{
+              this.userform.disinfection_status = information.disinfection_status
+            }
+           
             this.userform.disinfection_residue = information.disinfection_residue
             this.userform.longtime = information.long_time
-            this.userform.starttime = this.updateTimes(information.disinfec_startime)
-            this.userform.endtime = this.updateTimes(information.disinfec_endtime)
+            if(information.disinfec_startime >0){
+              this.userform.starttime = this.updateTimes(information.disinfec_startime)
+            }else{
+              this.userform.starttime= ""
+            }
+
+            if(information.disinfec_endtime >0){
+              this.userform.endtime = this.updateTimes(information.disinfec_endtime)
+            }else{
+              this.userform.endtime = ""
+            }
+           
+           
 
             if (information.dialysis_checked === 1) {
               this.userform.dialysis_checked = true
@@ -4699,16 +4743,16 @@ export default {
         var samplinglocationa = this.qualityForm.sampling_locationa
         var samplinglocationas = parseInt(samplinglocationa)
         this.qualityForm.sampling_locationa = samplinglocationas
-        
+
         //  if(this.qualityForm.pass_examination!=''){
         //    this.qualityForm.pass_examination = parseInt(this.qualityForm.pass_examination)
         //  }
          if(this.qualityForm.modifications!=''){
            this.qualityForm.modifications = parseInt(this.qualityForm.modifications)
          }
-       
+
         console.log("3333333",this.qualityForm)
-       
+
         this.$refs[formName].validate(response => {
           SaveBacteria(this.equimentid, this.qualityForm).then(response => {
             if (response.data.state === 1) {
@@ -4736,7 +4780,7 @@ export default {
         this.qualityForm.detection_result = ''
       },
       SaveLincomycin(formName) {
-       
+
         this.$refs[formName].validate((valid) => {
           if (this.qualityFormTwo.specimenb === '') {
             this.qualityFormTwo.specimenb = 0
@@ -4752,13 +4796,13 @@ export default {
           var sampling = this.qualityFormTwo.sampling_locationb
           var samplings = parseInt(sampling)
           this.qualityFormTwo.sampling_locationb = samplings
-           
-       
+
+
           if(this.qualityFormTwo.modifications!=''){
             this.qualityFormTwo.modifications = parseInt(this.qualityFormTwo.modifications)
           }
-       
-      
+
+
           if (valid) {
             SaveLincomycin(this.equimentid, this.qualityFormTwo).then(response => {
               if (response.data.state === 1) {
@@ -4770,8 +4814,8 @@ export default {
                 this.qualityFormTwo.concentrateb_nod = ''
                 this.qualityFormTwo.sampling_locationb = ''
                 this.qualityFormTwo.detection_resultb = ''
-               
-              
+
+
                 this.$refs.mychild.getAllQulityInfo()
               }
             })
@@ -4790,11 +4834,11 @@ export default {
       SaveQualityControl(formName) {
         this.$refs[formName].validate((valid) => {
           if (valid) {
-             
+
               if(this.qualityFormThree.modifications!=''){
                 this.qualityFormThree.modifications = parseInt(this.qualityFormThree.modifications)
               }
-            
+
             SaveQualityControl(this.equimentid, this.qualityFormThree).then(response => {
               if (response.data.state === 1) {
                 var ion = response.data.data.ion
@@ -4953,6 +4997,8 @@ export default {
                 this.guaForm.exclude = 0
                 this.guaForm.images = ''
                 this.guaForm.treatment_process = ''
+                this.guaForm.function_accessories_inspection= ""
+                this.guaForm.other_information= ""
                 this.classShow = false
                 this.guaForm.imageName = ''
               }
@@ -5042,7 +5088,7 @@ export default {
             var deviceInformation = response.data.data.deviceInformation
             var timetwo = this.getTimestamp(this.userform.date) - deviceInformation.stime
             var clean = response.data.data.clean
-          
+
           }
         })
       },
@@ -5145,10 +5191,10 @@ export default {
          GetUserTotalCount(bedid).then(response=>{
             if(response.data.state == 1){
               var count =  response.data.data.count
-              var addmacher = response.data.data.addmacher 
+              var addmacher = response.data.data.addmacher
               if(addmacher.user_total == ''){
                   addmacher.user_total = 0
-              }   
+              }
               // this.userform.user_total = count[0].Total + parseInt(addmacher.user_total)
             }
          })
@@ -5171,12 +5217,12 @@ export default {
           var sampling = this.qualityFormFour.sampling_locationb
           var samplings = parseInt(sampling)
           this.qualityFormFour.sampling_locationb = samplings
-           
-        
+
+
           if(this.qualityFormFour.modifications!=''){
             this.qualityFormFour.modifications = parseInt(this.qualityFormFour.modifications)
           }
-       
+
           if (valid) {
             saveOxygenates(this.equimentid, this.qualityFormFour).then(response => {
               if (response.data.state === 1) {
@@ -5187,10 +5233,10 @@ export default {
                 this.qualityFormFour.concentrate_noc = ''
                 this.qualityFormFour.concentrateb_nod = ''
                 this.qualityFormFour.sampling_locationb = ''
-             
+
                 this.qualityFormFour.detection_resultb = ''
-                
-              
+
+
                 this.$refs.mychild.getAllQulityInfo()
               }
             })
@@ -5215,12 +5261,12 @@ export default {
           var sampling = this.qualityFormFive.sampling_locationb
           var samplings = parseInt(sampling)
           this.qualityFormFive.sampling_locationb = samplings
-           
-        
+
+
           if(this.qualityFormFive.modifications!=''){
             this.qualityFormFive.modifications = parseInt(this.qualityFormFive.modifications)
           }
-       
+
           if (valid) {
             saveHardWater(this.equimentid, this.qualityFormFive).then(response => {
               if (response.data.state === 1) {
@@ -5232,8 +5278,8 @@ export default {
                 this.qualityFormFive.concentrateb_nod = ''
                 this.qualityFormFive.sampling_locationb = ''
                 this.qualityFormFive.detection_resultb = ''
-               
-              
+
+
                 this.$refs.mychild.getAllQulityInfo()
               }
             })
@@ -5258,12 +5304,12 @@ export default {
           var sampling = this.qualityFormSix.sampling_locationb
           var samplings = parseInt(sampling)
           this.qualityFormSix.sampling_locationb = samplings
-           
-       
+
+
           if(this.qualityFormSix.modifications!=''){
             this.qualityFormSix.modifications = parseInt(this.qualityFormSix.modifications)
           }
-       
+
           if (valid) {
             saveWater(this.equimentid, this.qualityFormSix).then(response => {
               if (response.data.state === 1) {
@@ -5275,8 +5321,8 @@ export default {
                 this.qualityFormSix.concentrateb_nod = ''
                 this.qualityFormSix.sampling_locationb = ''
                 this.qualityFormSix.detection_resultb = ''
-             
-              
+
+
                 this.$refs.child.getAllQulityInfo()
               }else{
                 this.qualityFormSix.pass_examination = "1"
@@ -5303,12 +5349,12 @@ export default {
           var sampling = this.qualityFormSeven.sampling_locationb
           var samplings = parseInt(sampling)
           this.qualityFormSeven.sampling_locationb = samplings
-           
-       
+
+
           if(this.qualityFormSeven.modifications!=''){
             this.qualityFormSeven.modifications = parseInt(this.qualityFormSeven.modifications)
           }
-       
+
           if (valid) {
             saveDevicePH(this.equimentid, this.qualityFormSeven).then(response => {
               if (response.data.state === 1) {
@@ -5320,8 +5366,8 @@ export default {
                 this.qualityFormSeven.concentrateb_nod = ''
                 this.qualityFormSeven.sampling_locationb = ''
                 this.qualityFormSeven.detection_resultb = ''
-              
-              
+
+
                 this.$refs.mychild.getAllQulityInfo()
               }
             })
@@ -5343,7 +5389,7 @@ export default {
       this.getAllpatient()
       this.getAllMode()
       this.GetUserTotalCount(bedid)
-      
+
 
   }
   }
@@ -5408,9 +5454,16 @@ export default {
        margin-bottom: 10px;
     margin-left: 82%
   }
+  .el-form-item__error {
+    margin-left: 130px;
+    
+  }
 
 </style>
 <style lang="scss">
+    .el-form-item__error {
+      left:103px !important;
+    }
    .a{
      margin-bottom: 10px;
       margin-top: 6px;
@@ -5453,9 +5506,7 @@ export default {
   //   width: 130px;
   //   font-size: 14px;
   // }
-  .el-form-item__error {
-    margin-left: 130px;
-  }
+  
 
  .el-upload-list__item-name {
     color: #606266;

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -262,7 +262,7 @@
           cost: '',
           phone: '',
           social_type: ''
-        }, 
+        },
         IDCardTypes: [{
           value: 1,
           label: '社保卡'
@@ -739,10 +739,8 @@
       hide: function () {
         this.visibility = false
         this.$refs['formValue'].resetFields()
-      },
-       cancel: function(formName) {
+      }, cancel: function(formName) {
         this.$emit('cancel', this.getValue())
-        this.visibility=false
         this.$refs['formValue'].resetFields()
       },
       confirm: function(formName) {
@@ -751,9 +749,6 @@
             let value = {}
             value = this.getValue()
             this.$emit('confirm', value)
-            this.visibility=false
-            this.$refs['formValue'].resetFields()
-            this.$parent.loadingone=false
           }
         })
       },

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -122,12 +122,12 @@
 
 
 
-            <el-button  size="small"  v-if="(org_id == 0 && this.order.is_upload_diagnose == 0 && this.order.order_status == 2)  || (org_id == 10138 && this.order.is_upload_diagnose == 0 && this.order.order_status == 2) || (org_id == 10278 && this.order.is_upload_diagnose == 0 && this.order.order_status == 2)"
+            <el-button  size="small"  v-if="(org_id == 10138 && this.order.is_upload_diagnose == 0 && this.order.order_status == 2) || (org_id == 10278 && this.order.is_upload_diagnose == 0 && this.order.order_status == 2)"
                        @click="openZF(1)"
                        type="primary">自费门诊就医上传(4205)
             </el-button>
 
-            <el-button  size="small" v-if="(org_id == 0 && this.order.is_upload_success == 0 && this.order.order_status == 2)  || (org_id == 10138  && this.order.is_upload_success == 0 && this.order.order_status == 2) || (org_id == 10278  && this.order.is_upload_success == 0 && this.order.order_status == 2) "
+            <el-button  size="small" v-if="(org_id == 10138  && this.order.is_upload_success == 0 && this.order.order_status == 2) || (org_id == 10278  && this.order.is_upload_success == 0 && this.order.order_status == 2) "
                         @click="openZF(2)"
                         type="primary">自费上传确认(4203)
             </el-button>
@@ -854,6 +854,19 @@
         </div>
       </div>
     </div>
+    <el-dialog
+      title="发票号码"
+      :visible.sync="fapiaoCodeDialogVisible"
+      width="30%"
+    >
+      <el-input placeholder="请输入发票号码" v-model="fapiao_code"></el-input>
+
+      <span slot="footer" class="dialog-footer">
+                <el-button @click="fapiaoCodeDialogVisible = false">取 消</el-button>
+                <el-button type="primary" @click="comfirmFaPiaoCode">确 定</el-button>
+             </span>
+    </el-dialog>
+
     <el-dialog
         title="提示"
         :visible.sync="dialogVisible"
@@ -1005,6 +1018,8 @@ export default {
   },
   data() {
     return {
+      fapiaoCodeDialogVisible:false,
+      fapiao_code:"",
       monthChargePatientTableData: [],
       invoiceVisible: false,
       invoiceParams: null,
@@ -1218,6 +1233,45 @@ export default {
     this.getPatientList()
   },
   methods: {
+    comfirmFaPiaoCode(){
+      var  that = this
+      let params = {
+        'order_id': this.order.id,
+        'admin_user_id': this.$store.getters.xt_user.user.id,
+        'fapiao_code':this.fapiao_code,
+      }
+      axios.get('http://127.0.0.1:9532/api/4205', {
+        params: params
+      }).then(function(response) {
+        if (response.data.state == 0) {
+          that.$message.error(response.data.msg)
+          that.fapiaoCodeDialogVisible = false
+          return false
+        } else {
+          that.fapiaoCodeDialogVisible = false
+          if (response.data.data.failed_code == -10) {
+            that.$confirm(response.data.data.msg, '医保错误信息', {
+              confirmButtonText: '确 定',
+              type: 'warning'
+            }).then(() => {
+
+            }).catch(() => {
+
+            })
+
+          } else {
+            that.$message({ message: '上传成功', type: 'success', duration: 5000 })
+            that.order.is_upload_diagnose = 1
+          }
+
+        }
+      })
+        .catch(function(error) {
+
+        })
+
+
+    },
     fetchAllAdminUsers() {
       fetchAllAdminUsers().then(response => {
         if (response.data.state == 1) {
@@ -3021,6 +3075,8 @@ export default {
 
       }
     },openZF(index){
+
+
       var  that = this
       let params = {
         'order_id': this.order.id,
@@ -3029,33 +3085,7 @@ export default {
       }
       switch (index){
         case 1:
-          axios.get('http://127.0.0.1:9532/api/4205', {
-            params: params
-          }).then(function(response) {
-            if (response.data.state == 0) {
-              that.$message.error(response.data.msg)
-
-              return false
-            } else {
-              if (response.data.data.failed_code == -10) {
-                that.$confirm(response.data.data.msg, '医保错误信息', {
-                  confirmButtonText: '确 定',
-                  type: 'warning'
-                }).then(() => {
-
-                }).catch(() => {
-                })
-
-              } else {
-                that.$message({ message: '上传成功', type: 'success', duration: 5000 })
-                that.changeRadioAndPatient(2)
-              }
-
-            }
-          })
-            .catch(function(error) {
-
-            })
+          this.fapiaoCodeDialogVisible = true
           break
         case 2:
 
@@ -3078,7 +3108,8 @@ export default {
 
               } else {
                 that.$message({ message: '确认成功', type: 'success', duration: 5000 })
-                that.changeRadioAndPatient(2)
+                // that.changeRadioAndPatient(2)
+                that.order.is_upload_success = 1
               }
 
             }

src/xt_pages/outpatientCharges/statementTemplate/printFour.vue

@@ -1,153 +1,18 @@
 <template>
-    <div>
-        <div v-if="paramsObj.balance_accounts_type != 2" id='prescription-print' class="prescription-print">
-            <div v-for='(i,pageIndex) in pageArr.length' :key="pageIndex">
-                <div class="printTitle">血液透析中心医药费收据及收费项目清单</div>
-                <div class="infoMain">
-                    <div class="infoP">医院(药店)编号：{{info.org_code}}</div>
-                    <div class="infoP">名称：{{info.org_name}}</div>
-                    <div class="infoP">医生工号：{{info.doctor_code}}</div>
-                    <div class="infoP">门诊流水号：{{info.number}}</div>
-                    <div class="infoP">科别: {{info.department}}</div>
-                    <div class="infoP">处方单据号：{{info.order_number}}</div>
-                    <div class="infoP">姓名：{{info.patient.name}}</div>
-                    <div class="infoP">医疗账号：{{info.health_card_no}}</div>
-                    <div class="infoP">医疗类别：</div>
-                </div>
-                <div class="chargeBox">
-                    <div style="display:flex;justify-content: space-between;border-bottom:1px solid #000;">
-                        <div class="chargeUl" style="width:20%;">
-                            <p style="width:50%;border-right:1px solid #000;">费用类型</p>
-                            <p style="width:50%;border-right:1px solid #000;">金额</p>
-                        </div>
-                        <div class="chargeUl" style="width:80%;">
-                            <p style="width:40%;border-right:1px solid #000;">明细名称</p>
-                            <p style="width:15%;border-right:1px solid #000;">规格</p>
-                            <p style="width:15%;border-right:1px solid #000;">数量</p>
-                            <p style="width:15%;border-right:1px solid #000;">单价</p>
-                            <p style="width:15%;">金额</p>
-                        </div>
-                    </div>
-                    <div style="display:flex;justify-content: space-between;">
-                        <div style="width:20%;">
-                            <div class="chargeUl" v-if="info.bed_cost_total > 0">
-                                <p style="width:50%;">床位费</p>
-                                <p style="width:50%;">{{info.bed_cost_total?info.bed_cost_total:0}}元</p>
-                            </div>
-                            <div class="chargeUl" v-if="info.operation_cost_total > 0">
-                                <p style="width:50%;">手术费</p>
-                                <p style="width:50%;">{{info.operation_cost_total?info.operation_cost_total:0}}元</p>
-                            </div>
-                            <div class="chargeUl" v-if="info.other_cost_total > 0">
-                                <p style="width:50%;">其他费</p>
-                                <p style="width:50%;">{{info.other_cost_total?info.other_cost_total:0}}元</p>
-                            </div>
-                            <div class="chargeUl" v-if="info.material_cost_total > 0">
-                                <p style="width:50%;">材料费</p>
-                                <p style="width:50%;">{{info.material_cost_total?info.material_cost_total:0}}元</p>
-                            </div>
-                            <div class="chargeUl" v-if="info.western_medicine_cost_total > 0">
-                                <p style="width:50%;">西药费</p>
-                                <p style="width:50%;">{{info.western_medicine_cost_total?info.western_medicine_cost_total:0}}元</p>
-                            </div>
-                            <div class="chargeUl" v-if="info.chinese_traditional_medicine_cost_total > 0">
-                                <p style="width:50%;">中成费</p>
-                                <p style="width:50%;">{{info.chinese_traditional_medicine_cost_total?info.chinese_traditional_medicine_cost_total:0}}元</p>
-                            </div>
-                            <div class="chargeUl" v-if="info.check_cost_total > 0">
-                                <p style="width:50%;">检查费</p>
-                                <p style="width:50%;">{{info.check_cost_total?info.check_cost_total:0}}元</p>
-                            </div>
-                            <div class="chargeUl" v-if="info.laboratory_cost_total > 0">
-                                <p style="width:50%;">化验费</p>
-                                <p style="width:50%;">{{info.laboratory_cost_total?info.laboratory_cost_total:0}}元</p>
-                            </div>
-                            <div class="chargeUl" v-if="info.treat_cost_total > 0">
-                                <p style="width:50%;">治疗费</p>
-                                <p style="width:50%;">{{info.treat_cost_total?info.treat_cost_total:0}}元</p>
-                            </div>
-                            <div class="chargeUl" style="border-top:1px solid #000;">
-                                <p style="width:50%;">费用合计</p>
-                                <p style="width:50%;">{{info.medfee_sumamt?info.medfee_sumamt:0}}元</p>
-                            </div>
-                            <div class="chargeUl" style="border-top:1px solid #000;">
-                                <p style="width:50%;">记账支付</p>
-                                <p style="width:50%;">{{info.hifp_pay?info.hifp_pay:0}}元</p>
-                            </div>
-                            <div class="chargeUl" style="border-top:1px solid #000;">
-                                <p style="width:50%;">个人账号</p>
-                                <p style="width:50%;">{{info.acct_pay?info.acct_pay:0}}元</p>
-                            </div>
-                            <div class="chargeUl" style="border-top:1px solid #000;border-bottom:1px solid #000;">
-                                <p style="width:50%;">现金支付</p>
-                                <p style="width:50%;">{{info.psn_pay?info.psn_pay:0}}元</p>
-                            </div>
-                        </div>
-                        <div style="width:80%;max-height:500px;">
-                            <div style="display:flex;" v-for="(item,i) in info.order_infos.slice(pageIndex * 13,(pageIndex * 13) + pageArr[pageIndex])" :key="i">
-                                <div style="border-left:1px solid #000;border-right:1px solid #000;width:40%;text-align:center;">
-                                    <p class="chargeP">
-                                        <span v-if='item.type == 1'>{{item.advice.advice_name}}</span>
-                                        <span v-if='item.project.type == 2'>{{item.project.project.project_name}}</span>
-                                        <span v-if='item.project.type == 3'>{{item.project.good_info.specification_name}}</span>
-                                    </p>
-                                </div>
-                                <div style="border-right:1px solid #000;width:15%;text-align:center;">
-                                    <p class="chargeP">
-                                        <span v-if='item.type == 1'>{{ item.advice.drug.dose + item.advice.drug.dose_unit + "*" +item.advice.drug.min_number + item.advice.drug.min_unit +"/" + item.advice.drug.max_unit}}</span>
-                                        <span v-if='item.project.type == 2'>{{item.project.project.unit}}</span>
-                                        <span v-if='item.project.type == 3'>{{item.project.unit}}</span>
-                                    </p>
-                                </div>
-                                <div style="border-right:1px solid #000;width:15%;text-align:center;">
-                                    <p class="chargeP">
-                                      <span v-if='item.type == 1'>{{item.cnt}}{{item.advice.prescribing_number_unit}}</span>
-                                      <span v-if='item.project.type == 2'>{{item.cnt}}{{item.project.project.unit}}</span>
-                                      <span v-if='item.project.type == 3'>{{item.cnt}}{{item.project.unit}}</span>
-                                    </p>
-                                </div>
-                                <div style="border-right:1px solid #000;width:15%;text-align:center;">
-                                    <p class="chargeP">
-                                        <span>{{item.pric}}元</span>
-                                    </p>
-                                </div>
-                                <div style="width:15%;text-align:center;">
-                                    <p class="chargeP">
-                                        <span>{{(item.cnt * item.pric).toFixed(2)}}元</span>
-                                    </p>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                </div>
-                <div class="moneyBox">
-                    <p>实收金：{{info.medfee_sumamt?info.medfee_sumamt:0}}元</p>
-                    <p>记账前金额：{{0.00}}元</p>
-                    <p>扣款金额：{{0.00}}元</p>
-                    <p>记账后金额：{{info.balc}}元</p>
-                    <p>找赎金：{{0.00}}元</p>
-                </div>
-                <div class="actionBar">
-                    <div>收费员：{{info.charge_admin.user_name}}</div>
-                    <div>日期：{{info.setl_time ? info.setl_time.split(' ')[0] : ''}}</div>
-                </div>
-            </div>
-
-        </div>
-        <div v-else id='prescription-print' class="prescription-print">
+  <div>
+      <div v-if="paramsObj.balance_accounts_type != 2" id='prescription-print' class="prescription-print">
           <div v-for='(i,pageIndex) in pageArr.length' :key="pageIndex">
               <div class="printTitle">血液透析中心医药费收据及收费项目清单</div>
               <div class="infoMain">
-                  <div class="infoP">医院(药店)编号：{{balanceAccounts.org_config.code}}</div>
-                  <div class="infoP">名称：{{balanceAccounts.org_config.org_name}}</div>
-                  <div class="infoP">医生工号：</div>
-                  <div class="infoP">门诊流水号：{{balanceAccounts.his.number ? balanceAccounts.his.number : ''}}</div>
-                  <div class="infoP">科别: {{balanceAccounts.order.department_name ? balanceAccounts.order.department_name : ''}}</div>
-                  <div class="infoP">处方单据号：{{balanceAccounts.order.number ? balanceAccounts.order.number : ''}}</div>
-                  <div class="infoP">姓名：{{balanceAccounts.patient ? balanceAccounts.patient.name : ''}}</div>
-                  <div class="infoP">医疗账号：</div>
-                  <div class="infoP">医疗类别：自费</div>
+                  <div class="infoP">医院(药店)编号：{{info.org_code}}</div>
+                  <div class="infoP">名称：{{info.org_name}}</div>
+                  <div class="infoP">医生工号：{{info.doctor_code}}</div>
+                  <div class="infoP">门诊流水号：{{info.number}}</div>
+                  <div class="infoP">科别: {{info.department}}</div>
+                  <div class="infoP">处方单据号：{{info.order_number}}</div>
+                  <div class="infoP">姓名：{{info.patient.name}}</div>
+                  <div class="infoP">医疗账号：{{info.health_card_no}}</div>
+                  <div class="infoP">医疗类别：</div>
               </div>
               <div class="chargeBox">
                   <div style="display:flex;justify-content: space-between;border-bottom:1px solid #000;">
@@ -165,50 +30,80 @@
                   </div>
                   <div style="display:flex;justify-content: space-between;">
                       <div style="width:20%;">
-                          <div class="chargeUl" v-for="(item,i) in balanceAccounts.new_detail_list" :key="i">
-                              <p style="width:50%;">
-                                <span v-if="item.type == 1">药品费</span>
-                                <span v-if="item.type == 2">治疗费</span>
-                                <span v-if="item.type == 3">耗材费</span>
-                              </p>
-                              <p style="width:50%;">{{item.total?item.total:0}}元</p>
+                          <div class="chargeUl" v-if="info.bed_cost_total > 0">
+                              <p style="width:50%;">床位费</p>
+                              <p style="width:50%;">{{info.bed_cost_total?info.bed_cost_total:0}}元</p>
+                          </div>
+                          <div class="chargeUl" v-if="info.operation_cost_total > 0">
+                              <p style="width:50%;">手术费</p>
+                              <p style="width:50%;">{{info.operation_cost_total?info.operation_cost_total:0}}元</p>
+                          </div>
+                          <div class="chargeUl" v-if="info.other_cost_total > 0">
+                              <p style="width:50%;">其他费</p>
+                              <p style="width:50%;">{{info.other_cost_total?info.other_cost_total:0}}元</p>
+                          </div>
+                          <div class="chargeUl" v-if="info.material_cost_total > 0">
+                              <p style="width:50%;">材料费</p>
+                              <p style="width:50%;">{{info.material_cost_total?info.material_cost_total:0}}元</p>
+                          </div>
+                          <div class="chargeUl" v-if="info.western_medicine_cost_total > 0">
+                              <p style="width:50%;">西药费</p>
+                              <p style="width:50%;">{{info.western_medicine_cost_total?info.western_medicine_cost_total:0}}元</p>
+                          </div>
+                          <div class="chargeUl" v-if="info.chinese_traditional_medicine_cost_total > 0">
+                              <p style="width:50%;">中成费</p>
+                              <p style="width:50%;">{{info.chinese_traditional_medicine_cost_total?info.chinese_traditional_medicine_cost_total:0}}元</p>
+                          </div>
+                          <div class="chargeUl" v-if="info.check_cost_total > 0">
+                              <p style="width:50%;">检查费</p>
+                              <p style="width:50%;">{{info.check_cost_total?info.check_cost_total:0}}元</p>
+                          </div>
+                          <div class="chargeUl" v-if="info.laboratory_cost_total > 0">
+                              <p style="width:50%;">化验费</p>
+                              <p style="width:50%;">{{info.laboratory_cost_total?info.laboratory_cost_total:0}}元</p>
+                          </div>
+                          <div class="chargeUl" v-if="info.treat_cost_total > 0">
+                              <p style="width:50%;">治疗费</p>
+                              <p style="width:50%;">{{info.treat_cost_total?info.treat_cost_total:0}}元</p>
                           </div>
                           <div class="chargeUl" style="border-top:1px solid #000;">
                               <p style="width:50%;">费用合计</p>
-                              <p style="width:50%;">{{balanceAccounts.order.medfee_sumamt?balanceAccounts.order.medfee_sumamt:0}}元</p>
+                              <p style="width:50%;">{{info.medfee_sumamt?info.medfee_sumamt:0}}元</p>
                           </div>
                           <div class="chargeUl" style="border-top:1px solid #000;">
                               <p style="width:50%;">记账支付</p>
-                              <p style="width:50%;">0元</p>
+                              <p style="width:50%;">{{info.hifp_pay?info.hifp_pay:0}}元</p>
                           </div>
                           <div class="chargeUl" style="border-top:1px solid #000;">
                               <p style="width:50%;">个人账号</p>
-                              <p style="width:50%;">0元</p>
+                              <p style="width:50%;">{{info.acct_pay?info.acct_pay:0}}元</p>
                           </div>
                           <div class="chargeUl" style="border-top:1px solid #000;border-bottom:1px solid #000;">
                               <p style="width:50%;">现金支付</p>
-                              <p style="width:50%;">{{balanceAccounts.order.medfee_sumamt?balanceAccounts.order.medfee_sumamt:0}}元</p>
+                              <p style="width:50%;">{{info.psn_pay?info.psn_pay:0}}元</p>
                           </div>
                       </div>
                       <div style="width:80%;max-height:500px;">
-                          <div style="display:flex;" v-for="(item,i) in balanceAccounts.order_info.slice(pageIndex * 13,(pageIndex * 13) + pageArr[pageIndex])" :key="i">
+                          <div style="display:flex;" v-for="(item,i) in info.order_infos.slice(pageIndex * 13,(pageIndex * 13) + pageArr[pageIndex])" :key="i">
                               <div style="border-left:1px solid #000;border-right:1px solid #000;width:40%;text-align:center;">
                                   <p class="chargeP">
-                                      <span v-if='item.advice_id > 0'>{{item.advice.advice_name}}</span>
+                                      <span v-if='item.type == 1'>{{item.advice.advice_name}}</span>
                                       <span v-if='item.project.type == 2'>{{item.project.project.project_name}}</span>
                                       <span v-if='item.project.type == 3'>{{item.project.good_info.specification_name}}</span>
                                   </p>
                               </div>
                               <div style="border-right:1px solid #000;width:15%;text-align:center;">
                                   <p class="chargeP">
-                                      <span v-if='item.advice_id > 0'>{{item.advice.drug.dose + item.advice.drug.dose_unit + "*" +item.advice.drug.min_number + item.advice.drug.min_unit +"/" + item.advice.drug.max_unit}}</span>
+                                      <span v-if='item.type == 1'>{{ item.advice.drug.dose + item.advice.drug.dose_unit + "*" +item.advice.drug.min_number + item.advice.drug.min_unit +"/" + item.advice.drug.max_unit}}</span>
                                       <span v-if='item.project.type == 2'>{{item.project.project.unit}}</span>
                                       <span v-if='item.project.type == 3'>{{item.project.unit}}</span>
                                   </p>
                               </div>
                               <div style="border-right:1px solid #000;width:15%;text-align:center;">
                                   <p class="chargeP">
-                                      <span>{{item.cnt}}次</span>
+                                    <span v-if='item.type == 1'>{{item.cnt}}{{item.advice.prescribing_number_unit}}</span>
+                                    <span v-if='item.project.type == 2'>{{item.cnt}}{{item.project.project.unit}}</span>
+                                    <span v-if='item.project.type == 3'>{{item.cnt}}{{item.project.unit}}</span>
                                   </p>
                               </div>
                               <div style="border-right:1px solid #000;width:15%;text-align:center;">
@@ -227,298 +122,403 @@
 
               </div>
               <div class="moneyBox">
-                  <p>实收金：{{balanceAccounts.order.medfee_sumamt?balanceAccounts.order.medfee_sumamt:0}}元</p>
+                  <p>实收金：{{info.medfee_sumamt?info.medfee_sumamt:0}}元</p>
                   <p>记账前金额：{{0.00}}元</p>
                   <p>扣款金额：{{0.00}}元</p>
-                  <p>记账后金额：{{0.00}}元</p>
+                  <p>记账后金额：{{info.balc}}元</p>
                   <p>找赎金：{{0.00}}元</p>
               </div>
               <div class="actionBar">
-                  <div>收费员：{{balanceAccounts.current_admin.user_name}}</div>
-                  <div>日期：{{getTime(balanceAccounts.order.settle_accounts_date,"{y}-{m}-{d}")?getTime(balanceAccounts.order.settle_accounts_date,"{y}-{m}-{d}"):""}}</div>
+                  <div>收费员：{{info.charge_admin.user_name}}</div>
+                  <div>日期：{{info.setl_time ? info.setl_time.split(' ')[0] : ''}}</div>
               </div>
           </div>
 
+      </div>
+      <div v-else id='prescription-print' class="prescription-print">
+        <div v-for='(i,pageIndex) in pageArr.length' :key="pageIndex">
+            <div class="printTitle">血液透析中心医药费收据及收费项目清单</div>
+            <div class="infoMain">
+                <div class="infoP">医院(药店)编号：{{balanceAccounts.org_config.code}}</div>
+                <div class="infoP">名称：{{balanceAccounts.org_config.org_name}}</div>
+                <div class="infoP">医生工号：</div>
+                <div class="infoP">门诊流水号：{{balanceAccounts.his.number ? balanceAccounts.his.number : ''}}</div>
+                <div class="infoP">科别: {{balanceAccounts.order.department_name ? balanceAccounts.order.department_name : ''}}</div>
+                <div class="infoP">处方单据号：{{balanceAccounts.order.number ? balanceAccounts.order.number : ''}}</div>
+                <div class="infoP">姓名：{{balanceAccounts.patient ? balanceAccounts.patient.name : ''}}</div>
+                <div class="infoP">医疗账号：</div>
+                <div class="infoP">医疗类别：自费</div>
+            </div>
+            <div class="chargeBox">
+                <div style="display:flex;justify-content: space-between;border-bottom:1px solid #000;">
+                    <div class="chargeUl" style="width:20%;">
+                        <p style="width:50%;border-right:1px solid #000;">费用类型</p>
+                        <p style="width:50%;border-right:1px solid #000;">金额</p>
+                    </div>
+                    <div class="chargeUl" style="width:80%;">
+                        <p style="width:40%;border-right:1px solid #000;">明细名称</p>
+                        <p style="width:15%;border-right:1px solid #000;">规格</p>
+                        <p style="width:15%;border-right:1px solid #000;">数量</p>
+                        <p style="width:15%;border-right:1px solid #000;">单价</p>
+                        <p style="width:15%;">金额</p>
+                    </div>
+                </div>
+                <div style="display:flex;justify-content: space-between;">
+                    <div style="width:20%;">
+                        <div class="chargeUl" v-for="(item,i) in balanceAccounts.new_detail_list" :key="i">
+                            <p style="width:50%;">
+                              <span v-if="item.type == 1">药品费</span>
+                              <span v-if="item.type == 2">治疗费</span>
+                              <span v-if="item.type == 3">耗材费</span>
+                            </p>
+                            <p style="width:50%;">{{item.total?item.total:0}}元</p>
+                        </div>
+                        <div class="chargeUl" style="border-top:1px solid #000;">
+                            <p style="width:50%;">费用合计</p>
+                            <p style="width:50%;">{{balanceAccounts.order.medfee_sumamt?balanceAccounts.order.medfee_sumamt:0}}元</p>
+                        </div>
+                        <div class="chargeUl" style="border-top:1px solid #000;">
+                            <p style="width:50%;">记账支付</p>
+                            <p style="width:50%;">0元</p>
+                        </div>
+                        <div class="chargeUl" style="border-top:1px solid #000;">
+                            <p style="width:50%;">个人账号</p>
+                            <p style="width:50%;">0元</p>
+                        </div>
+                        <div class="chargeUl" style="border-top:1px solid #000;border-bottom:1px solid #000;">
+                            <p style="width:50%;">现金支付</p>
+                            <p style="width:50%;">{{balanceAccounts.order.medfee_sumamt?balanceAccounts.order.medfee_sumamt:0}}元</p>
+                        </div>
+                    </div>
+                    <div style="width:80%;max-height:500px;">
+                        <div style="display:flex;" v-for="(item,i) in balanceAccounts.order_info.slice(pageIndex * 13,(pageIndex * 13) + pageArr[pageIndex])" :key="i">
+                            <div style="border-left:1px solid #000;border-right:1px solid #000;width:40%;text-align:center;">
+                                <p class="chargeP">
+                                    <span v-if='item.advice_id > 0'>{{item.advice.advice_name}}</span>
+                                    <span v-if='item.project.type == 2'>{{item.project.project.project_name}}</span>
+                                    <span v-if='item.project.type == 3'>{{item.project.good_info.specification_name}}</span>
+                                </p>
+                            </div>
+                            <div style="border-right:1px solid #000;width:15%;text-align:center;">
+                                <p class="chargeP">
+                                    <span v-if='item.advice_id > 0'>{{ item.advice.drug.dose + item.advice.drug.dose_unit + "*" +item.advice.drug.min_number + item.advice.drug.min_unit +"/" + item.advice.drug.max_unit}}</span>
+                                    <span v-if='item.project.type == 2'>{{item.project.project.unit}}</span>
+                                    <span v-if='item.project.type == 3'>{{item.project.unit}}</span>
+                                </p>
+                            </div>
+                            <div style="border-right:1px solid #000;width:15%;text-align:center;">
+                                <p class="chargeP">
+                                    <span>{{item.cnt}}次</span>
+                                </p>
+                            </div>
+                            <div style="border-right:1px solid #000;width:15%;text-align:center;">
+                                <p class="chargeP">
+                                    <span>{{item.pric}}元</span>
+                                </p>
+                            </div>
+                            <div style="width:15%;text-align:center;">
+                                <p class="chargeP">
+                                    <span>{{(item.cnt * item.pric).toFixed(2)}}元</span>
+                                </p>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+            <div class="moneyBox">
+                <p>实收金：{{balanceAccounts.order.medfee_sumamt?balanceAccounts.order.medfee_sumamt:0}}元</p>
+                <p>记账前金额：{{0.00}}元</p>
+                <p>扣款金额：{{0.00}}元</p>
+                <p>记账后金额：{{0.00}}元</p>
+                <p>找赎金：{{0.00}}元</p>
+            </div>
+            <div class="actionBar">
+                <div>收费员：{{balanceAccounts.current_admin.user_name}}</div>
+                <div>日期：{{getTime(balanceAccounts.order.settle_accounts_date,"{y}-{m}-{d}")?getTime(balanceAccounts.order.settle_accounts_date,"{y}-{m}-{d}"):""}}</div>
+            </div>
         </div>
-    </div>
+
+      </div>
+  </div>
 
 </template>
 <script>
-  import axios from 'axios'
-  import { getChargePrint } from '@/api/project/project'
-  import { uParseTime } from '@/utils/tools'
-
-  export default {
-    data() {
-      return {
-        list: {},
-        prescription: [],
-        patient: {},
-        orgname: '',
-
-        result: {},
-        org_code: '',
-        patient_name: '',
-        doctor_code: '',
-        doctor_name: '',
-
-        name_arr: [],
-        spec_arr: [],
-        count_arr: [],
-        price_arr: [],
-        total_arr: [],
-
-        page:1,
-        pageArr:[],
+import axios from 'axios'
+import { getChargePrint } from '@/api/project/project'
+import { uParseTime } from '@/utils/tools'
+
+export default {
+  data() {
+    return {
+      list: {},
+      prescription: [],
+      patient: {},
+      orgname: '',
+
+      result: {},
+      org_code: '',
+      patient_name: '',
+      doctor_code: '',
+      doctor_name: '',
+
+      name_arr: [],
+      spec_arr: [],
+      count_arr: [],
+      price_arr: [],
+      total_arr: [],
+
+      page:1,
+      pageArr:[],
 
-      }
-    },
-    props: {
-      paramsObj: Object,
-      info: Object,
-      balanceAccounts:Object
-    },
-    methods: {
-      getItemName(number) {
-        switch (number) {
-          case '01':
-            return '床位费'
-            break
-          case '02':
-            return '西药费'
-
-            break
-          case '03':
-            return '中药费'
-
-            break
-          case '04':
-            return '中成药费'
-
-            break
-          case '05':
-            return '中草药费'
-
-            break
-          case '06':
-            return '检查费'
-
-            break
-          case '07':
-            return '治疗费'
-
-            break
-          case '08':
-            return '放射费'
-
-            break
-          case '09':
-            return '手术费'
-
-            break
-          case '10':
-            return '化验费'
-
-            break
-          case '11':
-            return '输血费'
-
-            break
-          case '12':
-            return '输氧费'
-
-            break
-          case '13':
-            return '其它费'
-
-            break
-          case '14':
-            return '麻醉费'
-
-            break
-          case '15':
-            return '材料费'
-
-            break
-          case '16':
-            return '特殊检查费'
-
-            break
-          case '17':
-            return '特殊治疗费'
-
-            break
-          case '18':
-            return '诊疗费(诊查费)'
-
-            break
-          case '19':
-            return '护理费'
-
-            break
-          case '20':
-            return '诊金'
-
-            break
-          case '21':
-            return '检查费（CT）'
-
-            break
-          case '22':
-            return '检查费（MRT）'
-
-            break
-          case '23':
-            return '检查费（其他）'
-
-            break
-          case '24':
-            return '特需服务费'
-
-            break
-          case '25':
-            return '杂费'
-
-            break
-          case '26':
-            return '挂号费'
-            break
+    }
+  },
+  props: {
+    paramsObj: Object,
+    info: Object,
+    balanceAccounts:Object
+  },
+  methods: {
+    getItemName(number) {
+      switch (number) {
+        case '01':
+          return '床位费'
+          break
+        case '02':
+          return '西药费'
+
+          break
+        case '03':
+          return '中药费'
+
+          break
+        case '04':
+          return '中成药费'
+
+          break
+        case '05':
+          return '中草药费'
+
+          break
+        case '06':
+          return '检查费'
+
+          break
+        case '07':
+          return '治疗费'
+
+          break
+        case '08':
+          return '放射费'
+
+          break
+        case '09':
+          return '手术费'
+
+          break
+        case '10':
+          return '化验费'
+
+          break
+        case '11':
+          return '输血费'
+
+          break
+        case '12':
+          return '输氧费'
+
+          break
+        case '13':
+          return '其它费'
+
+          break
+        case '14':
+          return '麻醉费'
+
+          break
+        case '15':
+          return '材料费'
+
+          break
+        case '16':
+          return '特殊检查费'
+
+          break
+        case '17':
+          return '特殊治疗费'
+
+          break
+        case '18':
+          return '诊疗费(诊查费)'
+
+          break
+        case '19':
+          return '护理费'
+
+          break
+        case '20':
+          return '诊金'
+
+          break
+        case '21':
+          return '检查费（CT）'
+
+          break
+        case '22':
+          return '检查费（MRT）'
+
+          break
+        case '23':
+          return '检查费（其他）'
+
+          break
+        case '24':
+          return '特需服务费'
+
+          break
+        case '25':
+          return '杂费'
+
+          break
+        case '26':
+          return '挂号费'
+          break
 
-        }
+      }
 
-      },
-      getPage(){
-        if(this.paramsObj.balance_accounts_type != 2){
-          this.page = 1
-          this.pageArr = []
-          if(this.info.order_infos.length <= 13){
-              this.page = 1
-              this.pageArr.push(this.info.order_infos.length)
-              console.log('this.pageArr',this.pageArr)
-          }else if(this.info.order_infos.length > 13){
-              this.page = parseInt(this.info.order_infos.length / 13)
-              let num = this.info.order_infos.length % 13
-              for (var i=0;i<this.page;i++){
-                  this.pageArr.push(13)
-              }
-              if(num != 0){
-                  this.pageArr.push(num)
-              }
-          }
-        }else{
-          this.page = 1
-          this.pageArr = []
-          if(this.balanceAccounts.order_info.length <= 13){
-              this.page = 1
-              this.pageArr.push(this.balanceAccounts.order_info.length)
-              console.log('this.pageArr',this.pageArr)
-          }else if(this.balanceAccounts.order_info.length > 13){
-              this.page = parseInt(this.balanceAccounts.order_info.length / 13)
-              let num = this.balanceAccounts.order_info.length % 13
-              for (var i=0;i<this.page;i++){
-                  this.pageArr.push(13)
-              }
-              if(num != 0){
-                  this.pageArr.push(num)
-              }
-          }
+    },
+    getPage(){
+      if(this.paramsObj.balance_accounts_type != 2){
+        this.page = 1
+        this.pageArr = []
+        if(this.info.order_infos.length <= 13){
+            this.page = 1
+            this.pageArr.push(this.info.order_infos.length)
+            console.log('this.pageArr',this.pageArr)
+        }else if(this.info.order_infos.length > 13){
+            this.page = parseInt(this.info.order_infos.length / 13)
+            let num = this.info.order_infos.length % 13
+            for (var i=0;i<this.page;i++){
+                this.pageArr.push(13)
+            }
+            if(num != 0){
+                this.pageArr.push(num)
+            }
         }
-
-      },
-      getTime(value, temp) {
-        if (value != undefined) {
-          return uParseTime(value, temp)
+      }else{
+        this.page = 1
+        this.pageArr = []
+        if(this.balanceAccounts.order_info.length <= 13){
+            this.page = 1
+            this.pageArr.push(this.balanceAccounts.order_info.length)
+            console.log('this.pageArr',this.pageArr)
+        }else if(this.balanceAccounts.order_info.length > 13){
+            this.page = parseInt(this.balanceAccounts.order_info.length / 13)
+            let num = this.balanceAccounts.order_info.length % 13
+            for (var i=0;i<this.page;i++){
+                this.pageArr.push(13)
+            }
+            if(num != 0){
+                this.pageArr.push(num)
+            }
         }
-        return ''
       }
-    },
-    created() {
-
 
     },
-    watch:{
-      info: {
-        handler(newVal) {
-            this.getPage()
-        },
-        deep: true,
-      },
-      balanceAccounts(){
-        this.getPage()
-      },
-      deep: true
+    getTime(value, temp) {
+      if (value != undefined) {
+        return uParseTime(value, temp)
+      }
+      return ''
     }
+  },
+  created() {
+
 
+  },
+  watch:{
+    info: {
+      handler(newVal) {
+          this.getPage()
+      },
+      deep: true,
+    },
+    balanceAccounts(){
+      this.getPage()
+    },
+    deep: true
   }
+
+}
 </script>
 
 
 <style lang="scss" scoped>
-    .prescription-print {
-        -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
-        -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
-        box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
-        margin-bottom: 20px;
-        padding: 20px 10px;
-    }
+  .prescription-print {
+      -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
+      -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+      box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+      margin-bottom: 20px;
+      padding: 20px 10px;
+  }
 
-    .printTitle {
-        font-size: 22px;
-        text-align: center;
-        font-weight: bold;
-    }
+  .printTitle {
+      font-size: 22px;
+      text-align: center;
+      font-weight: bold;
+  }
 
-    .infoMain {
-        display: flex;
-        flex-wrap: wrap;
-        padding: 0 10px;
-        margin-top: 10px;
-    }
+  .infoMain {
+      display: flex;
+      flex-wrap: wrap;
+      padding: 0 10px;
+      margin-top: 10px;
+  }
 
-    .infoMain .infoP {
-        width: 33%;
-        line-height: 24px;
-    }
+  .infoMain .infoP {
+      width: 33%;
+      line-height: 24px;
+  }
 
-    .chargeBox {
-        border: 1px solid #000;
-    }
+  .chargeBox {
+      border: 1px solid #000;
+  }
 
-    .chargeUl {
-        display: flex;
-        justify-content: space-between;
-        text-align: center;
-    }
+  .chargeUl {
+      display: flex;
+      justify-content: space-between;
+      text-align: center;
+  }
 
-    .chargeUl p {
-        height: 40px;
-        line-height: 40px;
-    }
+  .chargeUl p {
+      height: 40px;
+      line-height: 40px;
+  }
 
-    .chargeP {
-        height: 40px;
-        line-height: 40px;
-    }
+  .chargeP {
+      height: 40px;
+      line-height: 40px;
+  }
 
-    .moneyBox {
-        display: flex;
-        justify-content: space-between;
-        padding: 0 10px;
-        background: #eee;
-        height: 40px;
-        align-items: center;
-        border: 1px solid #000;
-        border-top: none
-    }
+  .moneyBox {
+      display: flex;
+      justify-content: space-between;
+      padding: 0 10px;
+      background: #eee;
+      height: 40px;
+      align-items: center;
+      border: 1px solid #000;
+      border-top: none
+  }
 
-    .actionBar {
-        display: flex;
-        justify-content: space-between;
-        line-height: 24px;
-        padding: 0 10px;
-    }
+  .actionBar {
+      display: flex;
+      justify-content: space-between;
+      line-height: 24px;
+      padding: 0 10px;
+  }
 
-    .actionBar div {
-        width: 150px;
-    }
+  .actionBar div {
+      width: 150px;
+  }
 </style>

src/xt_pages/outpatientCharges/statementTemplate/printTen.vue

@@ -1,378 +1,378 @@
 <template>
-    <div  id="statement-print" class="statement-print"
-         style="position: relative;">
-      <div class="print-content">
-        <div class="print-title">
-          <h1 style="text-align: center;">江西省医疗保障定点机构医疗费用结算单</h1>
-        </div>
+  <div  id="statement-print" class="statement-print"
+       style="position: relative;">
+    <div class="print-content">
+      <div class="print-title">
+        <h1 style="text-align: center;">江西省医疗保障定点机构医疗费用结算单</h1>
+      </div>
 
-        <div class="print-tab" style="margin: 0px auto; text-align: center;">
-          <div class="hospital" style="margin:0px 112px ;width: 70%;">
-            <!-- style="display: inline-block;margin: 10px 80px 10px 0px ;" -->
-            <span class="yiliao" style="display: inline-block;margin: 10px 80px 10px 0px ;">
-                          <span>医疗机构名称：</span>
-                          <span>{{info.fixmedins_name}}</span>
-                      </span>
-            <span class="yiliao" style="display: inline-block;margin: 10px 80px 10px 0px ;">
-                          <span>医疗机构编码：</span>
-                          <span>{{info.fixmedins_code}}</span>
-                      </span>
-            <span class="yiliao" style="display: inline-block;margin: 10px 80px 10px 0px ;">
-                          <span>医院等级：</span>
-                          <span  v-if="info.hosp_lv == '1'">三级特等</span>
-                          <span  v-else-if="info.hosp_lv == '2'">三级甲等</span>
-                          <span v-else-if="info.hosp_lv == '3'">三级乙等</span>
-                          <span v-else-if="info.hosp_lv == '4'">三级丙等</span>
-                          <span v-else-if="info.hosp_lv == '5'">二级甲等</span>
-                          <span v-else-if="info.hosp_lv == '6'">二级乙等</span>
-                          <span v-else-if="info.hosp_lv == '7'">二级丙等</span>
-                          <span  v-else-if="info.hosp_lv == '8'">一级甲等</span>
-                          <span v-else-if="info.hosp_lv == '9'">一级乙等</span>
-                          <span v-else-if="info.hosp_lv == '10'">一级丙等</span>
-                          <span  v-else-if="info.hosp_lv == '11'">无等级</span>
-                          <span  v-else></span>
-            </span>
-          </div>
-          <table class="jiesuan" style="border-collapse: collapse;margin: auto;">
-            <tr>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">姓名</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.psn_name}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">性别</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.gend == '1'">男</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.gend == '2'">女</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else></td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">人员类别</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.psn_type == '11'">在职</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1101'">职工在职</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1102'">公务员在职</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1103'">灵活就业人员在职</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1160'">地方其他扩展人员</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '12'">退休人员</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1201'">职工退休</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1202'">公务员退休</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1203'">灵活就业人员退休</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1260'">地方其他扩展人员</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '13'">离休</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1300'">离休人员</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1360'">地方其他扩展人员</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '14'">居民(未成年)</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1401'">新生儿</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1402'">学龄前儿童</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1403'">中小学生</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1404'">大学生</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1405'">未成年(未入学)</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '15'">居民(成年)</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1501'">普通居民(成年)</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1560'">地方其他扩展身份</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '16'">居民(老年)</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else></td>
-            </tr>
-            <tr>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">身份证号码</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.certno}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">参保险种</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.insutype == '310'">职工基本医疗保险</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.insutype == '320'">公务员医疗补助</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.insutype == '330'">大额医疗费用补助</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.insutype == '340'">离休人员医疗保障</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.insutype == '390'">城乡居民基本医疗保险</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.insutype == '392'">城乡居民大病医疗保险</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.insutype == '510'">生育保险</td>
-
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">医疗类别</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.med_type == '11'">普通门诊</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.med_type == '12'">门诊挂号</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.med_type == '13'">急诊</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.med_type == '14'">门诊特殊病</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.med_type == '15'">门诊统筹</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.med_type == '16'">门诊慢性病</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.med_type == '21'">普通住院</td>
-
-            </tr>
-            <tr>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">结算ID</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.setl_id}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">住院号</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.number}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">住院天数</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{getDay(info.begndate,info.enddate)}}</td>
-            </tr>
-            <tr>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">科室</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{'血透'}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">床号</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;"></td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">参保区划</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.insu_optins}}</td>
-            </tr>
-            <tr>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">入院日期</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.begndate ? info.begndate.split(' ')[0] : ''}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">出院日期</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.enddate ? info.enddate.split(' ')[0] : ''}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">结算日期</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.setl_time ? info.setl_time.split(' ')[0] : ''}}</td>
-            </tr>
-            <tr>
-              <td colspan="6" style="border: 1px solid gray;width: 150px;height: 30px;"> 费用分类情况</td>
-            </tr>
-            <tr>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">项目名称</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">总金额</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">符合政策范围</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">先行自付</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">超限价</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">自费</td>
-            </tr>
-            <tr v-if="info.bed_cost_total > 0">
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">床位费</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.bed_cost_total}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.bedInscpTotal}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.bed_cost_part_self_total}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.bed_cost_self_total}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.bedSelfTotal}}</td>
-
-            </tr>
-
-            <tr v-if="info.operation_cost_total > 0">
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">手术费</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.operation_cost_total}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.operationInscpTotal}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.operation_cost_part_self_total}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.operation_cost_self_total}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.operationSelfTotal}}</td>
-
-            </tr>
-
-            <tr v-if="info.check_cost_total > 0">
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">检查费</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.check_cost_total}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.checkInscpTotal}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.check_cost_part_self_total}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.check_cost_self_total}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.checkSelfTotal}}</td>
-
-            </tr>
-
-            <tr v-if="info.treat_cost_total > 0">
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">治疗费</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.treat_cost_total}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.treatInscpTotal}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.treat_cost_part_self_total}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.treat_cost_self_total}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.treatSelfTotal}}</td>
-
-            </tr>
-
-            <tr v-if="info.treat_cost_total > 0">
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">化验费</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.laboratory_cost_total}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.laboratoryInscpTotal}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.laboratory_cost_part_self_total}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.laboratory_cost_self_total}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.laboratorySelfTotal}}</td>
-
-            </tr>
-
-
-            <tr v-if="info.western_medicine_cost_total > 0">
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">西药费</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.western_medicine_cost_total}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.westernMedicineInscpTotal}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.western_medicine_cost_part_self_total}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.western_medicine_cost_self_total}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.westernMedicineSelfTotal}}</td>
-
-            </tr>
-
-            <tr v-if="info.material_cost_total > 0">
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">材料费</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.material_cost_total}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.materialInscpTotal}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.material_cost_part_self_total}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.material_cost_self_total}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.materialSelfTotal}}</td>
-
-            </tr>
-            <tr v-if="info.other_cost_total > 0">
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">其他费</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.other_cost_total}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.otherInscpTotal}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.other_cost_part_self_total}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.other_cost_self_total}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.otherSelfTotal}}</td>
-            </tr>
-
-            <tr v-if="info.chinese_traditional_medicine_cost_total > 0">
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">中成药</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.chinese_traditional_medicine_cost_total}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.chineseTraditionalInscpTotal}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.chinese_traditional_medicine_cost_part_self_total}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.chinese_traditional_medicine_cost_self_total}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.chineseTraditionalSelfTotal}}</td>
-            </tr>
-
-            <tr>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">金额合计</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{(parseFloat(info.bed_cost_total) +
-                parseFloat(info.operation_cost_total) + parseFloat(info.other_cost_total) +
-                parseFloat(info.material_cost_total) + parseFloat(info.western_medicine_cost_total) +
-                parseFloat(info.chinese_traditional_medicine_cost_total) + parseFloat(info.check_cost_total) +
-                parseFloat(info.laboratory_cost_total) + parseFloat(info.treat_cost_total)).toFixed(2) }}
-              </td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{(parseFloat(info.bedInscpTotal) +
-                parseFloat(info.operationInscpTotal) + parseFloat(info.checkInscpTotal) +
-                parseFloat(info.treatInscpTotal) + parseFloat(info.laboratoryInscpTotal) +
-                parseFloat(info.westernMedicineInscpTotal) + parseFloat(info.materialInscpTotal) +
-                parseFloat(info.otherInscpTotal) + parseFloat(info.chineseTraditionalInscpTotal)).toFixed(2) }}
-              </td>
-
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{(parseFloat(info.bed_cost_part_self_total) +
-                parseFloat(info.operation_cost_part_self_total) + parseFloat(info.other_cost_part_self_total) +
-                parseFloat(info.material_cost_part_self_total) + parseFloat(info.western_medicine_cost_part_self_total) +
-                parseFloat(info.chinese_traditional_medicine_cost_part_self_total) +
-                parseFloat(info.check_cost_part_self_total) + parseFloat(info.laboratory_cost_part_self_total) +
-                parseFloat(info.treat_cost_part_self_total)).toFixed(2)}}
-              </td>
-
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{(parseFloat(info.bed_cost_self_total )+
-                parseFloat(info.operation_cost_self_total) + parseFloat(info.other_cost_self_total) +
-                parseFloat(info.material_cost_self_total) + parseFloat(info.western_medicine_cost_self_total) +
-                parseFloat(info.chinese_traditional_medicine_cost_self_total) + parseFloat(info.check_cost_self_total) +
-                parseFloat(info.laboratory_cost_self_total) + parseFloat(info.treat_cost_self_total)).toFixed(2)}}
-              </td>
-
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{(parseFloat(info.bedSelfTotal) +
-                parseFloat(info.operationSelfTotal) + parseFloat(info.checkSelfTotal) +
-                parseFloat(info.treatSelfTotal) + parseFloat(info.laboratorySelfTotal) +
-                parseFloat(info.westernMedicineSelfTotal) + parseFloat(info.materialSelfTotal) +
-                parseFloat(info.otherSelfTotal) + parseFloat(info.chineseTraditionalSelfTotal)).toFixed(2) }}
-              </td>
-
-            </tr>
-
-            <tr>
-              <td colspan="6" style="border: 1px solid gray;width: 150px;height: 30px;"> 费用结算情况</td>
-            </tr>
-            <tr>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">费用总额</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.new_order.medfee_sumamt}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">统筹基金支付</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.new_order.hifp_pay}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">大病保险支付</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.new_order.hifmi_pay}}</td>
-            </tr>
-            <tr>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">医疗救助支付</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.new_order.maf_pay}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">公务员补充支付</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.new_order.cvlserv_pay}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">离休保健专项</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;"></td>
-            </tr>
-            <tr>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">个人账户支付</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.new_order.acct_pay}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">个人现金支付</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.new_order.psn_cash_pay}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">其他基金支付</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.new_order.oth_pay}}</td>
-            </tr>
-            <tr>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">起付线</td>
-              <td colspan="2" style="border: 1px solid gray;width: 150px;height: 30px;">{{info.new_order.act_pay_dedc}}</td>
-              <td style="border: 1px solid gray;width: 150px;height: 30px;">医院垫付金额</td>
-              <td colspan="2" style="border: 1px solid gray;width: 150px;height: 30px;">{{info.new_order.hosp_part_amt}}</td>
-            </tr>
-          </table>
-          <div style="width: 51%; margin: 5px 100px; text-align: center;">
-           <span style="display: inline-block;"> 备注：其它包含军转、财政、慈善、其他商报等支付来源</span>
-          </div>
+      <div class="print-tab" style="margin: 0px auto; text-align: center;">
+        <div class="hospital" style="margin:0px 112px ;width: 70%;">
+          <!-- style="display: inline-block;margin: 10px 80px 10px 0px ;" -->
+          <span class="yiliao" style="display: inline-block;margin: 10px 80px 10px 0px ;">
+                        <span>医疗机构名称：</span>
+                        <span>{{info.fixmedins_name}}</span>
+                    </span>
+          <span class="yiliao" style="display: inline-block;margin: 10px 80px 10px 0px ;">
+                        <span>医疗机构编码：</span>
+                        <span>{{info.fixmedins_code}}</span>
+                    </span>
+          <span class="yiliao" style="display: inline-block;margin: 10px 80px 10px 0px ;">
+                        <span>医院等级：</span>
+                        <span  v-if="info.hosp_lv == '1'">三级特等</span>
+                        <span  v-else-if="info.hosp_lv == '2'">三级甲等</span>
+                        <span v-else-if="info.hosp_lv == '3'">三级乙等</span>
+                        <span v-else-if="info.hosp_lv == '4'">三级丙等</span>
+                        <span v-else-if="info.hosp_lv == '5'">二级甲等</span>
+                        <span v-else-if="info.hosp_lv == '6'">二级乙等</span>
+                        <span v-else-if="info.hosp_lv == '7'">二级丙等</span>
+                        <span  v-else-if="info.hosp_lv == '8'">一级甲等</span>
+                        <span v-else-if="info.hosp_lv == '9'">一级乙等</span>
+                        <span v-else-if="info.hosp_lv == '10'">一级丙等</span>
+                        <span  v-else-if="info.hosp_lv == '11'">无等级</span>
+                        <span  v-else></span>
+          </span>
+        </div>
+        <table class="jiesuan" style="border-collapse: collapse;margin: auto;">
+          <tr>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">姓名</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.psn_name}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">性别</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.gend == '1'">男</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.gend == '2'">女</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else></td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">人员类别</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.psn_type == '11'">在职</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1101'">职工在职</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1102'">公务员在职</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1103'">灵活就业人员在职</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1160'">地方其他扩展人员</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '12'">退休人员</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1201'">职工退休</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1202'">公务员退休</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1203'">灵活就业人员退休</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1260'">地方其他扩展人员</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '13'">离休</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1300'">离休人员</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1360'">地方其他扩展人员</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '14'">居民(未成年)</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1401'">新生儿</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1402'">学龄前儿童</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1403'">中小学生</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1404'">大学生</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1405'">未成年(未入学)</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '15'">居民(成年)</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1501'">普通居民(成年)</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1560'">地方其他扩展身份</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '16'">居民(老年)</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else></td>
+          </tr>
+          <tr>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">身份证号码</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.certno}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">参保险种</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.insutype == '310'">职工基本医疗保险</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.insutype == '320'">公务员医疗补助</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.insutype == '330'">大额医疗费用补助</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.insutype == '340'">离休人员医疗保障</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.insutype == '390'">城乡居民基本医疗保险</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.insutype == '392'">城乡居民大病医疗保险</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.insutype == '510'">生育保险</td>
+
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">医疗类别</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.med_type == '11'">普通门诊</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.med_type == '12'">门诊挂号</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.med_type == '13'">急诊</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.med_type == '14'">门诊特殊病</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.med_type == '15'">门诊统筹</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.med_type == '16'">门诊慢性病</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.med_type == '21'">普通住院</td>
+
+          </tr>
+          <tr>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">结算ID</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.setl_id}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">住院号</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.number}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">住院天数</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{getDay(info.begndate,info.enddate)}}</td>
+          </tr>
+          <tr>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">科室</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{'血透'}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">床号</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;"></td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">参保区划</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.insu_optins}}</td>
+          </tr>
+          <tr>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">入院日期</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.begndate ? info.begndate.split(' ')[0] : ''}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">出院日期</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.enddate ? info.enddate.split(' ')[0] : ''}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">结算日期</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.setl_time ? info.setl_time.split(' ')[0] : ''}}</td>
+          </tr>
+          <tr>
+            <td colspan="6" style="border: 1px solid gray;width: 150px;height: 30px;"> 费用分类情况</td>
+          </tr>
+          <tr>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">项目名称</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">总金额</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">符合政策范围</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">先行自付</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">超限价</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">自费</td>
+          </tr>
+          <tr v-if="info.bed_cost_total > 0">
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">床位费</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.bed_cost_total}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.bedInscpTotal}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.bed_cost_part_self_total}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.bed_cost_self_total}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.bedSelfTotal}}</td>
+
+          </tr>
+
+          <tr v-if="info.operation_cost_total > 0">
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">手术费</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.operation_cost_total}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.operationInscpTotal}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.operation_cost_part_self_total}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.operation_cost_self_total}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.operationSelfTotal}}</td>
+
+          </tr>
+
+          <tr v-if="info.check_cost_total > 0">
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">检查费</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.check_cost_total}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.checkInscpTotal}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.check_cost_part_self_total}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.check_cost_self_total}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.checkSelfTotal}}</td>
+
+          </tr>
+
+          <tr v-if="info.treat_cost_total > 0">
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">治疗费</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.treat_cost_total}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.treatInscpTotal}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.treat_cost_part_self_total}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.treat_cost_self_total}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.treatSelfTotal}}</td>
+
+          </tr>
+
+          <tr v-if="info.treat_cost_total > 0">
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">化验费</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.laboratory_cost_total}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.laboratoryInscpTotal}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.laboratory_cost_part_self_total}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.laboratory_cost_self_total}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.laboratorySelfTotal}}</td>
+
+          </tr>
+
+
+          <tr v-if="info.western_medicine_cost_total > 0">
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">西药费</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.western_medicine_cost_total}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.westernMedicineInscpTotal}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.western_medicine_cost_part_self_total}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.western_medicine_cost_self_total}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.westernMedicineSelfTotal}}</td>
+
+          </tr>
+
+          <tr v-if="info.material_cost_total > 0">
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">材料费</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.material_cost_total}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.materialInscpTotal}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.material_cost_part_self_total}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.material_cost_self_total}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.materialSelfTotal}}</td>
+
+          </tr>
+          <tr v-if="info.other_cost_total > 0">
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">其他费</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.other_cost_total}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.otherInscpTotal}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.other_cost_part_self_total}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.other_cost_self_total}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.otherSelfTotal}}</td>
+          </tr>
+
+          <tr v-if="info.chinese_traditional_medicine_cost_total > 0">
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">中成药</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.chinese_traditional_medicine_cost_total}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.chineseTraditionalInscpTotal}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.chinese_traditional_medicine_cost_part_self_total}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.chinese_traditional_medicine_cost_self_total}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.chineseTraditionalSelfTotal}}</td>
+          </tr>
+
+          <tr>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">金额合计</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{(parseFloat(info.bed_cost_total) +
+              parseFloat(info.operation_cost_total) + parseFloat(info.other_cost_total) +
+              parseFloat(info.material_cost_total) + parseFloat(info.western_medicine_cost_total) +
+              parseFloat(info.chinese_traditional_medicine_cost_total) + parseFloat(info.check_cost_total) +
+              parseFloat(info.laboratory_cost_total) + parseFloat(info.treat_cost_total)).toFixed(2) }}
+            </td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{(parseFloat(info.bedInscpTotal) +
+              parseFloat(info.operationInscpTotal) + parseFloat(info.checkInscpTotal) +
+              parseFloat(info.treatInscpTotal) + parseFloat(info.laboratoryInscpTotal) +
+              parseFloat(info.westernMedicineInscpTotal) + parseFloat(info.materialInscpTotal) +
+              parseFloat(info.otherInscpTotal) + parseFloat(info.chineseTraditionalInscpTotal)).toFixed(2) }}
+            </td>
+
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{(parseFloat(info.bed_cost_part_self_total) +
+              parseFloat(info.operation_cost_part_self_total) + parseFloat(info.other_cost_part_self_total) +
+              parseFloat(info.material_cost_part_self_total) + parseFloat(info.western_medicine_cost_part_self_total) +
+              parseFloat(info.chinese_traditional_medicine_cost_part_self_total) +
+              parseFloat(info.check_cost_part_self_total) + parseFloat(info.laboratory_cost_part_self_total) +
+              parseFloat(info.treat_cost_part_self_total)).toFixed(2)}}
+            </td>
+
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{(parseFloat(info.bed_cost_self_total )+
+              parseFloat(info.operation_cost_self_total) + parseFloat(info.other_cost_self_total) +
+              parseFloat(info.material_cost_self_total) + parseFloat(info.western_medicine_cost_self_total) +
+              parseFloat(info.chinese_traditional_medicine_cost_self_total) + parseFloat(info.check_cost_self_total) +
+              parseFloat(info.laboratory_cost_self_total) + parseFloat(info.treat_cost_self_total)).toFixed(2)}}
+            </td>
+
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{(parseFloat(info.bedSelfTotal) +
+              parseFloat(info.operationSelfTotal) + parseFloat(info.checkSelfTotal) +
+              parseFloat(info.treatSelfTotal) + parseFloat(info.laboratorySelfTotal) +
+              parseFloat(info.westernMedicineSelfTotal) + parseFloat(info.materialSelfTotal) +
+              parseFloat(info.otherSelfTotal) + parseFloat(info.chineseTraditionalSelfTotal)).toFixed(2) }}
+            </td>
+
+          </tr>
+
+          <tr>
+            <td colspan="6" style="border: 1px solid gray;width: 150px;height: 30px;"> 费用结算情况</td>
+          </tr>
+          <tr>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">费用总额</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.new_order.medfee_sumamt}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">统筹基金支付</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.new_order.hifp_pay}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">大病保险支付</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.new_order.hifmi_pay}}</td>
+          </tr>
+          <tr>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">医疗救助支付</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.new_order.maf_pay}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">公务员补充支付</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.new_order.cvlserv_pay}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">离休保健专项</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;"></td>
+          </tr>
+          <tr>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">个人账户支付</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.new_order.acct_pay}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">个人现金支付</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.new_order.psn_cash_pay}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">其他基金支付</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.new_order.oth_pay}}</td>
+          </tr>
+          <tr>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">起付线</td>
+            <td colspan="2" style="border: 1px solid gray;width: 150px;height: 30px;">{{info.new_order.act_pay_dedc}}</td>
+            <td style="border: 1px solid gray;width: 150px;height: 30px;">医院垫付金额</td>
+            <td colspan="2" style="border: 1px solid gray;width: 150px;height: 30px;">{{info.new_order.hosp_part_amt}}</td>
+          </tr>
+        </table>
+        <div style="width: 51%; margin: 5px 100px; text-align: center;">
+         <span style="display: inline-block;"> 备注：其它包含军转、财政、慈善、其他商报等支付来源</span>
         </div>
       </div>
-
     </div>
+
+  </div>
 </template>
 <script>
 import { getChargePrint } from '@/api/project/project'
 import { uParseTime } from '@/utils/tools'
 
 export default {
-  data() {
-    return {
-      list: {},
-      prescription: [],
-      patient: {},
-      orgname: '',
-
-      result: {},
-      org_code: '',
-      patient_name: '',
-      doctor_code: '',
-      doctor_name: '',
-
-      name_arr: [],
-      spec_arr: [],
-      count_arr: [],
-      price_arr: [],
-      total_arr: []
+data() {
+  return {
+    list: {},
+    prescription: [],
+    patient: {},
+    orgname: '',
+
+    result: {},
+    org_code: '',
+    patient_name: '',
+    doctor_code: '',
+    doctor_name: '',
+
+    name_arr: [],
+    spec_arr: [],
+    count_arr: [],
+    price_arr: [],
+    total_arr: []
 
+  }
+},
+props: {
+  paramsObj: Object,
+  info: {
+    type: Object,
+    default: function() {
+      return {}
     }
   },
-  props: {
-    paramsObj: Object,
-    info: {
-      type: Object,
-      default: function() {
-        return {}
-      }
-    },
-    balanceAccounts: Object
-  },
-  methods: {
-    getDay(dateString1,dateString2){
-      var  startDate = Date.parse(dateString1);
-      var  endDate = Date.parse(dateString2);
-      if (startDate>endDate){
-        return 0;
-      }
-      if (startDate==endDate){
-        return 1;
-      }
-      var days=(endDate - startDate)/(1*24*60*60*1000);
-      return  days;
-    },
-    getTime(value, temp) {
-      if (value != undefined) {
-        return uParseTime(value, temp)
-      }
-      return ''
+  balanceAccounts: Object
+},
+methods: {
+  getDay(dateString1,dateString2){
+    var  startDate = Date.parse(dateString1);
+    var  endDate = Date.parse(dateString2);
+    if (startDate>endDate){
+      return 0;
+    }
+    if (startDate==endDate){
+      return 1;
     }
+    var days=(endDate - startDate)/(1*24*60*60*1000);
+    return  days;
   },
-  mounted() {
+  getTime(value, temp) {
+    if (value != undefined) {
+      return uParseTime(value, temp)
+    }
+    return ''
+  }
+},
+mounted() {
 
 
-  },
-  watch: {
-    paramsObj: {//深度监听，可监听到对象、数组的变化
-      handler(val, oldVal) {
+},
+watch: {
+  paramsObj: {//深度监听，可监听到对象、数组的变化
+    handler(val, oldVal) {
 
 
-      },
-      deep: true
-    }
+    },
+    deep: true
   }
 }
+}
 </script>
 
 
 <style lang="scss" scoped>
 .prescription-print {
-  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
-  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
-  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
-  margin-bottom: 20px;
-  padding: 20px 10px;
+-webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
+-moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+margin-bottom: 20px;
+padding: 20px 10px;
 }
 
 </style>

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2431,6 +2431,7 @@
               if (num == 0) {
                 var arr = []//新增处方
                 var arr_one = []
+                var arr_Two = []
 
                 console.log("ooo233323233232323232",this.prescriptions)
 
@@ -2444,6 +2445,7 @@
                     if(arr.length > 0){
                       let objInfo = {};
                       arr.forEach((item, index) => {
+                      
                       let { id } = item.id;
                       if (!objInfo[id]) {
                           objInfo[id] = {
@@ -2504,8 +2506,9 @@
                         }
                       }
                       console.log("newArr",newArr )
-                    }
+                    }  
                   }
+                  
 
                   if(this.prescriptions[i].id > 0){ //修改处方
 
@@ -2513,11 +2516,16 @@
                        if(this.prescriptions[i].advices[j].advice_id == 0){ //新增列
                          arr_one.push(this.prescriptions[i].advices[j])
                        }
+                       if(this.prescriptions[i].advices[j].advice_id >0){
+                         arr_Two.push(this.prescriptions[i].advices[j])
+                       }
                      }
-                     console.log("ara23322323233232",arr)
+                     console.log("编辑处方",arr_one)
                      if(arr_one.length > 0){
+
                       let objInfo = {};
                       arr_one.forEach((item, index) => {
+                     
                       let { id } = item.id;
                       if (!objInfo[id]) {
                           objInfo[id] = {
@@ -2569,6 +2577,53 @@
                     }
                   }
                 }
+                 
+               
+                if(arr.length > 0){
+                  for(let i =0;i<arr.length;i++){
+                    if(arr[i].drug!=null){
+                      if(arr[i].drug.is_user == 2){
+                        if(arr[i].prescribing_number_unit != arr[i].drug.max_unit && arr[i].prescribing_number_unit!=arr[i].drug.min_unit){
+                          this.$message.error(arr[i].drug.drug_name + " " +arr[i].drug.dose + arr[i].drug.dose_unit + "*" + arr[i].drug.min_number + arr[i].drug.min_unit+"/"+arr[i].drug.max_unit +" "+ "总量单位不统一,保存失败!")
+                          isLoading = false
+                          this.$emit('editKeepLoad', false)
+                          return
+                        }
+                      }
+                    }
+                  }
+                }
+
+
+                if(arr_one.length > 0){
+                  for(let i =0;i<arr_one.length;i++){
+                    if(arr_one[i].drug!=null){
+                      if(arr_one[i].drug.is_user == 2){
+                        if(arr_one[i].prescribing_number_unit != arr_one[i].drug.max_unit && arr_one[i].prescribing_number_unit!=arr_one[i].drug.min_unit){
+                          this.$message.error(arr_one[i].drug.drug_name + " " +arr_one[i].drug.dose + arr_one[i].drug.dose_unit + "*" + arr_one[i].drug.min_number + arr_one[i].drug.min_unit+"/"+arr_one[i].drug.max_unit +" "+ "总量单位不匹配,保存失败!")
+                          isLoading = false
+                          this.$emit('editKeepLoad', false)
+                          return
+                        }
+                      }
+                    }
+                  }
+                }
+
+                if(arr_Two.length > 0){
+                  for(let i =0;i<arr_Two.length;i++){
+                    if(arr_Two[i].drug!=null){
+                      if(arr_Two[i].drug.is_user == 2){
+                        if(arr_Two[i].prescribing_number_unit != arr_Two[i].drug.max_unit && arr_Two[i].prescribing_number_unit!=arr_Two[i].drug.min_unit){
+                          this.$message.error(arr_Two[i].drug.drug_name + " " +arr_Two[i].drug.dose + arr_Two[i].drug.dose_unit + "*" + arr_Two[i].drug.min_number + arr_Two[i].drug.min_unit+"/"+arr_Two[i].drug.max_unit +" "+ "总量单位不匹配,保存失败!")
+                          isLoading = false
+                          this.$emit('editKeepLoad', false)
+                          return
+                        }
+                      }
+                    }
+                  }
+                }
 
                if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 9679){
                   var project_arr = []

src/xt_pages/user/courseOfDisease.vue

@@ -37,7 +37,7 @@
         </div>
         <div class="record">
           <el-row :gutter="15">
-            <el-col :span="10">
+            <el-col :span="9">
               <el-table :header-cell-style="{
                   backgroundColor: 'rgb(245, 247, 250)',
                   color: '#606266'
@@ -48,7 +48,10 @@
                         :row-class-name="tableRow"
                         @row-click="onRowClick"
               >
-                <el-table-column type="selection" width="40" align="center"></el-table-column>
+                <el-table-column
+                  type="selection"
+                  width="55">
+                </el-table-column>
                 <el-table-column label="病程标题" align="center">
                   <template slot-scope="scope">
                     {{ scope.row.title}}
@@ -66,13 +69,609 @@
                 </el-table-column>
               </el-table>
             </el-col>
-            <el-col :span="14">
+            <el-col :span="15">
               <div class="record_content_panel">
                 <div style="background-color:rgb(245, 247, 250)" class="title">病程内容</div>
+                <!--v-html="current_select_record.content"-->
                 <div class="content">
-                  <span v-if="current_select_record" v-html="current_select_record.content">{{current_select_record.content }}</span>
+                  <span v-if="current_select_record" >{{current_select_record.content }}</span>
                   <span v-else></span>
                 </div>
+                <!-- <el-form>
+                  <el-row style="margin-top: 20px;">
+                    <el-col :span="6" style="margin-left: 20px;">
+                      <el-form-item label="日期：">
+                        <el-date-picker
+                          v-model="start_time"
+                          type="date"
+                          placeholder="选择日期"
+                          style="width: 145px;">
+                        </el-date-picker>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="6" >
+                      <el-form-item label="医生：">
+
+                        <el-select v-model="doctor" placeholder="请选择" style="width: 145px;">
+                          <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                          </el-option>
+                        </el-select>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+
+                  <el-row >
+                    <el-col :span="5" style="margin-left: 20px;">
+                      <el-form-item label="T:">
+                        <el-input v-model="input" placeholder="请输入内容" style="width: 65px;"></el-input>
+                        <span >ºC</span>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="5" >
+                      <el-form-item label="P:">
+                        <el-input v-model="input" placeholder="请输入内容" style="width: 65px;"></el-input>
+                        <span >次/分</span>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="5" >
+                      <el-form-item label="R:">
+                        <el-input v-model="input" placeholder="请输入内容" style="width: 65px;"></el-input>
+                        <span >次/分</span>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="8" >
+                      <el-form-item label="BP:">
+                        <el-input v-model="input" placeholder="请输入内容" style="width: 65px;"></el-input>
+                        <span >/</span>
+                        <el-input v-model="input" placeholder="请输入内容" style="width: 65px;"></el-input>
+                        <span >mmHg</span>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+
+                  <el-row >
+                    <el-col :span="6" style="margin-left: 20px;">
+                      <el-form-item label="贫血容貌：">
+                        <el-select v-model="doctor" placeholder="请选择" style="width: 90px;">
+                          <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                          </el-option>
+                        </el-select>
+                      </el-form-item>
+
+                    </el-col>
+                    <el-col :span="5" >
+                      <el-form-item label="体位：">
+                        <el-select v-model="doctor" placeholder="请选择" style="width: 90px;">
+                          <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                          </el-option>
+                        </el-select>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="5" >
+                      <el-form-item label="浮肿：">
+                        <el-select v-model="doctor" placeholder="请选择" style="width: 90px;">
+                          <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                          </el-option>
+                        </el-select>
+                      </el-form-item>
+
+                    </el-col>
+                    <el-col :span="7" >
+                      <el-form-item label="出血点/瘀斑/血肿：">
+                        <el-select v-model="doctor" placeholder="请选择" style="width: 90px;">
+                          <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                          </el-option>
+                        </el-select>
+                      </el-form-item>
+
+                    </el-col>
+                  </el-row>
+
+                  <el-row >
+                    <el-col :span="6" style="margin-left: 20px;">
+                      <el-form-item label="发育：">
+                        <el-select v-model="doctor" placeholder="请选择" style="width: 90px;">
+                          <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                          </el-option>
+                        </el-select>
+                      </el-form-item>
+
+                    </el-col>
+                    <el-col :span="5" >
+                      <el-form-item label="营养：">
+                        <el-select v-model="doctor" placeholder="请选择" style="width: 90px;">
+                          <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                          </el-option>
+                        </el-select>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="5" >
+                      <el-form-item label="神志：">
+                        <el-select v-model="doctor" placeholder="请选择" style="width: 90px;">
+                          <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                          </el-option>
+                        </el-select>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+
+                  <el-row>
+                    <el-col style="text-align: center;">
+                      <span style="">-------------------------------------------------------------------------------</span>
+                      <span style="color: aqua;">皮肤黏膜</span>
+                      <span style="">-------------------------------------------------------------------------------</span>
+                    </el-col>
+                  </el-row>
+
+                  <el-row >
+                    <el-col :span="6" style="margin-left: 20px;">
+                      <el-form-item label="皮肤黏膜：">
+                        <el-select v-model="doctor" placeholder="请选择" style="width: 100px;">
+                          <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                          </el-option>
+                        </el-select>
+                      </el-form-item>
+
+                    </el-col>
+                    <el-col :span="5" >
+                      <el-form-item label="部位：">
+                        <el-input v-model="input" placeholder="请输入内容" style="width: 100px;"></el-input>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="5" >
+                      <el-form-item label="程度：">
+                        <el-input v-model="input" placeholder="请输入内容" style="width: 100px;"></el-input>
+                      </el-form-item>
+
+                    </el-col>
+                    <el-col :span="7" >
+                      <el-form-item label="皮下出血点：">
+                        <el-select v-model="doctor" placeholder="请选择" style="width: 100px;">
+                          <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                          </el-option>
+                        </el-select>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+
+                  <el-row >
+                    <el-col :span="6" style="margin-left: 20px;">
+                      <el-form-item label="紫癜：">
+                        <el-select v-model="doctor" placeholder="请选择" style="width: 100px;">
+                          <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                          </el-option>
+                        </el-select>
+                      </el-form-item>
+
+                    </el-col>
+                    <el-col :span="6" >
+                      <el-form-item label="皮肤温度：">
+                        <el-select v-model="doctor" placeholder="请选择" style="width: 100px;">
+                          <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                          </el-option>
+                        </el-select>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="9" >
+                      <el-form-item label="其它：">
+                        <el-input type="textarea" v-model="input" placeholder="请输入内容" style="width: 210px;"></el-input>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+
+                  <el-row>
+                    <el-col style="text-align: center;">
+                      <span style="">-------------------------------------------------------------------------------</span>
+                      <span style="color: aqua;">淋巴结</span>
+                      <span style="">-------------------------------------------------------------------------------</span>
+                    </el-col>
+                  </el-row>
+
+                  <el-row >
+                    <el-col :span="8"  style="margin-left: 20px;">
+                      <el-form-item label="浅表淋巴肿大：">
+                        <el-select v-model="doctor" placeholder="请选择" style="width: 100px;">
+                          <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                          </el-option>
+                        </el-select>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12" >
+                      <el-form-item label="其它：">
+                        <el-input type="textarea" v-model="input" placeholder="请输入内容" style="width: 210px;"></el-input>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+
+                  <el-row>
+                    <el-col style="text-align: center;">
+                      <span style="">-------------------------------------------------------------------------------</span>
+                      <span style="color: aqua;">头部</span>
+                      <span style="">-------------------------------------------------------------------------------</span>
+                    </el-col>
+                  </el-row>
+
+                  <el-row >
+                    <el-col :span="6" style="margin-left: 20px;">
+                      <el-form-item label="眼睑：">
+                        <el-select v-model="doctor" placeholder="请选择" style="width: 100px;">
+                          <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                          </el-option>
+                        </el-select>
+                      </el-form-item>
+
+                    </el-col>
+                    <el-col :span="6" >
+                      <el-form-item label="瞳孔(等大等圆)：">
+                        <el-select v-model="doctor" placeholder="请选择" style="width: 100px;">
+                          <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                          </el-option>
+                        </el-select>
+                      </el-form-item>
+
+                    </el-col>
+                    <el-col :span="5" >
+                      <el-form-item label="左(mm)：">
+                        <el-input v-model="input" placeholder="请输入内容" style="width: 100px;"></el-input>
+                      </el-form-item>
+
+                    </el-col>
+                    <el-col :span="5" >
+                      <el-form-item label="右(mm)：">
+                        <el-input v-model="input" placeholder="请输入内容" style="width: 100px;"></el-input>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+
+                  <el-row >
+                    <el-col :span="6" style="margin-left: 20px;">
+                      <el-form-item label="对光反射：">
+                        <el-input v-model="input" placeholder="请输入内容" style="width: 100px;"></el-input>
+                      </el-form-item>
+
+                    </el-col>
+                    <el-col :span="6" >
+                      <el-form-item label="扁桃体：">
+                        <el-input v-model="input" placeholder="请输入内容" style="width: 100px;"></el-input>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="9" >
+                      <el-form-item label="咽部：">
+                        <el-input v-model="input" placeholder="请输入内容" style="width: 100px;"></el-input>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+
+                  <el-row>
+                    <el-col style="margin-left: 20px;">
+                      <el-form-item label="其它：">
+                        <el-input type="textarea" v-model="input" placeholder="请输入内容" style="width: 300px;"></el-input>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+
+
+                  <el-row>
+                    <el-col style="text-align: center;">
+                      <span style="">-------------------------------------------------------------------------------</span>
+                      <span style="color: aqua;">肺脏</span>
+                      <span style="">-------------------------------------------------------------------------------</span>
+                    </el-col>
+                  </el-row>
+
+                  <el-row >
+                    <el-col :span="7" style="margin-left: 20px;">
+                      <el-form-item label="呼吸音：">
+                        <el-input v-model="input" placeholder="请输入内容" style="width: 100px;"></el-input>
+                      </el-form-item>
+
+                    </el-col>
+                    <el-col :span="6" >
+                      <el-form-item label="胸膜摩擦音：">
+                        <el-select v-model="doctor" placeholder="请选择" style="width: 100px;">
+                          <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                          </el-option>
+                        </el-select>
+                      </el-form-item>
+
+                    </el-col>
+                    <el-col :span="5" >
+                      <el-form-item label="部位：">
+                        <el-select v-model="doctor" placeholder="请选择" style="width: 100px;">
+                          <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                          </el-option>
+                        </el-select>
+                      </el-form-item>
+
+                    </el-col>
+                    <el-col :span="5" >
+                      <el-form-item label="啰音：">
+                        <el-select v-model="doctor" placeholder="请选择" style="width: 100px;">
+                          <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                          </el-option>
+                        </el-select>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+
+                  <el-row>
+                      <el-col style="margin-left: 20px;">
+                      <el-form-item label="描述：">
+                        <el-input type="textarea" v-model="input" placeholder="请输入内容" style="width: 300px;"></el-input>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+
+                   <el-row>
+                    <el-col style="text-align: center;">
+                      <span style="">-------------------------------------------------------------------------------</span>
+                      <span style="color: aqua;">心脏</span>
+                      <span style="">-------------------------------------------------------------------------------</span>
+                    </el-col>
+                  </el-row>
+
+                  <el-row >
+                    <el-col :span="6" style="margin-left: 20px;">
+                      <el-form-item label="心脏大小：">
+                        <el-select v-model="doctor" placeholder="请选择" style="width: 100px;">
+                          <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                          </el-option>
+                        </el-select>
+                      </el-form-item>
+
+                    </el-col>
+                    <el-col :span="6" >
+                      <el-form-item label="心律：">
+                        <el-select v-model="doctor" placeholder="请选择" style="width: 100px;">
+                          <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                          </el-option>
+                        </el-select>
+                      </el-form-item>
+
+                    </el-col>
+                    <el-col :span="6" >
+                      <el-form-item label="心包摩擦声：">
+                        <el-select v-model="doctor" placeholder="请选择" style="width: 100px;">
+                          <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                          </el-option>
+                        </el-select>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+
+                  <el-row >
+                    <el-col :span="6" style="margin-left: 20px;">
+                      <el-form-item label="杂音：">
+                        <el-select v-model="doctor" placeholder="请选择" style="width: 100px;">
+                          <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                          </el-option>
+                        </el-select>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="6" >
+                      <el-form-item label="附加音：">
+                        <el-select v-model="doctor" placeholder="请选择" style="width: 100px;">
+                          <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                          </el-option>
+                        </el-select>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                  <el-row>
+                      <el-col style="margin-left: 20px;">
+                      <el-form-item label="描述：">
+                        <el-input type="textarea" v-model="input" placeholder="请输入内容" style="width: 300px;"></el-input>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+
+
+                  <el-row>
+                    <el-col style="text-align: center;">
+                      <span style="">-------------------------------------------------------------------------------</span>
+                      <span style="color: aqua;">腹部</span>
+                      <span style="">-------------------------------------------------------------------------------</span>
+                    </el-col>
+                  </el-row>
+
+                  <el-row >
+                    <el-col :span="6" style="margin-left: 20px;">
+                      <el-form-item label="腹水征：">
+                        <el-select v-model="doctor" placeholder="请选择" style="width: 100px;">
+                          <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                          </el-option>
+                        </el-select>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12" >
+                      <el-form-item label="肝颈静脉返流征：">
+                        <el-input type="textarea" v-model="input" placeholder="请输入内容" style="width: 300px;"></el-input>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+
+                  <el-row >
+                    <el-col :span="10" style="margin-left: 20px;">
+                      <el-form-item label="肝脏：">
+                        <span>压痛</span>
+                        <el-select v-model="doctor" placeholder="请选择" style="width: 100px;">
+                          <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                          </el-option>
+                        </el-select>
+                        <span>叩痛</span>
+                        <el-select v-model="doctor" placeholder="请选择" style="width: 100px;">
+                          <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                          </el-option>
+                        </el-select>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="10" >
+                      <el-form-item label="脾脏：">
+                        <span>压痛</span>
+                        <el-select v-model="doctor" placeholder="请选择" style="width: 100px;">
+                          <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                          </el-option>
+                        </el-select>
+                        <span>叩痛</span>
+                        <el-select v-model="doctor" placeholder="请选择" style="width: 100px;">
+                          <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                          </el-option>
+                        </el-select>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+
+                  <el-row >
+                    <el-col :span="10" style="margin-left: 20px;">
+                      <el-form-item label="肾脏：">
+                        <span>压痛</span>
+                        <el-select v-model="doctor" placeholder="请选择" style="width: 100px;">
+                          <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                          </el-option>
+                        </el-select>
+                        <span>叩痛</span>
+                        <el-select v-model="doctor" placeholder="请选择" style="width: 100px;">
+                          <el-option
+                            v-for="item in options"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                          </el-option>
+                        </el-select>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+
+                  <el-row>
+                      <el-col style="margin-left: 20px;">
+                      <el-form-item label="描述：">
+                        <el-input type="textarea" autosize v-model="input" placeholder="请输入内容" style="width: 300px;"></el-input>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+
+                  <div style="background-color:aquamarine" class="title">其他</div>
+                  <div>
+                    双下肢无水肿
+                  </div>
+                </el-form> -->
+
               </div>
             </el-col>
           </el-row>
@@ -339,7 +938,7 @@
           return
         }
         this.uploading_new_record = true
-        
+
         createCourseOfDiseaseRecord(this.patient_id, this.new_content, this.course_of_disease_time, this.title).then(rs => {
           this.uploading_new_record = false
           var resp = rs.data
@@ -369,12 +968,12 @@
       },
 
       didSelectionChange: function(selectRows) {
-       
+
         var arr = []
         for(let i=0;i<selectRows.length;i++){
            arr.push(selectRows[i].id)
         }
-        var newArr = arr.join(',') 
+        var newArr = arr.join(',')
         this.ids = newArr
         console.log("select23322332",this.ids)
         this.selectingRows = selectRows

src/xt_pages/user/doctorAdvice.vue

@@ -4415,9 +4415,12 @@ export default {
       // this.sameRowArr = sameRowArr;
     },
     mergeSpan({ row, column, rowIndex, columnIndex }) {
+     
       if (columnIndex === 0 || columnIndex === 1 || columnIndex === 2) {
         const _row = this.tempArr[rowIndex];
         const _col = _row > 0 ? 1 : 0;
+        console.log("_row--------------",_row)
+        console.log("_col",_col)
         return {
           rowspan: _row,
           colspan: _col
@@ -4778,7 +4781,9 @@ export default {
       },
   },
   watch: {
+
     adviceTableData: function() {
+      console.log("hhahahhahah",this.adviceTableData)
       this.handleSpanTempArr();
     },
     "selectedTemp.list": function() {

src/xt_pages/user/firstDiseasePrint.vue

@@ -71,7 +71,7 @@
                   {{getDoctor(hosDetail==null?0:(hosDetail.doctor?hosDetail.doctor:hosDetail.doctor))}}
                   </span>
                   <span v-else>
-                    <img style="height:30px;" :src="setAdminUserES(hosDetail==null?0:(hosDetail.doctor?hosDetail.doctor:hosDetail.doctor))" alt="" srcset="">
+                    <img style="height:50px;" :src="setAdminUserES(hosDetail==null?0:(hosDetail.doctor?hosDetail.doctor:hosDetail.doctor))" alt="" srcset="">
                   </span>
               </div>
           </div>

src/xt_pages/user/hospitalSummaryPrint.vue

@@ -273,7 +273,7 @@
                   {{getDoctor(hosDetail.doctor)}} 
              </span>
               <span v-else>
-                <img style="height:30px;" :src="setAdminUserES(hosDetail.doctor?hosDetail.doctor:hosDetail.doctor)" alt="" srcset="">
+                <img style="height:50px;" :src="setAdminUserES(hosDetail.doctor?hosDetail.doctor:hosDetail.doctor)" alt="" srcset="">
               </span>
               </span>
             </td>

src/xt_pages/user/patientInfo.vue

@@ -12,7 +12,7 @@ import PatientSidebar from './components/PatientSidebar'
 
 export default {
    name: 'editForm',
-  components: { PatientDetail, PatientSidebar },
+  components: { PatientDetail, PatientSidebar},
   data() {
     return {
       patientID: 0,

src/xt_pages/user/rescueRecord.vue

@@ -68,11 +68,10 @@
                 @current-change="didChangeCurrentRecord"
                 @selection-change="didSelectionChange"
               >
-                <el-table-column
-                  type="selection"
-                  width="40"
-                  align="center"
-                ></el-table-column>
+              <el-table-column
+                type="selection"
+                width="55">
+              </el-table-column>
                 <el-table-column label="记录时间" align="center">
                   <template slot-scope="scope">
                     {{ recordTime(scope.row.record_time) }}

src/xt_pages/workforce/components/nextTableWeeks.vue

@@ -665,7 +665,7 @@ export default {
     },
     signPrint() {
         
-        if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340 || this.org_id == 0){
+        if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340){
          var zone = this.zone
           var newArr = []
           for(let i=0;i<this.zoneList.length;i++){
@@ -683,7 +683,7 @@ export default {
             path: '/schedule/remind/print/setting/one?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status+"&type="+2
           })
           }
-        if(this.org_id!=9671 && this.org_id!=9675 && this.org_id!=10340 && this.org_id!=0){
+        if(this.org_id!=9671 && this.org_id!=9675 && this.org_id!=10340){
           var zone = this.zone
         var newArr = []
         for(let i=0;i<this.zoneList.length;i++){

src/xt_pages/workforce/remind_print_setting.vue

@@ -121,7 +121,7 @@
                 <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340 || org_id == 9671 || org_id == 9675">干体重:{{main_collection.assessmentbefor.dry_weight}}</div>
                 <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340 || org_id == 9671 || org_id == 9675">透前体重:{{main_collection.assessmentbefor.weight_before}}</div>
                 <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340 || org_id == 9671 || org_id == 9675">体重增加:{{(main_collection.assessmentbefor.weight_before - main_collection.assessmentbefor.dry_weight).toFixed(2)}}</div>
-                <div>用法:静脉注射</div>
+                <div v-if="org_id!=10278">用法:静脉注射</div>
                 <!-- 透析器灌流器 -->
                
                  <div>
@@ -138,7 +138,15 @@
                 </div>
                 
                
-                <div v-if="org_id!=10440&&org_id!=0">打印时间:{{currentDate}}</div>
+                <div v-if="org_id!=10440">打印时间:
+                     {{getTime(main_collection.schedule_date)}}   
+                     <span v-if="main_collection.schedule_week ==1">星期一</span>
+                     <span v-if="main_collection.schedule_week ==2">星期二</span>
+                     <span v-if="main_collection.schedule_week ==3">星期三</span>
+                     <span v-if="main_collection.schedule_week ==4">星期四</span>
+                     <span v-if="main_collection.schedule_week ==5">星期五</span>
+                     <span v-if="main_collection.schedule_week ==6">星期六</span>
+                     <span v-if="main_collection.schedule_week ==7">星期日</span></div>
               </div>
 
               <div class="signPrint" style="font-size:16px;" v-else>
@@ -326,7 +334,7 @@
      this.org_id = this.$store.getters.xt_user.org.id
      console.log("机构ID",this.org_id)
      this.currentDate = this.getCurrentDate()
-
+     console.log("打印时间----------------------------",this.currentDate)
     this.printDate = moment().format("YYYY-MM-DD HH:mm:ss")
     this.modeOptions = this.$store.getters.treatment_mode
     this.anticoagulants_confit = this.$store.getters.anticoagulants_confit