Browse Source

Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

master_hella_20240701
songguoqiang 6 months ago
parent
commit
69147fc277
  1. 2
      README.md
  2. 5
      src/api/eam/equipmentMaintenanceMain/index.ts
  3. 62
      src/api/wms/processproductionRequestDetail/index.ts
  4. 57
      src/api/wms/processproductionRequestMain/index.ts
  5. 13
      src/utils/disposition/defaultButtons.ts
  6. 54
      src/views/eam/equipmentMaintenanceMain/index.vue
  7. 2
      src/views/wms/countManage/count/countJobMain/index.vue
  8. 2
      src/views/wms/countManage/count/countPlanMain/index.vue
  9. 2
      src/views/wms/countManage/count/countRecordMain/index.vue
  10. 2
      src/views/wms/countManage/count/countRequestMain/index.vue
  11. 2
      src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue
  12. 2
      src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
  13. 2
      src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/index.vue
  14. 2
      src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue
  15. 2
      src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue
  16. 2
      src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue
  17. 2
      src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
  18. 2
      src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/index.vue
  19. 2
      src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue
  20. 2
      src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
  21. 2
      src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue
  22. 2
      src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
  23. 2
      src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
  24. 2
      src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
  25. 2
      src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue
  26. 2
      src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue
  27. 2
      src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
  28. 2
      src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue
  29. 2
      src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue
  30. 2
      src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
  31. 2
      src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue
  32. 2
      src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue
  33. 2
      src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
  34. 2
      src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue
  35. 2
      src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue
  36. 2
      src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue
  37. 2
      src/views/wms/inventoryjobManage/scrap/scrapRecordMain/index.vue
  38. 2
      src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
  39. 2
      src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue
  40. 2
      src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue
  41. 2
      src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
  42. 2
      src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue
  43. 2
      src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/index.vue
  44. 2
      src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
  45. 2
      src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/index.vue
  46. 2
      src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/index.vue
  47. 2
      src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue
  48. 2
      src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue
  49. 2
      src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/index.vue
  50. 2
      src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
  51. 2
      src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue
  52. 2
      src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/index.vue
  53. 2
      src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
  54. 2
      src/views/wms/issueManage/issue/issueJobMain/index.vue
  55. 2
      src/views/wms/issueManage/issue/issueRecordMain/index.vue
  56. 2
      src/views/wms/issueManage/issue/issueRequestMain/index.vue
  57. 2
      src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
  58. 2
      src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue
  59. 2
      src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/index.vue
  60. 2
      src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue
  61. 2
      src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue
  62. 2
      src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
  63. 7
      src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts
  64. 2
      src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue
  65. 2
      src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue
  66. 2
      src/views/wms/issueManage/repleinsh/repleinshRecordMain/index.vue
  67. 2
      src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
  68. 6
      src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts
  69. 2
      src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue
  70. 2
      src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
  71. 2
      src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue
  72. 2
      src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue
  73. 2
      src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
  74. 2
      src/views/wms/productionManage/offlinesettlement/offlinesettlementRecordMain/index.vue
  75. 2
      src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/index.vue
  76. 286
      src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
  77. 337
      src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts
  78. 2
      src/views/wms/productionManage/productdismantle/productdismantleJobMain/index.vue
  79. 2
      src/views/wms/productionManage/productdismantle/productdismantleRecordMain/index.vue
  80. 2
      src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
  81. 2
      src/views/wms/productionManage/productionplan/productionMain/index.vue
  82. 2
      src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
  83. 2
      src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
  84. 2
      src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
  85. 2
      src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue
  86. 2
      src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue
  87. 2
      src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
  88. 2
      src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue
  89. 2
      src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/index.vue
  90. 2
      src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue
  91. 2
      src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
  92. 2
      src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
  93. 1
      src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts
  94. 2
      src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
  95. 2
      src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue
  96. 2
      src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue
  97. 2
      src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
  98. 2
      src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue
  99. 2
      src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue
  100. 2
      src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue

2
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 []
}
…下面是原有的按钮逻辑,不变

5
src/api/eam/equipmentMaintenanceMain/index.ts

@ -78,3 +78,8 @@ export const importTemplate = () => {
export const updateEnableCode = async (data: EquipmentMainPartVO) => {
return await request.post({ url: `/eam/equipment-maintenance-main/ables` , data })
}
// 执行保养工单
export const executeMaintenanceOrder = async (data: EquipmentMainPartVO) => {
return await request.post({ url: `/eam/equipment-maintenance-main/execute`, data })
}

62
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' })
}

57
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' })
}

13
src/utils/disposition/defaultButtons.ts

@ -325,6 +325,19 @@ export function mainListReceiveBtn(option:any) {
})
}
// 主列表-执行按钮
export function mainListExecuteBtn(option:any) {
return __defaultBtnOption(option,{
label: t(`ts.执行`).replace('ts.', ''),
name: 'execute',
hide: false,
type: 'primary',
color: '',
link: true, // 文本展现按钮
hasPermi: ''
})
}
// 主列表-完成按钮
export function mainListFinishBtn(option:any) {
return __defaultBtnOption(option,{

54
src/views/eam/equipmentMaintenanceMain/index.vue

@ -79,6 +79,8 @@ import {EquipmentAccounts} from "@/views/eam/equipmentAccounts/equipmentAccounts
import * as EquipmentItemApi from "@/api/eam/equipmentAccounts";
import {ToolAccounts} from "@/views/eam/toolAccounts/toolAccounts.data";
import * as ToolItemApi from "@/api/eam/toolAccounts";
import * as ReworkBatchApi from "@/api/mes/reworkBatch";
import {mainListExecuteBtn} from "@/utils/disposition/defaultButtons";
defineOptions({ name: 'EquipmentMaintenanceMain' })
@ -153,11 +155,21 @@ const isShowMainButton = (row,val) => {
}
}
const isShowStatusButton = (row,val) => {
if (val.indexOf(row.status) > -1) {
return false
} else {
return true
}
}
// -
const butttondata = (row) => {
return [
defaultButtons.mainListEditBtn({hasPermi:'eam:equipmentMaintenanceMain:update'}), //
//defaultButtons.mainListDeleteBtn({hasPermi:'eam:equipmentMaintenanceMain:delete'}), //
defaultButtons.mainListReceiveBtn({hide: isShowStatusButton(row,['3']),hasPermi:'eam:maintenance:update'}), //
defaultButtons.mainListExecuteBtn({hide: isShowStatusButton(row,['4']),hasPermi:'eam:maintenance:update'}), //
defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'eam:maintenance:update'}),
defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'eam:maintenance:update'}),
]
@ -169,6 +181,10 @@ const buttonTableClick = async (val, row) => {
openForm('update', row)
} else if (val == 'delete') { //
handleDelete(row.id)
} else if (val == 'receive') { //
handleReceive(row.id)
} else if (val == 'execute') { //
handleExecute(row.id)
}
}
@ -235,6 +251,44 @@ const handleDelete = async (id: number) => {
} catch {}
}
/** 领取按钮操作 */
const handleReceive = async (id: number) => {
try {
//
await message.delConfirm('是否领取所选中任务?');
const params = ref({
id: '',
status:'',
})
params.value.id = id
params.value.status = '4'
//
await EquipmentMaintenanceMainApi.executeMaintenanceOrder(params.value)
message.success(t('领取成功'))
//
await getList()
} catch {}
}
/** 执行按钮操作 */
const handleExecute = async (id: number) => {
try {
//
await message.delConfirm('是否执行所选中任务?');
const params = ref({
id: '',
status:'',
})
params.value.id = id
params.value.status = '5'
//
await EquipmentMaintenanceMainApi.executeMaintenanceOrder(params.value)
message.success(t('执行成功'))
//
await getList()
} catch {}
}
/** 启用 */
const handleEnable = async (id: number) => {
try {

2
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 [

2
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 [

2
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 [

2
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 [

2
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 []

2
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 [

2
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 []

2
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 [

2
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 [

2
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),] //

2
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 [

2
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 []

2
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 [

2
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 [

2
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),] //

2
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 [

2
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 [

2
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 [

2
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 [

2
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 []

2
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 [

2
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 [

2
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 [

2
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 [

2
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 [

2
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 []

2
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 [

2
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)] //

2
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 [

2
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 [

2
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 []

2
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 [

2
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 [

2
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 []

2
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 [

2
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 [

2
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 []

2
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 [

2
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 [

2
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 []

2
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 [

2
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 [

2
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 []

2
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 [

2
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 [

2
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 []

2
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 [

2
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 [

2
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 []

2
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 [

2
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 [

2
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 [

2
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 []

2
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 [

2
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 []

2
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 [

7
src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts

@ -652,7 +652,12 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
key: 'inventoryStatus',
value: 'OK',
isMainValue: false
}]
},{
key: 'productionLineCode',
value: 'productionLineCode',
message: '请选择生产线信息!',
isMainValue: true
}]
},
},
// {

2
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 [

2
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 [

2
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 []

2
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 [

6
src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts

@ -408,6 +408,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '包装规格',
field: 'packUnit',
sort: 'custom',
isForm:false,
table: {
width: 150
},
@ -417,6 +418,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '包装数量',
field: 'packQty',
sort: 'custom',
isForm:false,
table: {
width: 150
},
@ -526,6 +528,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTableForm: false,
isSearch: true,
sortTableDefault:5,
sortSearchDefault:3,
@ -559,6 +562,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTableForm: false,
isSearch: true,
},
{
@ -753,6 +757,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTableForm: false,
sortTableDefault:1,
},
{
@ -762,6 +767,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTableForm: false,
sortTableDefault:2,
},

2
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 []

2
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 [

2
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 [

2
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 []

2
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 [

2
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 []

2
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 [

286
src/views/wms/productionManage/processproduction/processproductionRequest/index.vue

@ -0,0 +1,286 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<Search :schema="ProcessproductionRequestMain.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
</ContentWrap>
<!-- 列表头部 -->
<TableHead
:HeadButttondata="HeadButttondata"
@button-base-click="buttonBaseClick"
:routeName="routeName"
@updataTableColumns="updataTableColumns"
@searchFormClick="searchFormClick"
:allSchemas="ProcessproductionRequestMain.allSchemas"
:detailAllSchemas="ProcessproductionRequestDetail.allSchemas"
/>
<!-- 列表 -->
<ContentWrap>
<Table
:columns="tableColumns"
:data="tableObject.tableList"
:loading="tableObject.loading"
:pagination="{
total: tableObject.total
}"
v-model:pageSize="tableObject.pageSize"
v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort"
>
<template #code="{row}">
<el-button type="primary" link @click="openDetail(row, '代码', row.code)">
<span>{{ row.code }}</span>
</el-button>
</template>
<template #action="{ row,$index }">
<ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
</template>
</Table>
</ContentWrap>
<!-- 表单弹窗添加/修改 -->
<BasicForm
ref="basicFormRef"
@success="formsSuccess"
:rules="ProcessproductionRequestMainRules"
:formAllSchemas="ProcessproductionRequestMain.allSchemas"
:apiUpdate="ProcessproductionRequestMainApi.updateProcessproductionRequestMain"
:apiCreate="ProcessproductionRequestMainApi.createProcessproductionRequestMain"
@searchTableSuccess="searchTableSuccess"
:isBusiness="true"
:tableAllSchemas="ProcessproductionRequestDetail.allSchemas"
:tableFormRules="ProcessproductionRequestDetailRules"
/>
<!-- 详情 -->
<Detail
ref="detailRef"
:isBasic="false"
:allSchemas="ProcessproductionRequestMain.allSchemas"
:detailAllSchemas="ProcessproductionRequestDetail.allSchemas"
:detailAllSchemasRules="ProcessproductionRequestDetailRules"
:apiCreate="ProcessproductionRequestDetailApi.createProcessproductionRequestDetail"
:apiUpdate="ProcessproductionRequestDetailApi.updateProcessproductionRequestDetail"
:apiPage="ProcessproductionRequestDetailApi.getProcessproductionRequestDetailPage"
:apiDelete="ProcessproductionRequestDetailApi.deleteProcessproductionRequestDetail"
@searchTableSuccessDetail="searchTableSuccessDetail"
:buttondataTable="buttondataTable"
/>
<!-- 导入 -->
<ImportForm ref="importFormRef" url="/request/processproduction-request-main/import" :importTemplateData="importTemplateData" @success="importSuccess" />
</template>
<script setup lang="ts">
import download from '@/utils/download'
import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
import { ProcessproductionRequestMain,ProcessproductionRequestMainRules,ProcessproductionRequestDetail,ProcessproductionRequestDetailRules } from './processproductionRequestMain.data'
import * as ProcessproductionRequestMainApi from '@/api/wms/processproductionRequestMain'
import * as ProcessproductionRequestDetailApi from '@/api/wms/processproductionRequestDetail'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
import Detail from '@/components/Detail/src/Detail.vue'
defineOptions({ name: 'ProcessproductionRequestMain' })
const message = useMessage() //
const { t } = useI18n() //
const route = useRoute() //
const routeName = ref()
routeName.value = route.name
const tableColumns = ref([...ProcessproductionRequestMain.allSchemas.tableColumns,...ProcessproductionRequestDetail.allSchemas.tableMainColumns])
//
const searchTableSuccess = (formField, searchField, val, formRef) => {
nextTick(() => {
const setV = {}
setV[formField] = val[0][searchField]
formRef.setValues(setV)
})
}
//
const updataTableColumns = (val) => {
tableColumns.value = val
}
const { tableObject, tableMethods } = useTable({
getListApi: ProcessproductionRequestDetailApi.getProcessproductionRequestDetailPage //
})
//
const { getList, setSearchParams } = tableMethods
//
const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'wms:processproduction-request-main:create'}), //
defaultButtons.defaultImportBtn({hasPermi:'wms:processproduction-request-main:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:processproduction-request-main:export'}), //
defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), //
defaultButtons.defaultSetBtn(null), //
// {
// label: '',
// name: 'zdy',
// hide: false,
// type: 'primary',
// icon: 'Select',
// color: ''
// },
]
//
const buttonBaseClick = (val, item) => {
if (val == 'add') { //
openForm('create')
} else if (val == 'import') { //
handleImport()
} else if (val == 'export') { //
handleExport()
} else if (val == 'refresh') { //
getList()
} else if (val == 'filtrate') { //
} else { //
console.log('其他按钮', item)
}
}
// -
const butttondata = (row,$index) => {
const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
if(findIndex>-1&&findIndex<$index){
return []
}
return [
defaultButtons.mainListEditBtn({hasPermi:'wms:processproduction-request-main:update'}), //
defaultButtons.mainListDeleteBtn({hasPermi:'wms:processproduction-request-main:delete'}), //
]
}
const buttondataTable = ref()
// -
const buttonTableClick = async (val, row) => {
if (val == 'edit') { //
openForm('update', row)
} else if (val == 'delete') { //
handleDelete(row.id)
}
}
/** 添加/修改操作 */
const basicFormRef = ref()
const openForm = (type: string, row?: any) => {
basicFormRef.value.open(type, row)
}
// form
const formsSuccess = async (formType,data) => {
var isHave =ProcessproductionRequestMain.allSchemas.formSchema.some(function (item) {
return item.field === 'activeTime' || item.field === 'expireTime';
});
if(isHave){
if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
message.error('失效时间要大于生效时间')
return;
}
}
if(data.activeTime==0)data.activeTime = null;
if(data.expireTime==0)data.expireTime = null;
if (formType === 'create') {
await ProcessproductionRequestMainApi.createProcessproductionRequestMain(data)
message.success(t('common.createSuccess'))
} else {
await ProcessproductionRequestMainApi.updateProcessproductionRequestMain(data)
message.success(t('common.updateSuccess'))
}
basicFormRef.value.dialogVisible = false
getList()
}
//
const { wsCache } = useCache()
/** 详情操作 */
const detailRef = ref()
const openDetail = (row: any, titleName: any, titleValue: any) => {
const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
detailRef.value.openDetail(row, titleName, titleValue, 'basicProcessproductionRequestMain')
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
//
await message.delConfirm()
//
await ProcessproductionRequestMainApi.deleteProcessproductionRequestMain(id)
message.success(t('common.delSuccess'))
//
await getList()
} catch {}
}
/** 导出按钮操作 */
const exportLoading = ref(false) //
const handleExport = async () => {
try {
//
await message.exportConfirm()
//
exportLoading.value = true
const data = await ProcessproductionRequestMainApi.exportProcessproductionRequestMain(tableObject.params)
download.excel(data, '工序报产申请主.xlsx')
} catch {
} finally {
exportLoading.value = false
}
}
/** 导入 */
const importFormRef = ref()
const handleImport = () => {
importFormRef.value.open()
}
//
const importTemplateData = reactive({
templateUrl: '',
templateTitle: '工序报产申请主导入模版.xlsx'
})
//
const importSuccess = () => {
getList()
}
//
const searchFormClick = (searchData) => {
tableObject.params = {
isSearch: true,
filters: searchData.filters
}
getList() //
}
//
const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
nextTick(() => {
const setV = {}
setV[formField] = val[0][searchField]
formRef.setValues(setV)
})
}
/** 初始化 **/
onMounted(async () => {
getList()
importTemplateData.templateUrl = await ProcessproductionRequestMainApi.importTemplate()
})
</script>

337
src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts

@ -0,0 +1,337 @@
import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
export const ProcessproductionRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
{
label: 'id',
field: 'id',
sort: 'custom',
isForm: false,
isTable:false,
isTableForm:false,
},
{
label: '单据号',
field: 'number',
sort: 'custom',
table: {
width: 150
},
isSearch: true,
},
{
label: '物料代码',
field: 'itemCode',
sort: 'custom',
table: {
width: 150
},
isSearch: true,
},
{
label: '完工数量',
field: 'completedQuantity',
sort: 'custom',
table: {
width: 150
},
},
{
label: '报废数量',
field: 'scrapQuantity',
sort: 'custom',
table: {
width: 150
},
},
{
label: '是否可用',
field: 'available',
sort: 'custom',
table: {
width: 150
},
},
{
label: '备注',
field: 'remark',
sort: 'custom',
isTable:false,
},
{
label: '创建时间',
field: 'createTime',
sort: 'custom',
formatter: dateFormatter,
isForm: false,
isTable: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<CrudSchema[]>([
{
label: 'id',
field: 'id',
sort: 'custom',
isForm: false,
isTable:false,
},
{
label: '主表ID',
field: 'masterId',
sort: 'custom',
isTable:false,
form: {
component: 'InputNumber',
value: 0
},
},
{
label: '单据号',
field: 'number',
sort: 'custom',
isSearch: true,
table: {
width: 150
},
hiddenInMain:true,
},
{
label: '工序',
field: 'processCode',
sort: 'custom',
table: {
width: 150
},
},
{
label: '生产线',
field: 'productionLine',
sort: 'custom',
table: {
width: 150
},
},
{
label: '库位代码',
field: 'locationCode',
sort: 'custom',
table: {
width: 150
},
},
{
label: '子物料代码',
field: 'componentItemCode',
sort: 'custom',
isSearch: false,
table: {
width: 150
},
},
{
label: '批次',
field: 'batch',
sort: 'custom',
table: {
width: 150
},
},
{
label: '子物料数量',
field: 'componentItemcodeQty',
sort: 'custom',
table: {
width: 150
},
},
{
label: '生效日期',
field: 'effectiveDate',
sort: 'custom',
formatter: dateFormatter,
form: {
component: 'DatePicker',
componentProps: {
type: 'datetime',
valueFormat: 'x'
}
},
table: {
width: 150
},
},
{
label: '是否可用',
field: 'available',
sort: 'custom',
isTable:false,
table: {
width: 150
},
},
{
label: '备注',
field: 'remark',
sort: 'custom',
},
{
label: '创建时间',
field: 'createTime',
sort: 'custom',
formatter: dateFormatter,
isForm: false,
table: {
width: 150
},
},
{
label: '删除时间',
field: 'deletionTime',
sort: 'custom',
formatter: dateFormatter,
isSearch: false,
isTable:false,
table: {
width: 150
},
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,
table: {
width: 150
},
},
{
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,
hiddenInMain:true,
table: {
width: 150,
fixed: 'right'
}
}
]))
// 表单校验
export const ProcessproductionRequestDetailRules = reactive({
})

2
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 [

2
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 []

2
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 [

2
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 [

2
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 [

2
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 [

2
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 [

2
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 [

2
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 []

2
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 [

2
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 [

2
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 []

2
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 [

2
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 [

2
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 [

1
src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts

@ -521,6 +521,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
label: '单据号',
field: 'number',
sort: 'custom',
hiddenInMain: true,
table: {
width: 180
},

2
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 [

2
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 [

2
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 [

2
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 [

2
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 [

2
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 []

2
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 [

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save