Browse Source

修改BUG

master
叶佳兴 4 weeks ago
parent
commit
262021dccf
  1. 2
      src/api/eam/device/deviceMaintenanceMain/index.ts
  2. 4
      src/components/SearchHigh/src/SearchHigh.vue
  3. 3
      src/views/eam/device/devicemaintenancejob/index.vue
  4. 29
      src/views/eam/item/itemAccountsChange/itemAccountsChange.data.ts

2
src/api/eam/device/deviceMaintenanceMain/index.ts

@ -68,7 +68,7 @@ export const orderStepChange = async (data: DeviceMaintenanceMainVO) => {
// 修改维修工单主
export const orderTurnTo = async (data: DeviceMaintenanceMainVO) => {
return await request.get({ url: `/eam/device-maintenance-job-main/turnTo?deviceNumber=`+data.deviceNumber +`&id=`+data.id + `&receiverType=`+ data.type +`&receiverUserId=` + data.maintenance })
return await request.get({ url: `/eam/device-maintenance-job-main/turnTo?deviceNumber=`+data.deviceNumber +`&id=`+data.id + `&receiverType=`+ data.type +`&receiverUserId=` + data.maintenance +`&factoryAreaNumber=` + data.factoryAreaNumber })
}

4
src/components/SearchHigh/src/SearchHigh.vue

@ -251,9 +251,9 @@ const formatMoreListActions = (val) => {
// -
const moreListDelete = (val,item,$event) => {
if (moreListData.value.filters.length == 1) {
message.warning(t('ts.必须保留一条筛选条件!'))
message.warning(t('必须保留一条筛选条件!'))
} else {
message.confirm(t('ts.您确定删除吗, 是否继续?')).then(() => {
message.confirm(t('您确定删除吗, 是否继续?')).then(() => {
moreListData.value.filters.splice(val, 1)
})
}

3
src/views/eam/device/devicemaintenancejob/index.vue

@ -1045,9 +1045,10 @@ const submitFormSec = async (formType, data) => {
deviceNumber: data.deviceNumber,
type: data.type,
maintenance: data.maintenance,
factoryAreaNumber: data.factoryAreaNumber,
id: data.id
}
console.log(data.subList)
console.log(data1,"yeyeye")
try {
await DeviceMaintenanceMainApi.orderTurnTo(data1)
message.success(t('common.updateSuccess'))

29
src/views/eam/item/itemAccountsChange/itemAccountsChange.data.ts

@ -111,27 +111,36 @@ export const ItemAccountsChange = useCrudSchemas(
}
}
},
{
label: '采购时间',
field: 'purchaseTime',
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')]
}
detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss'
},
sort: 'custom',
table: {
width: 180
},
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')]
}
}
},
{

Loading…
Cancel
Save