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

src/api/manage.js

@@ -63,6 +63,7 @@ export function getAllMachine(zoneid, classid, deviceid) {
 }
 
 export function getMachineDetailById(id, params) {
+  console.log("id是神m", id);
   return request({
     url: "/api/management/getmachinedetail?id=" + id,
     method: "Get",
@@ -154,7 +155,6 @@ export function getComprehensive(params) {
 }
 
 export function SaveInformation(id, data) {
-  console.log("data是什么东西", data);
   return request({
     url: "/api/manage/saveinformation?id=" + id,
     method: "Post",
@@ -357,6 +357,7 @@ export function queryTable(bedid, startime, endtime) {
 }
 
 export function SaveRepair(id, data) {
+  console.log("data", data);
   return request({
     url: "/api/manage/saverepair?id=" + id,
     method: "post",

src/styles/index.scss

@@ -523,4 +523,12 @@ code {
 
 .el-table th {
   text-align: center;
-}
+}
+
+// 修改选中表格内容颜色
+.el-table .success-row {
+  background: #87ceff !important;
+}
+.el-checkbox__inner {
+  border: 1px solid #696969 !important;
+}

src/utils/tools.js

@@ -117,6 +117,9 @@ export function uParseTime(time, cFormat) {
   if (time === 0) {
     return "";
   }
+  if (time < 0) {
+    return "";
+  }
   if (arguments.length === 0) {
     return null;
   }
@@ -139,8 +142,9 @@ export function uParseTime(time, cFormat) {
   };
   const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
     let value = formatObj[key];
-    if (key === "a")
+    if (key === "a") {
       return ["一", "二", "三", "四", "五", "六", "日"][value - 1];
+    }
     if (result.length > 0 && value < 10) {
       value = "0" + value;
     }

src/xt_pages/management/components/ManageForm.vue

@@ -50,6 +50,13 @@
                 ></el-option>
               </el-select>
             </el-form-item>
+            <el-form-item label="机位号:" v-show="bedShowTwo">
+              <el-input
+                v-model="form.bed_number"
+                style="width:135px"
+                type="number"
+              ></el-input>
+            </el-form-item>
           </el-col>
         </el-row>
         <el-row>
@@ -277,13 +284,6 @@
                 v-model="form.treat_mode"
                 @change="changetreatmentmode"
               >
-                <!-- <el-checkbox
-                  style="min-width:50px"
-                  v-for="item in treatmentmode"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                ></el-checkbox> -->
                 <el-checkbox
                   style="min-width:50px"
                   v-for="item in treatmentmode"
@@ -368,11 +368,6 @@ export default {
         treat_mode: [],
         treat_type: [] // 治疗模式
       },
-      fucks: [
-        { id: 1, name: 'zs' },
-        { id: 2, name: 'ls' },
-        { id: 3, name: 'ww' }
-      ],
       deviceType: [],
       bedNumber: [],
       machineStatus: [
@@ -382,6 +377,7 @@ export default {
         { id: 4, name: '报废机' }
       ],
       DisinfectionMode: [
+        { id: 0, name: '请选择' },
         { id: 1, name: '化学消毒' },
         { id: 2, name: '热消毒' },
         { id: 3, name: '化学消毒+热消毒' }
@@ -406,6 +402,7 @@ export default {
         { id: 3, name: '其他' }
       ],
       reverseMode: [
+        { id: 0, name: '请选择' },
         { id: 1, name: '单级反渗' },
         { id: 2, name: '双级反渗' }
       ],
@@ -423,6 +420,7 @@ export default {
       allShow: true,
       totalShow: true,
       bedShow: true,
+      bedShowTwo: false,
       disa: true
     }
   },
@@ -467,6 +465,7 @@ export default {
         this.totalShow = true
         this.treatShow = true
         this.allShow = true
+        this.bedShowTwo = false
       }
 
       if (val === 2) {
@@ -475,7 +474,8 @@ export default {
         this.allShow = false
         this.treatShow = false
         this.reverseShow = true
-        this.bedShow = true
+        this.bedShow = false
+        this.bedShowTwo = true
       }
 
       if (val === 3) {
@@ -485,6 +485,7 @@ export default {
         this.allShow = false
         this.treatShow = false
         this.DisinfectionShow = false
+        this.bedShowTwo = false
       }
     },
     changeMachineStatus(val) {
@@ -497,7 +498,6 @@ export default {
       }
     },
     SaveManageInfo(formName) {
-      console.log('====', this.form.treat_mode)
       const arr1 = []
       this.form.treat_mode.map((item, index) => {
         const obj = {}
@@ -545,12 +545,6 @@ export default {
         }
         arr1.push(obj.id)
       })
-      // this.form.treat_mode.map((item, index) => {
-      //   const obj = {};
-      //   obj.id = index + 1;
-      //   // obj.name = item
-      //   arr1.push(obj.id);
-      // });
       console.log('arrr1', arr1)
       this.form.treat_type = arr1
 
@@ -558,8 +552,6 @@ export default {
       var device_types = parseInt(device_type)
       this.form.device_type = device_types
 
-      console.log('机号是什么东西', this.form.bed_number)
-
       if (this.form.rubbish_reason === '') {
         this.form.rubbish_reason = 0
       }
@@ -593,6 +585,10 @@ export default {
       var bed_numberss = parseInt(bed_numbers)
       this.form.bed_number = bed_numberss
       console.log('购买日期', this.form.buy_date)
+
+      if (this.form.revers_mode === '') {
+        this.form.revers_mode = 0
+      }
       this.$refs[formName].validate(valid => {
         if (valid) {
           SaveManageInfo(this.form).then(response => {
@@ -602,6 +598,7 @@ export default {
               this.$message.success('保存成功')
               this.getAllSubregion()
               this.$emit('getAllMachineInfo')
+              this.$forceUpdate()
             } else {
               this.$message.error('添加失败')
             }

src/xt_pages/management/components/QualityForm.vue

@@ -670,8 +670,8 @@ export default {
       dialogVisible: false,
       dialogVisibleTwo: false,
       dialogVisibleThree: false,
-      disable: false,
-      diableTwo: false,
+      disable: true,
+      diableTwo: true,
       form: {
         id: '',
         date: '',
@@ -773,7 +773,12 @@ export default {
       getAllSubregion().then(response => {
         var zones = response.data.data.zones
         var numbers = response.data.data.numbers
-        this.bedNumber = numbers
+        var number = [{ id: 0, number: '全部' }]
+        for (let index = 0; index < numbers.length; index++) {
+          const item = numbers[index]
+          number.push({ id: item.id, number: item.number })
+        }
+        this.bedNumber = number
       })
     },
     getAllQulityInfo() {
@@ -872,14 +877,10 @@ export default {
         this.diableTwo = false
       }
       if (val === 1) {
-        this.form.concentrate_nob = ''
-        this.form.concentrateb_nod = ''
-        this.diableTwo = true
+        this.diableTwo = false
         this.disable = false
       }
       if (val === 2) {
-        this.form.concentrate_noa = ''
-        this.form.concentrate_noc = ''
         this.diableTwo = true
         this.disable = false
       }
@@ -976,6 +977,34 @@ export default {
           this.form.date = uParseTime(culture.speling_date, '{y}-{m}-{d}')
           this.form.specimen = culture.specimen
 
+          if (this.form.specimen === 0) {
+            this.disable = false
+            this.diableTwo = false
+          }
+
+          if (this.form.specimen === 1) {
+            this.disable = false
+            this.diableTwo = false
+          }
+
+          if (this.form.specimen === 2) {
+            this.disable = false
+            this.diableTwo = true
+          }
+          if (this.form.specimen === 3) {
+            this.diableTwo = false
+            this.disable = true
+          }
+
+          if (this.form.specimen === 4) {
+            this.disable = false
+            this.diableTwo = false
+          }
+          if (this.form.specimen === 5) {
+            this.disable = false
+            this.diableTwo = false
+          }
+
           this.form.concentrate_noa = culture.concentrate_noa
           this.form.concentrate_nob = culture.concentrate_nob
           this.form.sampling_locationa = culture.sampling_locationa
@@ -1051,6 +1080,33 @@ export default {
             '{y}-{m}-{d}'
           )
           this.diaForm.specimenb = dialysate.specimenb
+          if (this.diaForm.specimenb === 0) {
+            this.disable = false
+            this.diableTwo = false
+          }
+
+          if (this.diaForm.specimenb === 1) {
+            this.disable = false
+            this.diableTwo = false
+          }
+
+          if (this.diaForm.specimenb === 2) {
+            this.disable = false
+            this.diableTwo = true
+          }
+          if (this.diaForm.specimenb === 3) {
+            this.diableTwo = false
+            this.disable = true
+          }
+
+          if (this.diaForm.specimenb === 4) {
+            this.disable = false
+            this.diableTwo = false
+          }
+          if (this.diaForm.specimenb === 5) {
+            this.disable = false
+            this.diableTwo = false
+          }
           this.diaForm.concentrate_noc = dialysate.concentrate_noc
           this.diaForm.concentrateb_nod = dialysate.concentrateb_nod
           this.diaForm.sampling_locationb = dialysate.sampling_locationb

src/xt_pages/management/components/RepairForm.vue

@@ -470,7 +470,12 @@ export default {
       getAllSubregion().then(response => {
         var zones = response.data.data.zones
         var numbers = response.data.data.numbers
-        this.bedNumber = numbers
+        var number = [{ id: 0, number: '全部' }]
+        for (let index = 0; index < numbers.length; index++) {
+          const item = numbers[index]
+          number.push({ id: item.id, number: item.number })
+        }
+        this.bedNumber = number
       })
     },
     handleSelectionChange(val) {
@@ -482,6 +487,10 @@ export default {
           var repair = response.data.data.repair
           console.log('repair是', repair)
           for (let index = 0; index < repair.length; index++) {
+            if (repair[index].failure_stage === 0) {
+              repair[index].failure_stage = ''
+            }
+
             if (repair[index].failure_stage === 1) {
               repair[index].failure_stage = '开机启动'
             }
@@ -498,6 +507,10 @@ export default {
               repair[index].failure_stage = '消毒'
             }
 
+            if (repair[index].exclude === 0) {
+              repair[index].exclude = ''
+            }
+
             if (repair[index].exclude === 1) {
               repair[index].exclude = '是'
             }
@@ -600,6 +613,24 @@ export default {
     },
     UpdateRepair(formName) {
       this.$refs[formName].validate(valid => {
+        this.guaForm.start_time = uParseTime(this.guaForm.start_time, '{y}-{m}-{d} {h}:{i}')
+        this.guaForm.arrive_time = uParseTime(this.guaForm.arrive_time, '{y}-{m}-{d} {h}:{i}')
+        this.guaForm.finish_time = uParseTime(this.guaForm.finish_time, '{y}-{m}-{d} {h}:{i}')
+
+        if (this.guaForm.failure_stage === '') {
+          this.guaForm.failure_stage = 0
+        }
+
+        var failurestages = this.guaForm.failure_stage
+        var falur = parseInt(failurestages)
+        this.guaForm.failure_stage = falur
+
+        if (this.guaForm.exclude === '') {
+          this.guaForm.exclude = 0
+        }
+        var excludes = this.guaForm.exclude
+        var exclude = parseInt(excludes)
+        this.guaForm.exclude = exclude
         if (valid) {
           UpdateRepair(this.guaForm).then(response => {
             if (response.data.state === 1) {

src/xt_pages/management/components/UserForm.vue

@@ -300,6 +300,24 @@
                 ></el-option>
               </el-select>
             </el-form-item>
+             <!-- <el-autocomplete
+                  style="margin:16px 5px"
+                  popper-class="my-autocomplete"
+                  v-model="value"
+                 :fetch-suggestions="querySearchAsync"
+                 :trigger-on-focus="false"
+                 placeholder="病人名字"
+                  @select="handleSelect"
+            >
+             <i
+               class="el-icon-search el-input__icon"
+               slot="suffix"
+              >
+            </i>
+           <template slot-scope="{ item }">
+              <div class="name">{{ item.name }}</div>
+             </template>
+          </el-autocomplete> -->
           </el-col>
           <el-col :span="8">
             <el-form-item label="传染病:">
@@ -748,6 +766,7 @@ import {
   queryInfo
 } from '@/api/manage'
 import { uParseTime } from '@/utils/tools'
+import { PostSearch } from '@/api/patient'
 import print from 'print-js'
 const moment = require('moment')
 export default {
@@ -927,7 +946,8 @@ export default {
         clean: '', // 清洁
         sign_name: '' // 签名
       },
-      hiddenShow: false
+      hiddenShow: false,
+      searchArray: []
     }
   },
   methods: {
@@ -944,9 +964,20 @@ export default {
       getAllSubregion().then(response => {
         if (response.data.state === 1) {
           var zones = response.data.data.zones
-          this.zones = zones
+          console.log('zonses=====================', zones)
+          var zone = [{ id: 0, name: '全部' }]
+          for (let i = 0; i < zones.length; i++) {
+            const item = zones[i]
+            zone.push({ id: item.id, name: item.name })
+          }
+          this.zones = zone
           var numbers = response.data.data.numbers
-          this.bedNumber = numbers
+          var number = [{ id: 0, number: '全部' }]
+          for (let index = 0; index < numbers.length; index++) {
+            const item = numbers[index]
+            number.push({ id: item.id, number: item.number })
+          }
+          this.bedNumber = number
         }
       })
     },
@@ -954,7 +985,7 @@ export default {
       getInformationData(this.limit, this.page).then(response => {
         if (response.data.state === 1) {
           var information = response.data.data.information
-          console.log('为什么', information)
+          console.log('information', information)
           for (let index = 0; index < information.length; index++) {
             if (information[index].class === 1) {
               information[index].class = '上午'
@@ -1352,6 +1383,23 @@ export default {
           scanStyles: false
         })
       }, 1)
+    },
+
+    querySearchAsync(keyword, cb) {
+      let key = ''
+      if (keyword != undefined) {
+        key = keyword
+      }
+      let searchArray = []
+      PostSearch(key).then(response => {
+        if (response.data.state == 1) {
+          searchArray = response.data.data.patient
+          cb(searchArray)
+        } else {
+          this.$message.error(response.data.msg)
+          cb([])
+        }
+      })
     }
   },
   created() {

src/xt_pages/stock/cancelStockOrder.vue

@@ -158,8 +158,8 @@
         <el-pagination
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
-          :page-sizes="[7, 10, 50, 100]"
-          :page-size="7"
+          :page-sizes="[10, 50, 100]"
+          :page-size="10"
           background
           style="margin-top:20px;float: right"
           layout="total, sizes, prev, pager, next, jumper"
@@ -219,7 +219,7 @@ export default {
       searchKey: "",
       type: 1,
       page: 1,
-      limit: 7,
+      limit: 10,
       checked: false,
       total: 0,
       pageTotal: 0,

src/xt_pages/stock/config/dealer.vue

@@ -103,8 +103,8 @@
         <el-pagination
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
-          :page-sizes="[7]"
-          :page-size="7"
+          :page-sizes="[10,50,100]"
+          :page-size="10"
           background
           align="right"
           style="margin-top:20px;"
@@ -141,7 +141,7 @@ export default {
       pageTotal: 0,
       pageSelect: 0,
       page: 1,
-      limit: 7,
+      limit: 10,
 
       loading: false,
 

src/xt_pages/stock/config/goodInfo.vue

@@ -121,8 +121,8 @@
     <el-pagination
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
-      :page-sizes="[7]"
-      :page-size="7"
+      :page-sizes="[10, 50, 100]"
+      :page-size="10"
       background
       align="right"
       style="margin-top:20px;"
@@ -159,7 +159,7 @@ export default {
       pageTotal: 0,
       pageSelect: 0,
       page: 1,
-      limit: 7,
+      limit: 10,
       keywords: "",
       goodInfo: {
         loading: false,

src/xt_pages/stock/config/goodType.vue

@@ -124,8 +124,8 @@
         <el-pagination
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
-          :page-sizes="[7]"
-          :page-size="7"
+          :page-sizes="[10, 50, 100]"
+          :page-size="10"
           background
           align="right"
           style="margin-top:20px;"
@@ -232,7 +232,7 @@ export default {
       pageTotal: 0,
       pageSelect: 0,
       page: 1,
-      limit: 7,
+      limit: 10,
       keywords: "",
       goodType: {
         loading: false,

src/xt_pages/stock/config/manufacturer.vue

@@ -103,8 +103,8 @@
           <el-pagination
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
-            :page-sizes="[7]"
-            :page-size="7"
+            :page-sizes="[10, 50, 100]"
+            :page-size="10"
             background
             align="right"
             style="margin-top:20px;"
@@ -142,7 +142,7 @@ export default {
       pageSelect: 0,
 
       page: 1,
-      limit: 7,
+      limit: 10,
       loading: false,
 
       manufacturer_code: "",

src/xt_pages/stock/detail/cancelStockDetail.vue

@@ -154,8 +154,8 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[7, 10, 50, 100]"
-        :page-size="7"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
         background
         style="margin-top:20px;float: right"
         layout="total, sizes, prev, pager, next, jumper"
@@ -211,7 +211,7 @@ export default {
       searchKey: "",
       type: 4,
       page: 1,
-      limit: 7,
+      limit: 10,
       checked: false,
       total: 0,
       pageTotal: 0,

src/xt_pages/stock/detail/salesReturnDetail.vue

@@ -154,8 +154,8 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[7, 10, 50, 100]"
-        :page-size="7"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
         background
         style="margin-top:20px;float: right"
         layout="total, sizes, prev, pager, next, jumper"
@@ -211,7 +211,7 @@ export default {
       searchKey: "",
       type: 3,
       page: 1,
-      limit: 7,
+      limit: 10,
       checked: false,
       total: 0,
       pageTotal: 0,

src/xt_pages/stock/detail/stockInDetail.vue

@@ -167,8 +167,8 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[7, 10, 50, 100]"
-        :page-size="7"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
         background
         style="margin-top:20px;float: right"
         layout="total, sizes, prev, pager, next, jumper"
@@ -228,7 +228,7 @@ export default {
       searchKey: "",
       type: 1,
       page: 1,
-      limit: 7,
+      limit: 10,
       manufacturer_id: "",
       dealer_id: "",
       order_type: "",

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -166,8 +166,8 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[7, 10, 50, 100]"
-        :page-size="7"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
         background
         style="margin-top:20px;float: right"
         layout="total, sizes, prev, pager, next, jumper"
@@ -224,7 +224,7 @@ export default {
       searchKey: "",
       type: 2,
       page: 1,
-      limit: 7,
+      limit: 10,
       checked: false,
       total: 0,
       pageTotal: 0,

src/xt_pages/stock/otherCancelStockOrder.vue

@@ -158,8 +158,8 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[7, 10, 50, 100]"
-        :page-size="7"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
         background
         style="margin-top:20px;float: right"
         layout="total, sizes, prev, pager, next, jumper"
@@ -217,7 +217,7 @@ export default {
       searchKey: "",
       type: 2,
       page: 1,
-      limit: 7,
+      limit: 10,
       checked: false,
       total: 0,
       pageTotal: 0,

src/xt_pages/stock/otherSalesReturnOrder.vue

@@ -160,8 +160,8 @@
         <el-pagination
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
-          :page-sizes="[7, 10, 50, 100]"
-          :page-size="7"
+          :page-sizes="[10, 50, 100]"
+          :page-size="10"
           background
           style="margin-top:20px;float: right"
           layout="total, sizes, prev, pager, next, jumper"
@@ -222,7 +222,7 @@ export default {
       ],
       type: 2,
       page: 1,
-      limit: 7,
+      limit: 10,
       checked: false,
       total: 0,
       pageTotal: 0,

src/xt_pages/stock/otherStockInOrder.vue

@@ -162,8 +162,8 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[7, 10, 50, 100]"
-        :page-size="7"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
         background
         style="margin-top:20px;float: right"
         layout="total, sizes, prev, pager, next, jumper"
@@ -223,7 +223,7 @@ export default {
         { path: false, name: "其他入库单" }
       ],
       page: 1,
-      limit: 7,
+      limit: 10,
       checked: false,
       total: 0,
       pageTotal: 0,

src/xt_pages/stock/otherStockOutOrder.vue

@@ -156,8 +156,8 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[7, 10, 50, 100]"
-        :page-size="7"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
         background
         style="margin-top:20px;float: right"
         layout="total, sizes, prev, pager, next, jumper"
@@ -215,7 +215,7 @@ export default {
       ],
       searchKey: "",
       page: 1,
-      limit: 7,
+      limit: 10,
       checked: false,
       total: 0,
       pageTotal: 0,

src/xt_pages/stock/salesReturnOrder.vue

@@ -156,8 +156,8 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[7, 10, 50, 100]"
-        :page-size="7"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
         background
         style="margin-top:20px;float: right"
         layout="total, sizes, prev, pager, next, jumper"
@@ -218,7 +218,7 @@ export default {
       ],
       type: 1,
       page: 1,
-      limit: 7,
+      limit: 10,
       checked: false,
       total: 0,
       pageTotal: 0,

src/xt_pages/stock/stockInOrder.vue

@@ -161,8 +161,8 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[7, 10, 50, 100]"
-        :page-size="7"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
         background
         style="margin-top:20px;float: right"
         layout="total, sizes, prev, pager, next, jumper"
@@ -254,7 +254,7 @@ export default {
       searchKey: "",
       type: 1,
       page: 1,
-      limit: 7,
+      limit: 10,
       checked: false,
       total: 0,
       pageTotal: 0,

src/xt_pages/stock/stockOutOrder.vue

@@ -155,8 +155,8 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[7, 10, 50, 100]"
-        :page-size="7"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
         background
         style="margin-top:20px;float: right"
         layout="total, sizes, prev, pager, next, jumper"
@@ -214,7 +214,7 @@ export default {
         { path: false, name: "出库单" }
       ],
       page: 1,
-      limit: 7,
+      limit: 10,
       checked: false,
       total: 0,
       pageTotal: 0,

src/xt_pages/stock/stockQuery.vue

@@ -109,8 +109,8 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[7, 10, 50, 100]"
-        :page-size="7"
+        :page-sizes="[10, 50, 100]"
+        :page-size="10"
         background
         align="right"
         style="margin-top:20px;"
@@ -154,7 +154,7 @@ export default {
       start_time: "",
       end_time: "",
       page: 1,
-      limit: 7,
+      limit: 10,
       goodType: [],
       goodInfo: [],
       WarehouseInfo: {