Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

src/api/mes/teamSetting/index.ts

@@ -0,0 +1,61 @@
+import request from '@/config/axios'
+
+export interface TeamSettingVO {
+  id: number
+  teamCode: string
+  teamName: string
+  teamType: string
+  endTime: Date
+  textOne: string
+  textTwo: string
+  textThree: string
+  textFour: string
+  textFive: string
+  deleteTime: Date
+  status: string
+  concurrencyStamp: number
+  remark: string
+  deleter: string
+  siteId: number
+}
+
+// 查询班组人员管理列表
+export const getTeamSettingPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/teamSetting/senior', data })
+  } else {
+    return await request.get({ url: `/mes/teamSetting/page`, params })
+  }
+}
+
+// 查询班组人员管理详情
+export const getTeamSetting = async (id: number) => {
+  return await request.get({ url: `/mes/teamSetting/get?id=` + id })
+}
+
+// 新增班组人员管理
+export const createTeamSetting = async (data: TeamSettingVO) => {
+  return await request.post({ url: `/mes/teamSetting/create`, data })
+}
+
+// 修改班组人员管理
+export const updateTeamSetting = async (data: TeamSettingVO) => {
+  return await request.put({ url: `/mes/teamSetting/update`, data })
+}
+
+// 删除班组人员管理
+export const deleteTeamSetting = async (id: number) => {
+  return await request.delete({ url: `/mes/teamSetting/delete?id=` + id })
+}
+
+// 导出班组人员管理 Excel
+export const exportTeamSetting = async (params) => {
+  return await request.download({ url: `/mes/teamSetting/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/mes/teamSetting/get-import-template' })
+}

src/api/system/notify/template/index.ts

@@ -5,6 +5,7 @@ export interface NotifyTemplateVO {
   name: string
   nickname: string
   code: string
+  roleIds: []
   content: string
   type: number
   params: string

src/views/mes/jobcalendar/index.vue

@@ -0,0 +1,10 @@
+<template>
+  <el-calendar v-model="value" />
+</template>
+
+<script lang="ts" setup>
+import { ref } from 'vue'
+const value = ref(new Date())
+</script>
+  
+  

src/views/mes/productionPlan/productionPlan.data.ts

@@ -78,7 +78,7 @@ export const ProductionPlan = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'deleteTime',
     sort: 'custom',
     formatter: dateFormatter,
-    isSearch: true,
+    isSearch: false,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -99,7 +99,7 @@ export const ProductionPlan = useCrudSchemas(reactive<CrudSchema[]>([
     label: '状态',
     field: 'status',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
     form: {
       component: 'Radio'
     },
@@ -118,7 +118,7 @@ export const ProductionPlan = useCrudSchemas(reactive<CrudSchema[]>([
     label: '备注',
     field: 'remark',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '创建时间',
@@ -140,7 +140,7 @@ export const ProductionPlan = useCrudSchemas(reactive<CrudSchema[]>([
     label: '删除用户名',
     field: 'deleter',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '位置ID',

src/views/mes/teamSetting/index.vue

@@ -0,0 +1,244 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="TeamSetting.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="TeamSetting.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="TeamSettingRules"
+    :formAllSchemas="TeamSetting.allSchemas"
+    :apiUpdate="TeamSettingApi.updateTeamSetting"
+    :apiCreate="TeamSettingApi.createTeamSetting"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="TeamSetting.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/mes/teamSetting/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { TeamSetting,TeamSettingRules } from './teamSetting.data'
+import * as TeamSettingApi from '@/api/mes/teamSetting'
+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: 'MesTeamSetting' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(TeamSetting.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: TeamSettingApi.getTeamSettingPage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'mes:teamSetting:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'mes:teamSetting:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'mes:teamSetting: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:teamSetting:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'mes:teamSetting: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 =TeamSetting.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 TeamSettingApi.createTeamSetting(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await TeamSettingApi.updateTeamSetting(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, 'basicTeamSetting')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await TeamSettingApi.deleteTeamSetting(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 TeamSettingApi.exportTeamSetting(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 TeamSettingApi.importTemplate()
+})
+
+</script>

src/views/mes/teamSetting/teamSetting.data.ts

@@ -0,0 +1,178 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const TeamSettingRules = reactive({
+  endTime: [required],
+  concurrencyStamp: [required],
+})
+
+export const TeamSetting = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: 'id',
+    field: 'id',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '班组编号',
+    field: 'teamCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '班组名称',
+    field: 'teamName',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '班组类型',
+    field: 'teamType',
+    sort: 'custom',
+    isSearch: true,
+                // form: {
+                //   component: 'SelectV2'
+                // },
+  },
+  {
+    label: '结束时间',
+    field: 'endTime',
+    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')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '备用字段一',
+    field: 'textOne',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '备用字段二',
+    field: 'textTwo',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '备用字段三',
+    field: 'textThree',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '备用字段四',
+    field: 'textFour',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '备用字段五',
+    field: 'textFive',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '删除时间',
+    field: 'deleteTime',
+    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')]
+      }
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        valueFormat: 'x'
+      }
+    },
+  },
+  {
+    label: '状态',
+    field: 'status',
+    sort: 'custom',
+    isSearch: false,
+    form: {
+      component: 'Radio'
+    },
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isSearch: false,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    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: 'deleter',
+    sort: 'custom',
+    isSearch: false,
+  },
+  {
+    label: '位置ID',
+    field: 'siteId',
+    sort: 'custom',
+    isSearch: false,
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))

src/views/system/notify/template/NotifyTemplateForm.vue

@@ -16,6 +16,11 @@
       <el-form-item label="发件人名称" prop="nickname">
         <el-input v-model="formData.nickname" placeholder="请输入发件人名称" />
       </el-form-item>
+      <el-form-item label="角色" prop="roleIds">
+        <el-select v-model="formData.roleIds" multiple placeholder="请选择角色">
+          <el-option v-for="item in roleList" :key="item.id" :label="item.name" :value="item.id" />
+          /></el-select> 
+      </el-form-item>
       <el-form-item label="模板内容" prop="content">
         <el-input type="textarea" v-model="formData.content" placeholder="请输入模板内容" />
       </el-form-item>
@@ -54,12 +59,15 @@
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import * as NotifyTemplateApi from '@/api/system/notify/template'
 import { CommonStatusEnum } from '@/utils/constants'
+import * as RoleApi from '@/api/system/role'
 const message = useMessage() // 消息弹窗
 
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型
+const roleList = ref([]) // 角色的列表
+
 const formData = ref<NotifyTemplateApi.NotifyTemplateVO>({
   id: null,
   name: '',
@@ -67,6 +75,7 @@ const formData = ref<NotifyTemplateApi.NotifyTemplateVO>({
   code: '',
   content: '',
   type: null,
+  roleIds: [],
   params: '',
   status: CommonStatusEnum.ENABLE,
   remark: ''
@@ -76,6 +85,7 @@ const formRules = reactive({
   status: [{ required: true, message: '开启状态不能为空', trigger: 'blur' }],
   code: [{ required: true, message: '模板编码不能为空', trigger: 'blur' }],
   name: [{ required: true, message: '模板名称不能为空', trigger: 'blur' }],
+  roleIds: [{ required: true, message: '角色不能为空', trigger: 'blur' }],
   nickname: [{ required: true, message: '发件人姓名不能为空', trigger: 'blur' }],
   content: [{ required: true, message: '模板内容不能为空', trigger: 'blur' }]
 })
@@ -96,6 +106,8 @@ const open = async (type: string, id?: number) => {
       formLoading.value = false
     }
   }
+  // 获得角色列表
+  roleList.value = await RoleApi.getSimpleRoleList()
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗