Merge pull request '修复bug' (#5) from zjl into master

Reviewed-on: http://git.picaiba.com/mt-fe-group/tft-fe/pulls/5

src/views/basicConfig/components/deviceAdd.vue

@@ -190,6 +190,7 @@ import {
 } from '@/api/basicConfig'
 import { commonUploadPath } from '@/api/app'
 import { getToken } from '@/utils/auth'
+import moment from 'moment'
 export default {
   name: 'ConsumablesAdd',
   data() {
@@ -205,8 +206,8 @@ export default {
         price: '',
         imgId: '',
         supplier: '',
-        purchaseDate: '',
-        productDate: '',
+        purchaseDate: moment().format('YYYY-MM-DD'),
+        productDate: moment().format('YYYY-MM-DD'),
         remark: '',
         enabled: 1
       },
@@ -255,7 +256,11 @@ export default {
             }
             this.form.supplier = res.data.supplier
             this.form.purchaseDate = res.data.purchaseDate
+              ? res.data.purchaseDate
+              : ''
             this.form.productDate = res.data.productDate
+              ? res.data.productDate
+              : ''
             this.form.remark = res.data.remark
             this.form.enabled = res.data.enabled
           }

src/views/consumablesManagement/components/inAndOutManagementAdd.vue

@@ -246,6 +246,9 @@ export default {
           this.form.minNum = res.data.minNum ? res.data.minNum : 0
           this.form.maxNum = res.data.maxNum ? res.data.maxNum : 0
           this.form.remark = res.data.remark
+          this.form.recipient = this.$store.getters.username
+            ? this.$store.getters.username
+            : ''
         })
         if (param.type === 'edit') {
           this.showEdit = true

src/views/consumablesManagement/inAndOutRecords.vue

@@ -197,7 +197,6 @@ export default {
   methods: {
     getList() {
       getOutInRecordRecord({ ...this.listQuery }).then((res) => {
-        console.log(res)
         if (res.code === 0) {
           this.total = res.data.total
           this.tableData = res.data.records
@@ -205,7 +204,6 @@ export default {
       })
     },
     selectChanged(val) {
-      console.log(val)
       if (val.value) {
         let id = null
         let line = JSON.parse(localStorage.getItem('publicList')).proLineVoList
@@ -217,6 +215,8 @@ export default {
           })
         sideLibraryList({ id }).then((res) => {
           if (res.code === 0) {
+            this.formConfig[0].defaultSelect =
+              this.$refs.searchBarForm.formInline.timeVal
             this.formConfig[3].selectOptions = res.data
             this.formConfig[3].defaultSelect = null
           }
@@ -225,14 +225,12 @@ export default {
     },
     getMaterialList() {
       materialList().then((res) => {
-        console.log(res)
         if (res.code === 0) {
           this.formConfig[4].selectOptions = res.data
         }
       })
     },
     buttonClick(val) {
-      console.log(val)
       if (val.btnName === 'search') {
         this.listQuery.startTime = val.timeVal ? val.timeVal[0] : ''
         this.listQuery.endTime = val.timeVal ? val.timeVal[1] : ''

src/views/consumablesManagement/materialTracking.vue

@@ -13,6 +13,12 @@
       :max-height="tableH"
       :row-class-name="tableRowClassName"
     />
+    <pagination
+      :page.sync="listQuery.current"
+      :limit.sync="listQuery.size"
+      :total="total"
+      @pagination="getList"
+    />
     <!-- 设置预警值 -->
     <base-dialog
       dialogTitle="设置预警值"
@@ -108,11 +114,11 @@ export default {
       ],
       tableProps,
       tableData: [],
-      tableH: tableHeight(230),
+      tableH: tableHeight(270),
       total: 0,
       listQuery: {
         current: 1,
-        size: 1000,
+        size: 20,
         proLineId: '',
         stockId: ''
       },
@@ -121,7 +127,7 @@ export default {
   },
   mounted() {
     window.addEventListener('resize', () => {
-      this.tableH = tableHeight(230)
+      this.tableH = tableHeight(270)
     })
     this.getList()
   },
@@ -129,7 +135,8 @@ export default {
     getList() {
       onlineMaterialTrackSelect({ ...this.listQuery }).then((res) => {
         if (res.code === 0) {
-          this.tableData = res.data
+          this.tableData = res.data.records
+          this.total = res.data.total ? res.data.total : 0
         }
       })
     },