eam
/
eam-ui
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改BUG

master
叶佳兴 4 weeks ago
parent
1de7c41e03
commit
79dd533a6f
6 changed files with 162 additions and 101 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/api/eam/item/itemUseRecordMain/index.ts
  2. 4
      src/views/eam/basic/deviceItem/deviceItem.data.ts
  3. 2
      src/views/eam/device/deviceAccounts/index.vue
  4. 192
      src/views/eam/device/deviceRepair/index.vue
  5. 2
      src/views/eam/device/devicemaintenancejob/index.vue
  6. 59
      src/views/eam/item/itemUseRecordMain/itemUseRecordMain.data.ts

4
src/api/eam/item/itemUseRecordMain/index.ts
View File

@ -11,12 +11,14 @@ export interface ItemUseRecordMainVO {
// 查询备件使用操作主表记录列表
export const getItemUseRecordMainPage = async (params) => {
//只查询采购入库
params.inventoryAction="PURCHASEIN"
if (params.isSearch) {
delete params.isSearch
const data = {...params}
return await request.post({ url: '/eam/item-use-record-main/senior', data })
} else {
return await request.get({ url: `/eam/item-use-record-main/pageForReceipt`, params })
return await request.get({ url: `/eam/item-use-record-main/page`, params })
}
}

4
src/views/eam/basic/deviceItem/deviceItem.data.ts
View File

@ -12,7 +12,7 @@ export const DeviceItemRules = reactive({
export const DeviceItem = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '设备',
label: '设备台账编号',
field: 'deviceNumber',
sort: 'custom',
isSearch: true,
@ -22,7 +22,7 @@ export const DeviceItem = useCrudSchemas(reactive<CrudSchema[]>([
},
},
{
label: '备件',
label: '备件名称',
field: 'itemNumber',
sort: 'custom',
isSearch: true,

2
src/views/eam/device/deviceAccounts/index.vue
View File

@ -131,7 +131,7 @@
defaultButtons.defaultAddBtn({hasPermi:'eam:device-accounts:create'}), // 新增
defaultButtons.selectQrCodeBatchBtn(null), //批量生成二维码
defaultButtons.defaultImportBtn(null), // 导入
// defaultButtons.defaultExportBtn({hasPermi:'eam:device-accounts:export'}), // 导出
defaultButtons.defaultExportBtn(null), // 导出
defaultButtons.defaultFreshBtn(null), // 刷新
defaultButtons.defaultFilterBtn(null), // 筛选
defaultButtons.defaultSetBtn(null) // 设置

192
src/views/eam/device/deviceRepair/index.vue
View File

@ -1,63 +1,90 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="DeviceRepair.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
<Search
:schema="DeviceRepair.allSchemas.searchSchema"
@search="setSearchParams"
@reset="setSearchParams"
/>
</ContentWrap>
<!-- 列表头部 -->
<TableHead :HeadButttondata="HeadButttondata" @button-base-click="buttonBaseClick" :routeName="routeName"
@updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick" :allSchemas="DeviceRepair.allSchemas" />
<TableHead
:HeadButttondata="HeadButttondata"
@button-base-click="buttonBaseClick"
:routeName="routeName"
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="DeviceRepair.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">
<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 #upload="{ row }">
<ButtonBase v-if="row.filePathList != null && row.filePathList.length != 0" :Butttondata="butttondataView(row)" @button-base-click="buttonTableClick($event, row)" />
<ButtonBase
v-if="row.filePathList != null && row.filePathList.length != 0"
:Butttondata="butttondataView(row)"
@button-base-click="buttonTableClick($event, row)"
/>
</template>
<template #action="{ row }">
<ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event, row)" />
<ButtonBase
:Butttondata="butttondata(row)"
@button-base-click="buttonTableClick($event, row)"
/>
</template>
</Table>
</ContentWrap>
<!-- 表单弹窗：添加/修改 -->
<BasicForm
ref="basicFormRef"
@success="formsSuccess"
<BasicForm
ref="basicFormRef"
@success="formsSuccess"
:rules="DeviceRepairRules"
:formAllSchemas="DeviceRepair.allSchemas"
:formAllSchemas="DeviceRepair.allSchemas"
:apiUpdate="DeviceRepairApi.updateDeviceRepair"
:apiCreate="DeviceRepairApi.createDeviceRepair"
@searchTableSuccess="searchTableSuccess"
:isBusiness="false"
:apiCreate="DeviceRepairApi.createDeviceRepair"
@searchTableSuccess="searchTableSuccess"
:isBusiness="false"
@onChange="onChange"
/>
<!-- 详情 -->
<Detail ref="detailRef" :isBasic="true" :allSchemas="DeviceRepair.allSchemas" />
<Dialog
<Dialog
ref="basicFormViewRef"
v-model="showView"
v-model="showView"
:key="viewKey"
:closeOnClickModal="true"
:title="viewTitle"
:title="viewTitle"
>
<el-image v-for="url in urls" :key="url" :src="url" lazy />
</Dialog>
<!-- 导入 -->
<ImportForm ref="importFormRef" url="/eam/device-repair-request/import" :importTemplateData="importTemplateData"
@success="importSuccess" />
<ImportForm
ref="importFormRef"
url="/eam/device-repair-request/import"
:importTemplateData="importTemplateData"
@success="importSuccess"
/>
</template>
<script setup lang="ts">
@ -75,7 +102,6 @@ import { useUserStore } from '@/store/modules/user'
defineOptions({ name: 'DeviceRepair' })
const userStore = useUserStore()
const message = useMessage() // 消息弹窗
@ -89,8 +115,8 @@ const urls = ref([])
const viewKey = ref(0)
routeName.value = route.name
const tableColumns = ref(DeviceRepair.allSchemas.tableColumns)
const factoryAreaNumber = ref('');
const type = ref('DEVICE');
const factoryAreaNumber = ref('')
const type = ref('DEVICE')
// 查询页面返回
const searchTableSuccess = (formField, searchField, val, formRef) => {
nextTick(() => {
@ -114,12 +140,12 @@ const { getList, setSearchParams } = tableMethods
// 列表头部按钮
const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'eam:device-repair-request:create'}), // 新增
defaultButtons.defaultAddBtn({ hasPermi: 'eam:device-repair-request:create' }), // 新增
// defaultButtons.defaultImportBtn({hasPermi:'eam:device-repair-request:import'}), // 导入
// defaultButtons.defaultExportBtn({hasPermi:'eam:device-repair-request:export'}), // 导出
defaultButtons.defaultFreshBtn(null), // 刷新
defaultButtons.defaultFilterBtn(null), // 筛选
defaultButtons.defaultSetBtn(null), // 设置
defaultButtons.defaultSetBtn(null) // 设置
// {
// label: '自定义扩展按钮',
// name: 'zdy',
@ -132,16 +158,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)
}
}
@ -151,29 +183,32 @@ const butttondata = (row) => {
return [
// defaultButtons.mainListEditBtn({hasPermi:'eam:deviceRepair:update'}), // 编辑
// defaultButtons.mainListDeleteBtn({ hasPermi: 'eam:deviceRepair:delete' }), // 删除
defaultButtons.backoutBtn({hasPermi:'eam:device-repair-request:cancel', hide: !(row.result == 'PENDING' && row.declarer == userStore.getUser.id )}), // 撤销
defaultButtons.backoutBtn({
hasPermi: 'eam:device-repair-request:cancel',
hide: !(row.result == 'PENDING' && row.declarer == userStore.getUser.id)
}) // 撤销
]
}
// 列表-操作按钮
const butttondataView = (row) => {
return [
defaultButtons.viewBtn(null),
]
return [defaultButtons.viewBtn(null)]
}
// 列表-操作按钮事件
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)
} else if (val == 'backout') { //撤销
} else if (val == 'backout') {
//撤销
handleBackout(row)
} else if (val == 'view') { //预览
} else if (val == 'view') {
//预览
openForm('view', row)
}
}
@ -182,32 +217,30 @@ const buttonTableClick = async (val, row) => {
const basicFormRef = ref()
const basicFormViewRef = ref()
const openForm = (type: string, row?: any) => {
if (type == 'view') {
showView.value = true
urls.value = row.filePathList
viewKey.value += 1
}else {
} else {
basicFormRef.value.open(type, row)
}
}
// form表单提交
const formsSuccess = async (formType, data) => {
var isHave = DeviceRepair.allSchemas.formSchema.some(function (item) {
return item.field === 'activeTime' || item.field === 'expireTime';
});
return item.field === 'activeTime' || item.field === 'expireTime'
})
if (isHave) {
if (data.activeTime && data.expireTime && data.activeTime >= data.expireTime) {
message.error('失效时间要大于生效时间')
return;
return
}
}
if (data.activeTime == 0) data.activeTime = null;
if (data.expireTime == 0) data.expireTime = null;
data.result = 'PENDING';
if (data.upload != null && data.upload != "") {
if (data.activeTime == 0) data.activeTime = null
if (data.expireTime == 0) data.expireTime = null
data.result = 'PENDING'
if (data.upload != null && data.upload != '') {
data.filePathList = data?.upload?.map((item: any) => {
return item.url
})
@ -239,7 +272,7 @@ const handleDelete = async (id: number) => {
message.success(t('common.delSuccess'))
// 刷新列表
await getList()
} catch { }
} catch {}
}
/** 导出按钮操作 */
@ -275,13 +308,13 @@ const importSuccess = () => {
// 筛选提交
const searchFormClick = (searchData) => {
searchData.filters = searchData.filters.filter(item=>item.column != 'type')
searchData.filters = searchData.filters.filter((item) => item.column != 'type')
const fixedField = [
{
action:"==",
column:"type",
value:"DEVICE",
},
action: '==',
column: 'type',
value: 'DEVICE'
}
]
searchData.filters.push(...fixedField)
tableObject.params = {
@ -297,18 +330,19 @@ const searchFormClick = (searchData) => {
// })
// }
function handleBackout(row) {
/** 撤销按钮操作 */
const handleBackout = async (row) => {
if (row.result != 'PENDING') {
message.error('该报修单正在处理中，不能撤销！')
}
DeviceRepairApi.cancel(row.id).then(res => {
console.log("撤销成功！")
getList() // 刷新当前列表
})
// 撤销的二次确认
await message.confirm("是否确认撤销该数据项?")
await DeviceRepairApi.cancel(row.id)
message.success(t('common.success'))
await getList() // 刷新当前列表
}
const onChange = (field, cur, item,formRef) => {
const onChange = (field, cur, item, formRef) => {
if (field == 'factoryAreaNumber') {
nextTick(() => {
const setV = {}
@ -316,23 +350,23 @@ const onChange = (field, cur, item,formRef) => {
formRef.setValues(setV)
})
factoryAreaNumber.value = cur
if(type.value != 'MOLD'){
if (type.value != 'MOLD') {
DeviceAccountApi.getDeviceAccountsAllNoPage({
factoryAreaNumber: cur,
type: type.value,
status: '0'
}).then((res) => {
DeviceRepair.allSchemas.formSchema.find(item => {
DeviceRepair.allSchemas.formSchema.find((item) => {
return item.field == 'deviceNumber'
}).componentProps.options = res
})
}else{
MoldAccountApi.getMoldAccountsAllNoPage({
} else {
MoldAccountApi.getMoldAccountsAllNoPage({
factoryAreaNumber: cur,
type: type.value,
status: '0'
}).then((res) => {
DeviceRepair.allSchemas.formSchema.find(item => {
DeviceRepair.allSchemas.formSchema.find((item) => {
return item.field == 'deviceNumber'
}).componentProps.options = res
})
@ -346,32 +380,31 @@ const onChange = (field, cur, item,formRef) => {
formRef.setValues(setV)
})
type.value = cur
if(cur != 'MOLD'){
if (cur != 'MOLD') {
type.value = 'DEVICE'
DeviceAccountApi.getDeviceAccountsAllNoPage({
factoryAreaNumber: factoryAreaNumber.value,
type: 'DEVICE',
status: '0'
}).then((res) => {
DeviceRepair.allSchemas.formSchema.find(item => {
DeviceRepair.allSchemas.formSchema.find((item) => {
return item.field == 'deviceNumber'
}).componentProps.options = res
})
}else{
} else {
type.value = 'MOLD'
MoldAccountApi.getMoldAccountsAllNoPage({
factoryAreaNumber: factoryAreaNumber.value,
type: 'MOLD',
status: '0'
}).then((res) => {
DeviceRepair.allSchemas.formSchema.find(item => {
DeviceRepair.allSchemas.formSchema.find((item) => {
return item.field == 'deviceNumber'
}).componentProps.options = res
})
}
}
// if (field == 'factoryAreaNumber') {
// // 获取当前的工厂区域编号
// debugger
@ -379,18 +412,13 @@ const onChange = (field, cur, item,formRef) => {
// return item.field == 'deviceNumber'
// }).value
// }
}
/** 初始化 **/
onMounted(async () => {
getList()
importTemplateData.templateUrl = await DeviceRepairApi.importTemplate()
})
</script>

2
src/views/eam/device/devicemaintenancejob/index.vue
View File

@ -95,8 +95,8 @@
:detailAllSchemasRules="DeviceMaintenanceDetailRules"
:apiCreate="DeviceMaintenanceDetailApi.createDeviceMaintenanceDetail"
:apiUpdate="DeviceMaintenanceDetailApi.updateDeviceMaintenanceDetail"
:apiPage="DeviceMaintenanceDetailApi.getDeviceMaintenanceDetailPage"
:apiDelete="DeviceMaintenanceDetailApi.deleteDeviceMaintenanceDetail"
:apiPage="DeviceMaintenanceDetailApi.getDeviceMaintenanceDetailPage"
:Echo="Echo"
@searchTableSuccessDetail="searchTableSuccessDetail"
@detailOpenForm="detailOpenForm"

59
src/views/eam/item/itemUseRecordMain/itemUseRecordMain.data.ts
View File

@ -1,5 +1,5 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter2 } from '@/utils/formatTime'
import { dateFormatter } from '@/utils/formatTime'
import { Item } from '@/views/eam/basic/item/item.data'
import * as ItemApi from '@/api/eam/basic/item'
import { validateHanset, validateEmail } from '@/utils/validator'
@ -15,7 +15,6 @@ export const ItemUseRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom',
isSearch: true,
table: {
width: 150,
fixed: 'left'
},
},
@ -33,23 +32,55 @@ export const ItemUseRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
dictClass: 'string',
isSearch: false,
isTable: true,
table: {
width: 150
},
tableForm: {
type: 'Select'
}
},
{
label: '操作',
field: 'action',
isDetail: false,
isForm: false,
table: {
width: 200,
fixed: 'right'
}
}
label: '操作者',
field: 'creator',
sort: 'custom',
isSearch: false
},
{
label: '操作时间',
field: 'createTime',
formatter: dateFormatter,
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
sort: 'custom',
isTable: true,
form: {
component: 'DatePicker',
componentProps: {
style: { width: '100%' },
type: 'datetime',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x'
}
},
isForm: false,
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')]
}
}
},
// {
// label: '操作',
// field: 'action',
// isDetail: false,
// isForm: false,
// table: {
// width: 200,
// fixed: 'right'
// }
// }
]))
//表单校验

Write Preview
Loading…
Cancel
Save