Browse Source

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

master_hella_20240701
zhousq 6 months ago
parent
commit
fb82246970
  1. 0
      src/api/eam/basicDocumentType/index.ts
  2. 64
      src/api/eam/basicMaintenanceOption/index.ts
  3. 0
      src/views/eam/basicDocumentType/basicDocumentType.data.ts
  4. 4
      src/views/eam/basicDocumentType/index.vue
  5. 171
      src/views/eam/basicMaintenanceOption/basicMaintenanceOption.data.ts
  6. 291
      src/views/eam/basicMaintenanceOption/index.vue
  7. 24
      src/views/wms/agvManage/interfaceInfo/index.vue

0
src/api/eam/documentType/index.ts → src/api/eam/basicDocumentType/index.ts

64
src/api/eam/basicMaintenanceOption/index.ts

@ -0,0 +1,64 @@
import request from '@/config/axios'
import {EquipmentMainPartVO} from "@/api/eam/equipmentMainPart";
export interface BasicMaintenanceOptionVO {
id: number
code: string
name: string
describing: string
isUpdated: boolean
type: string
departmentCode: string
remark: string
siteId: string
available: string
deletionTime: Date
deleterId: byte[]
concurrencyStamp: number
}
// 查询保养方案列表
export const getBasicMaintenanceOptionPage = async (params) => {
if (params.isSearch) {
delete params.isSearch
const data = {...params}
return await request.post({ url: '/eam/basic-maintenance-option/senior', data })
} else {
return await request.get({ url: `/eam/basic-maintenance-option/page`, params })
}
}
// 查询保养方案详情
export const getBasicMaintenanceOption = async (id: number) => {
return await request.get({ url: `/eam/basic-maintenance-option/get?id=` + id })
}
// 新增保养方案
export const createBasicMaintenanceOption = async (data: BasicMaintenanceOptionVO) => {
return await request.post({ url: `/eam/basic-maintenance-option/create`, data })
}
// 修改保养方案
export const updateBasicMaintenanceOption = async (data: BasicMaintenanceOptionVO) => {
return await request.put({ url: `/eam/basic-maintenance-option/update`, data })
}
// 删除保养方案
export const deleteBasicMaintenanceOption = async (id: number) => {
return await request.delete({ url: `/eam/basic-maintenance-option/delete?id=` + id })
}
// 导出保养方案 Excel
export const exportBasicMaintenanceOption = async (params) => {
return await request.download({ url: `/eam/basic-maintenance-option/export-excel`, params })
}
// 下载用户导入模板
export const importTemplate = () => {
return request.download({ url: '/eam/basic-maintenance-option/get-import-template' })
}
// 启用 / 禁用
export const updateEnableCode = async (data: EquipmentMainPartVO) => {
return await request.post({ url: `/eam/basic-maintenance-option/ables` , data })
}

0
src/views/eam/documentType/documentType.data.ts → src/views/eam/basicDocumentType/basicDocumentType.data.ts

4
src/views/eam/documentType/index.vue → src/views/eam/basicDocumentType/index.vue

@ -59,8 +59,8 @@
<script setup lang="ts">
import download from '@/utils/download'
import { DocumentType,DocumentTypeRules } from './documentType.data'
import * as DocumentTypeApi from '@/api/eam/documentType'
import { DocumentType,DocumentTypeRules } from './basicDocumentType.data'
import * as DocumentTypeApi from '@/api/eam/basicDocumentType'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue'

171
src/views/eam/basicMaintenanceOption/basicMaintenanceOption.data.ts

@ -0,0 +1,171 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
// 表单校验
export const BasicMaintenanceOptionRules = reactive({
code: [required],
type: [required],
name: [required],
})
export const BasicMaintenanceOption = useCrudSchemas(reactive<CrudSchema[]>([
{
label: 'id',
field: 'id',
sort: 'custom',
isSearch: false,
isTable: false,
isForm: false,
isDetail:false,
},
{
label: '编号',
field: 'code',
sort: 'custom',
isSearch: true,
},
{
label: '方案名称',
field: 'name',
sort: 'custom',
isSearch: true,
},
{
label: '描述',
field: 'describing',
sort: 'custom',
isSearch: true,
},
{
label: '项是否可修改默认是',
field: 'isUpdated',
sort: 'custom',
isSearch: true,
form: {
component: 'Switch',
value: 'TRUE',
componentProps: {
inactiveValue: 'FALSE',
activeValue: 'TRUE'
}
},
},
{
label: '来源于类型配置',
field: 'type',
sort: 'custom',
isSearch: true,
},
{
label: '创建时间',
field: 'createTime',
sort: 'custom',
formatter: dateFormatter,
isSearch: false,
isTable: false,
isForm: false,
isDetail: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: '部门id',
field: 'departmentCode',
sort: 'custom',
isSearch: false,
isTable: false,
isForm: false,
isDetail:false,
},
{
label: '备注',
field: 'remark',
sort: 'custom',
isSearch: true,
},
{
label: '地点ID',
field: 'siteId',
sort: 'custom',
isSearch: false,
isTable: false,
isForm: false,
isDetail:false,
},
{
label: '是否可用',
field: 'available',
sort: 'custom',
form: {
component: 'Switch',
value: 'TRUE',
componentProps: {
inactiveValue: 'FALSE',
activeValue: 'TRUE'
}
},
},
{
label: '删除时间',
field: 'deletionTime',
sort: 'custom',
formatter: dateFormatter,
isSearch: false,
isTable: false,
isForm: false,
isDetail: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: '删除人id',
field: 'deleterId',
sort: 'custom',
isSearch: false,
isTable: false,
isForm: false,
isDetail:false,
},
{
label: '并发乐观锁',
field: 'concurrencyStamp',
sort: 'custom',
isSearch: false,
isTable: false,
isForm: false,
isDetail:false,
form: {
component: 'InputNumber',
value: 0
},
},
{
label: '操作',
field: 'action',
isForm: false,
table: {
width: 150,
fixed: 'right'
}
}
]))

291
src/views/eam/basicMaintenanceOption/index.vue

@ -0,0 +1,291 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="BasicMaintenanceOption.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
<TableHead
:HeadButttondata="HeadButttondata"
@button-base-click="buttonBaseClick"
:routeName="routeName"
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="BasicMaintenanceOption.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(row)" @button-base-click="buttonTableClick($event,row)" />
</template>
</Table>
</ContentWrap>
<!-- 表单弹窗添加/修改 -->
<BasicForm
ref="basicFormRef"
@success="formsSuccess"
:rules="BasicMaintenanceOptionRules"
:formAllSchemas="BasicMaintenanceOption.allSchemas"
:apiUpdate="BasicMaintenanceOptionApi.updateBasicMaintenanceOption"
:apiCreate="BasicMaintenanceOptionApi.createBasicMaintenanceOption"
@searchTableSuccess="searchTableSuccess"
:isBusiness="false"
/>
<!-- 详情 -->
<Detail ref="detailRef" :isBasic="true" :allSchemas="BasicMaintenanceOption.allSchemas" />
<!-- 导入 -->
<ImportForm ref="importFormRef" url="/eam/basic-maintenance-option/import" :importTemplateData="importTemplateData" @success="importSuccess" />
</template>
<script setup lang="ts">
import download from '@/utils/download'
import { BasicMaintenanceOption,BasicMaintenanceOptionRules } from './basicMaintenanceOption.data'
import * as BasicMaintenanceOptionApi from '@/api/eam/basicMaintenanceOption'
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: 'BasicMaintenanceOption' })
const message = useMessage() //
const { t } = useI18n() //
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref(BasicMaintenanceOption.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: BasicMaintenanceOptionApi.getBasicMaintenanceOptionPage //
})
//
const { getList, setSearchParams } = tableMethods
//
const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'eam:basicMaintenanceOption:create'}), //
// defaultButtons.defaultImportBtn({hasPermi:'wms:basicMaintenanceOption:import'}), //
// defaultButtons.defaultExportBtn({hasPermi:'wms:basicMaintenanceOption: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 isShowMainButton = (row,val) => {
if (val.indexOf(row.available) > -1) {
return false
} else {
return true
}
}
// -
const butttondata = (row) => {
return [
defaultButtons.mainListEditBtn({hasPermi:'eam:basicMaintenanceOption:update'}), //
//defaultButtons.mainListDeleteBtn({hasPermi:'eam:equipmentMainPart:delete'}), //
defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'eam:basicMaintenanceOption:update'}),
defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'eam:basicMaintenanceOption:update'}),
]
}
// -
const buttonTableClick = async (val, row) => {
if (val == 'edit') { //
openForm('update', row)
} else if (val == 'delete') { //
handleDelete(row.id)
}else if (val == 'enable') {
handleEnable(row.id)
}else if (val == 'disable') {
handleDisable(row.id)
}
}
/** 添加/修改操作 */
const basicFormRef = ref()
const openForm = (type: string, row?: any) => {
basicFormRef.value.open(type, row)
}
// form
const formsSuccess = async (formType,data) => {
var isHave =BasicMaintenanceOption.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 BasicMaintenanceOptionApi.createBasicMaintenanceOption(data)
message.success(t('common.createSuccess'))
} else {
await BasicMaintenanceOptionApi.updateBasicMaintenanceOption(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, 'basicBasicMaintenanceOption')
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
//
await message.delConfirm()
//
await BasicMaintenanceOptionApi.deleteBasicMaintenanceOption(id)
message.success(t('common.delSuccess'))
//
await getList()
} catch {}
}
/** 启用 */
const handleEnable = async (id: number) => {
try {
const params = ref({
id: '',
available:'',
})
params.value.id = id
params.value.available = 'TRUE'
await BasicMaintenanceOptionApi.updateEnableCode(params.value)
message.success(t('common.updateSuccess'))
//
await getList()
} catch {}
}
/** 禁用 */
const handleDisable = async (id: number) => {
try {
const params = ref({
id: '',
available:'',
})
params.value.id = id
params.value.available = 'FALSE'
await BasicMaintenanceOptionApi.updateEnableCode(params.value)
message.success(t('common.updateSuccess'))
//
await getList()
} catch {}
}
/** 导出按钮操作 */
const exportLoading = ref(false) //
const handleExport = async () => {
try {
//
await message.exportConfirm()
//
exportLoading.value = true
const data = await BasicMaintenanceOptionApi.exportBasicMaintenanceOption(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 BasicMaintenanceOptionApi.importTemplate()
})
</script>

24
src/views/wms/agvManage/interfaceInfo/index.vue

@ -20,6 +20,7 @@
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"
:showOverflowTooltip="false"
:pagination="{
total: tableObject.total
}"
@ -27,6 +28,16 @@
v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort"
>
<template #reqBody="{row}">
<el-tooltip>
<template #content>
<div class="toolContent">
<pre>{{ JSON.parse(row.reqBody.replace(/[\\]/g, '')) }}</pre>
</div>
</template>
<span class="ellipsis">{{row.reqBody}}</span>
</el-tooltip>
</template>
<template #number="{row}">
<el-button type="primary" link @click="openDetail(row, '序号', row.number)">
<span>{{ row.number }}</span>
@ -243,3 +254,16 @@ onMounted(async () => {
})
</script>
<style lang="scss">
.toolContent{
max-height: 300px;
overflow: auto;
}
.ellipsis{
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
width: 180px;
}
</style>

Loading…
Cancel
Save