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://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

@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 
 export function fetchSignPatients(params) {
-  console.log("bbbbbbbbbbbbbbb")
+  console.log("bbbbbbbbbbbbbbb号码")
   console.log(params)
   return request({
     url: '/api/sign/patients',
@@ -62,3 +62,13 @@ export function editdata(params) {
     params: params
   })
 }
+
+export function sighdata(params){
+  console.log("好还哦")
+  console.log(params)
+   return request({
+     url: '/api/sigh/sighdata',
+     params: params,   
+     method: 'Post'
+   })
+}

src/lang/zh.js

@@ -136,22 +136,22 @@ export default {
     special_permission_manage: '特殊权限管理',
     schedule_print: '排班打印',
 
-    stockInOrder: '入库单',
-    salesReturnOrder: '退货单',
-    stockOutOrder: '出库单',
-    cancelStockOrder: '出库退库单',
+    stockInOrder: '耗材入库单',
+    salesReturnOrder: '耗材退货单',
+    stockOutOrder: '耗材出库单',
+    cancelStockOrder: '耗材退库单',
     otherStockInOrder: '其他入库单',
     otherSalesReturnOrder: '其他退货单',
     otherStockOutOrder: '其他出库单',
-    otherCancelStockOrder: '其他出库退库单',
+    otherCancelStockOrder: '其他退库单',
     stockInOrderAdd: '新增入库单',
     salesReturnOrderAdd: '新增退货单',
     stockOutOrderAdd: '新增出库单',
-    cancelStockOrderAdd: '新增出库退库单',
+    cancelStockOrderAdd: '新增退库单',
     stockInDetail: '入库单详情',
     salesReturnDetail: '退货单详情',
     stockOutDetail: '出库单详情',
-    cancelStockDetail: '出库退库单详情',
+    cancelStockDetail: '退库单详情',
     stockDetail:'出入库明细查询',
 
   },

src/xt_pages/data/components/table.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="" style="margin-right:20px;">
-    <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :key='tableKey' :data="list" v-loading="listLoading" border fit highlight-current-row @current-change="handleRowChange"
+    <el-table style="margin-top: 42px;" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :key='tableKey' :data="list" v-loading="listLoading" border fit highlight-current-row @current-change="handleRowChange"
       >
       <el-table-column  align="center" label="名称">
         <template slot-scope="scope">

src/xt_pages/data/components/tableson.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="">
     <div class="filter-container">
-      <el-button class="filter-item" size="small" :disabled="addState"  @click="handleCreate" type="primary" icon="el-icon-circle-plus-outline">{{$t('table.add')}}</el-button>
+      <el-button style="float: right;margin-right: 20px" class="filter-item" size="small" :disabled="addState"  @click="handleCreate" type="primary" icon="el-icon-circle-plus-outline">{{$t('table.add')}}</el-button>
     </div>
 
     <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :key='tableKey' :data="list" v-loading="listLoading" border fit highlight-current-row

src/xt_pages/dialysis/details/index.vue

@@ -249,7 +249,6 @@ export default {
   data() {
     return {
       crumbs:[
-        {path:false, name:'科室质控'},
         {path:false, name:'透析管理'},
         {path:false, name:'透析记录'},
         {path:false, name:'透析单'},

src/xt_pages/sign/index.vue

@@ -35,7 +35,7 @@
                     <el-table-column prop="shift" label="班次" min-width="30" align="center"></el-table-column>
                     <el-table-column prop="arrange" label="排班" min-width="30" align="center" ></el-table-column>
                     <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" >
+                    <el-table-column prop="weight" label="称重(透前/透后)" min-width="50" align="center">
                         <template slot-scope="scope">
                             {{scope.row.before}} / {{scope.row.after}}
                         </template>
@@ -88,9 +88,7 @@
                             </el-form-item>
                         </el-col>
                     </el-row>
-
-                    <div class="border"></div>
-                    
+                    <div class="border"></div>                  
                     <el-row :gutter="20">
                         <el-col :span="8">
                             <el-form-item label="透后称重(kg):" label-width="100px">
@@ -133,7 +131,7 @@
                     <el-row :gutter="20">
                         <el-col :span="23" align="right" class="button">
                             <el-button  @click="hide()">取消</el-button>
-                            <el-button @click="savedata();updatedata()" type="primary">保存</el-button>
+                            <el-button @click="savedata();updatedata();sighdata()" type="primary">保存</el-button>
                         </el-col>
                     </el-row>
                    </div>
@@ -145,7 +143,7 @@
 </template>
 
 <script>
-import { fetchSignPatients, getPatientSign, SignWeigh, getDialysisInforInfomation, getDialysisAfterInfomation, createdata, editdata } from '@/api/signandweigh'
+import { fetchSignPatients, getPatientSign, SignWeigh, getDialysisInforInfomation, getDialysisAfterInfomation, createdata, editdata,sighdata} from '@/api/signandweigh'
 import BreadCrumb from '../components/bread-crumb'
 export default {
   name: 'sign',
@@ -259,9 +257,6 @@ export default {
               if (this.schedules[index].type in response.data.data.panel) {
                 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
-                console.log("签到统计")
-                console.log(response.data.data.panel)
-                console.log(this.schedules[index].sign)
                 this.schedules[index].before = response.data.data.panel[this.schedules[index].type].before
                 this.schedules[index].after = response.data.data.panel[this.schedules[index].type].after
               }
@@ -270,37 +265,37 @@ export default {
         }
       })
     },
-    //   getPatientSign(){
-    //       getPatientSign(this.querySignParams).then(response=>{
-    //           if (response.data.state==1) {
-    //               if (response.data.data.sign != null) {
-    //                   var sign = response.data.data.sign;
-    //                   this.weigh_form.dry_weight = sign.dry_weight;
-    //                   this.weigh_form.clothes_weight = sign.clothes_weight;
-    //                     // 透前
-    //                   this.weigh_form.weigh_before = sign.weigh_before;
-    //                   this.weigh_form.dehydrated_weight = sign.dehydrated_weight;
-    //                   this.weigh_form.dehydrated_percent = sign.dehydrated_percent;
-    //                   this.weigh_form.weight_before = sign.weight_before;
-    //                   this.weigh_form.temperature_before = sign.temperature_before;
-    //                   this.weigh_form.pulse_rate_before = sign.pulse_rate_before;  // P 脉率
-    //                   this.weigh_form.respiratory_rate_before = sign.respiratory_rate_before; // R 呼吸频率
-    //                   this.weigh_form.DBP_before = sign.DBP_before; // 舒张压
-    //                   this.weigh_form.SBP_before = sign.SBP_before // 收缩压
-    //                     // 透后
-    //                   this.weigh_form.weigh_after = sign.weigh_after;
-    //                   this.weigh_form.weight_reduce_after = sign.weight_reduce_after;
-    //                   this.weigh_form.weight_after = sign.weight_after
-    //                   this.weigh_form.temperature_after = sign.temperature_after;
-    //                   this.weigh_form.pulse_rate_after = sign.pulse_rate_after; // P 脉率
-    //                   this.weigh_form.respiratory_rate_after = sign.respiratory_rate_after; // R 呼吸频率
-    //                   this.weigh_form.DBP_after = sign.DBP_after; // 舒张压
-    //                   this.weigh_form.SBP_after = sign.SBP_after; // 收缩压
-    //                   this.weigh_form.id=sign.id;
-    //               }
-    //           }
-    //       });
-    //   },
+      // getPatientSign(){
+      //     getPatientSign(this.querySignParams).then(response=>{
+      //         if (response.data.state==1) {
+      //             if (response.data.data.sign != null) {
+      //                 var sign = response.data.data.sign;
+      //                 this.weigh_form.dry_weight = sign.dry_weight;
+      //                 this.weigh_form.clothes_weight = sign.clothes_weight;
+      //                   // 透前
+      //                 this.weigh_form.weigh_before = sign.weigh_before;
+      //                 this.weigh_form.dehydrated_weight = sign.dehydrated_weight;
+      //                 this.weigh_form.dehydrated_percent = sign.dehydrated_percent;
+      //                 this.weigh_form.weight_before = sign.weight_before;
+      //                 this.weigh_form.temperature_before = sign.temperature_before;
+      //                 this.weigh_form.pulse_rate_before = sign.pulse_rate_before;  // P 脉率
+      //                 this.weigh_form.respiratory_rate_before = sign.respiratory_rate_before; // R 呼吸频率
+      //                 this.weigh_form.DBP_before = sign.DBP_before; // 舒张压
+      //                 this.weigh_form.SBP_before = sign.SBP_before // 收缩压
+      //                   // 透后
+      //                 this.weigh_form.weigh_after = sign.weigh_after;
+      //                 this.weigh_form.weight_reduce_after = sign.weight_reduce_after;
+      //                 this.weigh_form.weight_after = sign.weight_after
+      //                 this.weigh_form.temperature_after = sign.temperature_after;
+      //                 this.weigh_form.pulse_rate_after = sign.pulse_rate_after; // P 脉率
+      //                 this.weigh_form.respiratory_rate_after = sign.respiratory_rate_after; // R 呼吸频率
+      //                 this.weigh_form.DBP_after = sign.DBP_after; // 舒张压
+      //                 this.weigh_form.SBP_after = sign.SBP_after; // 收缩压
+      //                 this.weigh_form.id=sign.id;
+      //             }
+      //         }
+      //     });
+      // },
     changeSearch() {
       this.queryParams.need_schedule_type = 0
       this.fetchSignPatients()
@@ -438,8 +433,6 @@ export default {
           this.weigh_list.breathing_rate = patientlist.breathing_rate
           this.weigh_list.systolic_blood_pressure = patientlist.systolic_blood_pressure
           this.weigh_list.diastolic_blood_pressure = patientlist.diastolic_blood_pressure
-          console.log('报恩')
-          console.log(patientlist)
         }
       })
     },
@@ -482,8 +475,6 @@ export default {
           })
         }
       })
-      console.log('aaaaaaaaaaaaaaaaaa')
-      console.log(params)
     },
     hide() {
       this.show = false
@@ -508,7 +499,69 @@ export default {
       })
       console.log('hahahahah')
       console.log(params)
-    }
+    },
+    sighdata() {
+      //透前数据
+      var params = new Object()
+      var data_time = this.querySignParams.date_time
+      params.date_time = data_time
+      params.patient_id = this.weigh_form.patient_id
+      params.dry_weight = this.weigh_list.dry_weight
+      params.weight_before = this.weigh_list.weight_before
+      params.temperature = this.weigh_list.temperature
+      params.pulse_frequency = this.weigh_list.pulse_frequency
+      params.breathing_rate = this.weigh_list.breathing_rate
+      params.systolic_blood_pressure = this.weigh_list.systolic_blood_pressure
+      params.diastolic_blood_pressure = this.weigh_list.diastolic_blood_pressure
+      
+      //透后数据
+      params.weight_after = this.weigh_infor.weight_after
+      params.temperatureafter = this.weigh_infor.temperature
+      params.pulse_frequencyafter = this.weigh_infor.pulse_frequency
+      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)
+      sighdata(params).then(response => {
+         var signs = response.data.data.signs
+           console.log(signs)
+        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){
+              var signin = this.patients[index].signin
+              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){
+                                   this.schedules[j].before++
+                              }
+                              if(signin.weigh_time === 0 && response.data.data.signs.weigh_time > 0){
+                                  this.schedules[j].after++
+                              }
+                         }
+                    }  
+              }
+              break
+           }
+         }
+           this.weigh_form.id = response.data.data.signs.id
+        }else{
+           this.$message.error(response.data.msg)
+           return false
+        }
+      })
+ }
   },
   watch: {
     'weigh_form.weigh_before': function() {

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -194,11 +194,8 @@
               tempForm['good_type_id'] = val.goodTypeId
               tempForm['good_id'] = val.selectedGoodInfo[i].id
               tempForm['return_count'] = ''
-              // this.recordInfo.recordData.push(tempForm)
               this.recordInfo.recordData.splice(this.currentIndex+1, 0, tempForm);
 
-
-
             }
           }
         }

src/xt_pages/stock/cancelStockOrderDetail.vue

@@ -6,18 +6,18 @@
   <div class="app-container">
 
     <div class="filter-container">
-      <span style="font-size: 20px">退库单详情</span>
+      <span style="font-size: 20px;color: #606266">退库单详情</span>
       <el-row style="float:right;">
-        <span>{{CancelStockInfo.cancelStock.order_number}}</span>
+        <span style="color: #606266">{{CancelStockInfo.cancelStock.order_number}}</span>
       </el-row>
     </div>
 
 
 
     <div class="cell clearfix">
-      <span style="width: 300px">单据日期:  {{CancelStockInfo.cancelStock.return_time | parseTime('{y}-{m}-{d}')}} </span>
-      <span style="width: 300px">厂商 {{getManufactuerName(CancelStockInfo.cancelStock.manufacturer)}}</span>
-      <span style="width: 300px">经销商 {{getDealerName(CancelStockInfo.cancelStock.dealer)}}</span>
+      <span style="width: 300px;color: #606266">单据日期:  {{CancelStockInfo.cancelStock.return_time | parseTime('{y}-{m}-{d}')}} </span>
+      <span style="width: 300px;color: #606266">厂商 {{getManufactuerName(CancelStockInfo.cancelStock.manufacturer)}}</span>
+      <span style="width: 300px;color: #606266">经销商 {{getDealerName(CancelStockInfo.cancelStock.dealer)}}</span>
     </div>
 
     <div class="filter-container" style="margin-top: 10px">

src/xt_pages/stock/detail/cancelStockDetail.vue

@@ -2,7 +2,7 @@
   <div class="main-contain">
     <div class="app-container">
       <div class="cell clearfix" >
-        <el-input style="width: 300px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品类型"/>
+        <el-input style="width: 300px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
@@ -59,7 +59,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="商品类型" align="center">
+          <el-table-column label="商品" align="center">
             <template slot-scope="scope">
               {{specificationName(scope.row.good_id)}}
             </template>

src/xt_pages/stock/salesReturnOrderDetail.vue

@@ -7,17 +7,17 @@
     <div class="app-container">
 
       <div class="filter-container">
-        <span style="font-size: 18px">退货单详情</span>
-        <el-row style="float:right;">
-          <span>{{ReturnInfo.salesReturn.order_number}}</span>
+        <span style="font-size: 18px;color: #606266">退货单详情</span>
+        <el-row style="float:right;color: #606266">
+          <span style="color: #606266">{{ReturnInfo.salesReturn.order_number}}</span>
         </el-row>
       </div>
 
 
       <div class="cell clearfix">
-        <span style="width: 300px">单据日期:  {{ReturnInfo.salesReturn.return_time | parseTime('{y}-{m}-{d}')}} </span>
-        <span style="width: 300px">厂商: {{getManufactuerName(ReturnInfo.salesReturn.manufacturer)}}</span>
-        <span style="width: 300px">经销商: {{getDealerName(ReturnInfo.salesReturn.dealer)}}</span>
+        <span style="width: 300px;color: #606266">单据日期:  {{ReturnInfo.salesReturn.return_time | parseTime('{y}-{m}-{d}')}} </span>
+        <span style="width: 300px;color: #606266">厂商: {{getManufactuerName(ReturnInfo.salesReturn.manufacturer)}}</span>
+        <span style="width: 300px;color: #606266">经销商: {{getDealerName(ReturnInfo.salesReturn.dealer)}}</span>
       </div>
 
       <div class="filter-container" style="margin-top: 10px">

src/xt_pages/stock/stockInOrderDetail.vue

@@ -5,16 +5,16 @@
     </div>
   <div class="app-container">
     <div class="filter-container">
-      <span style="font-size: 18px">入库单详情</span>
+      <span style="font-size: 18px;color: #606266">入库单详情</span>
       <el-row style="float:right;">
-        <span>入库单号: {{WarehouseInfo.warehouse.warehousing_order}}</span>
+        <span style="color: #606266">入库单号: {{WarehouseInfo.warehouse.warehousing_order}}</span>
       </el-row>
     </div>
 
     <div class="cell clearfix">
-      <span style="width: 300px">单据日期:  {{WarehouseInfo.warehouse.warehousing_time | parseTime('{y}-{m}-{d}')}}</span>
-      <span style="width: 300px">厂商: {{getManufactuerName(WarehouseInfo.warehouse.manufacturer)}}</span>
-      <span style="width: 300px">经销商: {{getDealerName(WarehouseInfo.warehouse.dealer)}}</span>
+      <span style="width: 300px;color: #606266">单据日期:  {{WarehouseInfo.warehouse.warehousing_time | parseTime('{y}-{m}-{d}')}}</span>
+      <span style="width: 300px;color: #606266">厂商: {{getManufactuerName(WarehouseInfo.warehouse.manufacturer)}}</span>
+      <span style="width: 300px;color: #606266">经销商: {{getDealerName(WarehouseInfo.warehouse.dealer)}}</span>
     </div>
 
     <div class="cell clearfix" style="margin-top: 10px">

src/xt_pages/stock/stockOutOrderDetail.vue

@@ -7,17 +7,17 @@
     <div class="app-container">
 
       <div class="filter-container">
-        <span style="font-size: 18px">出库单详情</span>
+        <span style="font-size: 18px;color: #606266">出库单详情</span>
         <el-row style="float:right;">
-          <span>{{warehousingOutInfo.info.warehouse_out_order_number}}</span>
+          <span style="color: #606266">{{warehousingOutInfo.info.warehouse_out_order_number}}</span>
         </el-row>
       </div>
 
 
       <div class="cell clearfix">
-        <span style="width: 300px;">单据日期:  {{warehousingOutInfo.info.warehouse_out_time | parseTime('{y}-{m}-{d}')}} </span>
-        <span style="width: 300px;">厂商 {{getManufactuerName(warehousingOutInfo.info.manufacturer)}}</span>
-        <span style="width: 300px;">经销商 {{getDealerName(warehousingOutInfo.info.dealer)}}</span>
+        <span style="width: 300px;color: #606266">单据日期:  {{warehousingOutInfo.info.warehouse_out_time | parseTime('{y}-{m}-{d}')}} </span>
+        <span style="width: 300px;color: #606266">厂商 {{getManufactuerName(warehousingOutInfo.info.manufacturer)}}</span>
+        <span style="width: 300px;color: #606266">经销商 {{getDealerName(warehousingOutInfo.info.dealer)}}</span>
       </div>
 
       <div class="filter-container" style="margin-top: 10px">