YT-1659供应商发货申请，子表字段显示、及顺序显示应与需求显示一致，现不一致

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

@@ -123,7 +123,11 @@
     :apiPage="SupplierdeliverRequestDetailApi.getSupplierdeliverRequestDetailPage"
     :apiDelete="SupplierdeliverRequestDetailApi.deleteSupplierdeliverRequestDetail"
     @searchTableSuccessDetail="searchTableSuccessDetail"
-  />
+  >
+    <template #isPutaway="{ row }">
+     <el-tag type="primary">{{row.isPutaway ==1 ?'是':'否'}}</el-tag>
+    </template>
+  </Detail>
 
   <!-- 导入 -->
   <ImportForm

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts

@@ -13,6 +13,14 @@ import { cloneDeep } from 'lodash-es'
 import {validateInteger} from '@/utils/validator'
 const { t } = useI18n() // 国际化
 
+const valueFilter = [{
+  label: '是',
+  value:'1'
+}, {
+  label: '否',
+    value: '0'
+  }]
+     
 
 let PurchasePlanDetailSchemas = cloneDeep(PurchasePlanDetail.allSchemas)
 if(PurchasePlanDetailSchemas?.tableColumns){
@@ -417,6 +425,9 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     isForm: false,
     isTableForm: false,
     isTable: false,
+    table: {
+      
+    },
     detail: {
       dictType: 'primary',
       valueFilter: (value) => {
@@ -1313,7 +1324,25 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isTable: false,
     isForm: false
   },
-
+  {
+    label: '是否上架',
+    field: 'isPutaway',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    sort: 'custom',
+    // formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+    //   return valueFilter.find((account) => account.value == cellValue)?.label
+    // },
+    sortTableDefault: 10000,
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    }
+  },
   {
     label: '创建时间',
     field: 'createTime',
@@ -1322,7 +1351,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     hiddenInMain: false,
-    isTable: false,
+    isTable: true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -1338,6 +1367,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     },
     isTableForm: false,
     isForm: false,
+    sortTableDefault:10000
   },
   {
     label: '创建者',
@@ -1346,10 +1376,10 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
-    hiddenInMain:false,
     isTableForm: false,
-    isTable: false,
+    isTable: true,
     isForm: false,
+    sortTableDefault: 10000
   },
   // {
   //   label: '最后更新时间',

src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue

@@ -34,7 +34,7 @@
       </template>
       <template #action="{ row }">
         <ButtonBaseMore
-          :Butttondata="butttondata(row, $index)"
+          :Butttondata="butttondata(row)"
           @button-base-click="buttonTableClick($event, row)"
         />
       </template>