bug更新

src/xt_pages/qcd/dialysisTotal.vue

@@ -22,7 +22,7 @@
         <el-date-picker
           v-model="listQuery.end_time"
           prefix-icon="el-icon-date"
-          @change="changeTime"
+          @change="changeEndTime"
           :editable="false"
           style="width: 196px;"
           type="date"
@@ -301,6 +301,20 @@ export default {
     changeTime() {
       this.getList();
     },
+    changeEndTime(val) {
+      var time =
+        this.getTimestamp(val) - this.getTimestamp(this.listQuery.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.listQuery.end_time = "";
+      } else {
+        this.getList();
+      }
+    },
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+    },
     selectStatisticalMethod(type) {
       this.statisticalMethod = type;
       this.listQuery.statistical_method = type;

src/xt_pages/qcd/outcomeIndicators/control.vue

@@ -31,7 +31,7 @@
         <el-date-picker
           v-model="listQuery.end_time"
           prefix-icon="el-icon-date"
-          @change="changeTime"
+          @change="changeEndTime"
           :editable="false"
           style="width: 196px;"
           type="date"
@@ -376,6 +376,20 @@ export default {
     changeTime() {
       this.getList();
     },
+    changeEndTime(val) {
+      var time =
+        this.getTimestamp(val) - this.getTimestamp(this.listQuery.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.listQuery.end_time = "";
+      } else {
+        this.getList();
+      }
+    },
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+    },
     selectLapseTo(lapseto) {
       this.lapsetoType = lapseto;
       this.listQuery.lapseto = lapseto;

src/xt_pages/qcd/patientAnalysis/total.vue

@@ -38,7 +38,7 @@
         <el-date-picker
           v-model="listQuery.end_time"
           prefix-icon="el-icon-date"
-          @change="changeTime"
+          @change="changeEndTime"
           :editable="false"
           style="width: 196px;"
           type="date"
@@ -283,6 +283,20 @@ export default {
     changeTime() {
       this.getList();
     },
+    changeEndTime(val) {
+      var time =
+        this.getTimestamp(val) - this.getTimestamp(this.listQuery.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.listQuery.end_time = "";
+      } else {
+        this.getList();
+      }
+    },
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+    },
     onSearch() {
       this.getList();
     },

src/xt_pages/qcd/processIndicators.vue

@@ -22,7 +22,7 @@
         <el-date-picker
           v-model="listQuery.end_time"
           prefix-icon="el-icon-date"
-          @change="changeTime"
+          @change="changeEndTime"
           :editable="false"
           style="width: 196px;"
           type="date"
@@ -321,6 +321,20 @@ export default {
     changeTime() {
       this.getList();
     },
+    changeEndTime(val) {
+      var time =
+        this.getTimestamp(val) - this.getTimestamp(this.listQuery.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.listQuery.end_time = "";
+      } else {
+        this.getList();
+      }
+    },
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+    },
     selectLapseTo(lapseto) {
       this.lapsetoType = lapseto;
       this.listQuery.lapseto = lapseto;

src/xt_pages/stock/cancelStockOrder.vue

@@ -339,7 +339,17 @@ export default {
       this.GetCancelStock();
     },
     endTimeChange(val) {
-      this.GetCancelStock();
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.end_time = "";
+      } else {
+        this.GetCancelStock();
+      }
+    },
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
     },
     calculate: function(val) {
       return Math.round(parseFloat(val) * 100) / 100;

src/xt_pages/stock/detail/cancelStockDetail.vue

@@ -381,7 +381,17 @@ export default {
       this.GetCancelStock();
     },
     endTimeChange(val) {
-      this.GetCancelStock();
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.end_time = "";
+      } else {
+        this.GetCancelStock();
+      }
+    },
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
     },
     calculate: function(val) {
       return Math.round(parseFloat(val) * 100) / 100;

src/xt_pages/stock/detail/salesReturnDetail.vue

@@ -380,7 +380,17 @@ export default {
       this.GetCancelStock();
     },
     endTimeChange(val) {
-      this.GetCancelStock();
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.end_time = "";
+      } else {
+        this.GetCancelStock();
+      }
+    },
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
     },
     calculate: function(val) {
       return Math.round(parseFloat(val) * 100) / 100;

src/xt_pages/stock/detail/stockInDetail.vue

@@ -422,7 +422,17 @@ export default {
       this.GetCancelStock();
     },
     endTimeChange(val) {
-      this.GetCancelStock();
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.end_time = "";
+      } else {
+        this.GetCancelStock();
+      }
+    },
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
     },
     calculate: function(val) {
       return Math.round(parseFloat(val) * 100) / 100;

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -404,7 +404,17 @@ export default {
       this.GetCancelStock();
     },
     endTimeChange(val) {
-      this.GetCancelStock();
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.end_time = "";
+      } else {
+        this.GetCancelStock();
+      }
+    },
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
     },
     calculate: function(val) {
       return Math.round(parseFloat(val) * 100) / 100;

src/xt_pages/stock/otherCancelStockOrder.vue

@@ -337,7 +337,17 @@ export default {
       this.GetCancelStock();
     },
     endTimeChange(val) {
-      this.GetCancelStock();
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.end_time = "";
+      } else {
+        this.GetCancelStock();
+      }
+    },
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
     },
     calculate: function(val) {
       return Math.round(parseFloat(val) * 100) / 100;

src/xt_pages/stock/otherSalesReturnOrder.vue

@@ -174,51 +174,51 @@
 </template>
 
 <script>
-import { uParseTime } from '@/utils/tools'
-import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from '@/api/doctor'
+import { uParseTime } from "@/utils/tools";
+import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from "@/api/doctor";
 import {
   deleteSalesReturn,
   GetAllConfig,
   getSalesReturnList,
   getWarehouseInfoList,
   getWarehouseList
-} from '@/api/stock'
-import BreadCrumb from '../components/bread-crumb'
+} from "@/api/stock";
+import BreadCrumb from "../components/bread-crumb";
 
 export default {
-  name: 'salesReturnOrder',
+  name: "salesReturnOrder",
   components: { BreadCrumb },
   created() {
-    var nowDate = new Date()
-    var nowYear = nowDate.getFullYear()
-    var nowMonth = nowDate.getMonth() + 1
-    var nowDay = nowDate.getDate()
+    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()
+      "-" +
+      (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()
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+    this.GetSalesReturn();
+    this.GetConfigInfo();
+    this.fetchAllAdminUsers();
   },
   data() {
     return {
-      searchKey: '',
+      searchKey: "",
       crumbs: [
-        { path: false, name: '库存管理' },
-        { path: false, name: '其他退货单' }
+        { path: false, name: "库存管理" },
+        { path: false, name: "其他退货单" }
       ],
       type: 2,
       page: 1,
@@ -229,17 +229,17 @@ export default {
       pageSelect: 0,
       adminUserOptions: [],
       multipleSelection: [],
-      signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
-      start_time: '',
+      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
+      start_time: "",
       saleReturnDate: [],
-      end_time: '',
+      end_time: "",
       goodType: [],
       goodInfo: [],
       manufacturer: [],
       selectedTableData: [],
       dealer: [],
-      startTime: ''
-    }
+      startTime: ""
+    };
   },
   methods: {
     search: function() {
@@ -250,25 +250,25 @@ export default {
         end_time: this.end_time,
         type: this.type,
         keywords: this.searchKey
-      }
-      this.saleReturnDate = []
+      };
+      this.saleReturnDate = [];
       getSalesReturnList(Params).then(response => {
         if (response.data.state == 0) {
-          this.$message.error(response.data.msg)
-          return false
+          this.$message.error(response.data.msg);
+          return false;
         } else {
-          this.total = response.data.data.total
+          this.total = response.data.data.total;
           for (let i = 0; i < response.data.data.list.length; i++) {
-            this.saleReturnDate.push(response.data.data.list[i])
+            this.saleReturnDate.push(response.data.data.list[i]);
           }
         }
-      })
+      });
     },
     AddNewOrder: function() {
       this.$router.push({
-        name: 'salesReturnOrderAdd',
+        name: "salesReturnOrderAdd",
         query: { type: this.type }
-      })
+      });
     },
     GetSalesReturn: function() {
       const Params = {
@@ -277,214 +277,212 @@ export default {
         start_time: this.start_time,
         end_time: this.end_time,
         type: this.type
-      }
-      this.saleReturnDate = []
+      };
+      this.saleReturnDate = [];
       getSalesReturnList(Params).then(response => {
         if (response.data.state == 0) {
-          this.$message.error(response.data.msg)
-          return false
+          this.$message.error(response.data.msg);
+          return false;
         } else {
-          this.total = response.data.data.total
+          this.total = response.data.data.total;
           for (let i = 0; i < response.data.data.list.length; i++) {
-            this.saleReturnDate.push(response.data.data.list[i])
+            this.saleReturnDate.push(response.data.data.list[i]);
           }
         }
-      })
+      });
     },
     getXuserName(id) {
       if (id <= 0) {
-        return ''
+        return "";
       }
-      var name = ''
+      var name = "";
       if (
         this.adminUserOptions == null ||
-        typeof this.adminUserOptions.length === 'undefined'
+        typeof this.adminUserOptions.length === "undefined"
       ) {
-        return name
+        return name;
       }
-      var leng = this.adminUserOptions.length
+      var leng = this.adminUserOptions.length;
       if (leng == 0) {
-        return name
+        return name;
       }
       for (let index = 0; index < leng; index++) {
         if (this.adminUserOptions[index].id == id) {
-          name = this.adminUserOptions[index].name
-          break
+          name = this.adminUserOptions[index].name;
+          break;
         }
       }
-      return name
+      return name;
     },
     fetchAllAdminUsers() {
       fetchAllAdminUsers().then(response => {
-        console.log(response)
+        console.log(response);
         if (response.data.state == 1) {
-          this.adminUserOptions = response.data.data.users
-          var alen = this.adminUserOptions.length
+          this.adminUserOptions = response.data.data.users;
+          var alen = this.adminUserOptions.length;
           for (let index = 0; index < alen; index++) {
             if (this.adminUserOptions[index].user_type == 2) {
               // this.doctorOptions.push(this.adminUserOptions[index]);
             }
           }
         }
-      })
+      });
     },
     handleSelectionChange: function(val) {
-      this.multipleSelection = val
+      this.multipleSelection = val;
     },
     handleSizeChange(val) {
-      this.limit = val
-      this.GetSalesReturn()
+      this.limit = val;
+      this.GetSalesReturn();
     },
     handleCurrentChange(val) {
-      this.page = val
-      this.GetSalesReturn()
+      this.page = val;
+      this.GetSalesReturn();
     },
     startTimeChange(val) {
-      this.startTime = this.getTimestamp(val)
-      this.GetSalesReturn()
+      this.startTime = this.getTimestamp(val);
+      this.GetSalesReturn();
     },
     endTimeChange(val) {
-      var time = this.getTimestamp(val) - this.startTime
-      console.log('开始时间', this.startTime)
-      console.log('结束', this.getTimestamp(val))
-      console.log('时间差', time)
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
       if (time < 0) {
-        this.$message.error('结束时间不能小于开始时间')
-        this.end_time = ''
+        this.$message.error("结束时间不能小于开始时间");
+        this.end_time = "";
       } else {
-        this.GetSalesReturn()
+        this.GetSalesReturn();
       }
     },
-    getTimestamp(time) { // 把时间日期转成时间戳
-      return (new Date(time)).getTime() / 1000
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
     },
     calculate: function(val) {
-      return Math.round(parseFloat(val) * 100) / 100
+      return Math.round(parseFloat(val) * 100) / 100;
     },
     GetConfigInfo: function() {
       GetAllConfig().then(response => {
         if (response.data.state == 0) {
-          this.$message.error(response.data.msg)
-          return false
+          this.$message.error(response.data.msg);
+          return false;
         } else {
-          this.manufacturer = response.data.data.manufacturer
-          this.dealer = response.data.data.dealer
+          this.manufacturer = response.data.data.manufacturer;
+          this.dealer = response.data.data.dealer;
         }
-      })
+      });
     },
     getManufactuerName: function(manufacturer_id) {
       for (let i = 0; i < this.manufacturer.length; i++) {
         if (this.manufacturer[i].id == manufacturer_id) {
-          return this.manufacturer[i].manufacturer_name
+          return this.manufacturer[i].manufacturer_name;
         }
       }
     },
     getDealerName: function(dealer_id) {
       for (let i = 0; i < this.dealer.length; i++) {
         if (this.dealer[i].id == dealer_id) {
-          return this.dealer[i].dealer_name
+          return this.dealer[i].dealer_name;
         }
       }
     },
     handleEdit: function(index, row) {
       this.$router.push({
-        name: 'salesReturnDetail',
+        name: "salesReturnDetail",
         query: { id: row.id, type: this.type }
-      })
+      });
     },
     handleDelete: function(index, row) {
-      const ids = []
-      ids.push(row.id)
-      const idStr = ids.join(',')
+      const ids = [];
+      ids.push(row.id);
+      const idStr = ids.join(",");
 
       const params = {
         ids: idStr
-      }
+      };
 
-      this.$confirm('确认删除退货单记录?', '删除退货单记录', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+      this.$confirm("确认删除退货单记录?", "删除退货单记录", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
       })
         .then(() => {
           deleteSalesReturn(params).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg)
-              return false
+              this.$message.error(response.data.msg);
+              return false;
             } else {
               this.$notify({
-                title: '成功',
-                message: '删除成功',
-                type: 'success',
+                title: "成功",
+                message: "删除成功",
+                type: "success",
                 duration: 2000
-              })
+              });
               for (let i = 0; i < ids.length; i++) {
                 for (let y = 0; y < this.saleReturnDate.length; y++) {
                   if (ids[i] == this.saleReturnDate[y].id) {
-                    this.saleReturnDate.splice(y, 1)
+                    this.saleReturnDate.splice(y, 1);
                   }
                 }
               }
             }
-          })
+          });
         })
-        .catch(() => {})
+        .catch(() => {});
     },
     changeAllSelected: function(val) {
       if (val) {
-        this.$refs.multipleTable.toggleAllSelection()
+        this.$refs.multipleTable.toggleAllSelection();
       } else {
-        this.$refs.multipleTable.clearSelection()
+        this.$refs.multipleTable.clearSelection();
       }
     },
     select(selection) {
-      this.selectedTableData = selection
+      this.selectedTableData = selection;
     },
     batchDelete() {
       if (this.selectedTableData.length <= 0) {
-        this.$message.error('请选择要删除的记录')
-        return
+        this.$message.error("请选择要删除的记录");
+        return;
       }
-      const ids = []
+      const ids = [];
       for (let i = 0; i < this.selectedTableData.length; i++) {
-        ids.push(this.selectedTableData[i].id)
+        ids.push(this.selectedTableData[i].id);
       }
-      const idStr = ids.join(',')
+      const idStr = ids.join(",");
       const params = {
         ids: idStr
-      }
-      this.$confirm('确认删除退货单记录?', '删除退货单记录', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+      };
+      this.$confirm("确认删除退货单记录?", "删除退货单记录", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
       })
         .then(() => {
           deleteSalesReturn(params).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg)
-              return false
+              this.$message.error(response.data.msg);
+              return false;
             } else {
               this.$notify({
-                title: '成功',
-                message: '删除成功',
-                type: 'success',
+                title: "成功",
+                message: "删除成功",
+                type: "success",
                 duration: 2000
-              })
+              });
 
               for (let i = 0; i < ids.length; i++) {
                 for (let y = 0; y < this.saleReturnDate.length; y++) {
                   if (ids[i] == this.saleReturnDate[y].id) {
-                    this.saleReturnDate.splice(y, 1)
+                    this.saleReturnDate.splice(y, 1);
                   }
                 }
               }
             }
-          })
+          });
         })
-        .catch(() => {})
+        .catch(() => {});
     }
   }
-}
+};
 </script>
 
 <style rel="stylesheet/css" lang="scss" scoped>

src/xt_pages/stock/otherStockInOrder.vue

@@ -453,7 +453,17 @@ export default {
       this.GetWarehouse();
     },
     endTimeChange(val) {
-      this.GetWarehouse();
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.end_time = "";
+      } else {
+        this.GetWarehouse();
+      }
+    },
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
     },
     calculate: function(val) {
       return Math.round(parseFloat(val) * 100) / 100;

src/xt_pages/stock/otherStockOutOrder.vue

@@ -336,7 +336,17 @@ export default {
       this.GetWarehouseOut();
     },
     endTimeChange(val) {
-      this.GetWarehouseOut();
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.end_time = "";
+      } else {
+        this.GetWarehouseOut();
+      }
+    },
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
     },
     calculate: function(val) {
       return Math.round(parseFloat(val) * 100) / 100;

src/xt_pages/stock/salesReturnOrder.vue

@@ -338,8 +338,19 @@ export default {
       this.GetSalesReturn();
     },
     endTimeChange(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.end_time = "";
+      } else {
+        this.GetWarehouse();
+      }
       this.GetSalesReturn();
     },
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+    },
     calculate: function(val) {
       return Math.round(parseFloat(val) * 100) / 100;
     },

src/xt_pages/stock/stockInOrder.vue

@@ -483,9 +483,7 @@ export default {
       this.startTime = this.getTimestamp(val);
     },
     endTimeChange(val) {
-      console.log("开始时间", this.start_time);
       var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
-      console.log("time", time);
       if (time < 0) {
         this.$message.error("结束时间不能小于开始时间");
         this.end_time = "";

src/xt_pages/stock/stockOutOrder.vue

@@ -168,50 +168,50 @@
 </template>
 
 <script>
-import { uParseTime } from "@/utils/tools";
-import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from "@/api/doctor";
+import { uParseTime } from '@/utils/tools'
+import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from '@/api/doctor'
 
 import {
   deleteWarehouseOut,
   GetAllConfig,
   getWarehouseOutList
-} from "@/api/stock";
-import BreadCrumb from "../components/bread-crumb";
+} from '@/api/stock'
+import BreadCrumb from '../components/bread-crumb'
 
 export default {
-  name: "salesReturnOrder",
+  name: 'salesReturnOrder',
   components: { BreadCrumb },
   created() {
-    var nowDate = new Date();
-    var nowYear = nowDate.getFullYear();
-    var nowMonth = nowDate.getMonth() + 1;
-    var nowDay = nowDate.getDate();
+    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();
+      '-' +
+      (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();
+      '-' +
+      (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+      '-' +
+      (nowDay < 10 ? '0' + nowDay : nowDay)
+    this.GetWarehouseOut()
+    this.GetConfigInfo()
+    this.fetchAllAdminUsers()
   },
   data() {
     return {
-      searchKey: "",
+      searchKey: '',
       crumbs: [
-        { path: false, name: "库存管理" },
-        { path: false, name: "出库单" }
+        { path: false, name: '库存管理' },
+        { path: false, name: '出库单' }
       ],
       page: 1,
       limit: 10,
@@ -221,17 +221,17 @@ export default {
       pageSelect: 0,
       adminUserOptions: [],
       multipleSelection: [],
-      signAndWeighBoxPatients: "sign-and-weigh-box-patients",
-      start_time: "",
+      signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+      start_time: '',
       warehouseOutDate: [],
-      end_time: "",
+      end_time: '',
       goodType: [],
       goodInfo: [],
       manufacturer: [],
       selectedTableData: [],
       dealer: [],
       type: 1
-    };
+    }
   },
   methods: {
     search: function() {
@@ -242,25 +242,25 @@ export default {
         end_time: this.end_time,
         type: this.type,
         keywords: this.searchKey
-      };
-      this.warehouseOutDate = [];
+      }
+      this.warehouseOutDate = []
       getWarehouseOutList(Params).then(response => {
         if (response.data.state == 0) {
-          this.$message.error(response.data.msg);
-          return false;
+          this.$message.error(response.data.msg)
+          return false
         } else {
-          this.total = response.data.data.total;
+          this.total = response.data.data.total
           for (let i = 0; i < response.data.data.list.length; i++) {
-            this.warehouseOutDate.push(response.data.data.list[i]);
+            this.warehouseOutDate.push(response.data.data.list[i])
           }
         }
-      });
+      })
     },
     AddNewOrder: function() {
       this.$router.push({
-        name: "stockOutOrderAdd",
+        name: 'stockOutOrderAdd',
         query: { type: this.type }
-      });
+      })
     },
     GetWarehouseOut: function() {
       const Params = {
@@ -269,201 +269,211 @@ export default {
         start_time: this.start_time,
         end_time: this.end_time,
         type: this.type
-      };
-      this.warehouseOutDate = [];
+      }
+      this.warehouseOutDate = []
       getWarehouseOutList(Params).then(response => {
         if (response.data.state == 0) {
-          this.$message.error(response.data.msg);
-          return false;
+          this.$message.error(response.data.msg)
+          return false
         } else {
-          this.total = response.data.data.total;
+          this.total = response.data.data.total
           for (let i = 0; i < response.data.data.list.length; i++) {
-            this.warehouseOutDate.push(response.data.data.list[i]);
+            this.warehouseOutDate.push(response.data.data.list[i])
           }
         }
-      });
+      })
     },
     getXuserName(id) {
       if (id <= 0) {
-        return "";
+        return ''
       }
-      var name = "";
+      var name = ''
       if (
         this.adminUserOptions == null ||
-        typeof this.adminUserOptions.length === "undefined"
+        typeof this.adminUserOptions.length === 'undefined'
       ) {
-        return name;
+        return name
       }
-      var leng = this.adminUserOptions.length;
+      var leng = this.adminUserOptions.length
       if (leng == 0) {
-        return name;
+        return name
       }
       for (let index = 0; index < leng; index++) {
         if (this.adminUserOptions[index].id == id) {
-          name = this.adminUserOptions[index].name;
-          break;
+          name = this.adminUserOptions[index].name
+          break
         }
       }
-      return name;
+      return name
     },
     fetchAllAdminUsers() {
       fetchAllAdminUsers().then(response => {
-        console.log(response);
+        console.log(response)
         if (response.data.state == 1) {
-          this.adminUserOptions = response.data.data.users;
-          var alen = this.adminUserOptions.length;
+          this.adminUserOptions = response.data.data.users
+          var alen = this.adminUserOptions.length
           for (let index = 0; index < alen; index++) {
             if (this.adminUserOptions[index].user_type == 2) {
               // this.doctorOptions.push(this.adminUserOptions[index]);
             }
           }
         }
-      });
+      })
     },
     handleSelectionChange: function(val) {
-      this.multipleSelection = val;
+      this.multipleSelection = val
     },
     handleSizeChange(val) {
-      this.limit = val;
-      this.GetWarehouseOut();
+      this.limit = val
+      this.GetWarehouseOut()
     },
     handleCurrentChange(val) {
-      this.page = val;
-      this.GetWarehouseOut();
+      this.page = val
+      this.GetWarehouseOut()
     },
     startTimeChange(val) {
-      this.GetWarehouseOut();
+      this.GetWarehouseOut()
     },
     endTimeChange(val) {
-      this.GetWarehouseOut();
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time)
+      if (time < 0) {
+        this.$message.error('结束时间不能小于开始时间')
+        this.end_time = ''
+      } else {
+        this.GetWarehouseOut()
+      }
+    },
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000
     },
     calculate: function(val) {
-      return Math.round(parseFloat(val) * 100) / 100;
+      return Math.round(parseFloat(val) * 100) / 100
     },
     GetConfigInfo: function() {
       GetAllConfig().then(response => {
         if (response.data.state == 0) {
-          this.$message.error(response.data.msg);
-          return false;
+          this.$message.error(response.data.msg)
+          return false
         } else {
-          this.manufacturer = response.data.data.manufacturer;
-          this.dealer = response.data.data.dealer;
+          this.manufacturer = response.data.data.manufacturer
+          this.dealer = response.data.data.dealer
         }
-      });
+      })
     },
     getManufactuerName: function(manufacturer_id) {
       for (let i = 0; i < this.manufacturer.length; i++) {
         if (this.manufacturer[i].id == manufacturer_id) {
-          return this.manufacturer[i].manufacturer_name;
+          return this.manufacturer[i].manufacturer_name
         }
       }
     },
     getDealerName: function(dealer_id) {
       for (let i = 0; i < this.dealer.length; i++) {
         if (this.dealer[i].id == dealer_id) {
-          return this.dealer[i].dealer_name;
+          return this.dealer[i].dealer_name
         }
       }
     },
     handleEdit: function(index, row) {
       this.$router.push({
-        name: "stockOutDetail",
+        name: 'stockOutDetail',
         query: { id: row.id, type: this.type }
-      });
+      })
     },
     handleDelete: function(index, row) {
-      const ids = [];
-      ids.push(row.id);
-      const idStr = ids.join(",");
+      const ids = []
+      ids.push(row.id)
+      const idStr = ids.join(',')
 
       const params = {
         ids: idStr
-      };
+      }
 
-      this.$confirm("确认删除出库单记录?", "删除出库单记录", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+      this.$confirm('确认删除出库单记录?', '删除出库单记录', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
         .then(() => {
           deleteWarehouseOut(params).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg);
-              return false;
+              this.$message.error(response.data.msg)
+              return false
             } else {
               this.$notify({
-                title: "成功",
-                message: "删除成功",
-                type: "success",
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
                 duration: 2000
-              });
+              })
               for (let i = 0; i < ids.length; i++) {
                 for (let y = 0; y < this.warehouseOutDate.length; y++) {
                   if (ids[i] == this.warehouseOutDate[y].id) {
-                    this.warehouseOutDate.splice(y, 1);
+                    this.warehouseOutDate.splice(y, 1)
                   }
                 }
               }
             }
-          });
+          })
         })
-        .catch(() => {});
+        .catch(() => {})
     },
     changeAllSelected: function(val) {
       if (val) {
-        this.$refs.multipleTable.toggleAllSelection();
+        this.$refs.multipleTable.toggleAllSelection()
       } else {
-        this.$refs.multipleTable.clearSelection();
+        this.$refs.multipleTable.clearSelection()
       }
     },
     select(selection) {
-      this.selectedTableData = selection;
+      this.selectedTableData = selection
     },
     batchDelete() {
       if (this.selectedTableData.length <= 0) {
-        this.$message.error("请选择要删除的记录");
-        return;
+        this.$message.error('请选择要删除的记录')
+        return
       }
-      const ids = [];
+      const ids = []
       for (let i = 0; i < this.selectedTableData.length; i++) {
-        ids.push(this.selectedTableData[i].id);
+        ids.push(this.selectedTableData[i].id)
       }
-      const idStr = ids.join(",");
+      const idStr = ids.join(',')
       const params = {
         ids: idStr
-      };
-      this.$confirm("确认删除退货单记录?", "删除退货单记录", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+      }
+      this.$confirm('确认删除退货单记录?', '删除退货单记录', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
         .then(() => {
           deleteWarehouseOut(params).then(response => {
             if (response.data.state == 0) {
-              this.$message.error(response.data.msg);
-              return false;
+              this.$message.error(response.data.msg)
+              return false
             } else {
               this.$notify({
-                title: "成功",
-                message: "删除成功",
-                type: "success",
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
                 duration: 2000
-              });
+              })
 
               for (let i = 0; i < ids.length; i++) {
                 for (let y = 0; y < this.warehouseOutDate.length; y++) {
                   if (ids[i] == this.warehouseOutDate[y].id) {
-                    this.warehouseOutDate.splice(y, 1);
+                    this.warehouseOutDate.splice(y, 1)
                   }
                 }
               }
             }
-          });
+          })
         })
-        .catch(() => {});
+        .catch(() => {})
     }
   }
-};
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss">