From 25af88bb3cb522edd45cc4179137b8ee3384adc0 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Sun, 28 Apr 2024 11:53:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B6=E5=93=81=E8=BF=94=E4=BF=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productrepairRecordMain.data.ts           |  89 +++++--
 .../productrepairRequestMain/index.vue        |   2 +-
 .../productrepairRequestMain.data.ts          | 228 +++++++++++-------
 3 files changed, 217 insertions(+), 102 deletions(-)

diff --git a/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts
index 19d07630a..ad8395324 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts
+++ b/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts
@@ -15,6 +15,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180,
       fixed: 'left'
     },
+    sortTableDefault:1,
     isSearch: true
   },
   {
@@ -23,15 +24,18 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     table: {
       width: 180
-    }
+    },
+    sortTableDefault:2,
   },
   {
-    label: '车间代码',
+    label: '车间',
     field: 'workshopCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:3,
+
   },
   {
     label: '班组',
@@ -40,6 +44,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:7,
   },
   {
     label: '班次',
@@ -48,6 +53,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:7,
   },
   {
     label: '出库事务类型',
@@ -56,6 +62,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false
   },
   {
     label: '入库事务类型',
@@ -64,6 +71,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false
   },
   {
     label: '执行时间',
@@ -76,6 +84,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -96,6 +105,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -117,6 +127,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -137,6 +148,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -153,13 +165,14 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false
   },
   {
     label: '接口类型',
     field: 'interfaceType',
     dictType: DICT_TYPE.INTERFACE_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -173,6 +186,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false
   },
   {
     label: '备注',
@@ -181,6 +195,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false
   },
   {
     label: '创建者',
@@ -189,6 +204,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false
   },
   {
     label: '创建时间',
@@ -201,6 +217,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -225,13 +242,14 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false
   },
   {
     label: '从库区类型范围',
     field: 'fromAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -241,6 +259,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '从库区代码范围',
     field: 'fromAreaCodes',
     sort: 'custom',
+    isTable: false,
     table: {
       width: 150
     },
@@ -251,7 +270,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isSearch: true,
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -328,62 +347,70 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150,
       show:false
     },
+    hiddenInMain:true,
   },
   {
-    label: '生产线代码',
+    label: '返修生产线',
     field: 'productionLineCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:4,
   },
   {
-    label: '工位代码',
+    label: '返修工位',
     field: 'workStationCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:5,
   },
   {
-    label: '工序代码',
+    label: '工序',
     field: 'processCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:6,
   },
   {
-    label: '包装号',
-    field: 'packingNumber',
+    label: '批次',
+    field: 'batch',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:11,
   },
   {
-    label: '器具号',
-    field: 'containerNumber',
+    label: '包装号',
+    field: 'packingNumber',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:11,
   },
   {
-    label: '成品库位代码',
-    field: 'fgFromLocationCode',
+    label: '器具号',
+    field: 'containerNumber',
     sort: 'custom',
     table: {
       width: 150
-    }
+    },
+    hiddenInMain:true,
   },
   {
-    label: '批次',
-    field: 'batch',
+    label: '成品库位',
+    field: 'fgFromLocationCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:19,
   },
   {
     label: '生产日期',
@@ -396,6 +423,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain:true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -417,6 +445,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain:true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -433,6 +462,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.INVENTORY_STATUS,
     dictClass: 'string',
     isTable: true,
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
@@ -445,6 +475,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '到库位组代码',
@@ -453,6 +484,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '到库区代码',
@@ -461,6 +493,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '单据号',
@@ -469,6 +502,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain:true,
   },
   {
     label: '物料代码',
@@ -477,6 +511,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:8,
   },
   {
     label: '备注',
@@ -485,6 +520,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '创建时间',
@@ -497,6 +533,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    hiddenInMain:true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -513,6 +550,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '物料名称',
@@ -521,6 +559,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:9,
   },
   {
     label: '物料描述1',
@@ -529,6 +568,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '物料描述2',
@@ -537,6 +577,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '项目代码',
@@ -545,6 +586,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '数量',
@@ -553,6 +595,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:12,
     form: {
       component: 'InputNumber',
     }
@@ -563,10 +606,20 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.UOM,
     dictClass: 'string',
     isTable: true,
+    sortTableDefault:13,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: 'Bom来源库位',
+    field: 'fromLocationCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:18,
   },
   // {
   //   label: '任务明细ID',
@@ -594,6 +647,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: 'Bom版本',
@@ -602,6 +656,7 @@ export const ProductrepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:10,
     tableForm: {
       disabled: true,
       isInpuFocusShow: true,
diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
index b95fd4b00..ae8d0a998 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
+++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue
@@ -232,7 +232,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
   nextTick(() => {
     if (type == 'tableForm') {
       // 明细查询页赋值
-      if(formField == 'packingNumber'){
+      if(formField == 'itemCode'){
         row['containerNumber'] = val[0]['containerNumber']
         row['itemCode'] = val[0]['itemCode']
         row['packingNumber'] = val[0]['packingNumber']
diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
index 8128a5378..fc3fb00f5 100644
--- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
+++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts
@@ -60,14 +60,36 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
     isSearch: true,
+    sortTableDefault:1,
   },
   {
-    label: '车间代码',
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.REQUEST_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    isForm:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:2,
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '车间',
     field: 'workshopCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:3,
     isSearch: true,
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -86,6 +108,54 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '返修生产线',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:4,
+    tableForm:{
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+      searchField: 'code', // 查询弹窗赋值字段
+      searchTitle: '生产线信息', // 查询弹窗标题
+      searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+      searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },{
+        key: 'workshopCode',
+        value: 'workshopCode',
+        message: '请填写车间代码！',
+        isMainValue: true
+      }]
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '生产线信息', // 查询弹窗标题
+        searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
+        searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        },{
+          key: 'workshopCode',
+          value: 'workshopCode',
+          message: '请填写车间代码！',
+          isMainValue: true
+        }]
+      }
+    }
+  },
   {
     label: '班组',
     field: 'team',
@@ -93,6 +163,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:8,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -117,6 +188,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:9,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -141,6 +213,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -148,7 +221,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'fromAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -162,6 +235,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -177,6 +251,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
         disabled: true
       }
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -199,6 +274,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -217,6 +293,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -230,6 +307,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -252,6 +330,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -270,6 +349,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
       return userDeptArray.find((account) => account.id == cellValue)?.name
     },
@@ -286,25 +366,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.REQUEST_STATUS,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
-    isForm:false,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      value: '1',
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
+  
   {
     label: '最后更新时间',
     field: 'updateTime',
@@ -316,6 +378,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -334,6 +397,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -341,7 +405,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoCommit',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -362,7 +426,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoAgree',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -383,7 +447,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoExecute',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm:false,
     sort: 'custom',
     table: {
@@ -472,63 +536,19 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
       width: 150,
       show: false
     },
+    hiddenInMain: true,
     isTableForm: false,
     isForm: false,
   },
+  
   {
-    label: '返修生产线代码',
-    field: 'productionLineCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm:{
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
-      searchField: 'code', // 查询弹窗赋值字段
-      searchTitle: '生产线信息', // 查询弹窗标题
-      searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
-      searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
-      searchCondition: [{
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      },{
-        key: 'workshopCode',
-        value: 'workshopCode',
-        message: '请填写车间代码！',
-        isMainValue: true
-      }]
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '生产线信息', // 查询弹窗标题
-        searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
-        searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        },{
-          key: 'workshopCode',
-          value: 'workshopCode',
-          message: '请填写车间代码！',
-          isMainValue: true
-        }]
-      }
-    }
-  },
-  {
-    label: '返修工位代码',
+    label: '返修工位',
     field: 'workStationCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:5,
     tableForm:{
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择工位代码', // 输入框占位文本
@@ -574,8 +594,9 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     field: 'fromLocationCode',
     sort: 'custom',
     table: {
-      width: 150
+      width: 160
     },
+    sortTableDefault:18,
     tableForm: {
       disabled: true
     },
@@ -586,12 +607,13 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '工序代码',
+    label: '工序',
     field: 'processCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:7,
     tableForm:{
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择工序代码',
@@ -629,8 +651,15 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    tableForm: {
-      disabled: true
+    sortTableDefault:10,
+    tableForm:{
+      disabled: true,
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择物料',
+      searchField: 'packingNumber',
+      searchTitle: '库存余额信息',
+      searchAllSchemas: Balance.allSchemas,
+      searchPage: BalanceApi.getBalanceItemPage
     },
     form: {
       componentProps:{
@@ -645,13 +674,15 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    sortTableDefault:15,
     tableForm:{
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择物料',
-      searchField: 'packingNumber',
-      searchTitle: '库存余额信息',
-      searchAllSchemas: Balance.allSchemas,
-      searchPage: BalanceApi.getBalanceItemPage
+      disabled: true,
+      // isInpuFocusShow: true,
+      // searchListPlaceholder: '请选择物料',
+      // searchField: 'packingNumber',
+      // searchTitle: '库存余额信息',
+      // searchAllSchemas: Balance.allSchemas,
+      // searchPage: BalanceApi.getBalanceItemPage
     },
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -666,15 +697,17 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     }
   },
   {
-    label: '成品库位代码',
+    label: '成品库位',
     field: 'fgFromLocationCode',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:19,
     tableForm: {
       disabled: true
     },
+    isTable: true,
     form: {
       componentProps:{
         disabled: true
@@ -688,6 +721,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain: true,
+    isTable: false,
     tableForm: {
       disabled: true
     },
@@ -704,6 +739,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    sortTableDefault:13,
     tableForm: {
       disabled: true
     },
@@ -728,6 +764,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
       disabled: true,
       type: 'Select'
     },
+    hiddenInMain:true,
+    sortTableDefault:18,
     form: {
       componentProps:{
         disabled: true
@@ -742,6 +780,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
       width: 180
     },
     isTableForm: false,
+    hiddenInMain: true,
+    isTable: false,
     form: {
       componentProps: {
         disabled: true
@@ -755,6 +795,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain: true,
+    isTable: false,
   },
   {
     label: '创建时间',
@@ -767,6 +809,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 180
     },
+    hiddenInMain: true,
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -786,6 +830,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain: true,
+    isTable: false,
     isTableForm: false,
     isForm: false
   },
@@ -797,6 +843,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
     isTableForm: false,
+    sortTableDefault:11,
     isForm: false,
   },
   {
@@ -806,6 +853,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain: true,
+    isTable: false,
     isTableForm: false,
     isForm: false,
   },
@@ -816,6 +865,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain: true,
+    isTable: false,
     isTableForm: false,
     isForm: false,
   },
@@ -826,16 +877,19 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain: true,
+    isTable: false,
     isTableForm: false,
     isForm: false,
   },
   {
-    label: '数量',
+    label: '返修数量',
     field: 'qty',
     sort: 'custom',
     table: {
       width: 150
     },
+    sortTableDefault:16,
     form: {
       component: 'InputNumber',
       componentProps: {
@@ -859,6 +913,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    sortTableDefault:17,
     tableForm: {
       type: 'Select'
     }
@@ -874,6 +929,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 180
     },
+    hiddenInMain: true,
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -893,6 +950,8 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    hiddenInMain: true,
+    isTable: false,
     isTableForm: false,
     isForm: false
   },
@@ -903,6 +962,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    sortTableDefault:12,
     tableForm: {
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择Bom版本', // 输入框占位文本