From 041720f9dd38244907065dadf46dd909190ed576 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Tue, 11 Mar 2025 11:16:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/countConfig/index.ts              |  61 +++++
 .../count/countConfig/countConfig.data.ts     |  88 +++++++
 .../countManage/count/countConfig/index.vue   | 244 ++++++++++++++++++
 .../countManage/count/countJobMain/index.vue  |  18 +-
 4 files changed, 403 insertions(+), 8 deletions(-)
 create mode 100644 src/api/wms/countConfig/index.ts
 create mode 100644 src/views/wms/countManage/count/countConfig/countConfig.data.ts
 create mode 100644 src/views/wms/countManage/count/countConfig/index.vue

diff --git a/src/api/wms/countConfig/index.ts b/src/api/wms/countConfig/index.ts
new file mode 100644
index 000000000..ac56a4e64
--- /dev/null
+++ b/src/api/wms/countConfig/index.ts
@@ -0,0 +1,61 @@
+import request from '@/config/axios'
+
+export interface CountConfigVO {
+  id: number
+  itemCode: string
+  itemName: string
+  desc1: string
+  uom: string
+  packUnit: string
+  packQty: number
+  countType: string
+  conversionRate: number
+  available: string
+  remark: string
+  deletionTime: Date
+  deleterId: string
+  extraProperties: string
+  concurrencyStamp: number
+  siteId: string
+}
+
+// 查询盘点配置列表
+export const getCountConfigPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/count-config/senior', data })
+  } else {
+    return await request.get({ url: `/wms/count-config/page`, params })
+  }
+}
+
+// 查询盘点配置详情
+export const getCountConfig = async (id: number) => {
+  return await request.get({ url: `/wms/count-config/get?id=` + id })
+}
+
+// 新增盘点配置
+export const createCountConfig = async (data: CountConfigVO) => {
+  return await request.post({ url: `/wms/count-config/create`, data })
+}
+
+// 修改盘点配置
+export const updateCountConfig = async (data: CountConfigVO) => {
+  return await request.put({ url: `/wms/count-config/update`, data })
+}
+
+// 删除盘点配置
+export const deleteCountConfig = async (id: number) => {
+  return await request.delete({ url: `/wms/count-config/delete?id=` + id })
+}
+
+// 导出盘点配置 Excel
+export const exportCountConfig = async (params) => {
+  return await request.download({ url: `/wms/count-config/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/wms/count-config/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/views/wms/countManage/count/countConfig/countConfig.data.ts b/src/views/wms/countManage/count/countConfig/countConfig.data.ts
new file mode 100644
index 000000000..c51d95cfd
--- /dev/null
+++ b/src/views/wms/countManage/count/countConfig/countConfig.data.ts
@@ -0,0 +1,88 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const CountConfigRules = reactive({
+  itemCode: [required],
+  available: [required],
+  concurrencyStamp: [required],
+})
+
+export const CountConfig = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '物品代码',
+    field: 'itemCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+  },
+  {
+    label: '背番',
+    field: 'desc1',
+    sort: 'custom',
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+  },
+  {
+    label: '盘点模式(1:二分之一,2:逐个)',
+    field: 'countType',
+    sort: 'custom',
+  },
+  {
+    label: '转换率',
+    field: 'conversionRate',
+    sort: 'custom',
+  },
+  {
+    label: '是否可用',
+    field: 'available',
+    sort: 'custom',
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/wms/countManage/count/countConfig/index.vue b/src/views/wms/countManage/count/countConfig/index.vue
new file mode 100644
index 000000000..3a71f2d2c
--- /dev/null
+++ b/src/views/wms/countManage/count/countConfig/index.vue
@@ -0,0 +1,244 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="CountConfig.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="CountConfig.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="CountConfigRules"
+    :formAllSchemas="CountConfig.allSchemas"
+    :apiUpdate="CountConfigApi.updateCountConfig"
+    :apiCreate="CountConfigApi.createCountConfig"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="CountConfig.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/count-config/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { CountConfig,CountConfigRules } from './countConfig.data'
+import * as CountConfigApi from '@/api/wms/countConfig'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'CountConfig' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(CountConfig.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: CountConfigApi.getCountConfigPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:count-config:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:count-config:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:count-config:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:countConfig:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:countConfig:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =CountConfig.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  });
+  if(isHave){
+    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      message.error('失效时间要大于生效时间')
+      return;
+    }
+  }
+  if(data.activeTime==0)data.activeTime = null;
+  if(data.expireTime==0)data.expireTime = null;
+  if (formType === 'create') {
+    await CountConfigApi.createCountConfig(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await CountConfigApi.updateCountConfig(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicCountConfig')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await CountConfigApi.deleteCountConfig(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await CountConfigApi.exportCountConfig(tableObject.params)
+    download.excel(data, '盘点配置.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '盘点配置导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await CountConfigApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/wms/countManage/count/countJobMain/index.vue b/src/views/wms/countManage/count/countJobMain/index.vue
index cb744daa7..3bb9b999e 100644
--- a/src/views/wms/countManage/count/countJobMain/index.vue
+++ b/src/views/wms/countManage/count/countJobMain/index.vue
@@ -301,14 +301,16 @@ const buttonTableClick = async (val, row) => {
     importTemplateData.value.templateTitle = "盘点任务导入模板.xlsx"
     importTemplateData.value.templateUrl = await CountJobMainApi.importTemplate()
     handleImport(row.id)
-  } else if (val == 'lineTypeImport') {
-    // 线边盘点
-    importUrl.value = "/wms/count-job-main/lineTypeImport"
-    importTitle.value = '线边盘点'
-    importTemplateData.value.templateTitle = "线边盘点任务导入模板.xlsx"
-    importTemplateData.value.templateUrl = await CountJobMainApi.lineTypeImportTemplate()
-    handleImport(row.id)
-  } else if (val == 'done') {
+  } 
+  // else if (val == 'lineTypeImport') {
+  //   // 线边盘点
+  //   importUrl.value = "/wms/count-job-main/lineTypeImport"
+  //   importTitle.value = '线边盘点'
+  //   importTemplateData.value.templateTitle = "线边盘点任务导入模板.xlsx"
+  //   importTemplateData.value.templateUrl = await CountJobMainApi.lineTypeImportTemplate()
+  //   handleImport(row.id)
+  // } 
+  else if (val == 'done') {
     // 完成
     handleDone(row.id)
   }