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

config/dev.env.js

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

src/xt_pages/sign/index.vue

@@ -10,13 +10,13 @@
                 <div class="dataTitle">患者列表</div>
                 <div style="margin-bottom: 10px;">
                     <el-input v-model="queryParams.keywords" placeholder="姓名/透析号" style="width: 180px;" @change="changeSearch"></el-input>&nbsp;
-                    <el-button type="primary" @change="changeSearch">搜索</el-button>
+                    <el-button type="primary" @change="changeSearch" icon="el-icon-search">搜索</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 :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">
                        <template slot-scope="scope">
@@ -39,7 +39,7 @@
                     <el-table-column prop="sign" label="签到" min-width="30" align="center" ></el-table-column>
                     <el-table-column prop="weight" label="称重(透前/透后)" min-width="50" align="center">
                         <template slot-scope="scope">
-                            {{scope.row.before}} / {{scope.row.after}}
+                             {{scope.row.before}} / {{scope.row.after}}
                         </template>
                     </el-table-column>
                 </el-table>
@@ -47,34 +47,33 @@
 
             <el-col :span="16">
                 <div class="dataTitle">患者信息</div>
-                <el-form class="information" label-position="left">
+                <el-form class="information">
                   <div class="inforTitle">
                   <el-button  @click="change()" style="float:right;">修改</el-button>
                    <span class="name">姓名:{{weigh_form.name}} &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;透析号:{{weigh_form.dialysis_no}} &nbsp;&nbsp;</span>
                    </div>
-                    <div class="border"></div>
+                    <div class="border"></div>       
                     <div style="margin-bottom:20px;color:rgb(96,96,96);font-size:14px">
                     透前体重(kg):&nbsp;<el-input v-model="weigh_list.weight_before" :disabled="disa" style="width:200px"></el-input> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                     干体重(kg):&nbsp;<el-input v-model="weigh_list.dry_weight" :disabled="disa" style="width:200px"></el-input><br>
                     </div>
                     <div style="margin-bottom:12px;color:rgb(96,96,96);font-size:14px">
-                     体温(℃):&nbsp;<el-input v-model="weigh_list.temperature" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp;
-                     脉搏(次/分):&nbsp;<el-input v-model="weigh_list.pulse_frequency" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp;
-                     呼吸(次/分):&nbsp;<el-input v-model="weigh_list.breathing_rate" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp;
-                     血压(mmHg):&nbsp;<el-input v-model="weigh_list.systolic_blood_pressure" style="width: 70px" :disabled="disa"></el-input><span> / </span> <el-input v-model="weigh_list.diastolic_blood_pressure" style="width: 70px" :disabled="disa"></el-input>
-                    </div>
-                    <div class="border"></div>
-                    <div style="margin-bottom:20px;color:rgb(96,96,96);font-size:14px">
+                     体温(℃):&nbsp;<el-input v-model="weigh_list.temperature" :disabled="disa" style="width:90px"></el-input>&nbsp;&nbsp;&nbsp;
+                     <!-- 呼吸(次/分):&nbsp;<el-input v-model="weigh_list.breathing_rate" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp; -->
+                     血压(mmHg):&nbsp;<el-input v-model="weigh_list.systolic_blood_pressure" style="width: 90px" :disabled="disa"></el-input><span> / </span> <el-input v-model="weigh_list.diastolic_blood_pressure" style="width: 90px" :disabled="disa"></el-input>&nbsp;&nbsp;&nbsp;
+                     脉率(次/分):&nbsp;<el-input v-model="weigh_list.pulse_frequency" :disabled="disa" style="width:90px"></el-input>
+                    </div> 
+                     <div class="border"></div> 
+                     <div style="margin-bottom:20px;color:rgb(96,96,96);font-size:14px">
                      透后称重(kg):&nbsp;<el-input v-model="weigh_infor.weight_after" style="width:200px" :disabled="disa"></el-input>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                      干体重(kg):&nbsp;<el-input v-model="weigh_list.dry_weight" :disabled="disa" style="width:200px"></el-input>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                     </div>
                     <div style="margin-bottom:12px;color:rgb(96,96,96);font-size:14px">
-                      体温(℃):&nbsp;<el-input v-model="weigh_infor.temperature" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp;
-                      脉搏(次/分):&nbsp;<el-input v-model="weigh_infor.pulse_frequency" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp;
-                      呼吸(次/分):&nbsp;<el-input v-model="weigh_infor.breathing_rate" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp;
-                      血压(mmHg):&nbsp;<el-input v-model="weigh_infor.systolic_blood_pressure" style="width: 70px" :disabled="disa"></el-input> <span> / </span><el-input v-model="weigh_infor.diastolic_blood_pressure" style="width: 70px" :disabled="disa"></el-input>
-                    </div>
-
+                      体温(℃):&nbsp;<el-input v-model="weigh_infor.temperature" :disabled="disa" style="width:90px"></el-input>&nbsp;&nbsp;&nbsp;
+                      <!-- 呼吸(次/分):&nbsp;<el-input v-model="weigh_infor.breathing_rate" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp; -->
+                      血压(mmHg):&nbsp;<el-input v-model="weigh_infor.systolic_blood_pressure" style="width: 90px" :disabled="disa"></el-input> <span> / </span><el-input v-model="weigh_infor.diastolic_blood_pressure" style="width: 90px" :disabled="disa"></el-input>&nbsp;&nbsp;&nbsp;
+                      脉率(次/分):&nbsp;<el-input v-model="weigh_infor.pulse_frequency" :disabled="disa" style="width:90px"></el-input>
+                    </div>      
                     <div class="border"></div>
                     <div v-if="show">
                     <el-row :gutter="20">
@@ -190,6 +189,7 @@ export default {
       dialysis_stege: 0,
       show: false,
       disa:true,
+      signnid:"",
     }
   },
   methods: {
@@ -198,22 +198,14 @@ export default {
         this.patients = []      
         if (response.data.state === 1) {
           this.patients = response.data.data.patients
-          console.log("病人信息",this.patients[0].schedule)           
+          // console.log("病人信息",this.patients[0].schedule)           
             //将没有排班的信息排除
-            for(let i = this.patients.length-1;i >= 0;i--){
-      
+            console.log("病人信息",this.patients)
+            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)
-            }
-          }
-
           this.queryParams.schedule_type = response.data.data.schedule_type
           this.querySignParams.date_time = response.data.data.today
 
@@ -271,33 +263,6 @@ export default {
       this.fetchSignPatients()
     },
     handleCurrentChange(row, old) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
       //     this.weigh_form = {
       //     id:0,
       //     choose:false,
@@ -336,7 +301,6 @@ export default {
       this.dialysis_stege = row.dialysis_order.stage
       this.getDialysisInforInfomation(row.id)
       this.getDialysisAfterInfomation(row.id) 
-
       //this.getsignweigh(row.id)    
     },
     // submitSign() {
@@ -528,9 +492,10 @@ export default {
       params.diastolic_blood_pressureafter = this.weigh_infor.diastolic_blood_pressure
        console.log("params是什么?",params)
       sighdata(params).then(response => {
-        var signs = response.data.data.signs
-       // this.patients[this.table_current_index].signin.id = 1
         if (response.data.state === 1) {
+           var signs = response.data.data.signs
+           this.signnid = signs.id
+           console.log("hheh",signs.id)
           this.$message({
             type: 'success',
             message: '成功!'
@@ -540,8 +505,7 @@ export default {
         for(let index=0;index<tlen;index++ ){
            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++){
@@ -568,7 +532,7 @@ export default {
            return false
         }
       })
-     }
+     }   
   },
   watch: {
     'weigh_form.weigh_before': function() {