diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 32cf5acde..08a41d8de 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -123,7 +123,11 @@
:apiPage="SupplierdeliverRequestDetailApi.getSupplierdeliverRequestDetailPage"
:apiDelete="SupplierdeliverRequestDetailApi.deleteSupplierdeliverRequestDetail"
@searchTableSuccessDetail="searchTableSuccessDetail"
- />
+ >
+
+ {{row.isPutaway ==1 ?'是':'否'}}
+
+
{
.get(CACHE_KEY.DEPT)
.find((account) => account.id == row.departmentCode)?.name
if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
- annexInspectionDetail.value.hiddenDelete = row.status==8 //HL-5838质检明细-删除按钮只有status=8隐藏,其他都展示
+ annexInspectionDetail.value.hiddenDelete = row.status == 8 //HL-5838质检明细-删除按钮只有status=8隐藏,其他都展示
detailRef.value.openDetail(row, titleName, titleValue, 'requestSupplierdeliverMain')
}
/** 上传履历表 */
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 83a4c317b..c3618b8be 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/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(
isForm: false,
isTableForm: false,
isTable: false,
+ table: {
+
+ },
detail: {
dictType: 'primary',
valueFilter: (value) => {
@@ -1313,7 +1324,25 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive {
+ // 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