Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

config/dev.env.js

 module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
-  BASE_API: '"http://localhost:9529"', // '"http://localhost:9529"'//http://api.xt.test.sgjyun.com http://112.74.16.180:9527
+  BASE_API: '"http://localhost:9529"',//'"http://112.74.16.180:9527"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527
 }

src/api/signandweigh.js

      params: params,   
      method: 'Post'
    })
-}
+}

src/xt_pages/sign/index.vue

             <el-col :span="8">
                 <div class="dataTitle">患者列表</div>
                 <div style="margin-bottom: 10px;">
-                    <el-input v-model="queryParams.keywords" placeholder="姓名/透析号" style="width: 180px;" @change="changeSearch"></el-input>
+                    <el-input v-model="queryParams.keywords" placeholder="姓名/透析号" style="width: 180px;" @change="changeSearch"></el-input>&nbsp;
+                    <el-button type="primary" @change="changeSearch">搜索</el-button>
                     <el-select v-model="queryParams.schedule_type" style="width: 100px;" @change="changeSearch">
                     <el-option v-for="item in shiftOptions" :label="item.label" :value="item.value" :key="item.value"></el-option>
                     </el-select>
                 </div>
+
                 <el-table  :data="patients" :class="signAndWeighBoxPatients" style="width: 100%" border highlight-current-row :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" max-height="300" @current-change="handleCurrentChange">
                     <el-table-column type="index" label="序号" width="50px" align="center"></el-table-column>
                     <el-table-column prop="name" label="姓名" min-width="20" align="center">
 
                     <el-table-column prop="state" label="状态" min-width="30" align="center">
                         <template slot-scope="scope">
-                            <span v-if="scope.row.id==0">未签到</span>
+                            <span v-if="scope.row.signin.id ==0">未签到</span>
                             <span v-else-if="scope.row.dialysis_order.stage==2">已经下机</span>
                             <span v-else>已签到</span>
                         </template>
                     <el-row :gutter="20">
                         <el-col :span="23" align="right" class="button">
                             <el-button  @click="hide()">取消</el-button>
-                            <el-button @click="savedata();updatedata();sighdata()" type="primary">保存</el-button>
+                            <el-button @click="savedata();updatedata();sighdata();" type="primary">保存</el-button>
                         </el-col>
                     </el-row>
                    </div>
         DBP_after: '', // 舒张压
         SBP_after: '', // 收缩压
         dialysis_no: ''
+       
       },
       weigh_list: {
         weight_before: '', // 透前体重
   methods: {
     fetchSignPatients() {
       fetchSignPatients(this.queryParams).then(response => {
-        this.patients = []
+        this.patients = []      
         if (response.data.state === 1) {
           this.patients = response.data.data.patients
-          console.log("排班数据是什么呢?")
-          console.log(this.patients)
+          console.log("病人信息",this.patients[0].schedule)           
+            //将没有排班的信息排除
+            for(let i = this.patients.length-1;i >= 0;i--){
+      
+             if(this.patients[i].schedule.id == 0){
+                 this.patients.splice(i,1)
+             }
+              
+          }
+
           for (let i = this.patients.length - 1; ; i--) {
             if(this.patients[i].schedule.id == 0){
               this.patients.splice(i, 1)
 
           if (this.queryParams.need_schedule_type === 1) {
             var sl = this.schedules.length
+            console.log("s1是什么东西")
+            console.log(sl)
             for (let index = 0; index < sl; index++) {
               if (this.schedules[index].type in response.data.data.panel) {
+                console.log(this.schedules[index].type)
+                console.log(response.data.data.panel[this.schedules[index].type].schedule)
                 this.schedules[index].arrange = response.data.data.panel[this.schedules[index].type].schedule
                 this.schedules[index].sign = response.data.data.panel[this.schedules[index].type].sign
                 this.schedules[index].before = response.data.data.panel[this.schedules[index].type].before
     },
     handleCurrentChange(row, old) {
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+=======
+
       //     this.weigh_form = {
       //     id:0,
       //     choose:false,
       //     patient_id: 0,
       //     dialysis_no:'',
       // };
+>>>>>>> .theirs
       this.disa = true
       this.show=false
       this.weigh_form.choose = true
       this.weigh_form.name = row.name
       this.weigh_form.dialysis_no = row.dialysis_no
-      //   if (row.alias.length>0) {
-      //       this.weigh_form.name += "("+row.alias+")";
-      //   }
       this.weigh_form.patient_id = row.id
       this.querySignParams.patient_id = row.id
       this.dialysis_stege = row.dialysis_order.stage
       this.getDialysisInforInfomation(row.id)
-      this.getDialysisAfterInfomation(row.id)
-        if (row.signin != null) {
-             this.weigh_form.dry_weight = '' + row.signin.dry_weight;
-             this.weigh_form.clothes_weight = '' + row.signin.clothing_weight;
-              // 透前
-              this.weigh_form.weigh_before = '' + row.signin.weighing_before;
-              this.weigh_form.dehydrated_weight = '' + row.signin.target_dewatering;
-
-              if (this.weigh_form.dry_weight == 0) {
-                  this.weigh_form.dehydrated_percent  = '';
-              }else {
-                  var dehydrated_percent = ((this.weigh_form.dehydrated_weight/this.weigh_form.dry_weight) * 100).toFixed(2);
-                  if (isNaN(dehydrated_percent)) {
-                      this.weigh_form.dehydrated_percent  = '';
-                  }else {
-                      this.weigh_form.dehydrated_percent  = dehydrated_percent + "%";
-                  }
-              }
+      this.getDialysisAfterInfomation(row.id) 
 
-              this.weigh_form.weight_before = '' + row.signin.weight_before;
-              this.weigh_form.temperature_before = '' + row.signin.temperature_before;
-              this.weigh_form.pulse_rate_before = '' + row.signin.pulse_frequency_before;
-              this.weigh_form.respiratory_rate_before = '' + row.signin.breathing_rate_before;
-              this.weigh_form.DBP_before = '' + row.signin.diastolic_blood_pressure_before;
-              this.weigh_form.SBP_before = '' + row.signin.systolic_blood_pressure_before;
-
-              this.weigh_form.weigh_after = '' + row.signin.weighing_after;
-              this.weigh_form.weight_reduce_after = '' + row.signin.weight_loss;
-              this.weigh_form.weight_after = '' + row.signin.weight_after;
-              this.weigh_form.temperature_after = '' + row.signin.temperature_after;
-              this.weigh_form.pulse_rate_after = '' + row.signin.pulse_frequency_after;
-              this.weigh_form.respiratory_rate_after = '' + row.signin.breathing_rate_after;
-              this.weigh_form.DBP_after = '' + row.signin.diastolic_blood_pressure_after;
-              this.weigh_form.SBP_after = '' + row.signin.systolic_blood_pressure_after;
-              this.weigh_form.id = row.id;
-              console.log("好难哦")
-              console.log(this.weigh_form.id)
-        }
-    },
-    submitSign() {
-      SignWeigh(this.querySignParams, this.weigh_form).then(response => {
-        if (response.data.state === 1) {
-          this.$message({
-            type: 'success',
-            message: '成功!'
-          })
-
-          var tlen = this.patients.length
-          for (let index = 0; index < tlen; index++) {
-            if (this.patients[index].id === this.querySignParams.patient_id) {
-              var signin = this.patients[index].signin
-              this.patients[index].signin = response.data.data.sign
-
-              if (this.patients[index].schedule.id > 0 && (this.patients[index].schedule.schedule_type >= 1 || this.patients[index].schedule.schedule_type <= 3)) {
-                var sl = this.schedules.length
-                for (let j = 0; j < sl; j++) {
-                  if (this.schedules[j].type === this.patients[index].schedule.schedule_type) {
-                    if (this.weigh_form.id <= 0) {
-                      this.schedules[j].sign++
-                    }
-                    if (signin.weigh_before_time === 0 && response.data.data.sign.weigh_before_time > 0) {
-                      this.schedules[j].before++
-                    }
-
-                    if (signin.weigh_time === 0 && response.data.data.sign.weigh_time > 0) {
-                      this.schedules[j].after++
-                    }
-                  }
-                }
-              }
-              break
-            }
-          }
-          this.weigh_form.id = response.data.data.sign.id
-        } else {
-          this.$message.error(response.data.msg)
-          return false
-        }
-      })
+      //this.getsignweigh(row.id)    
     },
+    // submitSign() {
+    //   SignWeigh(this.querySignParams, this.weigh_form).then(response => {
+    //     if (response.data.state === 1) {
+    //       this.$message({
+    //         type: 'success',
+    //         message: '成功!'
+    //       })
+
+    //       var tlen = this.patients.length
+    //       for (let index = 0; index < tlen; index++) {
+    //         if (this.patients[index].id === this.querySignParams.patient_id) {
+    //           var signin = this.patients[index].signin
+    //           this.patients[index].signin = response.data.data.sign
+
+    //           if (this.patients[index].schedule.id > 0 && (this.patients[index].schedule.schedule_type >= 1 || this.patients[index].schedule.schedule_type <= 3)) {
+    //             var sl = this.schedules.length
+    //             for (let j = 0; j < sl; j++) {
+    //               if (this.schedules[j].type === this.patients[index].schedule.schedule_type) {
+    //                 if (this.weigh_form.id <= 0) {
+    //                   this.schedules[j].sign++
+    //                 }
+    //                 if (signin.weigh_before_time === 0 && response.data.data.sign.weigh_before_time > 0) {
+    //                   this.schedules[j].before++
+    //                 }
+
+    //                 if (signin.weigh_time === 0 && response.data.data.sign.weigh_time > 0) {
+    //                   this.schedules[j].after++
+    //                 }
+    //               }
+    //             }
+    //           }
+    //           break
+    //         }
+    //       }
+    //       this.weigh_form.id = response.data.data.sign.id
+    //     } else {
+    //       this.$message.error(response.data.msg)
+    //       return false
+    //     }
+    //   })
+    // },
 
     getDialysisInforInfomation(id) {
       getDialysisInforInfomation(id).then(response => {
       params.breathing_rateafter = this.weigh_infor.breathing_rate
       params.systolic_blood_pressureafter = this.weigh_infor.systolic_blood_pressure
       params.diastolic_blood_pressureafter = this.weigh_infor.diastolic_blood_pressure
-      console.log("params数据",params)
+       console.log("params是什么?",params)
       sighdata(params).then(response => {
-         var signs = response.data.data.signs
-           console.log(signs)
+        var signs = response.data.data.signs
+       // this.patients[this.table_current_index].signin.id = 1
         if (response.data.state === 1) {
           this.$message({
             type: 'success',
             message: '成功!'
           })
         var tlen = this.patients.length
+        
         for(let index=0;index<tlen;index++ ){
-           if(this.patients[index].id ==params.patient_id){
+           if(this.patients[index].id == params.patient_id){
               var signin = this.patients[index].signin
-              this.patients[index].signin = response.data.data.signs
-
+              this.patients[index].signin = response.data.data.signs  
+             
               if(this.patients[index].schedule.id > 0 && (this.patients[index].schedule.schedule_type >= 1 || this.patients[index].schedule.schedule_type <= 3)){
                     var sl = this.schedules.length
                     for(let j = 0; j < sl; j++){
-                         if(this.schedules[j].type === this.patients[index].schedule.schedule_type){
-                              // if(this.weigh_form.id>= 0){
-                              //     this.schedules[j].sign++
-                              // }
-                              if((signin.weigh_before_time === 0 && response.data.data.signs.weigh_before_time > 0)||(signin.weigh_time === 0 && response.data.data.signs.weigh_time > 0)){
+                         if(this.schedules[j].type == this.patients[index].schedule.schedule_type){
+                              if((signin.weigh_before_time == 0 && response.data.data.signs.weigh_before_time > 0)||(signin.weigh_time === 0 && response.data.data.signs.weigh_time > 0)){
                                     this.schedules[j].sign++
                               }
+<<<<<<< .mine
+                              if(signin.weigh_before_time == 0 && response.data.data.signs.weigh_before_time > 0){
+                              
+=======
                               if(signin.weigh_before_time === 0 && response.data.data.signs.weigh_before_time > 0){
 
+>>>>>>> .theirs
                                    this.schedules[j].before++
                               }
-                              if(signin.weigh_time === 0 && response.data.data.signs.weigh_time > 0){
+                              if(signin.weigh_time == 0 && response.data.data.signs.weigh_time > 0){
                                   this.schedules[j].after++
                               }
                          }
            return false
         }
       })
- }
+     }
   },
   watch: {
     'weigh_form.weigh_before': function() {