采购收回退货申请主子表数据显示

src/api/wms/purchasereceiptRecordDetail/index.ts

@@ -58,7 +58,10 @@ export const getPurchasereceiptRecordDetailPage = async (params) => {
     return await request.get({ url: `/wms/purchasereceipt-record-detail/page`, params })
   }
 }
-
+// 查询采购收货记录子列表
+export const getPurchasereceiptRecordDetailList = async (params) => {
+    return await request.get({ url: `/wms/purchasereceipt-record-detail/list`, params })
+}
 // 查询采购收货记录子详情
 export const getPurchasereceiptRecordDetail = async (id: number) => {
   return await request.get({ url: `/wms/purchasereceipt-record-detail/get?id=` + id })

src/components/TableForm/src/TableForm.vue

@@ -16,7 +16,7 @@
       <el-table-column
         fixed="left" 
         :width="50" 
-        v-if="isShowButton" 
+        v-if="isShowReduceButton" 
         v-slot="{ row, $index }"
       >
         <Icon icon="ep:remove" color="#757575" size="26" style="cursor: pointer;margin-top: -16px;" @click="handleDeleteTable (row, $index)" />
@@ -273,6 +273,10 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  isShowReduceButton:{
+    type: Boolean,
+    default: true,
+  },
   // 加载状态
   tableLoading: {
     type: Boolean,

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@@ -389,32 +389,48 @@ export const PurchasereceiptRecordMainRules = reactive({
  */
 export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '从包装号',
+    label: '订单号',
-    field: 'fromPackingNumber',
+    field: 'poNumber',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '到包装号',
+    label: '订单行',
-    field: 'toPackingNumber',
+    field: 'poLine',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '从器具号',
+    label: '物品代码',
-    field: 'fromContainerNumber',
+    field: 'itemCode',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '到器具号',
+    label: '物品名称',
-    field: 'toContainerNumber',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物品描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '物品描述2',
+    field: 'itemDesc2',
     sort: 'custom',
     table: {
       width: 150
@@ -445,65 +461,109 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '到货日期',
+    label: '从包装号',
-    field: 'arriveDate',
+    field: 'fromPackingNumber',
-    formatter: dateFormatter,
+    sort: 'custom',
-    detail: {
+    table: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      width: 150
+    },
   },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
     sort: 'custom',
     table: {
-      width: 180
+      width: 150
     },
-    form: {
+  },
-      component: 'DatePicker',
+  {
-      componentProps: {
+    label: '从器具号',
-        type: 'datetime',
+    field: 'fromContainerNumber',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+    sort: 'custom',
-        valueFormat: 'x',
+    table: {
-      }
+      width: 150
     },
   },
   {
-    label: '生产日期',
+    label: '到器具号',
-    field: 'produceDate',
+    field: 'toContainerNumber',
-    formatter: dateFormatter,
+    sort: 'custom',
-    detail: {
+    table: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      width: 150
+    },
   },
+  {
+    label: '数量',
+    field: 'qty',
     sort: 'custom',
     table: {
-      width: 180
+      width: 150
     },
     form: {
-      component: 'DatePicker',
+      component: 'InputNumber',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
     }
   },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
     },
+  },
+  
   {
-    label: '过期日期',
+    label: '标包数量',
-    field: 'expireDate',
+    field: 'stdPackQty',
-    formatter: dateFormatter,
+    sort: 'custom',
-    detail: {
+    table: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '标包单位',
+    field: 'stdPackUnit',
+    dictType: DICT_TYPE.PACK_UNIT,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
   },
+
+  {
+    label: '供应商计量数量',
+    field: 'supplierQty',
     sort: 'custom',
     table: {
-      width: 180
+      width: 150
     },
     form: {
-      component: 'DatePicker',
+      component: 'InputNumber',
-      componentProps: {
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
     }
   },
+  {
+    label: '供应商计量单位',
+    field: 'supplierUom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
   },
+  
   {
     label: '库存状态',
     field: 'inventoryStatus',
@@ -581,89 +641,64 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '订单号',
+    label: '到货日期',
-    field: 'poNumber',
+    field: 'arriveDate',
-    sort: 'custom',
+    formatter: dateFormatter,
-    table: {
+    detail: {
-      width: 150
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-  },
-  {
-    label: '订单行',
-    field: 'poLine',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
     },
-  {
-    label: '标包数量',
-    field: 'stdPackQty',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     form: {
-      component: 'InputNumber',
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
       }
     },
-  {
-    label: '标包单位',
-    field: 'stdPackUnit',
-    dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
   },
   {
-    label: '数量',
+    label: '生产日期',
-    field: 'qty',
+    field: 'produceDate',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     form: {
-      component: 'InputNumber',
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
       }
     },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
   },
   {
-    label: '供应商计量数量',
+    label: '过期日期',
-    field: 'supplierQty',
+    field: 'expireDate',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     form: {
-      component: 'InputNumber',
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
       }
     },
-  {
-    label: '供应商计量单位',
-    field: 'supplierUom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
   },
   {
     label: '转换率',
@@ -734,38 +769,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
   },
-  {
+ 
-    label: '物品代码',
-    field: 'itemCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '物品名称',
-    field: 'itemName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '物品描述1',
-    field: 'itemDesc1',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
-  {
-    label: '物品描述2',
-    field: 'itemDesc2',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '项目代码',
     field: 'projectCode',
@@ -774,29 +778,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
   },
-  {
+
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-    }
-  },
-  {
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-  },
   {
     label: '单据号',
     field: 'number',

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue

@@ -50,6 +50,7 @@
     :apiUpdate="PurchasereturnRequestMainApi.updatePurchasereturnRequestMain"
     :apiCreate="PurchasereturnRequestMainApi.createPurchasereturnRequestMain"
     :isBusiness="true"
+    :isShowButton="false"
     @handleAddTable="handleAddTable"
     @handleDeleteTable="handleDeleteTable"
     @searchTableSuccess="searchTableSuccess"
@@ -80,6 +81,7 @@ import download from '@/utils/download'
 import { PurchasereturnRequestMain,PurchasereturnRequestMainRules,PurchasereturnRequestDetail,PurchasereturnRequestDetailRules } from './purchasereturnRequestMain.data'
 import * as PurchasereturnRequestMainApi from '@/api/wms/purchasereturnRequestMain'
 import * as PurchasereturnRequestDetailApi from '@/api/wms/purchasereturnRequestDetail'
+import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 
 // 采购退货申请
@@ -109,6 +111,29 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       setV[formField] = val[0][searchField]
       setV['purchaseReceiptRecordNumber'] = val[0]['number']
       setV['supplierCode'] = val[0]['supplierCode']
+      // 获取子表数据 getBomDisassemble
+      PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailList({
+        masterId: val[0]['id']}).then(res => {
+          if (res) tableData.value = res
+          console.log(PurchasereturnRequestDetail.allSchemas.tableFormColumns)
+          
+          PurchasereturnRequestDetail.allSchemas.tableFormColumns.map(item => {
+            // if(item.field == 'qty') {
+            //   item.tableForm.disabled = false
+            //   tableData.value.forEach(cur=>{
+            //     item.tableForm.max = cur['qty']
+            //   })
+            // }
+            if(item.field == 'remark') {
+              item.tableForm.disabled = false
+            }
+            if(item.field == 'failedReason') {
+              item.tableForm.disabled = false
+            }
+          })
+        }).catch(err => {
+          console.log(err)
+        })
       formRef.setValues(setV)
     }
   })

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts

@@ -23,6 +23,7 @@ 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
 
@@ -471,302 +472,346 @@ export const PurchasereturnRequestMainRules = reactive({
  */
 export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '包装号',
+    label: '订单号',
-    field: 'packingNumber',
+    field: 'poNumber',
     sort: 'custom',
     table: {
       width: 150
     },
-    isTableForm: false,
+    tableForm:{
-    isForm: false
+      disabled:true
+    }
   },
   {
-    label: '器具号',
+    label: '订单行',
-    field: 'containerNumber',
+    field: 'poLine',
     sort: 'custom',
     table: {
       width: 150
     }, 
-    isTableForm: false,
+    tableForm:{
-    isForm: false
+      disabled:true
+    }
   },
   {
-    label: '批次',
+    label: '物品代码',
-    field: 'batch',
+    field: 'itemCode',
     sort: 'custom',
     table: {
       width: 150
     }, 
+    tableForm:{
+      disabled:true
+    }
   },
   {
-    label: '替代批次',
+    label: '物品名称',
-    field: 'altBatch',
+    field: 'itemName',
     sort: 'custom',
     table: {
       width: 150
     }, 
-    isTableForm: false,
+    tableForm:{
-    isForm: false
+      disabled:true
+    }
   },
   {
-    label: '到库位代码',
+    label: '物品描述1',
-    field: 'toLocationCode',
+    field: 'itemDesc1',
     sort: 'custom',
     table: {
       width: 150
     }, 
-    isTableForm: false,
+    tableForm:{
-    isForm: false
+      disabled:true
+    }
   },
   {
-    label: '库存状态',
+    label: '物品描述2',
-    field: 'inventoryStatus',
+    field: 'itemDesc2',
-    dictType: DICT_TYPE.INVENTORY_STATUS,
-    dictClass: 'string',
-    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     }, 
-    isTableForm: false,
     tableForm:{
-      type: 'Select'
+      disabled:true
-    },
+    }
-    isForm: false
   },
   {
-    label: '订单号',
+    label: '从批次',
-    field: 'poNumber',
+    field: 'fromBatch',
     sort: 'custom',
     table: {
       width: 150
     }, 
     tableForm:{
-      isInpuFocusShow: true,
+      disabled:true
-      searchListPlaceholder: '请选择订单号',
-      searchField: 'number',
-      searchTitle: '采购订单信息',
-      searchAllSchemas: PurchaseMain.allSchemas,
-      searchPage: PurchaseMainApi.getPurchaseMainPage
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true,
-        searchListPlaceholder: '请选择订单号',
-        searchField: 'number',
-        searchTitle: '采购订单信息',
-        searchAllSchemas: PurchaseMain.allSchemas,
-        searchPage: PurchaseMainApi.getPurchaseMainPage
     }
+  },
+  {
+    label: '到批次',
+    field: 'toBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    }, 
+    tableForm:{
+      disabled:true
     }
   },
   {
-    label: '订单行',
+    label: '替代批次',
-    field: 'poLine',
+    field: 'altBatch',
     sort: 'custom',
     table: {
       width: 150
     }, 
     tableForm:{
-      isInpuFocusShow: true,
+      disabled:true
-      searchListPlaceholder: '请选择订单行',
+    }
-      searchField: 'lineNumber',
-      searchTitle: '采购订单信息',
-      searchAllSchemas: PurchaseDetail.allSchemas,
-      searchPage: PurchaseDetailApi.getPurchaseDetailPage,
-      searchCondition: [{
-        key:'number',
-        value:'poNumber',
-        isMainValue: true
-      }]
   },
-    form: {
+  {
-      // labelMessage: '信息提示说明！！！',
+    label: '从包装号',
-      componentProps: {
+    field: 'fromPackingNumber',
-        isSearchList: true,
+    sort: 'custom',
-        searchListPlaceholder: '请选择订单行',
+    table: {
-        searchField: 'lineNumber',
+      width: 150
-        searchTitle: '采购订单信息',
+    }, 
-        searchAllSchemas: PurchaseDetail.allSchemas,
+    tableForm:{
-        searchPage: PurchaseDetailApi.getPurchaseDetailPage,
+      disabled:true
-        searchCondition: [{
-          key:'number',
-          value:'poNumber',
-          isMainValue: true
-        }]
     }
+  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    }, 
+    tableForm:{
+      disabled:true
     }
   },
   {
-    label: '原因',
+    label: '从器具号',
-    field: 'reason',
+    field: 'fromContainerNumber',
     sort: 'custom',
     table: {
       width: 150
     }, 
-    dictType: DICT_TYPE.PURCHASE_RETURN_REASON,
-    dictClass: 'string',
     tableForm:{
-      type: 'Select'
+      disabled:true
+    }
   },
+  {
+    label: '到器具号',
+    field: 'toContainerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    }, 
+    tableForm:{
+      disabled:true
+    }
   },
   {
-    label: '从货主代码',
+    label: '数量',
-    field: 'fromOwnerCode',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150
     },
-    isTableForm: false,
+    form: {
-    isForm: false
+      component: 'InputNumber',
+    },
+    tableForm:{
+      disabled:true,
+      type:'InputNumber',
+      min:0,
+    }
   },
   {
-    label: '到货主代码',
+    label: '计量单位',
-    field: 'toOwnerCode',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     }, 
-    isTableForm: false,
+    tableForm:{
-    isForm: false
+      disabled:true
+    }
   },
+  
   {
-    label: '单据号',
+    label: '标包数量',
-    field: 'number',
+    field: 'stdPackQty',
     sort: 'custom',
     table: {
       width: 150
     },
-    isTableForm: false,
     form: {
-      componentProps: {
+      component: 'InputNumber',
+    }, 
+    tableForm:{
       disabled:true
     }
-    }
   },
   {
-    label: '物品代码',
+    label: '标包单位',
-    field: 'itemCode',
+    field: 'stdPackUnit',
+    dictType: DICT_TYPE.PACK_UNIT,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     }, 
     tableForm:{
-      isInpuFocusShow: true,
+      disabled:true
-      searchListPlaceholder: '请选择物品代码',
+    }
-      searchField: 'code',
+  },
-      searchTitle: '物品基础信息',
+
-      searchAllSchemas: Itembasic.allSchemas,
+  {
-      searchPage: ItembasicApi.getItembasicPage
+    label: '供应商计量数量',
+    field: 'supplierQty',
+    sort: 'custom',
+    table: {
+      width: 150
     },
     form: {
-      // labelMessage: '信息提示说明！！！',
+      component: 'InputNumber',
-      componentProps: {
+    }, 
-        isSearchList: true,
+    tableForm:{
-        searchListPlaceholder: '请选择物品代码',
+      disabled:true
-        searchField: 'code',
-        searchTitle: '物品基础信息',
-        searchAllSchemas: Itembasic.allSchemas,
-        searchPage: ItembasicApi.getItembasicPage
     }
+  },
+  {
+    label: '供应商计量单位',
+    field: 'supplierUom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    }, 
+    tableForm:{
+      disabled:true
     }
   },
+  
   {
-    label: '物品名称',
+    label: '库存状态',
-    field: 'itemName',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     }, 
-    isTableForm: false,
+    tableForm:{
-    isForm: false
+      disabled:true
+    }
   },
   {
-    label: '物品描述1',
+    label: '从库位代码',
-    field: 'itemDesc1',
+    field: 'fromLocationCode',
     sort: 'custom',
     table: {
       width: 150
     }, 
-    isTableForm: false,
+    tableForm:{
-    isForm: false
+      disabled:true
+    }
   },
   {
-    label: '物品描述2',
+    label: '到库位代码',
-    field: 'itemDesc2',
+    field: 'toLocationCode',
     sort: 'custom',
     table: {
       width: 150
     }, 
-    isTableForm: false,
+    tableForm:{
-    isForm: false
+      disabled:true
+    }
   },
   {
-    label: '项目代码',
+    label: '从库位组代码',
-    field: 'projectCode',
+    field: 'fromLocationGroupCode',
     sort: 'custom',
     table: {
       width: 150
     }, 
-    isTableForm: false,
+    tableForm:{
-    isForm: false
+      disabled:true
+    }
   },
   {
-    label: '数量',
+    label: '到库位组代码',
-    field: 'qty',
+    field: 'toLocationGroupCode',
     sort: 'custom',
     table: {
       width: 150
     }, 
-    form: {
+    tableForm:{
-      component: 'InputNumber',
+      disabled:true
-      componentProps: {
+    }
-        min: 1,
-        precision: 6
   },
+  {
+    label: '从库区代码',
+    field: 'fromAreaCodes',
+    sort: 'custom',
+    table: {
+      width: 150
     }, 
     tableForm:{
-      type: 'InputNumber',
+      disabled:true
-      min: 1,
-      precision: 6
     }
   },
   {
-    label: '计量单位',
+    label: '到库区代码',
-    field: 'uom',
+    field: 'toAreaCodes',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     }, 
     tableForm:{
-      type: 'Select'
+      disabled:true
     }
   },
   {
-    label: '备注',
+    label: '从货主代码',
-    field: 'remark',
+    field: 'fromOwnerCode',
     sort: 'custom',
     table: {
       width: 150
     }, 
+    tableForm:{
+      disabled:true
+    }
   },
   {
-    label: '创建者',
+    label: '到货主代码',
-    field: 'creator',
+    field: 'toOwnerCode',
     sort: 'custom',
     table: {
       width: 150
     }, 
-    isTableForm: false,
+    tableForm:{
-    isForm: false,
+      disabled:true
+    }
   },
   {
-    label: '创建时间',
+    label: '到货日期',
-    field: 'createTime',
+    field: 'arriveDate',
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -775,31 +820,226 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 180
     },
-    isTableForm: false,
-    isForm: false,
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
       }
     }, 
+    tableForm:{
+      disabled:true
+    }
   },
   {
-    label: '最后更新者',
+    label: '生产日期',
-    field: 'updater',
+    field: 'produceDate',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }, 
+    tableForm:{
+      disabled:true
+    }
+  },
+  {
+    label: '过期日期',
+    field: 'expireDate',
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }, 
+    tableForm:{
+      disabled:true
+    }
+  },
+  {
+    label: '转换率',
+    field: 'convertRate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }, 
+    tableForm:{
+      disabled:true
+    }
+  },
+  {
+    label: '目检结果',
+    field: 'visualInspectResult',
+    sort: 'custom',
+    table: {
+      width: 150
+    }, 
+    tableForm:{
+      disabled:true
+    }
+  },
+  {
+    label: '目检照片',
+    field: 'visualInspectPhotos',
+    sort: 'custom',
+    table: {
+      width: 150
+    }, 
+    tableForm:{
+      disabled:true
+    }
+  },
+  {
+    label: '不合格原因',
+    field: 'failedReason',
+    dictType: DICT_TYPE.PURCHASE_RETURN_REASON,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    }, 
+    tableForm:{
+      disabled:true
+    }
+  },
+  {
+    label: '单价',
+    field: 'singlePrice',
     sort: 'custom',
     table: {
       width: 150
     },
+    form: {
+      component: 'InputNumber',
+    }, 
+    tableForm:{
+      disabled:true
+    }
+  },
+  {
+    label: '金额',
+    field: 'amount',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }, 
+    tableForm:{
+      disabled:true
+    }
+  },
+  {
+    label: '任务明细ID',
+    field: 'jobDetailId',
+    sort: 'custom',
+    table: {
+      width: 150
+    }, 
+    tableForm:{
+      disabled:true
+    },
+    isTableForm:false,
+    isForm:false
+  },
+ 
+  {
+    label: '项目代码',
+    field: 'projectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    }, 
+    tableForm:{
+      disabled:true
+    }
+  },
+
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 150
+    }, 
+    tableForm:{
+      disabled:true
+    },
     isTableForm:false,
+    isForm:false
+  },
+  {
+    label: '代码',
+    field: 'code',
+    sort: 'custom',
+    table: {
+      width: 150
+    }, 
+    tableForm:{
+      disabled:true
+    },
+    isTableForm:false,
+    isForm:false
+  },
+  {
+    label: '接口类型',
+    field: 'interfaceType',
+    dictType: DICT_TYPE.INTERFACE_TYPE,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    }, 
+    tableForm:{
+      disabled:true
+    },
     isForm:false,
+    isTableForm:false
   },
   {
-    label: '最后更新时间',
+    label: '备注',
-    field: 'updateTime',
+    field: 'remark',
+    sort: 'custom',
+    table: {
+      width: 150
+    }, 
+    tableForm:{
+      disabled:true
+    }
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -811,25 +1051,29 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     form: {
       component: 'DatePicker',
       componentProps: {
-        style: {width:'100%'},
         type: 'datetime',
         dateFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'x',
       }
     }, 
+    tableForm:{
+      disabled:true
+    },
     isTableForm:false,
-    isForm: false,
+    isForm:false
   },
   {
-    label: '操作',
+    label: '创建者',
-    field: 'action',
+    field: 'creator',
-    isDetail: false,
+    sort: 'custom',
-    isForm: false ,
     table: {
-      width: 150,
+      width: 150
-      fixed: 'right'
+    }, 
+    tableForm:{
+      disabled:true
     },
     isTableForm:false,
+    isForm:false
   }
 ]))