From a19c8b1fb6fd6980e00143f7340437c045ebfdb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E8=83=9C=E6=A5=A0?= <2792649152@qq.com>
Date: Tue, 28 Nov 2023 15:18:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E6=9D=A1=E4=BB=B6=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereturnRequestMain.data.ts         | 46 +++++++++++--------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
index bebff112a..4feeb1457 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
@@ -5,12 +5,6 @@ import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
 import * as PurchasereceiptRecordMainApi from '@/api/wms/purchasereceiptRecordMain'
 import { PurchasereceiptRecordMain } from '../../purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data'
 
-import * as ItembasicApi from '@/api/wms/itembasic'
-import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
-
-import * as PurchaseMainApi from '@/api/wms/purchaseMain'
-import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
-
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
 const queryParams = {
   pageSize:10,
@@ -22,8 +16,6 @@ const queryParams = {
 
  // 获取当前操作人的部门
 import { useUserStore } from '@/store/modules/user'
-import { PurchaseDetail, PurchaseMain } from '../../supplierdeliver/purchaseMain/purchaseMain.data'
-import { type } from 'os'
 const userStore = useUserStore()
 const userDept = userStore.userSelfInfo.dept
 
@@ -46,7 +38,12 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         searchField: 'number', // 查询弹窗赋值字段
         searchTitle: '采购收货记录', // 查询弹窗标题
         searchAllSchemas: PurchasereceiptRecordMain.allSchemas, // 查询弹窗所需类
-        searchPage: PurchasereceiptRecordMainApi.getPurchasereceiptRecordMainPage // 查询弹窗所需分页方法
+        searchPage: PurchasereceiptRecordMainApi.getPurchasereceiptRecordMainPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
       }
     }
   },
@@ -642,7 +639,8 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     }, 
     tableForm:{
-      disabled:true
+      disabled:true,
+      type: 'Select',
     }
   },
   
@@ -672,7 +670,8 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     }, 
     tableForm:{
-      disabled:true
+      disabled:true,
+      type: 'Select',
     }
   },
 
@@ -702,7 +701,8 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     }, 
     tableForm:{
-      disabled:true
+      disabled:true,
+      type: 'Select',
     }
   },
   
@@ -718,7 +718,8 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     }, 
     tableForm:{
-      disabled:true
+      disabled:true,
+      type: 'Select',
     }
   },
   {
@@ -829,7 +830,10 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       }
     }, 
     tableForm:{
-      disabled:true
+      disabled:true,
+      type: 'FormDateTime',
+      dateFormat: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'x',
     }
   },
   {
@@ -852,7 +856,10 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       }
     }, 
     tableForm:{
-      disabled:true
+      disabled:true,
+      type: 'FormDateTime',
+      format: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'x',
     }
   },
   {
@@ -870,12 +877,15 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       component: 'DatePicker',
       componentProps: {
         type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+        format: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'x',
       }
     }, 
     tableForm:{
-      disabled:true
+      disabled:true,
+      type: 'FormDateTime',
+      format: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'x',
     }
   },
   {