From 57b91b137d5716b7b4bab5c1a3443d2383dcd029 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=AE=9C=E9=98=B3?= <1301318913@qq.com>
Date: Fri, 29 Mar 2024 08:45:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=8A=82=E5=81=87?=
 =?UTF-8?q?=E6=97=A5api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .eslintrc.js                                  |   3 +
 src/api/mes/holidaySetting/index.ts           |  61 +++++
 .../mes/holidaySetting/holidaySetting.data.ts | 178 +++++++++++++
 src/views/mes/holidaySetting/index.vue        | 245 ++++++++++++++++++
 src/views/mes/jobcalendar/index.vue           |   4 +-
 5 files changed, 488 insertions(+), 3 deletions(-)
 create mode 100644 src/api/mes/holidaySetting/index.ts
 create mode 100644 src/views/mes/holidaySetting/holidaySetting.data.ts
 create mode 100644 src/views/mes/holidaySetting/index.vue

diff --git a/.eslintrc.js b/.eslintrc.js
index 3e4af635c..eee5ae3c0 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,5 +1,6 @@
 // @ts-check
 const { defineConfig } = require('eslint-define-config')
+const { off } = require('process')
 module.exports = defineConfig({
   root: true,
   env: {
@@ -26,6 +27,8 @@ module.exports = defineConfig({
     '@unocss'
   ],
   rules: {
+    //'indent':['off',2],
+    //"@typescript-eslint/no-this-alias":["off"],
     'vue/script-setup-uses-vars': 'error',
     'vue/no-reserved-component-names': 'off',
     'vue/no-setup-props-destructure': 'off',
diff --git a/src/api/mes/holidaySetting/index.ts b/src/api/mes/holidaySetting/index.ts
new file mode 100644
index 000000000..979a7e633
--- /dev/null
+++ b/src/api/mes/holidaySetting/index.ts
@@ -0,0 +1,61 @@
+import request from '@/config/axios'
+
+export interface HolidaySettingVO {
+  id: number
+  textOne: string
+  textTwo: string
+  textThree: string
+  textFour: string
+  textFive: string
+  deleteTime: Date
+  status: string
+  concurrencyStamp: number
+  remark: string
+  deleter: string
+  siteId: number
+  changeEmplId: number
+  holidayDate: Date
+  holidayFlag: string
+  holidayName: string
+}
+
+// 查询节假日设置列表
+export const getHolidaySettingPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/holidaySetting/senior', data })
+  } else {
+    return await request.get({ url: `/mes/holidaySetting/page`, params })
+  }
+}
+
+// 查询节假日设置详情
+export const getHolidaySetting = async (id: number) => {
+  return await request.get({ url: `/mes/holidaySetting/get?id=` + id })
+}
+
+// 新增节假日设置
+export const createHolidaySetting = async (data: HolidaySettingVO) => {
+  return await request.post({ url: `/mes/holidaySetting/create`, data })
+}
+
+// 修改节假日设置
+export const updateHolidaySetting = async (data: HolidaySettingVO) => {
+  return await request.put({ url: `/mes/holidaySetting/update`, data })
+}
+
+// 删除节假日设置
+export const deleteHolidaySetting = async (id: number) => {
+  return await request.delete({ url: `/mes/holidaySetting/delete?id=` + id })
+}
+
+// 导出节假日设置 Excel
+export const exportHolidaySetting = async (params) => {
+  return await request.download({ url: `/mes/holidaySetting/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/mes/holidaySetting/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/views/mes/holidaySetting/holidaySetting.data.ts b/src/views/mes/holidaySetting/holidaySetting.data.ts
new file mode 100644
index 000000000..4f7e833a6
--- /dev/null
+++ b/src/views/mes/holidaySetting/holidaySetting.data.ts
@@ -0,0 +1,178 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const HolidaySettingRules = reactive({
+  concurrencyStamp: [required],
+})
+
+export const HolidaySetting = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '备用字段一',
+    field: 'textOne',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '备用字段二',
+    field: 'textTwo',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '备用字段三',
+    field: 'textThree',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '备用字段四',
+    field: 'textFour',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '备用字段五',
+    field: 'textFive',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '删除时间',
+    field: 'deleteTime',
+    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')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '状态',
+    field: 'status',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'Radio'
+    },
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    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: 'deleter',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '位置ID',
+    field: 'siteId',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '更改ID',
+    field: 'changeEmplId',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '节假日日期',
+    field: 'holidayDate',
+    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')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '节假日类型',
+    field: 'holidayFlag',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '节假日名称',
+    field: 'holidayName',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/mes/holidaySetting/index.vue b/src/views/mes/holidaySetting/index.vue
new file mode 100644
index 000000000..bb63733b0
--- /dev/null
+++ b/src/views/mes/holidaySetting/index.vue
@@ -0,0 +1,245 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="HolidaySetting.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+  <!-- 列表头部 -->
+  <TableHead
+    :HeadButttondata="HeadButttondata"
+    @button-base-click="buttonBaseClick"
+    :routeName="routeName"
+    @updataTableColumns="updataTableColumns"
+    @searchFormClick="searchFormClick"
+    :allSchemas="HolidaySetting.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="HolidaySettingRules"
+    :formAllSchemas="HolidaySetting.allSchemas"
+    :apiUpdate="HolidaySettingApi.updateHolidaySetting"
+    :apiCreate="HolidaySettingApi.createHolidaySetting"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="HolidaySetting.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/mes/holidaySetting/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { HolidaySetting,HolidaySettingRules } from './holidaySetting.data'
+import * as HolidaySettingApi from '@/api/mes/holidaySetting'
+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: 'MesHolidaySetting' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(HolidaySetting.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: HolidaySettingApi.getHolidaySettingPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'mes:holidaySetting:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'mes:holidaySetting:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'mes:holidaySetting: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:'mes:holidaySetting:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'mes:holidaySetting: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 =HolidaySetting.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 HolidaySettingApi.createHolidaySetting(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await HolidaySettingApi.updateHolidaySetting(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, 'basicHolidaySetting')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await HolidaySettingApi.deleteHolidaySetting(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 HolidaySettingApi.exportHolidaySetting(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 HolidaySettingApi.importTemplate()
+})
+
+</script>
+./holidaySetting.data
\ No newline at end of file
diff --git a/src/views/mes/jobcalendar/index.vue b/src/views/mes/jobcalendar/index.vue
index ac7716f24..acd7a2a6c 100644
--- a/src/views/mes/jobcalendar/index.vue
+++ b/src/views/mes/jobcalendar/index.vue
@@ -5,6 +5,4 @@
 <script lang="ts" setup>
 import { ref } from 'vue'
 const value = ref(new Date())
-</script>
-  
-  
\ No newline at end of file
+</script>
\ No newline at end of file

From ddbcbb1427e13ff4c3bf9b256bc227cacc07aeb8 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Fri, 29 Mar 2024 08:57:06 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9mesBarCode=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=BD=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E5=A4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wms/{mes => buttMesManage}/mesBarCode/index.vue         | 0
 .../wms/{mes => buttMesManage}/mesBarCode/mesBarCode.data.ts      | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename src/views/wms/{mes => buttMesManage}/mesBarCode/index.vue (100%)
 rename src/views/wms/{mes => buttMesManage}/mesBarCode/mesBarCode.data.ts (100%)

diff --git a/src/views/wms/mes/mesBarCode/index.vue b/src/views/wms/buttMesManage/mesBarCode/index.vue
similarity index 100%
rename from src/views/wms/mes/mesBarCode/index.vue
rename to src/views/wms/buttMesManage/mesBarCode/index.vue
diff --git a/src/views/wms/mes/mesBarCode/mesBarCode.data.ts b/src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts
similarity index 100%
rename from src/views/wms/mes/mesBarCode/mesBarCode.data.ts
rename to src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts