From 8f43c079b94593e770d0d58d9004d92ebc2dfeaf Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Mon, 3 Jul 2023 11:32:50 +0800
Subject: [PATCH] dateTimeFtt

---
 src/pages/modules/finished/finished-instore-search.vue | 9 +++++----
 src/pages/modules/finished/select-finished-mater.vue   | 8 +++++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/pages/modules/finished/finished-instore-search.vue b/src/pages/modules/finished/finished-instore-search.vue
index 2eb2cf9..1658b11 100644
--- a/src/pages/modules/finished/finished-instore-search.vue
+++ b/src/pages/modules/finished/finished-instore-search.vue
@@ -89,8 +89,8 @@
                         <td>{{e.bill_type}}</td>
                         <td>{{e.material_code}}</td>
                         <td>{{e.material_name}}</td>
-                        <td>{{e.total_qty}}</td>
-                        <td>{{e.unit_weight}}</td>
+                        <td>{{e.total_qty | numeric(3)}}</td>
+                        <td>{{e.unit_weight | numeric(3)}}</td>
                         <td>{{e.storagevehicle_code}}</td>
                         <td>{{e.point_code}}</td>
                         <td>{{e.struct_code}}</td>
@@ -105,6 +105,7 @@
 
 <script>
 import { outgetAll, inconfirm } from '../../../config/getData1.js'
+import {dateTimeFtt} from '@config/utils.js'
 export default {
   data () {
     return {
@@ -112,7 +113,7 @@ export default {
       val2: '',
       options1: [],
       value1: '',
-      date: [new Date((new Date().getTime() - 24 * 60 * 60 * 1000)), new Date((new Date().getTime() + 24 * 60 * 60 * 1000))],
+      date: [new Date((new Date().getTime() - 6 * 24 * 60 * 60 * 1000)), new Date((new Date().getTime()))],
       options2: [],
       value2: '',
       dataList: [{bill_code: '030301010031'}],
@@ -127,7 +128,7 @@ export default {
   methods: {
     // 查询
     async _outgetAll () {
-      let res = await outgetAll(this.value1, this.date, this.value2, this.val1, this.val2)
+      let res = await outgetAll(this.value1, this.date !== null ? dateTimeFtt(this.date[0]) : '', this.date !== null ? dateTimeFtt(this.date[1]) : '', this.value2, this.val1, this.val2)
       this.dataList = [...res.data]
     },
     toRadio (e) {
diff --git a/src/pages/modules/finished/select-finished-mater.vue b/src/pages/modules/finished/select-finished-mater.vue
index da29a8c..497fb69 100644
--- a/src/pages/modules/finished/select-finished-mater.vue
+++ b/src/pages/modules/finished/select-finished-mater.vue
@@ -58,7 +58,7 @@
                         <td>{{e.bucketunique}}</td>
                         <td>{{e.material_code}}</td>
                         <td>{{e.material_name}}</td>
-                        <td>{{e.sale_qty}}</td>
+                        <td>{{e.sale_qty | numeric(3)}}</td>
                         <td>{{e.qty_unit_name}}</td>
                     </tr>
                 </tbody>
@@ -69,12 +69,13 @@
 
 <script>
 import { getMaterial } from '../../../config/getData1.js'
+import {dateTimeFtt} from '@config/utils.js'
 export default {
   data () {
     return {
       val1: '',
       val2: '',
-      date: [new Date((new Date().getTime() - 24 * 60 * 60 * 1000)), new Date((new Date().getTime() + 24 * 60 * 60 * 1000))],
+      date: [new Date((new Date().getTime() - 6 * 24 * 60 * 60 * 1000)), new Date((new Date().getTime()))],
       dataList: [{sale_code: '030301010031'}],
       pkId: '',
       pkObj: {}
@@ -86,7 +87,7 @@ export default {
   methods: {
     // 查询
     async _getMaterial () {
-      let res = await getMaterial(this.date, this.val1, this.val2)
+      let res = await getMaterial(this.date !== null ? dateTimeFtt(this.date[0]) : '', this.date !== null ? dateTimeFtt(this.date[1]) : '', this.val1, this.val2)
       this.dataList = [...res.data]
     },
     toRadio (e) {
@@ -94,6 +95,7 @@ export default {
       this.pkObj = this.pkId === e.sale_code ? e : {}
     },
     toSure () {
+      this.$store.dispatch('setMaterObj', JSON.stringify(this.pkObj))
       this.$router.push('/finishedinstore')
     },
     clear () {