From 7880748df391004e4779f2ae96471bbd7b72058e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Tue, 10 Oct 2023 19:56:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E8=A3=85=E4=BF=A1=E6=81=AF=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/disposition/tableColumns.ts | 125 +++++++++
 src/views/wms/itempackaging/index.vue | 376 +++++++-------------------
 2 files changed, 217 insertions(+), 284 deletions(-)

diff --git a/src/utils/disposition/tableColumns.ts b/src/utils/disposition/tableColumns.ts
index e16066b89..dde413872 100644
--- a/src/utils/disposition/tableColumns.ts
+++ b/src/utils/disposition/tableColumns.ts
@@ -284,6 +284,131 @@ export const ItemBasicRules = reactive({
   ],
 })
 
+/**
+ * @returns {Array} 基础包装信息
+ */
+export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
+  { 
+    label: '物品代码', 
+    field: 'itemCode',
+    table: {
+      width: 150
+    } 
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true
+  },
+  {
+    label: '包装单位',
+    field: 'stdPackUnit',
+    dictType: DICT_TYPE.PACK_UNIT,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true
+  },
+  { 
+    label: '包装数量', 
+    field: 'stdPackQty'
+  },
+  {
+    label: '替代包装单位',
+    field: 'altPackUnit1',
+    dictType: DICT_TYPE.PACK_UNIT,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true
+  },
+  { 
+    label: '替代包装量', 
+    field: 'altPackQty1'
+  },
+  {
+    label: '替代包装单位',
+    field: 'altPackUnit1',
+    dictType: DICT_TYPE.PACK_UNIT,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true
+  },
+  { 
+    label: '替代包装量', 
+    field: 'altPackQty2'
+  },
+  {
+    label: '替代包装单位',
+    field: 'altPackUnit3',
+    dictType: DICT_TYPE.PACK_UNIT,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true
+  },
+  { 
+    label: '替代包装量', 
+    field: 'altPackQty3'
+  },
+  {
+    label: '替代包装单位',
+    field: 'altPackUnit4',
+    dictType: DICT_TYPE.PACK_UNIT,
+    dictClass: 'string'
+  },
+  { 
+    label: '替代包装量', 
+    field: 'altPackQty4'
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string'
+  },
+  {
+    label: '生效时间',
+    field: 'activeTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    }
+  },
+  {
+    label: '失效时间',
+    field: 'expireTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    }
+  },
+  { 
+    label: '创建者', 
+    field: 'creator'
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    table: {
+      width: 150
+    }
+  }
+]))
+
+
 /**
  * @returns {Array} 基础质量信息
  */
diff --git a/src/views/wms/itempackaging/index.vue b/src/views/wms/itempackaging/index.vue
index 99b8457b9..7fc1c337a 100644
--- a/src/views/wms/itempackaging/index.vue
+++ b/src/views/wms/itempackaging/index.vue
@@ -1,243 +1,47 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="68px"
+    <Search :schema="Itempackaging.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata" 
+    @buttonBaseClick="buttonBaseClick"
+  />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="Itempackaging.allSchemas.tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
     >
-      <el-form-item label="物品代码" prop="itemCode">
-        <el-input
-          v-model="queryParams.itemCode"
-          placeholder="请输入物品代码"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="计量单位" prop="uom">
-        <el-select v-model="queryParams.uom" placeholder="请选择计量单位" clearable class="!w-240px">
-          <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.UOM)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="包装单位" prop="stdPackUnit">
-        <el-select
-          v-model="queryParams.stdPackUnit"
-          placeholder="请选择包装单位"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.PACK_UNIT)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="包装数量" prop="stdPackQty">
-        <el-input
-          v-model="queryParams.stdPackQty"
-          placeholder="请输入包装数量"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="替代包装单位" prop="altPackUnit1">
-        <el-select
-          v-model="queryParams.altPackUnit1"
-          placeholder="请选择替代包装单位"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.PACK_UNIT)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="替代包装量" prop="altPackQty1">
-        <el-input
-          v-model="queryParams.altPackQty1"
-          placeholder="请输入替代包装量"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="替代包装单位" prop="altPackUnit2">
-        <el-select
-          v-model="queryParams.altPackUnit2"
-          placeholder="请选择替代包装单位"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.PACK_UNIT)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="替代包装量" prop="altPackQty2">
-        <el-input
-          v-model="queryParams.altPackQty2"
-          placeholder="请输入替代包装量"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="替代包装单位" prop="altPackUnit3">
-        <el-select
-          v-model="queryParams.altPackUnit3"
-          placeholder="请选择替代包装单位"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.PACK_UNIT)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="替代包装量" prop="altPackQty3">
-        <el-input
-          v-model="queryParams.altPackQty3"
-          placeholder="请输入替代包装量"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="替代包装单位" prop="altPackUnit4">
-        <el-select
-          v-model="queryParams.altPackUnit4"
-          placeholder="请选择替代包装单位"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.PACK_UNIT)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="替代包装量" prop="altPackQty4">
-        <el-input
-          v-model="queryParams.altPackQty4"
-          placeholder="请输入替代包装量"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="是否可用" prop="available">
-        <el-select
-          v-model="queryParams.available"
-          placeholder="请选择是否可用"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.TRUE_FALSE)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="生效时间" prop="activeTime">
-        <el-date-picker
-          v-model="queryParams.activeTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="失效时间" prop="expireTime">
-        <el-date-picker
-          v-model="queryParams.expireTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <el-input
-          v-model="queryParams.remark"
-          placeholder="请输入备注"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="创建者ID" prop="creator">
-        <el-input
-          v-model="queryParams.creator"
-          placeholder="请输入创建者ID"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="info" plain  @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button type="info" plain  @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+      <template #action="{ row }">
         <el-button
+          link
           type="primary"
-          @click="openForm('create')"
-          v-hasPermi="['wms:itempackaging:create']"
+          @click="openForm('update', row.id)"
+          v-hasPermi="['wms:itembasic:update']"
         >
-          <Icon icon="ep:plus" class="mr-5px" /> 新增
+          编辑
         </el-button>
         <el-button
-          type="success"
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['wms:itempackaging:export']"
+          link
+          type="danger"
+          @click="handleDelete(row.id)"
+          v-hasPermi="['wms:itembasic:delete']"
         >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
+          删除
         </el-button>
-      </el-form-item>
-    </el-form>
-  </ContentWrap>
-
-  <!-- 列表 -->
-  <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      </template>
+    </Table>
+    <!-- <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
       <el-table-column label="物品代码" align="center" prop="itemCode" width="150px" />
       <el-table-column label="计量单位" align="center" prop="uom" width="150px">
         <template #default="scope">
@@ -322,14 +126,14 @@
           </el-button>
         </template>
       </el-table-column>
-    </el-table>
+    </el-table> -->
     <!-- 分页 -->
-    <Pagination
+    <!-- <Pagination
       :total="total"
       v-model:page="queryParams.pageNo"
       v-model:limit="queryParams.pageSize"
       @pagination="getList"
-    />
+    /> -->
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
@@ -337,68 +141,71 @@
 </template>
 
 <script setup lang="ts">
-import { DICT_TYPE, getStrDictOptions, getIntDictOptions } from '@/utils/dict'
-import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as ItempackagingApi from '@/api/wms/itempackaging'
 import ItempackagingForm from './ItempackagingForm.vue'
+import { Itempackaging } from '@/utils/disposition/tableColumns'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue' 
 
 defineOptions({ name: 'Itempackaging' })
 
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-
-const loading = ref(true) // 列表的加载中
-const total = ref(0) // 列表的总页数
-const list = ref([]) // 列表的数据
-const queryParams = reactive({
-  pageNo: 1,
-  pageSize: 10,
-  itemCode: null,
-  uom: null,
-  stdPackUnit: null,
-  stdPackQty: null,
-  altPackUnit1: null,
-  altPackQty1: null,
-  altPackUnit2: null,
-  altPackQty2: null,
-  altPackUnit3: null,
-  altPackQty3: null,
-  altPackUnit4: null,
-  altPackQty4: null,
-  available: null,
-  activeTime: [],
-  expireTime: [],
-  remark: null,
-  createTime: [],
-  creator: null
+const { tableObject, tableMethods } = useTable({
+  getListApi: ItempackagingApi.getItempackagingPage // 分页接口
 })
-const queryFormRef = ref() // 搜索的表单
-const exportLoading = ref(false) // 导出的加载中
 
-/** 查询列表 */
-const getList = async () => {
-  loading.value = true
-  try {
-    const data = await ItempackagingApi.getItempackagingPage(queryParams)
-    list.value = data.list
-    total.value = data.total
-  } finally {
-    loading.value = false
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn(null), // 新增
+  defaultButtons.defaultImportBtn(null), // 导入
+  defaultButtons.defaultExportBtn(null), // 导出
+  // defaultButtons.defaultFilterBtn(), // 筛选
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件 
+const buttonBaseClick = (val, item) => {
+    // 新增
+    if (val == 'add') {
+      console.log(417, item)
+    }
+    // 导入
+    else if (val == 'import') {
+
+    }
+    // 导出
+    else if (val == 'export') {
+      handleExport()
+    }
+    // 刷新
+    else if (val == 'refresh') {
+      getList()
+    } 
+    // 筛选
+    else if (val == 'filtrate') {
+
+    }
+    // 其他按钮 
+    else {
+
+    }
   }
-}
 
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.pageNo = 1
-  getList()
-}
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
 
-/** 重置按钮操作 */
-const resetQuery = () => {
-  queryFormRef.value.resetFields()
-  handleQuery()
-}
 
 /** 添加/修改操作 */
 const formRef = ref()
@@ -420,13 +227,14 @@ const handleDelete = async (id: number) => {
 }
 
 /** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await ItempackagingApi.exportItempackaging(queryParams)
+    const data = await ItempackagingApi.exportItempackaging(setSearchParams)
     download.excel(data, '物品包装信息 .xls')
   } catch {
   } finally {