From af6637e86ee2d6e5ae8ba782228a553cf72f1f2f Mon Sep 17 00:00:00 2001
From: Amjacks <1932302177@qq.com>
Date: Thu, 3 Apr 2025 10:47:27 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=9C=A8=E5=BA=93=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E3=80=81=E5=85=A5=E5=BA=93=E5=8D=95=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../materialBoxStockedQuery/index.vue         | 12 +++------
 src/views/Query/StockQuery/StockIn/index.vue  | 26 ++++++++-----------
 2 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/src/views/Query/BasicQuery/materialBoxStockedQuery/index.vue b/src/views/Query/BasicQuery/materialBoxStockedQuery/index.vue
index 3779e98..150220a 100644
--- a/src/views/Query/BasicQuery/materialBoxStockedQuery/index.vue
+++ b/src/views/Query/BasicQuery/materialBoxStockedQuery/index.vue
@@ -313,7 +313,7 @@
   const size = ref<'default' | 'large' | 'small'>('small');//formdata时间设置
   const state = reactive({
     orgNo:'',
-    PhaseList: [{ label: 'C', Value: 'C' }, { label: 'D', Value: 'D' }, { label: 'S', Value: 'S' }] as any,
+    PhaseList: [{ label: '全部', Value: '' }, { label: 'C', Value: 'C' }, { label: 'D', Value: 'D' }, { label: 'S', Value: 'S' }] as any,
     PackingGradeList:[{ label: '全部', Value: '' },{ label: '合格', Value: 'OK' }, { label: '不合格', Value: 'NG' }] as any,
     resultStateList:[{ label: '全部', Value: '' },{ label: '待质检', Value: 'PREOQA' },{ label: '质检完成', Value: 'END' }] as any,
     ChangeERPLocation: [],
@@ -540,14 +540,8 @@
     state.queryParams.version = 'WEB00034'
     await getQueryPageList(state.queryParams)
             .then((res: any) => {
-              if (res.data.list.length > 0) {
-                state.BoxHistoryList = res.data.list
-                state.total = res.data.total
-              } else {
-                state.BoxHistoryList = res.data.list
-                proxy.$ElMessage.success('查询结果为空');
-              }
-
+              state.BoxHistoryList = res.data.list
+              state.total = res.data.total
             })
     state.queryParams.version = 'WEB00032'
     state.AllNumber = 0
diff --git a/src/views/Query/StockQuery/StockIn/index.vue b/src/views/Query/StockQuery/StockIn/index.vue
index 23ce359..30c7d8a 100644
--- a/src/views/Query/StockQuery/StockIn/index.vue
+++ b/src/views/Query/StockQuery/StockIn/index.vue
@@ -237,6 +237,7 @@ function handleQuery() {
     state.loading = true
     state.list = []
     state.list_d = []
+    state.page_d.total = 0;
     queryFormRef.value.validate((isValid: boolean) => {
         if (isValid) {
             getQueryPageList({
@@ -249,27 +250,22 @@ function handleQuery() {
                 pageNum: state.page.pageNum,
                 pageSize: state.page.pageSize,
             }).then((res: any) => {
-                state.loading = false
-              if(res.data.list.length ==0 ){
-                ElMessageBox.alert('查无数据', '提醒框', {
-                  confirmButtonText: 'OK',
-                })
-              } else {
-                state.list = res.data.list;
-                for(let i=0;i<state.list.length;i++)
-                {
-                  var dates = new Date(state.list[i].ORDERDATE).toJSON();
-                  state.list[i].ORDERDATE=new Date(+new Date(dates) + 8 * 3600 * 1000).toISOString().replace(/T/g, ' ').replace(/\.[\d]{3}Z/, '')
-                  console.log( state.list[i].ORDERDATE);
+              state.loading = false
+              state.list = res.data.list;
+              state.page.total = res.data.total;
+              if (state.list.length > 0) {
+                for (const element of state.list) {
+                  const dates = new Date(element.ORDERDATE).toJSON()
+                  element.ORDERDATE = new Date(+new Date(dates) + 8 * 3600 * 1000)
+                    .toISOString()
+                    .replace(/T/g, ' ')
+                    .replace(/\.[\d]{3}Z/, '')
                 }
-                state.page.total = res.data.total;
-                state.loading = false
                 state.active_row = state.list[0]
                 if (state.active_row) {
                   handleQuery_d()
                 }
               }
-
             });
         }
     });