From 262021dccfa230d174ab5d98cd7a5e0c400a3062 Mon Sep 17 00:00:00 2001
From: "YEJIAXING-PC\\lenovo" <591141169@qq.com>
Date: Fri, 16 May 2025 08:35:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eam/device/deviceMaintenanceMain/index.ts |  2 +-
 src/components/SearchHigh/src/SearchHigh.vue  |  4 +--
 .../eam/device/devicemaintenancejob/index.vue |  3 +-
 .../itemAccountsChange.data.ts                | 29 ++++++++++++-------
 4 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/api/eam/device/deviceMaintenanceMain/index.ts b/src/api/eam/device/deviceMaintenanceMain/index.ts
index 2b2d968..52924c8 100644
--- a/src/api/eam/device/deviceMaintenanceMain/index.ts
+++ b/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 })
 }
 
 
diff --git a/src/components/SearchHigh/src/SearchHigh.vue b/src/components/SearchHigh/src/SearchHigh.vue
index 5fd7d6e..6c86db6 100644
--- a/src/components/SearchHigh/src/SearchHigh.vue
+++ b/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)
     })
   }
diff --git a/src/views/eam/device/devicemaintenancejob/index.vue b/src/views/eam/device/devicemaintenancejob/index.vue
index 778f8da..568da7f 100644
--- a/src/views/eam/device/devicemaintenancejob/index.vue
+++ b/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'))
diff --git a/src/views/eam/item/itemAccountsChange/itemAccountsChange.data.ts b/src/views/eam/item/itemAccountsChange/itemAccountsChange.data.ts
index e9eab38..4752e0e 100644
--- a/src/views/eam/item/itemAccountsChange/itemAccountsChange.data.ts
+++ b/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')]
+        }
       }
     },
     {