Merge branch 'superman' of http://git.shengws.com/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://112.74.16.180:9527"',//'"http://112.74.16.180:9527"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527
 }

src/api/signandweigh.js

@@ -71,4 +71,4 @@ export function sighdata(params){
      params: params,   
      method: 'Post'
    })
-}
+}

src/router/index.js

@@ -120,7 +120,7 @@ export const xt_constantRouterMap = [
       meta: { title: 'recordList', icon: 'shebei', noCache: true }
     }
     ]
-  }
+  },
 
   // ////////////////////////////
   // 本地开始
@@ -537,7 +537,7 @@ export const xt_constantRouterMap = [
     path: '/fullscreenboard',
     component: () => import('@/xt_pages/fullscreenboard/index'),
     hidden: true
-  },
+  }
   // /////////////本地要end/
 ]
 
@@ -887,7 +887,6 @@ export const xt_asyncRouterMap = [
   //       is_menu: false,
   //       meta: { title: 'cancelStockDetail', noCache: true }
   //     }
-
   //   ]
   //  },
   //  {

src/styles/index.scss

@@ -276,7 +276,7 @@ code {
 }
 
 .el-dialog__body {
-  max-height: calc(100vh - 350px) !important;
+  max-height: calc(100vh - 290px) !important;
   overflow-y: scroll !important;
   margin-right: 8px;
   /* 针对缺省样式 (必须的) */

src/views/layout/Layout.vue

@@ -54,13 +54,13 @@ export default {
   @import "src/styles/mixin.scss";
   .app-wrapper {
     @include clearfix;
-    position: relative;
+    // position: relative;
     height: 100%;
     width: 100%;
-    &.mobile.openSidebar{
-      position: fixed;
-      top: 0;
-    }
+    // &.mobile.openSidebar{
+    //   position: fixed;
+    //   top: 0;
+    // }
   }
   .drawer-bg {
     background: #000;

src/views/layout/components/Navbar.vue

@@ -128,7 +128,7 @@ export default {
   top: 0;
   left: 0;
   right: 0;
-  z-index: 2004;
+  z-index: 1000;
   .nav-logo {
     width: 162px;
     display: flex;

src/views/layout/components/TagsView.vue

@@ -130,9 +130,45 @@ export default {
     border-bottom: 1px solid #d8dce5;
     box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
     position: fixed;
-    z-index: 2004;
+    z-index: 1000;
     top: 60px;
     overflow-x: scroll;
+    /* 针对缺省样式 (必须的) */
+      &::-webkit-scrollbar {
+        width: 6px;
+        height: 2px;
+      }
+      /* 滚动条的滑轨背景颜色 */
+      &::-webkit-scrollbar-track {
+        background-color: #fff;
+        border-radius: 3px;
+        -moz-border-radius: 3px;
+        -webkit-border-radius: 3px;
+      }
+      /* 滑块颜色 */
+      &::-webkit-scrollbar-thumb {
+        background: #fff;
+        border-radius: 3px;
+        -moz-border-radius: 3px;
+        -webkit-border-radius: 3px;
+      }
+      /*内层轨道的颜色*/
+      &::-webkit-scrollbar-track-piece {
+        background-color: #fff;
+        border-radius: 3px;
+        -moz-border-radius: 3px;
+        -webkit-border-radius: 3px;
+      }
+      /* 滑轨两头的监听按钮颜色 */
+      &::-webkit-scrollbar-button {
+        background-color: #fff;
+        width: 0;
+        height: 0;
+      }
+      /* 横向滚动条和纵向滚动条相交处尖角的颜色 */
+      &::-webkit-scrollbar-corner {
+        background-color: #fff;
+      }
     .tags-view-item {
       display: inline-block;
       position: relative;

src/xt_pages/data/components/tableson.vue

@@ -1,9 +1,8 @@
 <template>
   <div class="">
     <div class="filter-container">
-      <el-button style="float: right;margin-right: 40px" 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;" 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
       style="width: 100%;">
       <el-table-column  align="center" label="名称">

src/xt_pages/data/components/templateTable.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="">
     <div class="filter-container">
-      <el-button size="small" class="filter-item" style="float:right;margin-right: 30px" @click="handleCreate" type="primary" icon="el-icon-circle-plus-outline">{{$t('table.add')}}</el-button>
+      <el-button size="small" class="filter-item" style="float:right;" @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 style="width: 100%;min-height:500px;">
       <!-- <el-table-column align="center" :label="$t('table.id')" width="65" @click="handleUpdate(scope.row)">

src/xt_pages/device/components/add_device_dialog.vue

@@ -1,7 +1,7 @@
 <template>
     <el-dialog title="新增设备" width="854px" top="15vh" :visible.sync="visible" :before-close="_close">
-        <device-info-form ref="device_info_form" :device_numbers="device_numbers" @did_create="didCreateDevice"></device-info-form>
-        <div style="text-align: right; padding-right: 25px; padding-top: 10px; padding-bottom: 10px;">
+        <device-info-form  ref="device_info_form" :device_numbers="device_numbers" @did_create="didCreateDevice"></device-info-form>
+        <div slot="footer" class="dialog-footer">
             <el-button @click="hide">取消</el-button>
             <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="createAction">保存</el-button>
         </div>
@@ -33,7 +33,7 @@ export default {
             done()
         },
         clear: function() {
-            
+
         },
         show() {
             this.clear()

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -95,14 +95,14 @@
           </template>
         </el-table-column>
 
-        <el-table-column prop="mode_name" label="透析模式" align="center"></el-table-column>
+        <el-table-column prop="mode_name" label="透析模式" align="center" width="100"></el-table-column>
 
-        <el-table-column prop="dialysis_before_weight" label="透前体重 (kg)" align="center"></el-table-column>
-        <el-table-column prop="dialysis_after_weight" label="透后体重 (kg)" align="center"></el-table-column>
-        <el-table-column label="透中血压">
-          <el-table-column v-for="(item, index) in labelArr" :key="index" :label="item">
+        <el-table-column prop="dialysis_before_weight" label="透前体重(kg)" align="center" width="120"></el-table-column>
+        <el-table-column prop="dialysis_after_weight" label="透后体重(kg)" align="center" width="120"></el-table-column>
+        <el-table-column label="透中血压(Hgmm)" align="center">
+          <el-table-column v-for="(item, index) in labelArr" :key="index" :label="item" align="center">
             <!-- 数据的遍历  scope.row就代表数据的每一个对象-->
-            <template slot-scope="scope">
+            <template slot-scope="scope" >
               <!--<span>{{scope.row.bp[index].value}}</span>-->
               <span>{{getValue(scope.row.bp[index])}}</span>
             </template>

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

@@ -4,6 +4,7 @@
             title="透后评估"
             :visible.sync="isVisibility"
             width="1010px"
+            modal-append-to-body=“false”
            >
             <el-form ref="form" :model="form" label-width="130px" >
               <!-- <el-row :gutter="20"> -->

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

@@ -5,6 +5,7 @@
       :visible.sync="isVisibility"
       width="1010px"
       @close="resetDialog"
+      modal-append-to-body=“false”
     >
       <div class="txsj" v-show="showAdvicePanel">
         <el-button  round @click="openGroupFrom" :loading="deleLoading">新增医嘱</el-button>
@@ -28,7 +29,7 @@
       <!--&lt;!&ndash;:header-cell-style="{ backgroundColor: 'rgb(64, 158, 255)', color: 'white'}"&ndash;&gt;@current-change="selectRow"-->
       <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :data="doctor_advices" border style="width: 100%" v-show="showAdvicePanel"
                 ref="advices_list" :row-class-name="tableRowClassName" :span-method="mergeSpan"
-                @row-click="cellMouseEnter"
+                @row-click="cellMouseEnter" modal-append-to-body=“false”
       >
         <el-table-column prop="date" label="开嘱医生" align="center" min-width="26px">
           <template slot-scope="scope">
@@ -41,22 +42,11 @@
           </template>
 
         </el-table-column>
-        <el-table-column prop="advice_name" min-width="50px" label="医嘱内容">
+        <el-table-column prop="advice_name" min-width="50px" label="医嘱内容" align="center">
           <template slot-scope="scope">
 
             <el-dropdown trigger="click" v-if="scope.row.parent_id == 0">
-
               <span class="el-dropdown-link">{{getAdviceContent(scope.row,1)}}<i class="el-icon-arrow-down el-icon--right"></i></span>
-              <!--<span>{{scope.row.advice_name }}</span>-->
-              <!--<span>{{scope.row.advice_desc}}</span>-->
-              <!--<span v-if="scope.row.single_dose">{{scope.row.single_dose}}{{scope.row.single_dose_unit}}</span>-->
-              <!--<span v-if="scope.row.drug_spec">{{scope.row.drug_spec}}{{scope.row.drug_spec_unit}}</span>-->
-              <!--<span v-if="scope.row.prescribing_number">* {{scope.row.prescribing_number}}{{scope.row.prescribing_number_unit}}</span>-->
-              <!--<span>{{scope.row.delivery_way}}</span>-->
-              <!--<span>{{scope.row.execution_frequency}}<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i></span>-->
-
-
-
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item @click.native="openEdit(scope.$index, scope.row)">修改医嘱</el-dropdown-item>
                 <el-dropdown-item @click.native="openDelete(scope.$index, scope.row)">删除医嘱</el-dropdown-item>
@@ -64,7 +54,6 @@
               </el-dropdown-menu>
             </el-dropdown>
 
-
             <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">
@@ -96,14 +85,7 @@
             <span v-else></span>
           </template>
         </el-table-column>
-        <!--<el-table-column label="操作" min-width="20" align="center">-->
-          <!--<template slot-scope="scope">-->
-            <!--<el-button type="primary" size="small"-->
-                       <!--@click="scope.row.groupno>0?openEditGroupAdvice(scope.row.groupno):openEdit(scope.$index, scope.row)"-->
-                       <!--v-if="isShowStartTime(scope.$index, scope.row)">编辑-->
-            <!--</el-button>-->
-          <!--</template>-->
-        <!--</el-table-column>-->
+
       </el-table>
       <!-- 医嘱列表 end -->
 
@@ -210,6 +192,7 @@
       :show-close="isClose"
       :close-on-click-modal="isClose"
       :close-on-press-escape="isClose"
+      modal-append-to-body=“false”
       >
       <el-date-picker
         v-model="execTime"

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

@@ -1,5 +1,6 @@
 <template>
   <el-dialog title="接诊评估"
+             modal-append-to-body=“false”
              :visible.sync="isVisibility"
             width="854px">
     <el-form :model="receiveTreatmentAsses" label-width="80px">

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -45,7 +45,7 @@
         <el-row >
           <el-col :span="2">
             &nbsp;&nbsp;
-          </el-col>  
+          </el-col>
           <el-col :span="5">
             <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" round
                        @click="openAdviceTemplate()">选择医嘱模板
@@ -87,11 +87,14 @@
                 label="医嘱名称"
                 property="advice_name"
                 style="word-break: keep-all;white-space:nowrap;"
+                align="center"
               ></el-table-column>
 
               <el-table-column
                 label="规格"
                 property="advice_desc"
+                align="center"
+
               ></el-table-column>
               <!-- <el-table-column label="药品规格*数量" min-width="80" property="drug_spec" align="center">
                 <template slot-scope="scope">
@@ -160,6 +163,7 @@
             style="width: 100%">
             <el-table-column
               prop="name"
+              align="center"
               label="模板名称">
             </el-table-column>
           </el-table>
@@ -180,16 +184,19 @@
           >
             <el-table-column
               type="selection"
+              align="center"
               width="55">
             </el-table-column>
             <el-table-column
               label="医嘱内容"
               property="advice_name"
               style="word-break: keep-all;white-space:nowrap;"
+              align="center"
             ></el-table-column>
             <el-table-column
               label="规格"
               property="advice_desc"
+              align="center"
             ></el-table-column>
             <el-table-column label="开药数量" min-width="80" property="prescribing_number" align="center">
               <template slot-scope="scope">

src/xt_pages/dialysis/details/dialog/adviceDialog/EditGroupAdvice.vue

@@ -38,7 +38,7 @@
         </el-row>
 
         <el-row>
-          <el-col :span="2">&nbsp;&nbsp;</el-col>          
+          <el-col :span="2">&nbsp;&nbsp;</el-col>
           <el-col :span="5">
             <el-button
               :disabled="$store.getters.xt_user.subscibe.state==3?true:false"
@@ -86,11 +86,15 @@
               <el-table-column
                 label="医嘱名称"
                 property="advice_name"
+                align="center"
+
                 style="word-break: keep-all;white-space:nowrap;"
               ></el-table-column>
               <el-table-column
                 label="规格"
                 property="advice_desc"
+                align="center"
+
               ></el-table-column>
               <!-- <el-table-column label="药品规格*数量" min-width="80" property="drug_spec" align="center">
                 <template slot-scope="scope">
@@ -150,6 +154,8 @@
             style="width: 100%">
             <el-table-column
               prop="name"
+              align="center"
+
               label="模板名称">
             </el-table-column>
           </el-table>
@@ -175,10 +181,14 @@
             <el-table-column
               label="医嘱内容"
               property="advice_name"
+              align="center"
+
               style="word-break: keep-all;white-space:nowrap;"
             ></el-table-column>
             <el-table-column
               label="规格"
+              align="center"
+
               property="advice_desc"
             ></el-table-column>
             <el-table-column label="开药数量" min-width="80" property="prescribing_number" align="center">

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

@@ -3,6 +3,7 @@
     title="透前评估"
     :visible.sync="isVisibility"
     width="1010px"
+    modal-append-to-body=“false”
   >
 
     <!--<check-box-dialog-->

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

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <el-dialog title="透析上机" :visible.sync="visible" width="854px">
+        <el-dialog title="透析上机" :visible.sync="visible" width="854px" modal-append-to-body=“false”>
             <el-form :model="form" label-width="80px">
                 <el-form-item label="上机床位">
                     <el-select v-model="form.bed_id" placeholder="" :disabled="dialysis_order.id != 0">

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

@@ -3,6 +3,8 @@
     title="透析处方"
     :visible.sync="isVisibility"
     width="1010px"
+    modal-append-to-body=“false”
+    :append-to-body="true"
   >
     <el-form ref="dialysisPrescription"  :model="dialysisPrescription" label-width="146px">
       <!-- <el-row :gutter="20"> -->

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

@@ -1,6 +1,7 @@
 <template>
   <el-dialog title="双人核对"
              :visible.sync="isVisibility"
+             modal-append-to-body=“false”
              width="854px">
 
     <el-form :inline="true" class="demo-form-inline" :model="doubleReview" label-width="110px">

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

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <el-dialog title="透析下机" :visible.sync="visible" width="854px">
+        <el-dialog title="透析下机" :visible.sync="visible" width="854px" modal-append-to-body=“false” >
             <div class="txsj">
             </div>
             <el-form :model="form" label-width="80px">

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

@@ -1,6 +1,6 @@
 <template>
   <div class="dialog_box">
-    <el-dialog title="透析监测" :visible.sync="visible" width="1100px" @close="reset">
+    <el-dialog title="透析监测" :visible.sync="visible" width="1100px" @close="reset" modal-append-to-body=“false”>
       <div v-show="edit == false">
         <div class="txsj">
           <el-button round @click="newRecordAction">新增监测</el-button>

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

@@ -3,7 +3,7 @@
     title="治疗小结"
     width="854px"
     :visible.sync="isVisibility"
-
+    modal-append-to-body=“false”
   >
     <el-form :model="treatmentSummary">
       <el-row :gutter="20">

src/xt_pages/sign/index.vue

@@ -9,28 +9,30 @@
             <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  :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">
                             {{scope.row.name}}({{scope.row.dialysis_no}})
-                        </template> 
-                    </el-table-column> 
+                        </template>
+                    </el-table-column>
 
                     <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-table-column>
                 </el-table>
-            
+
                 <el-table  :data="schedules" :class="signAndWeighBoxPatients" style="width: 100%; margin:15px 0 0 0;" border highlight-current-row :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}">
                     <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>
@@ -49,7 +51,7 @@
                   <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>
                     <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;
@@ -61,31 +63,31 @@
                      呼吸(次/分):&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 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>
                     <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>               
-                   
+                    </div>
+
                     <div class="border"></div>
                     <div v-if="show">
                     <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>
                 </el-form>
             </el-col>
         </el-row>
-    </div>   
+    </div>
    </div>
 </template>
 
@@ -136,6 +138,7 @@ export default {
         DBP_after: '', // 舒张压
         SBP_after: '', // 收缩压
         dialysis_no: ''
+       
       },
       weigh_list: {
         weight_before: '', // 透前体重
@@ -192,18 +195,36 @@ export default {
   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)
+            }
+          }
+
           this.queryParams.schedule_type = response.data.data.schedule_type
           this.querySignParams.date_time = response.data.data.today
-           
+
           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
@@ -250,7 +271,6 @@ export default {
       this.fetchSignPatients()
     },
     handleCurrentChange(row, old) {
-      
       //     this.weigh_form = {
       //     id:0,
       //     choose:false,
@@ -284,93 +304,55 @@ export default {
       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)
-        }
+      //this.getsignweigh(row.id)    
     },
-    submitSign() {
-      SignWeigh(this.querySignParams, this.weigh_form).then(response => {
-        if (response.data.state === 1) {
-          this.$message({
-            type: 'success',
-            message: '成功!'
-          })
+    // 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++
-                    }
+    //       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 (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
-        }
-      })
-    },
+    //           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 => {
@@ -423,7 +405,7 @@ export default {
           if(this.weigh_infor.weight_after == 0){
               this.weigh_infor.weight_after = ""
           }
-         
+
           this.weigh_infor.temperature = patientinfor.temperature
           if(this.weigh_infor.temperature == 0){
                this.weigh_infor.temperature = ""
@@ -509,7 +491,7 @@ export default {
       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
@@ -517,40 +499,38 @@ export default {
       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++
                               }
                               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){
+                              if(signin.weigh_time == 0 && response.data.data.signs.weigh_time > 0){
                                   this.schedules[j].after++
                               }
                          }
-                    }  
+                    }
               }
               break
            }
@@ -561,7 +541,7 @@ export default {
            return false
         }
       })
- }
+     }
   },
   watch: {
     'weigh_form.weigh_before': function() {

src/xt_pages/stock/Dialog/stockInDialog.vue

@@ -19,6 +19,7 @@
           :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
           style="width: 100%">
           <el-table-column
+            align="center"
             prop="type_name"
             label="商品类型">
           </el-table-column>
@@ -38,15 +39,18 @@
           :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
         >
           <el-table-column
+            align="center"
             type="selection"
             width="55">
           </el-table-column>
           <el-table-column
+            align="center"
             label="规格名称"
             property="specification_name"
             style="word-break: keep-all;white-space:nowrap;"
           ></el-table-column>
           <el-table-column
+            align="center"
             label="单位"
             property="good_unit"
           >

src/xt_pages/stock/cancelStockOrder.vue

@@ -131,29 +131,27 @@
     name: 'salesReturnOrder',
     components: { BreadCrumb },
     created() {
-      var year = new Date().getFullYear()
-      var month = new Date().getMonth() + 1
-      var day = new Date().getDate()
-      if (parseInt(month) < 10) {
-        month = '0' + month
-      }
-      if (parseInt(day) < 10) {
-        day = '0' + day
-      }
-      const endTime = year + '-' + month + '-' + day
-      this.end_time = endTime
-
-      var year = new Date().getFullYear()
-      var month = new Date().getMonth()
-      var day = new Date().getDate()
-      if (parseInt(month) < 10) {
-        month = '0' + month
-      }
-      if (parseInt(day) < 10) {
-        day = '0' + day
-      }
-      const startTime = year + '-' + month + '-' + day
-      this.start_time = startTime
+      var nowDate = new Date();
+      var nowYear = nowDate.getFullYear();
+      var nowMonth = nowDate.getMonth() + 1;
+      var nowDay = nowDate.getDate();
+      this.end_time =
+        nowYear +
+        "-" +
+        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+        "-" +
+        (nowDay < 10 ? "0" + nowDay : nowDay);
+      nowDate.setMonth(nowDate.getMonth() - 1);
+      nowYear = nowDate.getFullYear();
+      nowMonth = nowDate.getMonth() + 1;
+      nowDay = nowDate.getDate();
+      this.start_time =
+        nowYear +
+        "-" +
+        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+        "-" +
+        (nowDay < 10 ? "0" + nowDay : nowDay);
+
       this.GetCancelStock()
       this.GetConfigInfo()
       this.fetchAllAdminUsers()

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -361,17 +361,17 @@
       }
     },
     created() {
-      var year = new Date().getFullYear()
-      var month = new Date().getMonth() + 1
-      var day = new Date().getDate()
-      if (parseInt(month) < 10) {
-        month = '0' + month
-      }
-      if (parseInt(day) < 10) {
-        day = '0' + day
-      }
-      const endTime = year + '-' + month + '-' + day
-      this.return_time = endTime
+      var nowDate = new Date();
+      var nowYear = nowDate.getFullYear();
+      var nowMonth = nowDate.getMonth() + 1;
+      var nowDay = nowDate.getDate();
+      this.return_time =
+        nowYear +
+        "-" +
+        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+        "-" +
+        (nowDay < 10 ? "0" + nowDay : nowDay);
+
       const tempObj = {}
       tempObj['good_type_id'] = 0
       tempObj['good_id'] = 0

src/xt_pages/stock/detail/cancelStockDetail.vue

@@ -116,29 +116,26 @@
     name: 'cancelStockDetail',
 
     created() {
-      var year = new Date().getFullYear()
-      var month = new Date().getMonth() + 1
-      var day = new Date().getDate()
-      if (parseInt(month) < 10) {
-        month = '0' + month
-      }
-      if (parseInt(day) < 10) {
-        day = '0' + day
-      }
-      const endTime = year + '-' + month + '-' + day
-      this.end_time = endTime
-
-      var year = new Date().getFullYear()
-      var month = new Date().getMonth()
-      var day = new Date().getDate()
-      if (parseInt(month) < 10) {
-        month = '0' + month
-      }
-      if (parseInt(day) < 10) {
-        day = '0' + day
-      }
-      const startTime = year + '-' + month + '-' + day
-      this.start_time = startTime
+      var nowDate = new Date();
+      var nowYear = nowDate.getFullYear();
+      var nowMonth = nowDate.getMonth() + 1;
+      var nowDay = nowDate.getDate();
+      this.end_time =
+        nowYear +
+        "-" +
+        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+        "-" +
+        (nowDay < 10 ? "0" + nowDay : nowDay);
+      nowDate.setMonth(nowDate.getMonth() - 1);
+      nowYear = nowDate.getFullYear();
+      nowMonth = nowDate.getMonth() + 1;
+      nowDay = nowDate.getDate();
+      this.start_time =
+        nowYear +
+        "-" +
+        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+        "-" +
+        (nowDay < 10 ? "0" + nowDay : nowDay);
       this.GetCancelStock()
       this.GetConfigInfo()
       this.fetchAllAdminUsers()

src/xt_pages/stock/detail/salesReturnDetail.vue

@@ -119,29 +119,26 @@
     name: 'salesReturnDetail',
 
     created() {
-      var year = new Date().getFullYear()
-      var month = new Date().getMonth() + 1
-      var day = new Date().getDate()
-      if (parseInt(month) < 10) {
-        month = '0' + month
-      }
-      if (parseInt(day) < 10) {
-        day = '0' + day
-      }
-      const endTime = year + '-' + month + '-' + day
-      this.end_time = endTime
-
-      var year = new Date().getFullYear()
-      var month = new Date().getMonth()
-      var day = new Date().getDate()
-      if (parseInt(month) < 10) {
-        month = '0' + month
-      }
-      if (parseInt(day) < 10) {
-        day = '0' + day
-      }
-      const startTime = year + '-' + month + '-' + day
-      this.start_time = startTime
+      var nowDate = new Date();
+      var nowYear = nowDate.getFullYear();
+      var nowMonth = nowDate.getMonth() + 1;
+      var nowDay = nowDate.getDate();
+      this.end_time =
+        nowYear +
+        "-" +
+        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+        "-" +
+        (nowDay < 10 ? "0" + nowDay : nowDay);
+      nowDate.setMonth(nowDate.getMonth() - 1);
+      nowYear = nowDate.getFullYear();
+      nowMonth = nowDate.getMonth() + 1;
+      nowDay = nowDate.getDate();
+      this.start_time =
+        nowYear +
+        "-" +
+        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+        "-" +
+        (nowDay < 10 ? "0" + nowDay : nowDay);
       this.GetCancelStock()
       this.GetConfigInfo()
       this.fetchAllAdminUsers()

src/xt_pages/stock/detail/stockInDetail.vue

@@ -124,29 +124,26 @@
     name: 'stockInDetail',
 
     created() {
-      var year = new Date().getFullYear()
-      var month = new Date().getMonth() + 1
-      var day = new Date().getDate()
-      if (parseInt(month) < 10) {
-        month = '0' + month
-      }
-      if (parseInt(day) < 10) {
-        day = '0' + day
-      }
-      const endTime = year + '-' + month + '-' + day
-      this.end_time = endTime
-
-      var year = new Date().getFullYear()
-      var month = new Date().getMonth()
-      var day = new Date().getDate()
-      if (parseInt(month) < 10) {
-        month = '0' + month
-      }
-      if (parseInt(day) < 10) {
-        day = '0' + day
-      }
-      const startTime = year + '-' + month + '-' + day
-      this.start_time = startTime
+      var nowDate = new Date();
+      var nowYear = nowDate.getFullYear();
+      var nowMonth = nowDate.getMonth() + 1;
+      var nowDay = nowDate.getDate();
+      this.end_time =
+        nowYear +
+        "-" +
+        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+        "-" +
+        (nowDay < 10 ? "0" + nowDay : nowDay);
+      nowDate.setMonth(nowDate.getMonth() - 1);
+      nowYear = nowDate.getFullYear();
+      nowMonth = nowDate.getMonth() + 1;
+      nowDay = nowDate.getDate();
+      this.start_time =
+        nowYear +
+        "-" +
+        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+        "-" +
+        (nowDay < 10 ? "0" + nowDay : nowDay);
       this.GetCancelStock()
       this.GetConfigInfo()
       this.fetchAllAdminUsers()

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -129,29 +129,26 @@
     name: 'stockOutDetail',
 
     created() {
-      var year = new Date().getFullYear()
-      var month = new Date().getMonth() + 1
-      var day = new Date().getDate()
-      if (parseInt(month) < 10) {
-        month = '0' + month
-      }
-      if (parseInt(day) < 10) {
-        day = '0' + day
-      }
-      const endTime = year + '-' + month + '-' + day
-      this.end_time = endTime
-
-      var year = new Date().getFullYear()
-      var month = new Date().getMonth()
-      var day = new Date().getDate()
-      if (parseInt(month) < 10) {
-        month = '0' + month
-      }
-      if (parseInt(day) < 10) {
-        day = '0' + day
-      }
-      const startTime = year + '-' + month + '-' + day
-      this.start_time = startTime
+      var nowDate = new Date();
+      var nowYear = nowDate.getFullYear();
+      var nowMonth = nowDate.getMonth() + 1;
+      var nowDay = nowDate.getDate();
+      this.end_time =
+        nowYear +
+        "-" +
+        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+        "-" +
+        (nowDay < 10 ? "0" + nowDay : nowDay);
+      nowDate.setMonth(nowDate.getMonth() - 1);
+      nowYear = nowDate.getFullYear();
+      nowMonth = nowDate.getMonth() + 1;
+      nowDay = nowDate.getDate();
+      this.start_time =
+        nowYear +
+        "-" +
+        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+        "-" +
+        (nowDay < 10 ? "0" + nowDay : nowDay);
       this.GetCancelStock()
       this.GetConfigInfo()
       this.fetchAllAdminUsers()

src/xt_pages/stock/otherCancelStockOrder.vue

@@ -128,29 +128,26 @@
     name: 'salesReturnOrder',
     components: { BreadCrumb },
     created() {
-      var year = new Date().getFullYear()
-      var month = new Date().getMonth() + 1
-      var day = new Date().getDate()
-      if (parseInt(month) < 10) {
-        month = '0' + month
-      }
-      if (parseInt(day) < 10) {
-        day = '0' + day
-      }
-      const endTime = year + '-' + month + '-' + day
-      this.end_time = endTime
-
-      var year = new Date().getFullYear()
-      var month = new Date().getMonth()
-      var day = new Date().getDate()
-      if (parseInt(month) < 10) {
-        month = '0' + month
-      }
-      if (parseInt(day) < 10) {
-        day = '0' + day
-      }
-      const startTime = year + '-' + month + '-' + day
-      this.start_time = startTime
+      var nowDate = new Date();
+      var nowYear = nowDate.getFullYear();
+      var nowMonth = nowDate.getMonth() + 1;
+      var nowDay = nowDate.getDate();
+      this.end_time =
+        nowYear +
+        "-" +
+        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+        "-" +
+        (nowDay < 10 ? "0" + nowDay : nowDay);
+      nowDate.setMonth(nowDate.getMonth() - 1);
+      nowYear = nowDate.getFullYear();
+      nowMonth = nowDate.getMonth() + 1;
+      nowDay = nowDate.getDate();
+      this.start_time =
+        nowYear +
+        "-" +
+        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+        "-" +
+        (nowDay < 10 ? "0" + nowDay : nowDay);
       this.GetCancelStock()
       this.GetConfigInfo()
       this.fetchAllAdminUsers()

src/xt_pages/stock/otherSalesReturnOrder.vue

@@ -140,29 +140,26 @@
     name: 'salesReturnOrder',
     components: { BreadCrumb },
     created() {
-      var year = new Date().getFullYear()
-      var month = new Date().getMonth() + 1
-      var day = new Date().getDate()
-      if (parseInt(month) < 10) {
-        month = '0' + month
-      }
-      if (parseInt(day) < 10) {
-        day = '0' + day
-      }
-      const endTime = year + '-' + month + '-' + day
-      this.end_time = endTime
-
-      var year = new Date().getFullYear()
-      var month = new Date().getMonth()
-      var day = new Date().getDate()
-      if (parseInt(month) < 10) {
-        month = '0' + month
-      }
-      if (parseInt(day) < 10) {
-        day = '0' + day
-      }
-      const startTime = year + '-' + month + '-' + day
-      this.start_time = startTime
+      var nowDate = new Date();
+      var nowYear = nowDate.getFullYear();
+      var nowMonth = nowDate.getMonth() + 1;
+      var nowDay = nowDate.getDate();
+      this.end_time =
+        nowYear +
+        "-" +
+        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+        "-" +
+        (nowDay < 10 ? "0" + nowDay : nowDay);
+      nowDate.setMonth(nowDate.getMonth() - 1);
+      nowYear = nowDate.getFullYear();
+      nowMonth = nowDate.getMonth() + 1;
+      nowDay = nowDate.getDate();
+      this.start_time =
+        nowYear +
+        "-" +
+        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+        "-" +
+        (nowDay < 10 ? "0" + nowDay : nowDay);
       this.GetSalesReturn()
       this.GetConfigInfo()
       this.fetchAllAdminUsers()

src/xt_pages/stock/otherStockInOrder.vue

@@ -134,29 +134,26 @@
     name: 'stockIn',
     components: { BreadCrumb },
     created() {
-      var year = new Date().getFullYear()
-      var month = new Date().getMonth() + 1
-      var day = new Date().getDate()
-      if (parseInt(month) < 10) {
-        month = '0' + month
-      }
-      if (parseInt(day) < 10) {
-        day = '0' + day
-      }
-      const endTime = year + '-' + month + '-' + day
-      this.end_time = endTime
-
-      var year = new Date().getFullYear()
-      var month = new Date().getMonth()
-      var day = new Date().getDate()
-      if (parseInt(month) < 10) {
-        month = '0' + month
-      }
-      if (parseInt(day) < 10) {
-        day = '0' + day
-      }
-      const startTime = year + '-' + month + '-' + day
-      this.start_time = startTime
+      var nowDate = new Date();
+      var nowYear = nowDate.getFullYear();
+      var nowMonth = nowDate.getMonth() + 1;
+      var nowDay = nowDate.getDate();
+      this.end_time =
+        nowYear +
+        "-" +
+        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+        "-" +
+        (nowDay < 10 ? "0" + nowDay : nowDay);
+      nowDate.setMonth(nowDate.getMonth() - 1);
+      nowYear = nowDate.getFullYear();
+      nowMonth = nowDate.getMonth() + 1;
+      nowDay = nowDate.getDate();
+      this.start_time =
+        nowYear +
+        "-" +
+        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+        "-" +
+        (nowDay < 10 ? "0" + nowDay : nowDay);
       this.GetWarehouse()
       this.GetConfigInfo()
       this.fetchAllAdminUsers()

src/xt_pages/stock/otherStockOutOrder.vue

@@ -132,29 +132,26 @@ export default {
   name: "salesReturnOrder",
   components: { BreadCrumb },
   created() {
-    var year = new Date().getFullYear();
-    var month = new Date().getMonth() + 1;
-    var day = new Date().getDate();
-    if (parseInt(month) < 10) {
-      month = "0" + month;
-    }
-    if (parseInt(day) < 10) {
-      day = "0" + day;
-    }
-    const endTime = year + "-" + month + "-" + day;
-    this.end_time = endTime;
-
-    var year = new Date().getFullYear();
-    var month = new Date().getMonth();
-    var day = new Date().getDate();
-    if (parseInt(month) < 10) {
-      month = "0" + month;
-    }
-    if (parseInt(day) < 10) {
-      day = "0" + day;
-    }
-    const startTime = year + "-" + month + "-" + day;
-    this.start_time = startTime;
+    var nowDate = new Date();
+    var nowYear = nowDate.getFullYear();
+    var nowMonth = nowDate.getMonth() + 1;
+    var nowDay = nowDate.getDate();
+    this.end_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+    nowDate.setMonth(nowDate.getMonth() - 1);
+    nowYear = nowDate.getFullYear();
+    nowMonth = nowDate.getMonth() + 1;
+    nowDay = nowDate.getDate();
+    this.start_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
     this.GetWarehouseOut();
     this.GetConfigInfo();
     this.fetchAllAdminUsers();

src/xt_pages/stock/salesReturnOrder.vue

@@ -135,29 +135,27 @@
     name: 'salesReturnOrder',
     components: { BreadCrumb },
     created() {
-      var year = new Date().getFullYear()
-      var month = new Date().getMonth() + 1
-      var day = new Date().getDate()
-      if (parseInt(month) < 10) {
-        month = '0' + month
-      }
-      if (parseInt(day) < 10) {
-        day = '0' + day
-      }
-      const endTime = year + '-' + month + '-' + day
-      this.end_time = endTime
-
-      var year = new Date().getFullYear()
-      var month = new Date().getMonth()
-      var day = new Date().getDate()
-      if (parseInt(month) < 10) {
-        month = '0' + month
-      }
-      if (parseInt(day) < 10) {
-        day = '0' + day
-      }
-      const startTime = year + '-' + month + '-' + day
-      this.start_time = startTime
+      var nowDate = new Date();
+      var nowYear = nowDate.getFullYear();
+      var nowMonth = nowDate.getMonth() + 1;
+      var nowDay = nowDate.getDate();
+      this.end_time =
+        nowYear +
+        "-" +
+        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+        "-" +
+        (nowDay < 10 ? "0" + nowDay : nowDay);
+      nowDate.setMonth(nowDate.getMonth() - 1);
+      nowYear = nowDate.getFullYear();
+      nowMonth = nowDate.getMonth() + 1;
+      nowDay = nowDate.getDate();
+      this.start_time =
+        nowYear +
+        "-" +
+        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+        "-" +
+        (nowDay < 10 ? "0" + nowDay : nowDay);
+
       this.GetSalesReturn()
       this.GetConfigInfo()
       this.fetchAllAdminUsers()

src/xt_pages/stock/salesReturnOrderAdd.vue

@@ -373,17 +373,16 @@
       }
     },
     created() {
-      var year = new Date().getFullYear()
-      var month = new Date().getMonth() + 1
-      var day = new Date().getDate()
-      if (parseInt(month) < 10) {
-        month = '0' + month
-      }
-      if (parseInt(day) < 10) {
-        day = '0' + day
-      }
-      const endTime = year + '-' + month + '-' + day
-      this.return_time = endTime
+      var nowDate = new Date();
+      var nowYear = nowDate.getFullYear();
+      var nowMonth = nowDate.getMonth() + 1;
+      var nowDay = nowDate.getDate();
+      this.return_time =
+        nowYear +
+        "-" +
+        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+        "-" +
+        (nowDay < 10 ? "0" + nowDay : nowDay);
       const tempObj = {}
       tempObj['good_type_id'] = 0
       tempObj['good_id'] = 0

src/xt_pages/stock/stockInOrder.vue

@@ -133,29 +133,59 @@
     name: 'stockIn',
     components: { BreadCrumb },
     created() {
-      var year = new Date().getFullYear()
-      var month = new Date().getMonth() + 1
-      var day = new Date().getDate()
-      if (parseInt(month) < 10) {
-        month = '0' + month
-      }
-      if (parseInt(day) < 10) {
-        day = '0' + day
-      }
-      const endTime = year + '-' + month + '-' + day
-      this.end_time = endTime
-
-      var year = new Date().getFullYear()
-      var month = new Date().getMonth()
-      var day = new Date().getDate()
-      if (parseInt(month) < 10) {
-        month = '0' + month
-      }
-      if (parseInt(day) < 10) {
-        day = '0' + day
-      }
-      const startTime = year + '-' + month + '-' + day
-      this.start_time = startTime
+      // var nowDate = new Date();
+      //
+      // var year = new Date().getFullYear()
+      // var month = new Date().getMonth() + 1
+      // var day = nowDate.getDate()
+      // if (parseInt(month) < 10) {
+      //   month = '0' + month
+      // }
+      // if (parseInt(day) < 10) {
+      //   day = '0' + day
+      // }
+      // const endTime = year + '-' + month + '-' + day
+      // this.end_time = endTime
+      //
+      //
+      // var year = new Date().getFullYear()
+      // var month = new Date().getMonth()
+      // var day = new Date().getDate()
+      //
+      // day.setMonth(day.getMonth() - 3);
+      //
+      // if (parseInt(month) < 10) {
+      //   month = '0' + month
+      // }
+      // if (parseInt(day) < 10) {
+      //   day = '0' + day
+      // }
+      // const startTime = year + '-' + month + '-' + day
+      // this.start_time = startTime
+
+      var nowDate = new Date();
+      var nowYear = nowDate.getFullYear();
+      var nowMonth = nowDate.getMonth() + 1;
+      var nowDay = nowDate.getDate();
+      this.end_time =
+        nowYear +
+        "-" +
+        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+        "-" +
+        (nowDay < 10 ? "0" + nowDay : nowDay);
+      nowDate.setMonth(nowDate.getMonth() - 1);
+      nowYear = nowDate.getFullYear();
+      nowMonth = nowDate.getMonth() + 1;
+      nowDay = nowDate.getDate();
+      this.start_time =
+        nowYear +
+        "-" +
+        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+        "-" +
+        (nowDay < 10 ? "0" + nowDay : nowDay);
+
+
+
       this.GetWarehouse()
       this.GetConfigInfo()
       this.fetchAllAdminUsers()

src/xt_pages/stock/stockInOrderAdd.vue

@@ -59,7 +59,7 @@
                   </template>
 
                   <template slot-scope="scope">
-                    <el-form-item style="padding-top: 15px">
+                    <el-form-item style="padding-top: 15px;margin-left: 10px;margin-right: 10px">
                       <el-input placeholder="请输入商品类型" v-model="scope.row.good_type_id"
                                 :value="typeName(scope.row.good_type_id)"
                                 @focus="showDialog(scope.$index, scope.row)"></el-input>
@@ -341,7 +341,7 @@
       }, comfirm: function(val) {
         this.$refs.dialog.hide()
         if (val.selectedGoodInfo.length > 0) {
-          for (let i = val.selectedGoodInfo.length - 1; ; i--) {
+          for (let i = val.selectedGoodInfo.length - 1; i >= 0; i--) {
             if (i == 0) {
               this.recordInfo.recordData[this.currentIndex].good_type_id = val.goodTypeId
               this.recordInfo.recordData[this.currentIndex].good_id = val.selectedGoodInfo[i].id
@@ -581,18 +581,16 @@
       }
     },
     created() {
-      var year = new Date().getFullYear()
-      var month = new Date().getMonth() + 1
-      var day = new Date().getDate()
-      if (parseInt(month) < 10) {
-        month = '0' + month
-      }
-      if (parseInt(day) < 10) {
-        day = '0' + day
-      }
-      const endTime = year + '-' + month + '-' + day
-      this.warehousing_time = endTime
-
+      var nowDate = new Date();
+      var nowYear = nowDate.getFullYear();
+      var nowMonth = nowDate.getMonth() + 1;
+      var nowDay = nowDate.getDate();
+      this.warehousing_time =
+        nowYear +
+        "-" +
+        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+        "-" +
+        (nowDay < 10 ? "0" + nowDay : nowDay);
       const tempObj = {}
       tempObj['good_type_id'] = 0
       tempObj['good_id'] = 0

src/xt_pages/stock/stockOutOrder.vue

@@ -131,29 +131,26 @@ export default {
   name: "salesReturnOrder",
   components: { BreadCrumb },
   created() {
-    var year = new Date().getFullYear();
-    var month = new Date().getMonth() + 1;
-    var day = new Date().getDate();
-    if (parseInt(month) < 10) {
-      month = "0" + month;
-    }
-    if (parseInt(day) < 10) {
-      day = "0" + day;
-    }
-    const endTime = year + "-" + month + "-" + day;
-    this.end_time = endTime;
-
-    var year = new Date().getFullYear();
-    var month = new Date().getMonth();
-    var day = new Date().getDate();
-    if (parseInt(month) < 10) {
-      month = "0" + month;
-    }
-    if (parseInt(day) < 10) {
-      day = "0" + day;
-    }
-    const startTime = year + "-" + month + "-" + day;
-    this.start_time = startTime;
+    var nowDate = new Date();
+    var nowYear = nowDate.getFullYear();
+    var nowMonth = nowDate.getMonth() + 1;
+    var nowDay = nowDate.getDate();
+    this.end_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+    nowDate.setMonth(nowDate.getMonth() - 1);
+    nowYear = nowDate.getFullYear();
+    nowMonth = nowDate.getMonth() + 1;
+    nowDay = nowDate.getDate();
+    this.start_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
     this.GetWarehouseOut();
     this.GetConfigInfo();
     this.fetchAllAdminUsers();
@@ -473,75 +470,3 @@ export default {
   }
 }
 </style>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<<<<<<< .mine
-
-
-
-
-
-
-
-
-
-
-
-
-
-=======
-
-
-
-
-
-
-
-
-
-
-
-
-
->>>>>>> .theirs

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -397,17 +397,16 @@
       }
     },
     created() {
-      var year = new Date().getFullYear()
-      var month = new Date().getMonth() + 1
-      var day = new Date().getDate()
-      if (parseInt(month) < 10) {
-        month = '0' + month
-      }
-      if (parseInt(day) < 10) {
-        day = '0' + day
-      }
-      const endTime = year + '-' + month + '-' + day
-      this.warehouse_out_time = endTime
+      var nowDate = new Date();
+      var nowYear = nowDate.getFullYear();
+      var nowMonth = nowDate.getMonth() + 1;
+      var nowDay = nowDate.getDate();
+      this.warehouse_out_time =
+        nowYear +
+        "-" +
+        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+        "-" +
+        (nowDay < 10 ? "0" + nowDay : nowDay);
       const tempObj = {}
       tempObj['good_type_id'] = 0
       tempObj['good_id'] = 0

src/xt_pages/stock/stockQuery.vue

@@ -28,7 +28,7 @@
         </el-table-column>
         <el-table-column label="入库退货" align="center">
           <template slot-scope="scope">
-            <span @click="showSaleReturnDetailDialog(scope.row)" style="color: red">{{salesReturnCount(scope.row)}}</span>
+            <span @click="showSaleReturnDetailDialog(scope.row)" style="color: #F56C6C">{{salesReturnCount(scope.row)}}</span>
 
           </template>
         </el-table-column>
@@ -45,7 +45,7 @@
         </el-table-column>
         <el-table-column label="出库退库" align="center">
           <template slot-scope="scope">
-            <span @click="showCancelStockDetailDialog(scope.row)"  style="color: red">{{cancelStockCount(scope.row)}}</span>
+            <span @click="showCancelStockDetailDialog(scope.row)"  style="color: #F56C6C">{{cancelStockCount(scope.row)}}</span>
 
           </template>
         </el-table-column>

src/xt_pages/user/components/PatientDetail.vue

@@ -1214,4 +1214,7 @@ export default {
 .print_footnote_panel .proj .proj_title {
     font-weight: 500;
 }
+.el-select-dropdown{
+  z-index: 998!important;
+}
 </style>

src/xt_pages/user/components/PatientForm.vue

@@ -1,17 +1,21 @@
 <template>
   <div class="main-contain">
-    <div class="position">
-      <bread-crumb v-if="!isEdit" :crumbs='crumbs'></bread-crumb>
-
-      <div class="" style="float:right;">
-        <el-button @click="$router.back(-1)" icon="el-icon-refresh" size="small">取消</el-button>
+    <div v-if="!isEdit" class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <div class="" style="float:right;color: white">
         <el-button :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" type="primary" v-if="this.isEdit==false" @click="resetForm('form')"  icon="el-icon-circle-plus-outline" size="small">新增</el-button>
-        <el-button :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" @click="onSubmit('form')"  size="small" type="success" icon="el-icon-setting" >保存</el-button>
-        <el-button v-if="isEdit==false" @click="onReSubmit('form')" :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" icon="el-icon-document-add" size="small" type="warning" >保存并继续新增</el-button>
       </div>
     </div>
+
+    <div v-if="isEdit" class="" style="float:right;margin-right: 35px;margin-top: 10px">
+      <!-- <el-button @click="$router.back(-1)" icon="el-icon-refresh" size="small">取消</el-button>
+      <el-button :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" type="primary" v-if="this.isEdit==false" @click="resetForm('form')"  icon="el-icon-circle-plus-outline" size="small">新增</el-button>
+      <el-button :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" @click="onSubmit('form')"  size="small" type="success" icon="el-icon-setting" >保存</el-button>
+      <el-button v-if="isEdit==false" @click="onReSubmit('form')" :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" icon="el-icon-document-add" size="small" type="warning" >保存并继续新增</el-button> -->
+    </div>
+
     <div class="app-container " v-loading="pageLoad">
-      <el-form ref="form" :rules="rules" :model="form" label-width="124px" class="clearfix" >
+      <el-form ref="form" :rules="rules" :model="form" label-width="124px" class="clearfix" popper-append-to-body="false" >
         <div class="dataTitle">一般资料</div>
         <el-row >
           <el-col :span="20" class="form-table" >
@@ -83,17 +87,16 @@
                   <el-input v-model="form.homeTelephone" maxlength="20"></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="8" :style="isEdit?'width:360px':''" style="height:59px;" >
+              <el-col :span="8" :style="isEdit?'width:360px':''" style="height:58px;" >
                 <el-form-item label="患者来源 : " class="is-required" prop="source" >
                   <el-radio-group v-model="form.source">
                     <el-radio v-for="item in sourceOptions" :key="item.value" :label="item.value" :value="item.value" >{{item.label}}</el-radio>
                   </el-radio-group>
                 </el-form-item>
               </el-col>
-              <el-col :span="8" :style="isEdit?'width:360px':''" style="height:59px;">
+              <el-col :span="8" :style="isEdit?'width:360px':''" style="height:58px;">
                 <el-form-item label="治疗状态(转归) : " class="is-required" prop="lapseto" >
                   <el-radio-group v-model="form.lapseto">
-                    <!-- <el-radio :disabled="isEdit" v-for="item in lapsetoOptions" :key="item.value" :label="item.value" :value="item.value" >{{item.label}}</el-radio> -->
                     <el-radio v-for="item in lapsetoOptions" :key="item.value" :label="item.value" :value="item.value" >{{item.label}}</el-radio>
                   </el-radio-group>
                 </el-form-item>
@@ -142,7 +145,7 @@
                   </el-form-item> -->
                 </el-col>
                 <el-col :span="8" :style="isEdit?'width:360px':''">
-                  <el-form-item label="住院(门诊)号 : " prop="admissionNumber" >
+                  <el-form-item label="住院(门诊)号 : "  >
                     <el-input v-model="form.admissionNumber"></el-input>
                   </el-form-item>
                 </el-col>
@@ -363,14 +366,17 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="24" align="center">
+          <el-col :span="24" align="right" >
             <el-form-item>
-
+                <el-button @click="$router.back(-1)" icon="el-icon-refresh" size="small">取消</el-button>
+                <el-button :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" @click="onSubmit('form')"  size="small" type="primary" icon="el-icon-setting" >保存</el-button>
+                <el-button v-if="isEdit==false" @click="onReSubmit('form')" :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" icon="el-icon-document-add" size="small" type="success" >保存并继续新增</el-button>
             </el-form-item>
           </el-col>
         </el-row>
 
       </el-form>
+
     </div>
   </div>
 
@@ -1020,9 +1026,8 @@
   }
   }
   }
-  .el-select-dropdown,
-  .el-popper{
-    z-index: 2000!important;
-  }
+  .el-select-dropdown{
+  z-index: 998!important;
+}
 </style>
 

src/xt_pages/user/courseOfDisease.vue

@@ -132,30 +132,26 @@ export default {
 
 
 
-
-      var year = new Date().getFullYear()
-      var month = new Date().getMonth() + 1
-      var day = new Date().getDate()
-      if (parseInt(month) < 10) {
-        month = '0' + month
-      }
-      if (parseInt(day) < 10) {
-        day = '0' + day
-      }
-      const endTime = year + '-' + month + '-' + day
-      this.end_time = endTime
-
-      var year = new Date().getFullYear()
-      var month = new Date().getMonth()
-      var day = new Date().getDate()
-      if (parseInt(month) < 10) {
-        month = '0' + month
-      }
-      if (parseInt(day) < 10) {
-        day = '0' + day
-      }
-      const startTime = year + '-' + month + '-' + day
-      this.start_time = startTime
+      var nowDate = new Date();
+      var nowYear = nowDate.getFullYear();
+      var nowMonth = nowDate.getMonth() + 1;
+      var nowDay = nowDate.getDate();
+      this.end_time =
+        nowYear +
+        "-" +
+        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+        "-" +
+        (nowDay < 10 ? "0" + nowDay : nowDay);
+      nowDate.setMonth(nowDate.getMonth() - 1);
+      nowYear = nowDate.getFullYear();
+      nowMonth = nowDate.getMonth() + 1;
+      nowDay = nowDate.getDate();
+      this.start_time =
+        nowYear +
+        "-" +
+        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+        "-" +
+        (nowDay < 10 ? "0" + nowDay : nowDay);
 
 
       this.requestCourseRecords()

src/xt_pages/user/dialysisRecord.vue

@@ -32,7 +32,7 @@
           </el-form>
         </div>
         <div>
-          <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :data="recordData" border style="width: 100%" @current-change="clickCurrent">
+          <el-table id="oictable" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :data="recordData" border style="width: 100%" @current-change="clickCurrent">
               <el-table-column prop="dialysis_date" label="透析日期" align="center" width="110" fixed>
                 <template slot-scope="scope"><span style="color: #579ef8">{{scope.row.dialysis_date | parseTime('{y}-{m}-{d}')}}</span></template>
               </el-table-column>
@@ -360,6 +360,13 @@ export default {
   }
 }
 </script>
+<style>
+  #oictable ::-webkit-scrollbar {
+    height: 15px;
+  }
+
+</style>
+
 <style rel='stylesheet/scss' lang="scss" scoped >
 .total {
   font-size: 14px;

src/xt_pages/user/doctorAdvice.vue

@@ -2,11 +2,13 @@
     <div class="patient-container">
         <patient-sidebar :id="patientID" defaultActive="1-4" v-on:tran-patient="onTranPatient"></patient-sidebar>
         <div class="patient-app-container advice-container app-container">
-            <div class="filter-container">
+            <div class="cellButton" style="float:right;">
+              <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" size="small"   @click="openNew" type="primary" icon="el-icon-circle-plus-outline" >新增</el-button>
+                <el-button size="small"  @click="printThisInfo()" :type="adviceType==1 || adviceType == 3?'primary':'warning'" icon="el-icon-printer" >打印</el-button>            
+            </div>
+            <div class="cell clearfix">
                 <el-input   style="width: 400px;" v-model="listQuery.keywords" class="filter-item" size="small" />
-                <el-button  class="filter-item" size="small" type="primary" icon="el-icon-search" @click="changeKey" >搜索</el-button>
-                <el-button  class="filter-item" size="small" style="float:right;" @click="printThisInfo()" :type="adviceType==1 || adviceType == 3?'primary':'warning'" icon="el-icon-printer" >打印</el-button>
-                <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" size="small" class="filter-item" style="float:right;" @click="openNew" type="primary" icon="el-icon-circle-plus-outline" >新增</el-button>
+                <el-button   size="small" type="primary" icon="el-icon-search" @click="changeKey" >搜索</el-button>
             </div>
             <div class="cell clearfix">
                 <label class="title"><span class="name">医嘱类型</span> : </label>

src/xt_pages/user/patients.vue

@@ -385,6 +385,10 @@
 
     methods: {
       EditLapseto() {
+        if (this.lapsetoForm.lapseto_time == ''){
+          this.$message.error("请选择时间")
+          return
+        }
         EditLapseto(this.lapsetoForm.patient_id, this.lapsetoForm).then(response => {
           if (response.data.state === 1) {
             this.$notify({

src/xt_pages/user/registration.vue

@@ -608,6 +608,9 @@ export default {
     height: 59px!important;
 }
 }
+.el-select-dropdown{
+  z-index: 998!important;
+}
 
 </style>
 

src/xt_pages/user/rescueRecord.vue

@@ -123,32 +123,26 @@
         this.$router.push('/patients/patients')
         return
       }
-      var now = new Date()
-      this.date = [now.getTime() - (7 * 24 * 60 * 60 * 1000), now.getTime()]
-
-      var year = new Date().getFullYear()
-      var month = new Date().getMonth() + 1
-      var day = new Date().getDate()
-      if (parseInt(month) < 10) {
-        month = '0' + month
-      }
-      if (parseInt(day) < 10) {
-        day = '0' + day
-      }
-      const endTime = year + '-' + month + '-' + day
-      this.end_time = endTime
-
-      var year = new Date().getFullYear()
-      var month = new Date().getMonth()
-      var day = new Date().getDate()
-      if (parseInt(month) < 10) {
-        month = '0' + month
-      }
-      if (parseInt(day) < 10) {
-        day = '0' + day
-      }
-      const startTime = year + '-' + month + '-' + day
-      this.start_time = startTime
+      var nowDate = new Date();
+      var nowYear = nowDate.getFullYear();
+      var nowMonth = nowDate.getMonth() + 1;
+      var nowDay = nowDate.getDate();
+      this.end_time =
+        nowYear +
+        "-" +
+        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+        "-" +
+        (nowDay < 10 ? "0" + nowDay : nowDay);
+      nowDate.setMonth(nowDate.getMonth() - 1);
+      nowYear = nowDate.getFullYear();
+      nowMonth = nowDate.getMonth() + 1;
+      nowDay = nowDate.getDate();
+      this.start_time =
+        nowYear +
+        "-" +
+        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+        "-" +
+        (nowDay < 10 ? "0" + nowDay : nowDay);
 
       this.requestRescueRecords()
     },