From c3e10a6b3e7f0e37da5e37b7df6d0dd7ca1809c2 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Mon, 27 May 2024 18:41:16 +0800 Subject: [PATCH 1/6] =?UTF-8?q?bug=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repleinshRequestMain/repleinshRequestMain.data.ts | 6 ++++++ .../productreceiptRecordMain.data.ts | 1 + 2 files changed, 7 insertions(+) diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts index b3ab53b53..550dde555 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts +++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts @@ -408,6 +408,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive([ label: '包装规格', field: 'packUnit', sort: 'custom', + isForm:false, table: { width: 150 }, @@ -417,6 +418,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive([ label: '包装数量', field: 'packQty', sort: 'custom', + isForm:false, table: { width: 150 }, @@ -526,6 +528,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTableForm: false, isSearch: true, sortTableDefault:5, sortSearchDefault:3, @@ -559,6 +562,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTableForm: false, isSearch: true, }, { @@ -753,6 +757,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTableForm: false, sortTableDefault:1, }, { @@ -762,6 +767,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTableForm: false, sortTableDefault:2, }, diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts index a4002349f..238b9acd5 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts @@ -521,6 +521,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( label: '单据号', field: 'number', sort: 'custom', + hiddenInMain: true, table: { width: 180 }, From afc20e6c0d30f23661356a6ba02c51b0ea0b2140 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Mon, 27 May 2024 19:22:47 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=B8=BB=E5=AD=90=E8=A1=A8=E5=90=88?= =?UTF-8?q?=E5=B9=B6bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- src/views/wms/countManage/count/countJobMain/index.vue | 2 +- src/views/wms/countManage/count/countPlanMain/index.vue | 2 +- src/views/wms/countManage/count/countRecordMain/index.vue | 2 +- src/views/wms/countManage/count/countRequestMain/index.vue | 2 +- .../wms/countManage/countadjust/countadjustRecordMain/index.vue | 2 +- .../countManage/countadjust/countadjustRequestMain/index.vue | 2 +- .../customerreceipt/customerreceiptRecordMain/index.vue | 2 +- .../customerreceipt/customerreceiptRequestMain/index.vue | 2 +- .../customerreturn/customerreturnJobMain/index.vue | 2 +- .../customerreturn/customerreturnRecordMain/index.vue | 2 +- .../customerreturn/customerreturnRequestMain/index.vue | 2 +- .../customersettle/customersettleRecordMain/index.vue | 2 +- .../customersettle/customersettleRequestMain/index.vue | 2 +- .../deliversettlementManage/deliver/deliverJobMain/index.vue | 2 +- .../deliversettlementManage/deliver/deliverRecordMain/index.vue | 2 +- .../deliver/deliverRequestMain/index.vue | 2 +- .../deliverplan/deliverPlanMain/index.vue | 2 +- .../deliversettlementManage/saleShipmentMainRequest/index.vue | 2 +- .../deliversettlementManage/stockup/stockupMainJob/index.vue | 2 +- .../deliversettlementManage/stockup/stockupMainRecord/index.vue | 2 +- .../stockup/stockupMainRequest/index.vue | 2 +- .../containermanage/containerMainRequest/index.vue | 2 +- .../containermanage/containerRecordMain/index.vue | 2 +- .../containermanage/initialContainerMainRequest/index.vue | 2 +- .../containermanage/scrapContainerMainRequest/index.vue | 2 +- .../inventoryinitial/inventoryinitRecordMain/index.vue | 2 +- .../inventoryinitial/inventoryinitRequestMain/index.vue | 2 +- .../packageoverMain/packageoverRecordMain/index.vue | 2 +- .../packageoverMain/packageoverRequestMain/index.vue | 2 +- src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue | 2 +- .../wms/inventoryjobManage/scrap/scrapRecordMain/index.vue | 2 +- .../wms/inventoryjobManage/scrap/scrapRequestMain/index.vue | 2 +- .../sparepartsrequisitionJobMain/index.vue | 2 +- .../sparepartsrequisitionRecordMain/index.vue | 2 +- .../sparepartsrequisitionRequestMain/index.vue | 2 +- .../transferissue/transferissueJobMain/index.vue | 2 +- .../transferissue/transferissueRecordMain/index.vue | 2 +- .../transferissue/transferissueRequestMain/index.vue | 2 +- .../transferreceipt/transferreceiptJobMain/index.vue | 2 +- .../transferreceipt/transferreceiptRecordMain/index.vue | 2 +- .../transferreceipt/transferreceiptRequestMain/index.vue | 2 +- .../unplannedissue/unplannedissueJobMain/index.vue | 2 +- .../unplannedissue/unplannedissueRecordMain/index.vue | 2 +- .../unplannedissue/unplannedissueRequestMain/index.vue | 2 +- .../unplannedreceipt/unplannedreceiptJobMain/index.vue | 2 +- .../unplannedreceipt/unplannedreceiptRecordMain/index.vue | 2 +- .../unplannedreceipt/unplannedreceiptRequestMain/index.vue | 2 +- src/views/wms/issueManage/issue/issueJobMain/index.vue | 2 +- src/views/wms/issueManage/issue/issueRecordMain/index.vue | 2 +- src/views/wms/issueManage/issue/issueRequestMain/index.vue | 2 +- .../issueManage/preparetoissueplan/preparetoissueMain/index.vue | 2 +- .../productionreceipt/productionreceiptJobMain/index.vue | 2 +- .../productionreceipt/productionreceiptRecordMain/index.vue | 2 +- .../productionreturn/productionreturnJobMain/index.vue | 2 +- .../productionreturn/productionreturnRecordMain/index.vue | 2 +- .../productionreturn/productionreturnRequestMain/index.vue | 2 +- .../productionreturn/productionreturnRequestMainNo/index.vue | 2 +- src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue | 2 +- .../wms/issueManage/repleinsh/repleinshRecordMain/index.vue | 2 +- .../wms/issueManage/repleinsh/repleinshRequestMain/index.vue | 2 +- .../inventorychange/inventorychangeRecordMain/index.vue | 2 +- .../inventorychange/inventorychangeRequestMain/index.vue | 2 +- .../wms/moveManage/inventorymove/inventorymoveJobMain/index.vue | 2 +- .../moveManage/inventorymove/inventorymoveRecordMain/index.vue | 2 +- .../moveManage/inventorymove/inventorymoveRequestMain/index.vue | 2 +- .../offlinesettlement/offlinesettlementRecordMain/index.vue | 2 +- .../offlinesettlement/offlinesettlementRequestMain/index.vue | 2 +- .../productdismantle/productdismantleJobMain/index.vue | 2 +- .../productdismantle/productdismantleRecordMain/index.vue | 2 +- .../productdismantle/productdismantleRequestMain/index.vue | 2 +- .../productionManage/productionplan/productionMain/index.vue | 2 +- .../productionplan/productionMainAssemble/index.vue | 2 +- .../productionplan/productionMainAssembleSparePart/index.vue | 2 +- .../productionplan/productionMainPredictSparePart/index.vue | 2 +- .../productputaway/productputawayJobMain/index.vue | 2 +- .../productputaway/productputawayRecordMain/index.vue | 2 +- .../productputaway/productputawayRequestMain/index.vue | 2 +- .../productputawayAssembleJobMain/index.vue | 2 +- .../productputawayAssembleRecordMain/index.vue | 2 +- .../productputawayAssembleRequestMain/index.vue | 2 +- .../productreceipt/productreceiptJobMain/index.vue | 2 +- .../productreceipt/productreceiptRecordMain/index.vue | 2 +- .../productreceipt/productreceiptRequestMain/index.vue | 2 +- .../productreceiptAssembleJobMain/index.vue | 2 +- .../productreceiptAssembleRecordMain/index.vue | 2 +- .../productreceiptAssembleRequestMain/index.vue | 2 +- .../productreceiptscrap/productreceiptscrapJobMain/index.vue | 2 +- .../productreceiptscrap/productreceiptscrapRecordMain/index.vue | 2 +- .../productreceiptscrapRequestMain/index.vue | 2 +- .../productredress/productredressJobMain/index.vue | 2 +- .../productredress/productredressRecordMain/index.vue | 2 +- .../productredress/productredressRequestMain/index.vue | 2 +- .../productrepair/productrepairRecordMain/index.vue | 2 +- .../productrepair/productrepairRequestMain/index.vue | 2 +- .../productionManage/productscrap/productscrapJobMain/index.vue | 2 +- .../productscrap/productscrapRecordMain/index.vue | 2 +- .../productscrap/productscrapRequestMain/index.vue | 2 +- .../wms/purchasereceiptManage/inspect/inspectJobMain/index.vue | 2 +- .../purchasereceiptManage/inspect/inspectRecordMain/index.vue | 2 +- .../purchasereceiptManage/inspect/inspectRequestMain/index.vue | 2 +- .../purchasereceipt/purchasereceiptJobMain/index.vue | 2 +- .../purchasereceipt/purchasereceiptRecordMain/index.vue | 2 +- .../purchasereceipt/purchasereceiptRequestMain/index.vue | 2 +- .../purchasereturn/purchasereturnJobMain/index.vue | 2 +- .../purchasereturn/purchasereturnRecordMain/index.vue | 2 +- .../purchasereturn/purchasereturnRequestMain/index.vue | 2 +- .../wms/purchasereceiptManage/putaway/putawayJobMain/index.vue | 2 +- .../purchasereceiptManage/putaway/putawayRecordMain/index.vue | 2 +- .../purchasereceiptManage/putaway/putawayRequestMain/index.vue | 2 +- .../sparereceipt/sparereceiptJobMain/index.vue | 2 +- .../sparereceipt/sparereceiptRecordMain/index.vue | 2 +- .../sparereceipt/sparereceiptRequestMain/index.vue | 2 +- .../supplierdeliver/demandforecastingMain/index.vue | 2 +- .../supplierdeliver/purchaseMain/index.vue | 2 +- .../supplierdeliver/purchasePlanMain/index.vue | 2 +- .../supplierdeliver/supplierdeliverRecordMain/index.vue | 2 +- .../supplierdeliver/supplierdeliverRequestMain/index.vue | 2 +- .../purchaseclaim/purchaseclaimRecordMain/index.vue | 2 +- .../purchaseclaim/purchaseclaimRequestMain/index.vue | 2 +- .../supplierinvoice/supplierinvoiceRecordMain/index.vue | 2 +- .../supplierinvoice/supplierinvoiceRequestMain/index.vue | 2 +- 122 files changed, 122 insertions(+), 122 deletions(-) diff --git a/README.md b/README.md index e5f4b9509..314704f75 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ PurchaseDetail:子表 3.2 在按钮回调中添加$index，固定的写死： const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } …下面是原有的按钮逻辑，不变 diff --git a/src/views/wms/countManage/count/countJobMain/index.vue b/src/views/wms/countManage/count/countJobMain/index.vue index e569a548f..c695c1f77 100644 --- a/src/views/wms/countManage/count/countJobMain/index.vue +++ b/src/views/wms/countManage/count/countJobMain/index.vue @@ -194,7 +194,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/countManage/count/countPlanMain/index.vue b/src/views/wms/countManage/count/countPlanMain/index.vue index b77b68280..e9ef37a85 100644 --- a/src/views/wms/countManage/count/countPlanMain/index.vue +++ b/src/views/wms/countManage/count/countPlanMain/index.vue @@ -244,7 +244,7 @@ const isShowMainButton = (row, val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/countManage/count/countRecordMain/index.vue b/src/views/wms/countManage/count/countRecordMain/index.vue index a33275922..d82f09fcd 100644 --- a/src/views/wms/countManage/count/countRecordMain/index.vue +++ b/src/views/wms/countManage/count/countRecordMain/index.vue @@ -128,7 +128,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/countManage/count/countRequestMain/index.vue b/src/views/wms/countManage/count/countRequestMain/index.vue index 5da310cda..3fbb79910 100644 --- a/src/views/wms/countManage/count/countRequestMain/index.vue +++ b/src/views/wms/countManage/count/countRequestMain/index.vue @@ -286,7 +286,7 @@ const searchTableRef = ref() // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue b/src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue index 0e667c036..dfb07c37a 100644 --- a/src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue +++ b/src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue @@ -128,7 +128,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [] diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue index b127739f1..a20fce4bc 100644 --- a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue +++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue @@ -189,7 +189,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/index.vue b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/index.vue index f01ce986f..c077173d5 100644 --- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/index.vue @@ -128,7 +128,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [] diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue index 71ea36ad7..b1af5ce1e 100644 --- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue @@ -194,7 +194,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue index 2fe03e3cc..27bca0a16 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue @@ -181,7 +181,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue index b3853d769..5ff523ad5 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue @@ -129,7 +129,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] }else{ return [defaultButtons.mainListDocumentPrintBtn(null),] // 标签打印 diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue index 388c2682b..9dde767ca 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue @@ -281,7 +281,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/index.vue b/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/index.vue index 86aa9e358..4cdd0b633 100644 --- a/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/index.vue +++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/index.vue @@ -128,7 +128,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [] diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue index 0a66846e8..fc8514503 100644 --- a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue @@ -210,7 +210,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue index 40fa6a1ba..d684f7788 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue @@ -202,7 +202,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue index 5af1128a4..4f7b9dda3 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue @@ -151,7 +151,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] }else{ return [defaultButtons.mainListDocumentPrintBtn(null),] // 标签打印 diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue index 053d9afa2..751865884 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue @@ -271,7 +271,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue index f36162d4c..991f18fb2 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue @@ -274,7 +274,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue index d2170c375..879bc53fd 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue @@ -216,7 +216,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue index da63e664a..c567a0cc0 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue @@ -182,7 +182,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue index 136e068e8..5e5dda7fa 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue @@ -129,7 +129,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [] diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue index fc3918c55..1b210a28f 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue @@ -244,7 +244,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue index be42e4a99..b899abafc 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue @@ -296,7 +296,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue index 7e04d9d9d..f5b547605 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue @@ -172,7 +172,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue index e16f9e150..94c34f6e1 100644 --- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue @@ -248,7 +248,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue index f56500f1d..75a3a2590 100644 --- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue @@ -271,7 +271,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue index 4c9f5d7ba..a7125d120 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue @@ -128,7 +128,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [] diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue index 9638df0f3..326564896 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue @@ -190,7 +190,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue index ec1050a12..8af93c106 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue @@ -123,7 +123,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [defaultButtons.mainListPointBtn(null)] // 标签打印 diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue index 24f86773b..473c4716e 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue @@ -224,7 +224,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue index 75308eaac..c8d272de6 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue +++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue @@ -181,7 +181,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/index.vue index e3d09f8b3..cba209798 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/index.vue @@ -128,7 +128,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [] diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue index 43cdda661..d8bbf336e 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue @@ -214,7 +214,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue index 670a9ed80..f71761eaf 100644 --- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue +++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue @@ -181,7 +181,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue index aa75d9df5..e2b52a2f2 100644 --- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue @@ -128,7 +128,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [] diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue index 6f083ed11..31482c978 100644 --- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue @@ -203,7 +203,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue b/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue index 07aaa3842..1b63100c5 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue @@ -184,7 +184,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/index.vue b/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/index.vue index 78be198cb..9fa022af5 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/index.vue @@ -128,7 +128,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [] diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue index 2bf877e79..6d1743a0a 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue @@ -209,7 +209,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/index.vue b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/index.vue index 4f514d13d..4d759307d 100644 --- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/index.vue +++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/index.vue @@ -181,7 +181,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/index.vue b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/index.vue index ba281dbda..9322b57ce 100644 --- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/index.vue @@ -128,7 +128,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [] diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue index 9f98debee..098f29296 100644 --- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue @@ -202,7 +202,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue index eda091009..29c0d5fcd 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue @@ -181,7 +181,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/index.vue index f0ba7f1ea..3940755fd 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/index.vue @@ -128,7 +128,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [] diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue index a91464f67..26021eeda 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue @@ -225,7 +225,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue index 4e80be9e6..be963327d 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue @@ -181,7 +181,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/index.vue index 8efabb817..68d68e27b 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/index.vue @@ -128,7 +128,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [] diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue index 20a7dce2a..edb1747c3 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue @@ -311,7 +311,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/issueManage/issue/issueJobMain/index.vue b/src/views/wms/issueManage/issue/issueJobMain/index.vue index a75cda444..8ded944ee 100644 --- a/src/views/wms/issueManage/issue/issueJobMain/index.vue +++ b/src/views/wms/issueManage/issue/issueJobMain/index.vue @@ -166,7 +166,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/issueManage/issue/issueRecordMain/index.vue b/src/views/wms/issueManage/issue/issueRecordMain/index.vue index 59f1699f9..e8d26b0f9 100644 --- a/src/views/wms/issueManage/issue/issueRecordMain/index.vue +++ b/src/views/wms/issueManage/issue/issueRecordMain/index.vue @@ -128,7 +128,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [] diff --git a/src/views/wms/issueManage/issue/issueRequestMain/index.vue b/src/views/wms/issueManage/issue/issueRequestMain/index.vue index d8587322e..358850dc5 100644 --- a/src/views/wms/issueManage/issue/issueRequestMain/index.vue +++ b/src/views/wms/issueManage/issue/issueRequestMain/index.vue @@ -198,7 +198,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue index e6af1619a..df5f57e12 100644 --- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue +++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue @@ -239,7 +239,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue index f6abeb60f..b14c8534e 100644 --- a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue +++ b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue @@ -150,7 +150,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue index b90dc1c93..7adfda3b6 100644 --- a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue +++ b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue @@ -128,7 +128,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [] diff --git a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue index caace56e0..d8c3b9889 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue @@ -158,7 +158,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue index 359bf8fc0..cd2f00442 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue @@ -128,7 +128,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [] diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue index 74dbd8e21..ec46cb9df 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue @@ -315,7 +315,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue index 16b55fdf0..1c0ce5e05 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue @@ -291,7 +291,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue b/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue index c275dba64..9f0fa88ae 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue +++ b/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue @@ -167,7 +167,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/index.vue b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/index.vue index 7e9f462c2..f88f486ac 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/index.vue +++ b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/index.vue @@ -128,7 +128,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [] diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue index 3571d89dd..6d284844a 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue +++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue @@ -197,7 +197,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue index 503614031..c1ba6e857 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue @@ -174,7 +174,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [] diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue index 56525c2a8..3d4aae62f 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue @@ -244,7 +244,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue index c7347649d..e524d3cdd 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue @@ -234,7 +234,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue index 3a8b67b05..1cb0ba47e 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue @@ -183,7 +183,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [] diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue index fdcbe94fb..5a343df14 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue @@ -398,7 +398,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/index.vue b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/index.vue index 9508b4402..357c857df 100644 --- a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/index.vue +++ b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/index.vue @@ -128,7 +128,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [] diff --git a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/index.vue b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/index.vue index 1300b2da4..569b95755 100644 --- a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/index.vue +++ b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/index.vue @@ -202,7 +202,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/productionManage/productdismantle/productdismantleJobMain/index.vue b/src/views/wms/productionManage/productdismantle/productdismantleJobMain/index.vue index 081d38896..42c4f37f6 100644 --- a/src/views/wms/productionManage/productdismantle/productdismantleJobMain/index.vue +++ b/src/views/wms/productionManage/productdismantle/productdismantleJobMain/index.vue @@ -181,7 +181,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/index.vue b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/index.vue index 74c993aa8..b39050448 100644 --- a/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/index.vue +++ b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/index.vue @@ -198,7 +198,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [] diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue index d112002a0..cd7c3af6a 100644 --- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue +++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue @@ -351,7 +351,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/productionManage/productionplan/productionMain/index.vue b/src/views/wms/productionManage/productionplan/productionMain/index.vue index 12656ca59..0c3b69fd7 100644 --- a/src/views/wms/productionManage/productionplan/productionMain/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMain/index.vue @@ -221,7 +221,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue index ce49b644d..f8ba9417d 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue @@ -209,7 +209,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue index b7d650c64..deef0dd21 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue @@ -209,7 +209,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue index dc69b39e1..7afb1a6a1 100644 --- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue @@ -209,7 +209,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue index 54e7dfe8d..85a40e7db 100644 --- a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue +++ b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue @@ -152,7 +152,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue index d702a0794..bbe6e11a9 100644 --- a/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue +++ b/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue @@ -128,7 +128,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [] diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue index 5a2f84adb..36f19ee82 100644 --- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue +++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue @@ -209,7 +209,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue index ea0170c8b..cf54ae171 100644 --- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue +++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue @@ -152,7 +152,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/index.vue b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/index.vue index 3061645f5..622847e52 100644 --- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/index.vue +++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/index.vue @@ -128,7 +128,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [] diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue index 134b14892..7e13b6fd0 100644 --- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue +++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue @@ -201,7 +201,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue index 5ee3f4dd2..0eb42516c 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue @@ -221,7 +221,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue index 5da6c7699..c3456bdd5 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue @@ -173,7 +173,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue index d7dcaaa7f..c7fc1330c 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue @@ -281,7 +281,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue index 94b9bad9a..e72644dfd 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue @@ -161,7 +161,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue index 8ea8c882c..87cc38d0f 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue @@ -172,7 +172,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue index 2a8d3a901..a908fc68c 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue @@ -282,7 +282,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue index 6a083f625..9d935d270 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue @@ -160,7 +160,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue index 559e5cb50..091372a96 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue @@ -171,7 +171,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [] diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue index a21022513..d736db5ee 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue @@ -268,7 +268,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/productionManage/productredress/productredressJobMain/index.vue b/src/views/wms/productionManage/productredress/productredressJobMain/index.vue index 17230cea5..677a14754 100644 --- a/src/views/wms/productionManage/productredress/productredressJobMain/index.vue +++ b/src/views/wms/productionManage/productredress/productredressJobMain/index.vue @@ -106,7 +106,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return[ diff --git a/src/views/wms/productionManage/productredress/productredressRecordMain/index.vue b/src/views/wms/productionManage/productredress/productredressRecordMain/index.vue index 411b0ae3b..9cf2196de 100644 --- a/src/views/wms/productionManage/productredress/productredressRecordMain/index.vue +++ b/src/views/wms/productionManage/productredress/productredressRecordMain/index.vue @@ -104,7 +104,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [] diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue index 8a88db793..6aeaac98e 100644 --- a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue +++ b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue @@ -223,7 +223,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/productionManage/productrepair/productrepairRecordMain/index.vue b/src/views/wms/productionManage/productrepair/productrepairRecordMain/index.vue index c92dd93d5..8cab2de1e 100644 --- a/src/views/wms/productionManage/productrepair/productrepairRecordMain/index.vue +++ b/src/views/wms/productionManage/productrepair/productrepairRecordMain/index.vue @@ -237,7 +237,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [] diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue index 8a3173512..21ade2a3b 100644 --- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue +++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/index.vue @@ -350,7 +350,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/productionManage/productscrap/productscrapJobMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapJobMain/index.vue index 01c7e76a6..c03c33b32 100644 --- a/src/views/wms/productionManage/productscrap/productscrapJobMain/index.vue +++ b/src/views/wms/productionManage/productscrap/productscrapJobMain/index.vue @@ -181,7 +181,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue index 2ebe04e35..0d955d016 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue +++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/index.vue @@ -237,7 +237,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [] diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue index a0198ed11..290d50683 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue @@ -417,7 +417,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue index 201da8edf..b2779c087 100644 --- a/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/inspect/inspectJobMain/index.vue @@ -181,7 +181,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue index 5c294f156..b7f63eff1 100644 --- a/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/inspect/inspectRecordMain/index.vue @@ -132,7 +132,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue index 09ead7fb4..a12607b61 100644 --- a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue @@ -167,7 +167,7 @@ // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue index 0e8bada93..3019c6e03 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue @@ -208,7 +208,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue index 10b9b0134..3f9a0a5ef 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue @@ -166,7 +166,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue index 1e11cdda7..77db0f9c4 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue @@ -342,7 +342,7 @@ const isASNShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue index c78613eaf..2ffe84607 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/index.vue @@ -182,7 +182,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue index 642a148f3..847216e87 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue @@ -129,7 +129,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [defaultButtons.mainListDocumentPrintBtn(null)] diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index 25e49ecbf..5d1ef6233 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -445,7 +445,7 @@ const isShowMainButton = (row, val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue index f30bc9ad8..524fd6a1e 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue @@ -251,7 +251,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue index 18f01e354..3d07d9ad2 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/index.vue @@ -151,7 +151,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [] diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue index 4fc1c3040..8f2633ccf 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue @@ -218,7 +218,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue index ecdf2ca66..2f6ce397a 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/index.vue @@ -173,7 +173,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue index c4f4f8d25..e44e7e384 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue @@ -126,7 +126,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue index 35c3511c9..9b1423043 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue @@ -351,7 +351,7 @@ const isASNShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue index 591c528f7..a2e7beba7 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue @@ -196,7 +196,7 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue index 4d2d3fbf3..5664f6f56 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue @@ -274,7 +274,7 @@ console.log('PurchaseMain.allSchemas.searchSchema',PurchaseMain.allSchemas.searc // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index 93b47537d..86b4442a9 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -289,7 +289,7 @@ const getSearchTableData = async (number,formField,searchField)=>{ // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue index ca1ab82ee..67924eca3 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue @@ -174,7 +174,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index 8f3c8d6bc..7433e2f4d 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -424,7 +424,7 @@ const isShowMainButtonLabel = (row, val) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue index 7cf1fffee..38483b3ed 100644 --- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue +++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRecordMain/index.vue @@ -128,7 +128,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [] diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue index 598efc93a..7e2039f16 100644 --- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue +++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue @@ -205,7 +205,7 @@ // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue index 698788841..a6f7f394f 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue @@ -151,7 +151,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [] diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index 626fe9b25..f4fabe126 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -294,7 +294,7 @@ // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ From 8e1c2d2509dff654d7282c9ae27e90fb452b542f Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Mon, 27 May 2024 19:28:30 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processproductionRequestDetail/index.ts | 62 ++++ .../wms/processproductionRequestMain/index.ts | 57 ++++ .../processproductionRequest/index.vue | 286 ++++++++++++++++++ .../processproductionRequestMain.data.ts | 274 +++++++++++++++++ 4 files changed, 679 insertions(+) create mode 100644 src/api/wms/processproductionRequestDetail/index.ts create mode 100644 src/api/wms/processproductionRequestMain/index.ts create mode 100644 src/views/wms/productionManage/processproduction/processproductionRequest/index.vue create mode 100644 src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts diff --git a/src/api/wms/processproductionRequestDetail/index.ts b/src/api/wms/processproductionRequestDetail/index.ts new file mode 100644 index 000000000..0ea781d6e --- /dev/null +++ b/src/api/wms/processproductionRequestDetail/index.ts @@ -0,0 +1,62 @@ +import request from '@/config/axios' + +export interface ProcessproductionRequestDetailVO { + id: number + masterId: number + number: string + processCode: string + productionLine: string + locationCode: string + componentItemCode: string + batch: string + componentItemcodeQty: number + effectiveDate: Date + available: string + remark: string + deletionTime: Date + deleterId: string + extraProperties: string + concurrencyStamp: number + siteId: string +} + +// 查询工序报产申请子列表 +export const getProcessproductionRequestDetailPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/processproduction-request-detail/senior', data }) + } else { + return await request.get({ url: `/wms/processproduction-request-detail/page`, params }) + } +} + +// 查询工序报产申请子详情 +export const getProcessproductionRequestDetail = async (id: number) => { + return await request.get({ url: `/wms/processproduction-request-detail/get?id=` + id }) +} + +// 新增工序报产申请子 +export const createProcessproductionRequestDetail = async (data: ProcessproductionRequestDetailVO) => { + return await request.post({ url: `/wms/processproduction-request-detail/create`, data }) +} + +// 修改工序报产申请子 +export const updateProcessproductionRequestDetail = async (data: ProcessproductionRequestDetailVO) => { + return await request.put({ url: `/wms/processproduction-request-detail/update`, data }) +} + +// 删除工序报产申请子 +export const deleteProcessproductionRequestDetail = async (id: number) => { + return await request.delete({ url: `/wms/processproduction-request-detail/delete?id=` + id }) +} + +// 导出工序报产申请子 Excel +export const exportProcessproductionRequestDetail = async (params) => { + return await request.download({ url: `/wms/processproduction-request-detail/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/processproduction-request-detail/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/processproductionRequestMain/index.ts b/src/api/wms/processproductionRequestMain/index.ts new file mode 100644 index 000000000..66a626e93 --- /dev/null +++ b/src/api/wms/processproductionRequestMain/index.ts @@ -0,0 +1,57 @@ +import request from '@/config/axios' + +export interface ProcessproductionRequestMainVO { + id: number + number: string + itemCode: string + completedQuantity: number + scrapQuantity: number + available: string + remark: string + deletionTime: Date + deleterId: string + extraProperties: string + concurrencyStamp: number + siteId: string +} + +// 查询工序报产申请主列表 +export const getProcessproductionRequestMainPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/processproduction-request-main/senior', data }) + } else { + return await request.get({ url: `/wms/processproduction-request-main/page`, params }) + } +} + +// 查询工序报产申请主详情 +export const getProcessproductionRequestMain = async (id: number) => { + return await request.get({ url: `/wms/processproduction-request-main/get?id=` + id }) +} + +// 新增工序报产申请主 +export const createProcessproductionRequestMain = async (data: ProcessproductionRequestMainVO) => { + return await request.post({ url: `/wms/processproduction-request-main/create`, data }) +} + +// 修改工序报产申请主 +export const updateProcessproductionRequestMain = async (data: ProcessproductionRequestMainVO) => { + return await request.put({ url: `/wms/processproduction-request-main/update`, data }) +} + +// 删除工序报产申请主 +export const deleteProcessproductionRequestMain = async (id: number) => { + return await request.delete({ url: `/wms/processproduction-request-main/delete?id=` + id }) +} + +// 导出工序报产申请主 Excel +export const exportProcessproductionRequestMain = async (params) => { + return await request.download({ url: `/wms/processproduction-request-main/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/processproduction-request-main/get-import-template' }) +} \ No newline at end of file diff --git a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue new file mode 100644 index 000000000..aaa809414 --- /dev/null +++ b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue @@ -0,0 +1,286 @@ + + + diff --git a/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts b/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts new file mode 100644 index 000000000..869d7cf11 --- /dev/null +++ b/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts @@ -0,0 +1,274 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' + + +export const ProcessproductionRequestMain = useCrudSchemas(reactive([ + { + label: 'id', + field: 'id', + sort: 'custom', + isForm: false, + isTable:false, + isTableForm:false, + }, + { + label: '单据号', + field: 'number', + sort: 'custom', + isSearch: true, + }, + { + label: '物料代码', + field: 'itemCode', + sort: 'custom', + isSearch: true, + }, + { + label: '完工数量', + field: 'completedQuantity', + sort: 'custom', + }, + { + label: '报废数量', + field: 'scrapQuantity', + sort: 'custom', + }, + { + label: '是否可用', + field: 'available', + sort: 'custom', + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + isForm: false, + }, + { + label: '删除时间', + field: 'deletionTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + isTable:false, + isForm:false, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, + }, + { + label: '删除者ID', + field: 'deleterId', + sort: 'custom', + isSearch: false, + isTable:false, + }, + { + label: '扩展属性', + field: 'extraProperties', + sort: 'custom', + isSearch: false, + isTable:false, + }, + { + label: '并发乐观锁', + field: 'concurrencyStamp', + sort: 'custom', + isSearch: false, + isTable:false, + form: { + component: 'InputNumber', + value: 0 + }, + }, + { + label: '地点ID', + field: 'siteId', + sort: 'custom', + isSearch: false, + isTable:false, + }, + { + label: '操作', + field: 'action', + isForm: false, + table: { + width: 150, + fixed: 'right' + } + } +])) + +// 表单校验 +export const ProcessproductionRequestMainRules = reactive({ + available: [required], + concurrencyStamp: [required], +}) + + +export const ProcessproductionRequestDetail = useCrudSchemas(reactive([ + { + label: 'id', + field: 'id', + sort: 'custom', + isForm: false, + }, + { + label: '主表ID', + field: 'masterId', + sort: 'custom', + form: { + component: 'InputNumber', + value: 0 + }, + }, + { + label: '单据号', + field: 'number', + sort: 'custom', + isSearch: true, + }, + { + label: '工序', + field: 'processCode', + sort: 'custom', + }, + { + label: '生产线', + field: 'productionLine', + sort: 'custom', + }, + { + label: '库位代码', + field: 'locationCode', + sort: 'custom', + }, + { + label: '子物料代码', + field: 'componentItemCode', + sort: 'custom', + isSearch: true, + }, + { + label: '批次', + field: 'batch', + sort: 'custom', + }, + { + label: '子物料数量', + field: 'componentItemcodeQty', + sort: 'custom', + }, + { + label: '生效日期', + field: 'effectiveDate', + sort: 'custom', + formatter: dateFormatter, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, + }, + { + label: '是否可用', + field: 'available', + sort: 'custom', + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + isForm: false, + }, + { + label: '删除时间', + field: 'deletionTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: true, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, + }, + { + label: '删除者ID', + field: 'deleterId', + sort: 'custom', + isSearch: true, + }, + { + label: '扩展属性', + field: 'extraProperties', + sort: 'custom', + isSearch: true, + }, + { + label: '并发乐观锁', + field: 'concurrencyStamp', + sort: 'custom', + isSearch: true, + form: { + component: 'InputNumber', + value: 0 + }, + }, + { + label: '地点ID', + field: 'siteId', + sort: 'custom', + isSearch: true, + }, + { + label: '操作', + field: 'action', + isForm: false, + table: { + width: 150, + fixed: 'right' + } + } +])) + +// 表单校验 +export const ProcessproductionRequestDetailRules = reactive({ + +}) \ No newline at end of file From b12b81a7b36c6b262ab6d84d5e5e49256a27f917 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Mon, 27 May 2024 19:43:26 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=B8=BB=E5=AD=90=E8=A1=A8=E5=90=88?= =?UTF-8?q?=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processproduction/processproductionRequest/index.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue index aaa809414..0c24f2cac 100644 --- a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue +++ b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue @@ -47,9 +47,10 @@ :formAllSchemas="ProcessproductionRequestMain.allSchemas" :apiUpdate="ProcessproductionRequestMainApi.updateProcessproductionRequestMain" :apiCreate="ProcessproductionRequestMainApi.createProcessproductionRequestMain" - :tableData="tableData" @searchTableSuccess="searchTableSuccess" :isBusiness="true" + :tableAllSchemas="ProcessproductionRequestDetail.allSchemas" + :tableFormRules="ProcessproductionRequestDetailRules" /> @@ -108,7 +109,7 @@ const updataTableColumns = (val) => { const { tableObject, tableMethods } = useTable({ - getListApi: ProcessproductionRequestMainApi.getProcessproductionRequestMainPage // 分页接口 + getListApi: ProcessproductionRequestDetailApi.getProcessproductionRequestDetailPage // 分页接口 }) // 获得表格的各种操作 @@ -152,7 +153,7 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 - if(findIndex>0&&findIndex<$index){ + if(findIndex>-1&&findIndex<$index){ return [] } return [ From 8ca6cbe52b137ed935fe11be2736d8ca0d2ecaca Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Mon, 27 May 2024 19:56:54 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processproductionRequest/index.vue | 1 - .../processproductionRequestMain.data.ts | 75 +++++++++++++++++-- 2 files changed, 69 insertions(+), 7 deletions(-) diff --git a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue index 0c24f2cac..5637b4620 100644 --- a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue +++ b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue @@ -180,7 +180,6 @@ const openForm = (type: string, row?: any) => { basicFormRef.value.open(type, row) } -const tableData = ref([]) // form表单提交 const formsSuccess = async (formType,data) => { diff --git a/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts b/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts index 869d7cf11..e34250efe 100644 --- a/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts +++ b/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts @@ -15,33 +15,49 @@ export const ProcessproductionRequestMain = useCrudSchemas(reactive Date: Mon, 27 May 2024 20:05:08 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionManage/productionplan/productionMain/index.vue | 3 +++ .../productionplan/productionMainAssemble/index.vue | 3 +++ .../productionplan/productionMainAssembleSparePart/index.vue | 3 +++ .../productionplan/productionMainPredictSparePart/index.vue | 3 +++ .../purchasereturnRequestMain.data.ts | 3 ++- 5 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/views/wms/productionManage/productionplan/productionMain/index.vue b/src/views/wms/productionManage/productionplan/productionMain/index.vue index 12656ca59..3e660ccc2 100644 --- a/src/views/wms/productionManage/productionplan/productionMain/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMain/index.vue @@ -508,6 +508,9 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async () => { + tableObject.params = { + planType: 'predict' + } getList() importTemplateData.templateUrl = await ProductionMainApi.importTemplate() }) diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue index ce49b644d..3462032e1 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue @@ -496,6 +496,9 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async () => { + tableObject.params = { + planType: 'assemble' + } getList() importTemplateData.templateUrl = await ProductionMainApi.importTemplate() }) diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue index b7d650c64..be74c214c 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue @@ -495,6 +495,9 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async () => { + tableObject.params = { + planType: 'assembleSparePart' + } getList() importTemplateData.templateUrl = await ProductionMainApi.importTemplate() }) diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue index dc69b39e1..8e1b43a96 100644 --- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue @@ -496,6 +496,9 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async () => { + tableObject.params = { + planType: 'predictSparePart' + } getList() importTemplateData.templateUrl = await ProductionMainApi.importTemplate() }) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts index 1f7a017d5..fa9ea5ee8 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts @@ -1337,7 +1337,8 @@ export const PurchasereReturnRequestDetailLabel = useCrudSchemas(reactive