From dd84749e81ad58875b998f576de89d4fe245bbce Mon Sep 17 00:00:00 2001
From: songguoqiang <765017469@qq.com>
Date: Wed, 3 Jan 2024 16:09:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E7=BB=8F=E6=9C=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hrSizingmilldata108.data.ts               | 18 +++++-
 src/views/pszc/hrsizingmilldata108/index.vue  | 64 +++++++++++++------
 .../hrSizingmilldata90.data.ts                | 18 +++++-
 src/views/pszc/hrsizingmilldata90/index.vue   | 11 ++++
 4 files changed, 88 insertions(+), 23 deletions(-)

diff --git a/src/views/pszc/hrsizingmilldata108/hrSizingmilldata108.data.ts b/src/views/pszc/hrsizingmilldata108/hrSizingmilldata108.data.ts
index e7f69d4..d83f420 100644
--- a/src/views/pszc/hrsizingmilldata108/hrSizingmilldata108.data.ts
+++ b/src/views/pszc/hrsizingmilldata108/hrSizingmilldata108.data.ts
@@ -89,7 +89,23 @@ export const HrSizingmilldata108 = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '创建时间',
+    label: '开始时间',
+    field: 'updateTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    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: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
diff --git a/src/views/pszc/hrsizingmilldata108/index.vue b/src/views/pszc/hrsizingmilldata108/index.vue
index f9904ef..b15070c 100644
--- a/src/views/pszc/hrsizingmilldata108/index.vue
+++ b/src/views/pszc/hrsizingmilldata108/index.vue
@@ -1,7 +1,11 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="HrSizingmilldata108.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search
+      :schema="HrSizingmilldata108.allSchemas.searchSchema"
+      @search="setSearchParams"
+      @reset="setSearchParams"
+    />
   </ContentWrap>
 
   <!-- 列表头部 -->
@@ -27,13 +31,17 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
+      <template #ivalue="{ row }">
+        <span>{{ timesFormatter(row.ivalue) }}</span>
+      </template>
+
+      <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)" />
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -50,15 +58,18 @@
     @searchTableSuccess="searchTableSuccess"
     :isBusiness="false"
   />
-
 </template>
 
 <script setup lang="ts">
+import dayjs from 'dayjs'
+import duration from 'dayjs/plugin/duration'
+dayjs.extend(duration);
 import download from '@/utils/download'
-import { HrSizingmilldata108,HrSizingmilldata108Rules } from './hrSizingmilldata108.data'
+import { HrSizingmilldata108, HrSizingmilldata108Rules } from './hrSizingmilldata108.data'
 import * as HrSizingmilldata108Api from '@/api/pszc/hrsizingmilldata108'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 
+
 defineOptions({ name: 'HrSizingmilldata108' })
 
 const message = useMessage() // 消息弹窗
@@ -76,12 +87,12 @@ const updataTableColumns = (val) => {
 
 // 查询列表页面参数设置
 const searchTableParams = ref([
-//{
-//  formField: 'productItemCode',
-//  searchTableTitle: '物料信息',
-//  searchTableAllSchemas: Itembasic.allSchemas,
-//  searchTablePage: ItembasicApi.getItembasicPage
-//}
+  //{
+  //  formField: 'productItemCode',
+  //  searchTableTitle: '物料信息',
+  //  searchTableAllSchemas: Itembasic.allSchemas,
+  //  searchTablePage: ItembasicApi.getItembasicPage
+  //}
 ])
 
 const { tableObject, tableMethods } = useTable({
@@ -98,7 +109,7 @@ const HeadButttondata = [
   // defaultButtons.defaultExportBtn({hasPermi:'wms:hrSizingmilldata108:export'}), // 导出
   // defaultButtons.defaultFreshBtn(null), // 刷新
   // defaultButtons.defaultFilterBtn(null), // 筛选
-  defaultButtons.defaultSetBtn(null), // 设置
+  defaultButtons.defaultSetBtn(null) // 设置
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -111,16 +122,22 @@ const HeadButttondata = [
 
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
-  if (val == 'add') { // 新增
+  if (val == 'add') {
+    // 新增
     openForm('create')
-  } else if (val == 'import') { // 导入
+  } else if (val == 'import') {
+    // 导入
     handleImport()
-  } else if (val == 'export') { // 导出
+  } else if (val == 'export') {
+    // 导出
     handleExport()
-  } else if (val == 'refresh') { // 刷新
+  } else if (val == 'refresh') {
+    // 刷新
     getList()
-  } else if (val == 'filtrate') { // 筛选
-  } else { // 其他按钮
+  } else if (val == 'filtrate') {
+    // 筛选
+  } else {
+    // 其他按钮
     console.log('其他按钮', item)
   }
 }
@@ -133,9 +150,11 @@ const butttondata = [
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
-  if (val == 'edit') { // 编辑
+  if (val == 'edit') {
+    // 编辑
     openForm('update', row)
-  } else if (val == 'delete') { // 删除
+  } else if (val == 'delete') {
+    // 删除
     handleDelete(row.id)
   }
 }
@@ -214,10 +233,13 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 
+const timesFormatter =(s) => {
+  return dayjs.duration(s, 'seconds').format('HH时mm分ss秒')
+}
+
 /** 初始化 **/
 onMounted(async () => {
   getList()
   // importTemplateData.templateUrl = await HrSizingmilldata108Api.importTemplate()
 })
-
 </script>
diff --git a/src/views/pszc/hrsizingmilldata90/hrSizingmilldata90.data.ts b/src/views/pszc/hrsizingmilldata90/hrSizingmilldata90.data.ts
index e0b424f..685fb01 100644
--- a/src/views/pszc/hrsizingmilldata90/hrSizingmilldata90.data.ts
+++ b/src/views/pszc/hrsizingmilldata90/hrSizingmilldata90.data.ts
@@ -89,7 +89,23 @@ export const HrSizingmilldata90 = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '创建时间',
+    label: '开始时间',
+    field: 'updateTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: false,
+    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: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
diff --git a/src/views/pszc/hrsizingmilldata90/index.vue b/src/views/pszc/hrsizingmilldata90/index.vue
index bcae399..0c19f3b 100644
--- a/src/views/pszc/hrsizingmilldata90/index.vue
+++ b/src/views/pszc/hrsizingmilldata90/index.vue
@@ -27,6 +27,10 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
+    <template #ivalue="{ row }">
+        <span>{{ timesFormatter(row.ivalue) }}</span>
+      </template>
+
       <template #code="{row}">
         <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
           <span>{{ row.code }}</span>
@@ -58,6 +62,9 @@ import download from '@/utils/download'
 import { HrSizingmilldata90,HrSizingmilldata90Rules } from './hrSizingmilldata90.data'
 import * as HrSizingmilldata90Api from '@/api/pszc/hrSizingmilldata90'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import dayjs from 'dayjs'
+import duration from 'dayjs/plugin/duration'
+dayjs.extend(duration);
 
 defineOptions({ name: 'HrSizingmilldata90' })
 
@@ -214,6 +221,10 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 
+const timesFormatter =(s) => {
+  return dayjs.duration(s, 'seconds').format('HH时mm分ss秒')
+}
+
 /** 初始化 **/
 onMounted(async () => {
   getList()