From dc5dc45893bf38f09b5782ce4800156f185015de Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Thu, 13 Mar 2025 10:19:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=80=97=E6=9D=90=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/product/cons.ts                       |   8 +
 src/components/CURD/PageContent.vue           | 286 +++++++++++++-----
 .../consumables/components/DataStatistics.vue | 116 +++++++
 src/views/inventory/consumables/index.vue     |  59 ++--
 4 files changed, 367 insertions(+), 102 deletions(-)
 create mode 100644 src/views/inventory/consumables/components/DataStatistics.vue

diff --git a/src/api/product/cons.ts b/src/api/product/cons.ts
index 8261110..d271800 100644
--- a/src/api/product/cons.ts
+++ b/src/api/product/cons.ts
@@ -63,6 +63,14 @@ const Api = {
       method: "post",
     });
   },
+  // 统计
+  statistics(params: any) {
+    return request<any>({
+      url: `${baseURL}/statistics`,
+      method: "get",
+      params
+    });
+  },
 };
 
 
diff --git a/src/components/CURD/PageContent.vue b/src/components/CURD/PageContent.vue
index 59a4f6a..1af79c3 100644
--- a/src/components/CURD/PageContent.vue
+++ b/src/components/CURD/PageContent.vue
@@ -8,37 +8,58 @@
           <template v-if="typeof item === 'string'">
             <!-- 新增 -->
             <template v-if="item === 'add'">
-              <el-button v-hasPerm="[`${contentConfig.pageName}:${item}`]" type="primary" icon="plus"
-                @click="handleToolbar(item)">
+              <el-button
+                v-hasPerm="[`${contentConfig.pageName}:${item}`]"
+                type="primary"
+                icon="plus"
+                @click="handleToolbar(item)"
+              >
                 新增
               </el-button>
             </template>
             <!-- 删除 -->
             <template v-else-if="item === 'delete'">
-              <el-button v-hasPerm="[`${contentConfig.pageName}:${item}`]" type="danger" icon="delete"
-                :disabled="removeIds.length === 0" @click="handleToolbar(item)">
+              <el-button
+                v-hasPerm="[`${contentConfig.pageName}:${item}`]"
+                type="danger"
+                icon="delete"
+                :disabled="removeIds.length === 0"
+                @click="handleToolbar(item)"
+              >
                 删除
               </el-button>
             </template>
             <!-- 导入 -->
             <template v-else-if="item === 'import'">
-              <el-button v-hasPerm="[`${contentConfig.pageName}:${item}`]" type="default" icon="upload"
-                @click="handleToolbar(item)">
+              <el-button
+                v-hasPerm="[`${contentConfig.pageName}:${item}`]"
+                type="default"
+                icon="upload"
+                @click="handleToolbar(item)"
+              >
                 导入
               </el-button>
             </template>
             <!-- 导出 -->
             <template v-else-if="item === 'export'">
-              <el-button v-hasPerm="[`${contentConfig.pageName}:${item}`]" type="default" icon="download"
-                @click="handleToolbar(item)">
+              <el-button
+                v-hasPerm="[`${contentConfig.pageName}:${item}`]"
+                type="default"
+                icon="download"
+                @click="handleToolbar(item)"
+              >
                 导出
               </el-button>
             </template>
           </template>
           <!-- 其他 -->
           <template v-else-if="typeof item === 'object'">
-            <el-button v-hasPerm="[`${contentConfig.pageName}:${item.auth}`]" :icon="item.icon"
-              :type="item.type ?? 'default'" @click="handleToolbar(item.name)">
+            <el-button
+              v-hasPerm="[`${contentConfig.pageName}:${item.auth}`]"
+              :icon="item.icon"
+              :type="item.type ?? 'default'"
+              @click="handleToolbar(item.name)"
+            >
               {{ item.text }}
             </el-button>
           </template>
@@ -67,36 +88,68 @@
             </template>
             <!-- 导出 -->
             <template v-else-if="item === 'exports'">
-              <el-button v-hasPerm="[`${contentConfig.pageName}:export`]" icon="download" circle title="导出"
-                @click="handleToolbar(item)" />
+              <el-button
+                v-hasPerm="[`${contentConfig.pageName}:export`]"
+                icon="download"
+                circle
+                title="导出"
+                @click="handleToolbar(item)"
+              />
             </template>
             <!-- 导入 -->
             <template v-else-if="item === 'imports'">
-              <el-button v-hasPerm="[`${contentConfig.pageName}:import`]" icon="upload" circle title="导入"
-                @click="handleToolbar(item)" />
+              <el-button
+                v-hasPerm="[`${contentConfig.pageName}:import`]"
+                icon="upload"
+                circle
+                title="导入"
+                @click="handleToolbar(item)"
+              />
             </template>
             <!-- 搜索 -->
             <template v-else-if="item === 'search'">
-              <el-button v-hasPerm="[`${contentConfig.pageName}:query`]" icon="search" circle title="搜索"
-                @click="handleToolbar(item)" />
+              <el-button
+                v-hasPerm="[`${contentConfig.pageName}:query`]"
+                icon="search"
+                circle
+                title="搜索"
+                @click="handleToolbar(item)"
+              />
             </template>
           </template>
           <!-- 其他 -->
           <template v-else-if="typeof item === 'object'">
             <template v-if="item.auth">
-              <el-button v-hasPerm="[`${contentConfig.pageName}:${item.auth}`]" :icon="item.icon" circle
-                :title="item.title" @click="handleToolbar(item.name)" />
+              <el-button
+                v-hasPerm="[`${contentConfig.pageName}:${item.auth}`]"
+                :icon="item.icon"
+                circle
+                :title="item.title"
+                @click="handleToolbar(item.name)"
+              />
             </template>
             <template v-else>
-              <el-button :icon="item.icon" circle :title="item.title" @click="handleToolbar(item.name)" />
+              <el-button
+                :icon="item.icon"
+                circle
+                :title="item.title"
+                @click="handleToolbar(item.name)"
+              />
             </template>
           </template>
         </template>
       </div>
     </div>
     <!-- 列表 -->
-    <el-table ref="tableRef" v-loading="loading" v-bind="contentConfig.table" :data="pageData" :row-key="pk"
-      @selection-change="handleSelectionChange" @filter-change="handleFilterChange">
+    <el-table
+      ref="tableRef"
+      v-loading="loading"
+      v-bind="contentConfig.table"
+      :data="pageData"
+      :row-key="pk"
+      @selection-change="handleSelectionChange"
+      @filter-change="handleFilterChange"
+    >
       <template v-for="col in cols" :key="col">
         <el-table-column v-if="col.show" v-bind="col">
           <template #default="scope">
@@ -105,15 +158,24 @@
               <template v-if="col.prop">
                 <template v-if="Array.isArray(scope.row[col.prop])">
                   <template v-for="(item, index) in scope.row[col.prop]" :key="item">
-                    <el-image :src="item" :preview-src-list="scope.row[col.prop]" :initial-index="index"
-                      :preview-teleported="true" :style="`width: ${col.imageWidth ?? 40}px; height: ${col.imageHeight ?? 40
-                        }px`" />
+                    <el-image
+                      :src="item"
+                      :preview-src-list="scope.row[col.prop]"
+                      :initial-index="index"
+                      :preview-teleported="true"
+                      :style="`width: ${col.imageWidth ?? 40}px; height: ${
+                        col.imageHeight ?? 40
+                      }px`"
+                    />
                   </template>
                 </template>
                 <template v-else>
-                  <el-image :src="scope.row[col.prop]" :preview-src-list="[scope.row[col.prop]]"
+                  <el-image
+                    :src="scope.row[col.prop]"
+                    :preview-src-list="[scope.row[col.prop]]"
                     :preview-teleported="true"
-                    :style="`width: ${col.imageWidth ?? 40}px; height: ${col.imageHeight ?? 40}px`" />
+                    :style="`width: ${col.imageWidth ?? 40}px; height: ${col.imageHeight ?? 40}px`"
+                  />
                 </template>
               </template>
             </template>
@@ -135,20 +197,30 @@
             <template v-else-if="col.templet === 'switch'">
               <template v-if="col.prop">
                 <!-- pageData.length>0: 解决el-switch组件会在表格初始化的时候触发一次change事件 -->
-                <el-switch v-model="scope.row[col.prop]" :active-value="col.activeValue ?? 1"
-                  :inactive-value="col.inactiveValue ?? 0" :inline-prompt="true" :active-text="col.activeText ?? ''"
-                  :inactive-text="col.inactiveText ?? ''" :validate-event="false"
-                  :disabled="!hasAuth(`${contentConfig.pageName}:modify`)" @change="
+                <el-switch
+                  v-model="scope.row[col.prop]"
+                  :active-value="col.activeValue ?? 1"
+                  :inactive-value="col.inactiveValue ?? 0"
+                  :inline-prompt="true"
+                  :active-text="col.activeText ?? ''"
+                  :inactive-text="col.inactiveText ?? ''"
+                  :validate-event="false"
+                  :disabled="!hasAuth(`${contentConfig.pageName}:modify`)"
+                  @change="
                     pageData.length > 0 && handleModify(col.prop, scope.row[col.prop], scope.row)
-                    " />
+                  "
+                />
               </template>
             </template>
             <!-- 生成输入框组件 -->
             <template v-else-if="col.templet === 'input'">
               <template v-if="col.prop">
-                <el-input v-model="scope.row[col.prop]" :type="col.inputType ?? 'text'"
+                <el-input
+                  v-model="scope.row[col.prop]"
+                  :type="col.inputType ?? 'text'"
                   :disabled="!hasAuth(`${contentConfig.pageName}:modify`)"
-                  @blur="handleModify(col.prop, scope.row[col.prop], scope.row)" />
+                  @blur="handleModify(col.prop, scope.row[col.prop], scope.row)"
+                />
               </template>
             </template>
             <!-- 格式化为价格 -->
@@ -180,7 +252,7 @@
                 {{
                   scope.row[col.prop]
                     ? useDateFormat(scope.row[col.prop], col.dateFormat ?? "YYYY-MM-DD HH:mm:ss")
-                      .value
+                        .value
                     : ""
                 }}
               </template>
@@ -191,15 +263,21 @@
                 <template v-if="typeof item === 'string'">
                   <!-- 编辑/删除 -->
                   <template v-if="item === 'edit' || item === 'delete'">
-                    <el-button v-hasPerm="[`${contentConfig.pageName}:${item}`]"
-                      :type="item === 'edit' ? 'primary' : 'danger'" :icon="item" size="small" link @click="
+                    <el-button
+                      v-hasPerm="[`${contentConfig.pageName}:${item}`]"
+                      :type="item === 'edit' ? 'primary' : 'danger'"
+                      :icon="item"
+                      size="small"
+                      link
+                      @click="
                         handleOperat({
                           name: item,
                           row: scope.row,
                           column: scope.column,
                           $index: scope.$index,
                         })
-                        ">
+                      "
+                    >
                       {{ item === "edit" ? "编辑" : "删除" }}
                     </el-button>
                   </template>
@@ -207,28 +285,41 @@
                 <!-- 其他 -->
                 <template v-else-if="typeof item === 'object'">
                   <el-dropdown>
-                    <el-button v-if="item.render === undefined || item.render(scope.row)" v-bind="item.auth ? { 'v-hasPerm': [`${contentConfig.pageName}:${item.auth}`] } : {}
-                      " :icon="item.icon" :type="item.type ?? 'primary'" size="small" link @click="
+                    <el-button
+                      v-if="item.render === undefined || item.render(scope.row)"
+                      v-bind="
+                        item.auth ? { 'v-hasPerm': [`${contentConfig.pageName}:${item.auth}`] } : {}
+                      "
+                      :icon="item.icon"
+                      :type="item.type ?? 'primary'"
+                      size="small"
+                      link
+                      @click="
                         handleOperat({
                           name: item.name,
                           row: scope.row,
                           column: scope.column,
                           $index: scope.$index,
                         })
-                        ">
+                      "
+                    >
                       {{ item.text }}
                     </el-button>
                     <template #dropdown v-if="item.options && item.options.length > 0">
                       <el-dropdown-menu>
-                        <el-dropdown-item @click="
-                          handleOperat({
-                            name: item.name,
-                            row: scope.row,
-                            column: scope.column,
-                            $index: scope.$index,
-                            command: opt.command ? opt.command : '',
-                          })
-                          " v-for="opt in item.options" :key="opt.value">
+                        <el-dropdown-item
+                          @click="
+                            handleOperat({
+                              name: item.name,
+                              row: scope.row,
+                              column: scope.column,
+                              $index: scope.$index,
+                              command: opt.command ? opt.command : '',
+                            })
+                          "
+                          v-for="opt in item.options"
+                          :key="opt.value"
+                        >
                           {{ opt.label }}
                         </el-dropdown-item>
                       </el-dropdown-menu>
@@ -249,18 +340,33 @@
     <template v-if="showPagination">
       <el-scrollbar>
         <div class="mt-[12px]">
-          <el-pagination v-bind="pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+          <el-pagination
+            v-bind="pagination"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
         </div>
       </el-scrollbar>
     </template>
     <!-- 导出弹窗 -->
-    <el-dialog v-model="exportsModalVisible" :align-center="true" title="导出数据" width="600px" style="padding-right: 0"
-      @close="handleCloseExportsModal">
+    <el-dialog
+      v-model="exportsModalVisible"
+      :align-center="true"
+      title="导出数据"
+      width="600px"
+      style="padding-right: 0"
+      @close="handleCloseExportsModal"
+    >
       <!-- 滚动 -->
       <el-scrollbar max-height="60vh">
         <!-- 表单 -->
-        <el-form ref="exportsFormRef" label-width="auto" style="padding-right: var(--el-dialog-padding-primary)"
-          :model="exportsFormData" :rules="exportsFormRules">
+        <el-form
+          ref="exportsFormRef"
+          label-width="auto"
+          style="padding-right: var(--el-dialog-padding-primary)"
+          :model="exportsFormData"
+          :rules="exportsFormRules"
+        >
           <el-form-item label="文件名" prop="filename">
             <el-input v-model="exportsFormData.filename" clearable />
           </el-form-item>
@@ -270,10 +376,16 @@
           <el-form-item label="数据源" prop="origin">
             <el-select v-model="exportsFormData.origin">
               <el-option label="当前数据 (当前页的数据)" :value="ExportsOriginEnum.CURRENT" />
-              <el-option label="选中数据 (所有选中的数据)" :value="ExportsOriginEnum.SELECTED"
-                :disabled="selectionData.length <= 0" />
-              <el-option label="全量数据 (所有分页的数据)" :value="ExportsOriginEnum.REMOTE"
-                :disabled="contentConfig.exportsAction === undefined" />
+              <el-option
+                label="选中数据 (所有选中的数据)"
+                :value="ExportsOriginEnum.SELECTED"
+                :disabled="selectionData.length <= 0"
+              />
+              <el-option
+                label="全量数据 (所有分页的数据)"
+                :value="ExportsOriginEnum.REMOTE"
+                :disabled="contentConfig.exportsAction === undefined"
+              />
             </el-select>
           </el-form-item>
           <el-form-item label="字段" prop="fields">
@@ -294,17 +406,35 @@
       </template>
     </el-dialog>
     <!-- 导入弹窗 -->
-    <el-dialog v-model="importModalVisible" :align-center="true" title="导入数据" width="600px" style="padding-right: 0"
-      @close="handleCloseImportModal">
+    <el-dialog
+      v-model="importModalVisible"
+      :align-center="true"
+      title="导入数据"
+      width="600px"
+      style="padding-right: 0"
+      @close="handleCloseImportModal"
+    >
       <!-- 滚动 -->
       <el-scrollbar max-height="60vh">
         <!-- 表单 -->
-        <el-form ref="importFormRef" label-width="auto" style="padding-right: var(--el-dialog-padding-primary)"
-          :model="importFormData" :rules="importFormRules">
+        <el-form
+          ref="importFormRef"
+          label-width="auto"
+          style="padding-right: var(--el-dialog-padding-primary)"
+          :model="importFormData"
+          :rules="importFormRules"
+        >
           <el-form-item label="文件名" prop="files">
-            <el-upload ref="uploadRef" v-model:file-list="importFormData.files" class="w-full"
+            <el-upload
+              ref="uploadRef"
+              v-model:file-list="importFormData.files"
+              class="w-full"
               accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
-              :drag="true" :limit="1" :auto-upload="false" :on-exceed="handleFileExceed">
+              :drag="true"
+              :limit="1"
+              :auto-upload="false"
+              :on-exceed="handleFileExceed"
+            >
               <el-icon class="el-icon--upload"><upload-filled /></el-icon>
               <div class="el-upload__text">
                 <span>将文件拖到此处，或</span>
@@ -313,8 +443,13 @@
               <template #tip>
                 <div class="el-upload__tip">
                   *.xlsx / *.xls
-                  <el-link v-if="contentConfig.importTemplate" type="primary" icon="download" :underline="false"
-                    @click="handleDownloadTemplate">
+                  <el-link
+                    v-if="contentConfig.importTemplate"
+                    type="primary"
+                    icon="download"
+                    :underline="false"
+                    @click="handleDownloadTemplate"
+                  >
                     下载模板
                   </el-link>
                 </div>
@@ -326,7 +461,11 @@
       <!-- 弹窗底部操作按钮 -->
       <template #footer>
         <div style="padding-right: var(--el-dialog-padding-primary)">
-          <el-button type="primary" :disabled="importFormData.files.length === 0" @click="handleImportSubmit">
+          <el-button
+            type="primary"
+            :disabled="importFormData.files.length === 0"
+            @click="handleImportSubmit"
+          >
             确 定
           </el-button>
           <el-button @click="handleCloseImportModal">取 消</el-button>
@@ -743,7 +882,7 @@ function handleOperat(data: IOperatData) {
 
 // 属性修改
 function handleModify(field: string, value: boolean | string | number, row: Record<string, any>) {
-  console.log(1111111111111111111111111)
+  console.log(1111111111111111111111111);
   if (props.contentConfig.modifyAction) {
     props.contentConfig.modifyAction({
       [pk]: row[pk],
@@ -803,14 +942,13 @@ function fetchPageData(formData: IObject = {}, isRestart = false) {
     .indexAction(
       showPagination
         ? {
-          [request.pageName]: pagination.currentPage,
-          [request.limitName]: pagination.pageSize,
-          ...formData,
-        }
+            [request.pageName]: pagination.currentPage,
+            [request.limitName]: pagination.pageSize,
+            ...formData,
+          }
         : formData
     )
     .then((data) => {
-
       if (showPagination) {
         if (props.contentConfig.parseData) {
           data = props.contentConfig.parseData(data);
@@ -871,7 +1009,7 @@ function saveXlsx(fileData: BlobPart, fileName: string) {
 }
 
 // 暴露的属性和方法
-defineExpose({ fetchPageData, exportPageData, getFilterParams, getselectTable });
+defineExpose({ fetchPageData, exportPageData, getFilterParams, getselectTable, pagination });
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/src/views/inventory/consumables/components/DataStatistics.vue b/src/views/inventory/consumables/components/DataStatistics.vue
new file mode 100644
index 0000000..e6ecd3d
--- /dev/null
+++ b/src/views/inventory/consumables/components/DataStatistics.vue
@@ -0,0 +1,116 @@
+<template>
+  <div class="DataStatistics">
+    <div style="width: 200px">
+      <el-icon class="iconStyle">
+        <UserFilled />
+      </el-icon>
+      <span>耗材种数</span>
+      <span class="font-700">{{ data.totalRow || 0 }}</span>
+    </div>
+    <div style="width: 300px">
+      <el-icon class="iconStyle">
+        <UserFilled />
+      </el-icon>
+      <div>
+        <div>
+          <span>增加数量：</span>
+          <span class="num">{{ data.inSumTotal || 0 }}</span>
+        </div>
+        <div style="display: flex">
+          <div>
+            <span>手动增加：</span>
+            <span class="num">{{ data.winInNum || 0 }}</span>
+          </div>
+          <span style="margin: 0 20px; color: #ccc">|</span>
+          <div>
+            <span>入库：</span>
+            <span class="num">{{ data.stockInNum || 0 }}</span>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div style="width: 500px">
+      <el-icon class="iconStyle">
+        <UserFilled />
+      </el-icon>
+      <div>
+        <div>
+          <span>减少数量：</span>
+          <span class="num">{{ data.outSumTotal || 0 }}</span>
+        </div>
+        <div style="display: flex">
+          <div>
+            <span>手动减少：</span>
+            <span class="num">{{ data.lossOutNum || 0 }}</span>
+          </div>
+          <span style="margin: 0 20px; color: #ccc">|</span>
+          <div>
+            <span>消耗：</span>
+            <span class="num">{{ data.consumeNum || 0 }}</span>
+          </div>
+          <span style="margin: 0 20px; color: #ccc">|</span>
+          <div>
+            <span>报损：</span>
+            <span class="num">{{ data.damageNum || 0 }}</span>
+          </div>
+          <span style="margin: 0 20px; color: #ccc">|</span>
+          <div>
+            <span>出库：</span>
+            <span class="num">{{ data.stockOutNum || 0 }}</span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script setup>
+const props = defineProps({
+  data: {
+    type: Object,
+    default: () => {
+      return {};
+    },
+  },
+});
+</script>
+
+
+<style scoped lang="scss">
+.DataStatistics {
+  border: 1px solid #e4e7ed;
+  background-color: #fff;
+  border-radius: 4px;
+  margin-top: 12px;
+  margin-bottom: 12px;
+  padding: 20px;
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+
+  > div {
+    height: 80px;
+    background-color: #f4f9ff;
+    display: flex;
+    align-items: center;
+    justify-content: space-around;
+
+    padding: 20px;
+
+    .iconStyle {
+      background-color: #d4e9fe;
+      border-radius: 50%;
+      padding: 6px;
+      font-size: 36px;
+      color: #3f9eff;
+    }
+
+    span {
+      color: #666;
+      font-size: 14px;
+      &.num {
+        color: #3f9eff;
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/inventory/consumables/index.vue b/src/views/inventory/consumables/index.vue
index f66fbf3..041cb92 100644
--- a/src/views/inventory/consumables/index.vue
+++ b/src/views/inventory/consumables/index.vue
@@ -5,9 +5,11 @@
     <page-search
       ref="searchRef"
       :search-config="searchConfig"
-      @query-click="handleQueryClick"
+      @query-click="newHandleQueryClick"
       @reset-click="handleResetClick"
     />
+    <!-- 统计 -->
+    <data-tongji :data="gongjiData"></data-tongji>
     <!-- 列表 -->
     <page-content
       ref="contentRef"
@@ -92,15 +94,15 @@
 
 <script setup lang="ts">
 import addHaocai from "./components/add-haocai.vue";
+import dataTongji from "./components/DataStatistics.vue";
 import addConsTakin from "./components/addConsTakin.vue";
-import orderApi, { type getListResponse, OrderInfoVo } from "@/api/order/order";
+import consApi from "@/api/product/cons";
 import type { IObject, IOperatData } from "@/components/CURD/types";
 import usePage from "@/components/CURD/usePage";
 import contentConfig from "./config/content";
 import editModalConfig from "./config/edit";
 import searchConfig from "./config/search";
 import { returnOptionsLabel } from "./config/config";
-
 const router = useRouter();
 const {
   searchRef,
@@ -113,6 +115,26 @@ const {
   handleSearchClick,
   handleFilterChange,
 } = usePage();
+//统计数据
+const gongjiData = reactive({ totalRow: 0 });
+function getTongji(params: IObject | undefined) {
+  consApi.statistics(params).then((res) => {
+    Object.assign(gongjiData, res);
+  });
+}
+
+function newHandleQueryClick(e: IObject | undefined) {
+  const filterParams = contentRef.value?.getFilterParams();
+  contentRef.value?.fetchPageData({ ...e, ...filterParams }, true);
+  getTongji(e);
+}
+
+watch(
+  () => contentRef.value?.pagination.total,
+  (newval) => {
+    gongjiData.totalRow = newval as number;
+  }
+);
 
 //耗材盘点
 const refAddHaocaiTakin = ref();
@@ -123,14 +145,15 @@ function refAddHaocaiTakinShow(item: any) {
 function refresh() {
   console.log("refresh");
   contentRef.value?.fetchPageData();
+  getTongji(undefined);
 }
 const refAddHaocai = ref();
-function refAddHaocaiOpen(item) {
+function refAddHaocaiOpen(item: any) {
   refAddHaocai.value.open(item);
 }
 // 新增
 async function handleAddClick() {
-  refAddHaocaiOpen();
+  refAddHaocaiOpen(undefined);
 }
 // 编辑
 async function handleEditClick(row: IObject) {
@@ -184,29 +207,9 @@ function returnStateType(status: string) {
   }
 }
 
-const route = useRouter();
-// 结账
-function toPayOrder(order: getListResponse) {
-  route.push({
-    path: "/tool/index",
-    query: {
-      id: order.id,
-    },
-  });
-}
-//详情
-const refDetail = ref();
-function showdetail(row: OrderInfoVo) {
-  refDetail.value.show(row);
-}
-function toGoods(id: number) {
-  router.push({
-    path: "/product/index",
-    query: {
-      id,
-    },
-  });
-}
+onMounted(() => {
+  getTongji({});
+});
 </script>
 
 <style scoped lang="scss">