From 67ec602c8625f3342f209ca616ded42b93acce01 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Fri, 24 Mar 2023 19:17:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B1=87=E6=80=BB=E7=9B=B8=E5=85=B3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .eslintrc.js                             |  2 +-
 src/views/inout/IoCreateOrder.vue        |  2 +-
 src/views/inout/stat/IoStatDaySearch.vue | 40 ++++++++++++++++--------
 3 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 82bbdeea..af337949 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -190,7 +190,7 @@ module.exports = {
     'yield-star-spacing': [2, 'both'],
     'yoda': [2, 'never'],
     'prefer-const': 2,
-    'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
+    'no-': process.env.NODE_ENV === 'production' ? 2 : 0,
     'object-curly-spacing': [2, 'always', {
       objectsInObjects: false
     }],
diff --git a/src/views/inout/IoCreateOrder.vue b/src/views/inout/IoCreateOrder.vue
index 85623327..ff194daf 100644
--- a/src/views/inout/IoCreateOrder.vue
+++ b/src/views/inout/IoCreateOrder.vue
@@ -265,7 +265,6 @@ export default {
         mainAction: null,
         action: null,
         statusType: "newOrder",
-        busType: 2,
         page: 1,
         limit: 10,
         startTime: null,
@@ -274,6 +273,7 @@ export default {
         invCode: this.$store.getters.locInvCode,
 
       },
+      viewType: 3,
       corpLoading: false,
       fromOptions: [],
       checkStatus: {
diff --git a/src/views/inout/stat/IoStatDaySearch.vue b/src/views/inout/stat/IoStatDaySearch.vue
index e7838837..871f5fa4 100644
--- a/src/views/inout/stat/IoStatDaySearch.vue
+++ b/src/views/inout/stat/IoStatDaySearch.vue
@@ -33,6 +33,10 @@
             >查询
             </el-button
             >
+            <el-button type="primary" icon="el-icon-search" @click="onSubmit"
+            >汇总
+            </el-button
+            >
           </el-button-group>
         </el-form-item>
       </el-form>
@@ -42,8 +46,8 @@
                 @current-change="handleSelectionChange">
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="名称" prop="title"></el-table-column>
         <el-table-column label="记录号" prop="recordKey"></el-table-column>
+        <el-table-column label="名称" prop="title"></el-table-column>
         <el-table-column label="汇总日期" prop="date"></el-table-column>
         <el-table-column label="备注" prop="remark"></el-table-column>
       </el-table>
@@ -111,18 +115,28 @@
           <el-table-column label="产品通用名称" prop="productName" show-overflow-tooltip></el-table-column>
           <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
           <el-table-column label="批次号" prop="batchNo" show-overflow-tooltip></el-table-column>
-          <el-table-column label="期初数量" prop="beginCount"></el-table-column>
-          <el-table-column label="期初价格" prop="beginPrice"></el-table-column>
-          <el-table-column label="期初金额" prop="beginAmount"></el-table-column>
-          <el-table-column label="入库数量" prop="inCount"></el-table-column>
-          <el-table-column label="入库价格" prop="inPrice"></el-table-column>
-          <el-table-column label="入库金额" prop="inAmount"></el-table-column>
-          <el-table-column label="出库数量" prop="outCount"></el-table-column>
-          <el-table-column label="出库价格" prop="outPrice"></el-table-column>
-          <el-table-column label="出库金额" prop="outAmount"></el-table-column>
-          <el-table-column label="结余数量" prop="balanceCount"></el-table-column>
-          <el-table-column label="结余价格" prop="balancePrice"></el-table-column>
-          <el-table-column label="结余金额" prop="balanceAmount"></el-table-column>
+          <el-table-column label="期初" header-align="center">
+            <el-table-column label="数量" prop="beginCount"></el-table-column>
+            <el-table-column label="价格" prop="beginPrice"></el-table-column>
+            <el-table-column label="金额" prop="beginAmount"></el-table-column>
+          </el-table-column>
+          <el-table-column label="入库" header-align="center">
+            <el-table-column label="数量" prop="inCount"></el-table-column>
+            <el-table-column label="价格" prop="inPrice"></el-table-column>
+            <el-table-column label="金额" prop="inAmount"></el-table-column>
+          </el-table-column>
+          <el-table-column label="出库" header-align="center">
+            <el-table-column label="数量" prop="outCount"></el-table-column>
+            <el-table-column label="价格" prop="outPrice"></el-table-column>
+            <el-table-column label="金额" prop="outAmount"></el-table-column>
+          </el-table-column>
+
+          <el-table-column label="结余" header-align="center">
+            <el-table-column label="数量" prop="balanceCount"></el-table-column>
+            <el-table-column label="价格" prop="balancePrice"></el-table-column>
+            <el-table-column label="金额" prop="balanceAmount"></el-table-column>
+          </el-table-column>
+
         </el-table>
         <pagination
           v-show="detailTotal>0"