From 876f6bf942577ee8b763e84e155d639efaaf77e0 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Tue, 12 Nov 2024 13:56:43 +0800 Subject: [PATCH] =?UTF-8?q?21=E3=80=8122=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../amvPurchasereceiptRecordMain/index.vue | 2 +- .../purchasereceiptRecordMain.data.ts | 44 +++++++++---------- .../bsPurchasereceiptRecordMain/index.vue | 2 +- .../purchasereceiptRecordMain.data.ts | 44 +++++++++---------- .../purchasereceiptJobMain.data.ts | 24 +++++----- .../index.vue | 2 +- .../purchasereceiptRecordMain.data.ts | 44 +++++++++---------- .../purchasereceiptRequestMain.data.ts | 24 +++++----- .../jisPurchasereceiptRecordMain/index.vue | 2 +- .../purchasereceiptRecordMain.data.ts | 44 +++++++++---------- .../purchasereceiptRequestMain.data.ts | 24 +++++----- .../purchasereceiptJobMain.data.ts | 24 +++++----- .../purchasereceiptRecordMain/index.vue | 2 +- .../purchasereceiptRecordMain.data.ts | 24 +++++----- .../purchasereceiptRequestMain/index.vue | 2 +- .../purchasereceiptRequestMain.data.ts | 24 +++++----- .../purchasereceiptJobMain.data.ts | 24 +++++----- .../toolPurchasereceiptRecordMain/index.vue | 2 +- .../purchasereceiptRecordMain.data.ts | 44 +++++++++---------- .../purchasereceiptRequestMain.data.ts | 24 +++++----- 20 files changed, 213 insertions(+), 213 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/index.vue index a84904362..2f3801adb 100644 --- a/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/index.vue @@ -240,7 +240,7 @@ const butttondata = (row, $index) => { }), // 生成到货检验申请 defaultButtons.mainPutawayRequestBtn({ hasPermi: 'wms:amv-purchasereceipt-record-main:createPutawayRequest', - hide: row.putawayRequestFlag == 'FALSE' + hide: row.isPutaway==1?row.putawayRequestFlag == 'FALSE':'TRUE' }), // 生成采购上架申请 defaultButtons.mainPurchasereturnRecordBtn({ hasPermi: 'wms:amv-purchasereceipt-record-main:createPurchasereturnRecord', diff --git a/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index f123cfa53..ca47360f9 100644 --- a/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -426,16 +426,16 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ } } }, - // { - // label: '操作', - // field: 'action', - // isDetail: false, - // isForm: false, - // table: { - // width: 400, - // fixed: 'right' - // }, - // }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 400, + fixed: 'right' + }, + }, { label: '批次', // 实际是子表的从批次，为了不影响页面，单独放上面 field: 'fromBatch', @@ -1234,18 +1234,18 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive sortTableDefault:2000, }, - { - label: '操作', - hiddenInMain:true, - field: 'action', - isDetail: false, - isForm: false , - table: { - width: 150, - fixed: 'right' - }, - isTableForm:true, - } + // { + // label: '操作', + // hiddenInMain:true, + // field: 'action', + // isDetail: false, + // isForm: false , + // table: { + // width: 150, + // fixed: 'right' + // }, + // isTableForm:true, + // } ])) // 表单校验 diff --git a/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/index.vue index a3284de17..9c07d4d43 100644 --- a/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/index.vue @@ -240,7 +240,7 @@ const butttondata = (row, $index) => { }), // 生成到货检验申请 defaultButtons.mainPutawayRequestBtn({ hasPermi: 'wms:bs-purchasereceipt-record-main:createPutawayRequest', - hide: row.putawayRequestFlag == 'FALSE' + hide: row.isPutaway==1?row.putawayRequestFlag == 'FALSE':'TRUE' }), // 生成采购上架申请 defaultButtons.mainPurchasereturnRecordBtn({ hasPermi: 'wms:bs-purchasereceipt-record-main:createPurchasereturnRecord', diff --git a/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index f123cfa53..ca47360f9 100644 --- a/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -426,16 +426,16 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ } } }, - // { - // label: '操作', - // field: 'action', - // isDetail: false, - // isForm: false, - // table: { - // width: 400, - // fixed: 'right' - // }, - // }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 400, + fixed: 'right' + }, + }, { label: '批次', // 实际是子表的从批次，为了不影响页面，单独放上面 field: 'fromBatch', @@ -1234,18 +1234,18 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive sortTableDefault:2000, }, - { - label: '操作', - hiddenInMain:true, - field: 'action', - isDetail: false, - isForm: false , - table: { - width: 150, - fixed: 'right' - }, - isTableForm:true, - } + // { + // label: '操作', + // hiddenInMain:true, + // field: 'action', + // isDetail: false, + // isForm: false , + // table: { + // width: 150, + // fixed: 'right' + // }, + // isTableForm:true, + // } ])) // 表单校验 diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts index 3349d2e31..7a2fd37d2 100644 --- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts @@ -1114,18 +1114,18 @@ export const PurchasereceiptJobDetail = useCrudSchemas( hiddenInMain: false, sortTableDefault: 1012 }, - { - label: '操作', - hiddenInMain: true, - field: 'action', - isDetail: false, - isForm: false, - table: { - width: 180, - fixed: 'right' - }, - isTableForm: true - } + // { + // label: '操作', + // hiddenInMain: true, + // field: 'action', + // isDetail: false, + // isForm: false, + // table: { + // width: 180, + // fixed: 'right' + // }, + // isTableForm: true + // } ]) ) diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/index.vue index 55ee5fb9d..8dcc305fe 100644 --- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/index.vue @@ -240,7 +240,7 @@ const butttondata = (row, $index) => { }), // 生成到货检验申请 defaultButtons.mainPutawayRequestBtn({ hasPermi: 'wms:develop-purchasereceipt-record-main:createPutawayRequest', - hide: row.putawayRequestFlag == 'FALSE' + hide: row.isPutaway==1?row.putawayRequestFlag == 'FALSE':'TRUE' }), // 生成采购上架申请 defaultButtons.mainPurchasereturnRecordBtn({ hasPermi: 'wms:develop-purchasereceipt-record-main:createPurchasereturnRecord', diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index f123cfa53..ca47360f9 100644 --- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -426,16 +426,16 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ } } }, - // { - // label: '操作', - // field: 'action', - // isDetail: false, - // isForm: false, - // table: { - // width: 400, - // fixed: 'right' - // }, - // }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 400, + fixed: 'right' + }, + }, { label: '批次', // 实际是子表的从批次，为了不影响页面，单独放上面 field: 'fromBatch', @@ -1234,18 +1234,18 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive sortTableDefault:2000, }, - { - label: '操作', - hiddenInMain:true, - field: 'action', - isDetail: false, - isForm: false , - table: { - width: 150, - fixed: 'right' - }, - isTableForm:true, - } + // { + // label: '操作', + // hiddenInMain:true, + // field: 'action', + // isDetail: false, + // isForm: false , + // table: { + // width: 150, + // fixed: 'right' + // }, + // isTableForm:true, + // } ])) // 表单校验 diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index 211ddf776..e6ae972da 100644 --- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -1341,18 +1341,18 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive { }), // 生成到货检验申请 defaultButtons.mainPutawayRequestBtn({ hasPermi: 'wms:jis-purchasereceipt-record-main:createPutawayRequest', - hide: row.putawayRequestFlag == 'FALSE' + hide: row.isPutaway==1?row.putawayRequestFlag == 'FALSE':'TRUE' }), // 生成采购上架申请 defaultButtons.mainPurchasereturnRecordBtn({ hasPermi: 'wms:jis-purchasereceipt-record-main:createPurchasereturnRecord', diff --git a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index f123cfa53..ca47360f9 100644 --- a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -426,16 +426,16 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ } } }, - // { - // label: '操作', - // field: 'action', - // isDetail: false, - // isForm: false, - // table: { - // width: 400, - // fixed: 'right' - // }, - // }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 400, + fixed: 'right' + }, + }, { label: '批次', // 实际是子表的从批次，为了不影响页面，单独放上面 field: 'fromBatch', @@ -1234,18 +1234,18 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive sortTableDefault:2000, }, - { - label: '操作', - hiddenInMain:true, - field: 'action', - isDetail: false, - isForm: false , - table: { - width: 150, - fixed: 'right' - }, - isTableForm:true, - } + // { + // label: '操作', + // hiddenInMain:true, + // field: 'action', + // isDetail: false, + // isForm: false , + // table: { + // width: 150, + // fixed: 'right' + // }, + // isTableForm:true, + // } ])) // 表单校验 diff --git a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index 211ddf776..e6ae972da 100644 --- a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -1341,18 +1341,18 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive { }), // 生成到货检验申请 defaultButtons.mainPutawayRequestBtn({ hasPermi: 'wms:purchasereceipt-record-main:createPutawayRequest', - hide: row.putawayRequestFlag == 'FALSE' + hide: row.isPutaway==1?row.putawayRequestFlag == 'FALSE':'TRUE' }), // 生成采购上架申请 defaultButtons.mainPurchasereturnRecordBtn({ hasPermi: 'wms:purchasereceipt-record-main:createPurchasereturnRecord', diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index a0fb7f5ab..ca47360f9 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -1234,18 +1234,18 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive sortTableDefault:2000, }, - { - label: '操作', - hiddenInMain:true, - field: 'action', - isDetail: false, - isForm: false , - table: { - width: 150, - fixed: 'right' - }, - isTableForm:true, - } + // { + // label: '操作', + // hiddenInMain:true, + // field: 'action', + // isDetail: false, + // isForm: false , + // table: { + // width: 150, + // fixed: 'right' + // }, + // isTableForm:true, + // } ])) // 表单校验 diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue index 7306d2614..9e91e01e5 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue @@ -318,7 +318,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn(null), // 新增 + // defaultButtons.defaultAddBtn(null), // 新增 defaultButtons.defaultImportBtn(null), // 导入 defaultButtons.defaultExportBtn({hasPermi:'wms:purchasereceipt-request-main:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index 211ddf776..e6ae972da 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -1341,18 +1341,18 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive { }), // 生成到货检验申请 defaultButtons.mainPutawayRequestBtn({ hasPermi: 'wms:tool-purchasereceipt-record-main:createPutawayRequest', - hide: row.putawayRequestFlag == 'FALSE' + hide: row.isPutaway==1?row.putawayRequestFlag == 'FALSE':'TRUE' }), // 生成采购上架申请 defaultButtons.mainPurchasereturnRecordBtn({ hasPermi: 'wms:tool-purchasereceipt-record-main:createPurchasereturnRecord', diff --git a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index f123cfa53..ca47360f9 100644 --- a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -426,16 +426,16 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ } } }, - // { - // label: '操作', - // field: 'action', - // isDetail: false, - // isForm: false, - // table: { - // width: 400, - // fixed: 'right' - // }, - // }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 400, + fixed: 'right' + }, + }, { label: '批次', // 实际是子表的从批次，为了不影响页面，单独放上面 field: 'fromBatch', @@ -1234,18 +1234,18 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive sortTableDefault:2000, }, - { - label: '操作', - hiddenInMain:true, - field: 'action', - isDetail: false, - isForm: false , - table: { - width: 150, - fixed: 'right' - }, - isTableForm:true, - } + // { + // label: '操作', + // hiddenInMain:true, + // field: 'action', + // isDetail: false, + // isForm: false , + // table: { + // width: 150, + // fixed: 'right' + // }, + // isTableForm:true, + // } ])) // 表单校验 diff --git a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index 211ddf776..e6ae972da 100644 --- a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -1341,18 +1341,18 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive