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

src/xt_pages/sign/index.vue

@@ -39,7 +39,7 @@
                     <el-table-column prop="sign" label="签到" min-width="30" align="center" ></el-table-column>
                     <el-table-column prop="weight" label="称重(透前/透后)" min-width="50" align="center">
                         <template slot-scope="scope">
-                            {{scope.row.before}} / {{scope.row.after}}
+                             {{scope.row.before}} / {{scope.row.after}}
                         </template>
                     </el-table-column>
                 </el-table>
@@ -47,34 +47,69 @@
 
             <el-col :span="16">
                 <div class="dataTitle">患者信息</div>
-                <el-form class="information" label-position="left">
+                <el-form class="information">
                   <div class="inforTitle">
                   <el-button  @click="change()" style="float:right;">修改</el-button>
                    <span class="name">姓名:{{weigh_form.name}} &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;透析号:{{weigh_form.dialysis_no}} &nbsp;&nbsp;</span>
                    </div>
                     <div class="border"></div>
+                    <!-- <el-row :gutter="20">
+                    <el-col :span="8">
+                       <el-form-item label="透前称重(kg):" label-width="100px">
+                       <el-input :disabled="disa" v-model="weigh_list.weight_before"></el-input>
+                    </el-form-item>
+                    </el-col> 
+                    <el-col :span="8">
+                      <el-form-item label="干体重(kg):" label-width="100px">
+                       <el-input :disabled="disa" v-model="weigh_list.dry_weight"></el-input>
+                      </el-form-item>
+                      </el-col>
+                    </el-row>
+                      <el-row :gutter="20">
+                        <el-col :span="4">
+                            <el-form-item label="体温(℃):" label-width="80px">
+                               <el-input :disabled="disa" v-model="weigh_list.temperature" style="width: 70px"></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="5">
+                            <el-form-item label="呼吸(次/分):" label-width="100px">
+                                <el-input :disabled="disa" v-model="weigh_list.breathing_rate"></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="9">
+                            <el-form-item label="血压(mmHg):" label-width="100px">
+                                <el-input :disabled="disa" v-model="weigh_list.systolic_blood_pressure" style="width: 70px"></el-input>
+                                <span> / </span>
+                                <el-input :disabled="disa" v-model="weigh_list.diastolic_blood_pressure" style="width: 70px"></el-input>
+                            </el-form-item>
+                        </el-col>
+                         <el-col :span="5">
+                            <el-form-item label="脉搏(次/分):" label-width="100px">
+                                <el-input :disabled="disa" v-model="weigh_list.pulse_frequency"></el-input>
+                            </el-form-item>
+                        </el-col>
+                    </el-row> -->
                     <div style="margin-bottom:20px;color:rgb(96,96,96);font-size:14px">
                     透前体重(kg):&nbsp;<el-input v-model="weigh_list.weight_before" :disabled="disa" style="width:200px"></el-input> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                     干体重(kg):&nbsp;<el-input v-model="weigh_list.dry_weight" :disabled="disa" style="width:200px"></el-input><br>
                     </div>
                     <div style="margin-bottom:12px;color:rgb(96,96,96);font-size:14px">
-                     体温(℃):&nbsp;<el-input v-model="weigh_list.temperature" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp;
-                     呼吸(次/分):&nbsp;<el-input v-model="weigh_list.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>&nbsp;&nbsp;&nbsp;
-                     脉搏(次/分):&nbsp;<el-input v-model="weigh_list.pulse_frequency" :disabled="disa" style="width:70px"></el-input>
-                    </div>
-                    <div class="border"></div>
-                    <div style="margin-bottom:20px;color:rgb(96,96,96);font-size:14px">
+                     体温(℃):&nbsp;<el-input v-model="weigh_list.temperature" :disabled="disa" style="width:90px"></el-input>&nbsp;&nbsp;&nbsp;
+                     <!-- 呼吸(次/分):&nbsp;<el-input v-model="weigh_list.breathing_rate" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp; -->
+                     血压(mmHg):&nbsp;<el-input v-model="weigh_list.systolic_blood_pressure" style="width: 90px" :disabled="disa"></el-input><span> / </span> <el-input v-model="weigh_list.diastolic_blood_pressure" style="width: 90px" :disabled="disa"></el-input>&nbsp;&nbsp;&nbsp;
+                     脉率(次/分):&nbsp;<el-input v-model="weigh_list.pulse_frequency" :disabled="disa" style="width:90px"></el-input>
+                    </div> 
+                     <div class="border"></div> 
+                     <div style="margin-bottom:20px;color:rgb(96,96,96);font-size:14px">
                      透后称重(kg):&nbsp;<el-input v-model="weigh_infor.weight_after" style="width:200px" :disabled="disa"></el-input>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                      干体重(kg):&nbsp;<el-input v-model="weigh_list.dry_weight" :disabled="disa" style="width:200px"></el-input>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                     </div>
                     <div style="margin-bottom:12px;color:rgb(96,96,96);font-size:14px">
-                      体温(℃):&nbsp;<el-input v-model="weigh_infor.temperature" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp;
-                      呼吸(次/分):&nbsp;<el-input v-model="weigh_infor.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>&nbsp;&nbsp;&nbsp;
-                      脉搏(次/分):&nbsp;<el-input v-model="weigh_infor.pulse_frequency" :disabled="disa" style="width:70px"></el-input>
-                    </div>
-
+                      体温(℃):&nbsp;<el-input v-model="weigh_infor.temperature" :disabled="disa" style="width:90px"></el-input>&nbsp;&nbsp;&nbsp;
+                      <!-- 呼吸(次/分):&nbsp;<el-input v-model="weigh_infor.breathing_rate" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp; -->
+                      血压(mmHg):&nbsp;<el-input v-model="weigh_infor.systolic_blood_pressure" style="width: 90px" :disabled="disa"></el-input> <span> / </span><el-input v-model="weigh_infor.diastolic_blood_pressure" style="width: 90px" :disabled="disa"></el-input>&nbsp;&nbsp;&nbsp;
+                      脉率(次/分):&nbsp;<el-input v-model="weigh_infor.pulse_frequency" :disabled="disa" style="width:90px"></el-input>
+                    </div>      
                     <div class="border"></div>
                     <div v-if="show">
                     <el-row :gutter="20">

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

@@ -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();

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/user/components/PatientForm.vue

@@ -148,7 +148,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>

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/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/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()
     },