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

src/api/wms/agvLocationrelation/index.ts

@@ -47,7 +47,7 @@ export const exportAgvLocationrelation = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/wms/agv-locationrelation/export-excel-senior', data })
+    return await request.downloadPost({ url: '/wms/agv-locationrelation/export-excel-senior', data })
   } else {
     return await request.download({ url: `/wms/agv-locationrelation/export-excel`, params })
   }
@@ -56,4 +56,4 @@ export const exportAgvLocationrelation = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/agv-locationrelation/get-import-template' })
-}
+}

src/api/wms/barbasic/index.ts

@@ -47,10 +47,16 @@ export const deleteBarbasic = async (id: number) => {
 
 // 导出条码实体基类 Excel
 export const exportBarbasic = async (params) => {
-  return await request.download({ url: `/wms/barbasic/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.downloadPost({ url: '/wms/barbasic/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/barbasic/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/barbasic/get-import-template' })
-}
+}

src/api/wms/barcode/index.ts

@@ -50,10 +50,16 @@ export const deleteBarcode = async (id: number) => {
 
 // 导出条码片段 Excel
 export const exportBarcode = async (params) => {
-  return await request.download({ url: `/label/barcode/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.downloadPost({ url: '/label/barcode/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/label/barcode/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/label/barcode/get-import-template' })
-}
+}

src/api/wms/callmaterials/index.ts

@@ -44,10 +44,16 @@ export const deleteCallmaterials = async (id: number) => {
 
 // 导出叫料标签 Excel
 export const exportCallmaterials = async (params) => {
-  return await request.download({ url: `/wms/callmaterials/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.downloadPost({ url: '/wms/callmaterials/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/callmaterials/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/callmaterials/get-import-template' })
-}
+}

src/api/wms/customersettleRecordMain/index.ts

@@ -61,7 +61,7 @@ export const exportCustomersettleRecordMain = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/wms/customersettle-record-main/export-excel-senior', data })
+    return await request.downloadPost({ url: '/wms/customersettle-record-main/export-excel-senior', data })
   } else {
     return await request.download({ url: `/wms/customersettle-record-main/export-excel`, params })
   }
@@ -70,4 +70,4 @@ export const exportCustomersettleRecordMain = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/customersettle-record-main/get-import-template' })
-}
+}

src/api/wms/deliverPlanMain/index.ts

@@ -51,9 +51,15 @@ export const deleteDeliverPlanMain = async (id: number) => {
 export const exportDeliverPlanMain = async (params) => {
   params.businessType = 'Deliver'
   if (params.isSearch) {
+    // const cmd = {
+    //   'column':'businessType',
+    //   'action':'==',
+    //   'value':'Deliver'
+    // }
+    // params.filters.push(cmd)
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/wms/deliver-plan-main/export-excel-senior', data })
+    return await request.downloadPost({ url: '/wms/deliver-plan-main/export-excel-senior', data })
   } else {
     return await request.download({ url: `/wms/deliver-plan-main/export-excel`, params })
   }
@@ -63,9 +69,15 @@ export const exportDeliverPlanMain = async (params) => {
 export const exportZZBJDeliverPlanMain = async (params) => {
   params.businessType = 'ZZBJDeliver'
   if (params.isSearch) {
+    // const cmd = {
+    //   'column':'businessType',
+    //   'action':'==',
+    //   'value':'ZZBJDeliver'
+    // }
+    // params.filters.push(cmd)
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/wms/deliver-plan-main/export-excel-senior', data })
+    return await request.downloadPost({ url: '/wms/deliver-plan-main/export-excel-senior', data })
   } else {
     return await request.download({ url: `/wms/deliver-plan-main/export-excel`, params })
   }
@@ -109,4 +121,4 @@ export const publish = (id) => {
 // 重置
 export const resetting = (id) => {
   return request.put({ url: '/wms/deliver-plan-main/resetting?id=' + id })
-}
+}

src/api/wms/deliverRecordMain/index.ts

@@ -70,7 +70,7 @@ export const exportDeliverRecordMain = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/wms/deliver-record-main/export-excel-senior', data })
+    return await request.downloadPost({ url: '/wms/deliver-record-main/export-excel-senior', data })
   } else {
     return await request.download({ url: `/wms/deliver-record-main/export-excel`, params })
   }
@@ -79,4 +79,4 @@ export const exportDeliverRecordMain = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/deliver-record-main/get-import-template' })
-}
+}

src/api/wms/deliverRequestMain/index.ts

@@ -69,7 +69,7 @@ export const exportDeliverRequestMain = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/wms/deliver-request-main/export-excel-senior', data })
+    return await request.downloadPost({ url: '/wms/deliver-request-main/export-excel-senior', data })
   } else {
     return await request.download({ url: `/wms/deliver-request-main/export-excel`, params })
   }
@@ -81,7 +81,7 @@ export const exportZZBJDeliverRequestMain = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/wms/deliver-request-main/export-excel-senior', data })
+    return await request.downloadPost({ url: '/wms/deliver-request-main/export-excel-senior', data })
   } else {
     return await request.download({ url: `/wms/deliver-request-main/export-excel`, params })
   }
@@ -119,4 +119,4 @@ export const agree = (id) => {
 // 处理
 export const handle = (id) => {
   return request.put({ url: '/wms/deliver-request-main/handle?id=' + id })
-}
+}

src/api/wms/expectin/index.ts

@@ -46,10 +46,15 @@ export const deleteExpectin = async (id: number) => {
 
 // 导出预计入库存 Excel
 export const exportExpectin = async (params) => {
-  return await request.download({ url: `/wms/expectin/export-excel`, params })
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/expectin/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/expectin/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/expectin/get-import-template' })
-}
+}

src/api/wms/expectout/index.ts

@@ -47,10 +47,15 @@ export const deleteExpectout = async (id: number) => {
 
 // 导出预计出库存 Excel
 export const exportExpectout = async (params) => {
-  return await request.download({ url: `/wms/expectout/export-excel`, params })
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/expectout/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/expectout/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/expectout/get-import-template' })
-}
+}

src/api/wms/issueJobMain/index.ts

@@ -99,7 +99,7 @@ export const abandonIssueMain = async (id) => {
 
 // 关闭发料任务
 export const closeIssueMain = async (id) => {
-  return await request.get({ url: `/wms/issue-job-main/close?id=` + id })
+  return await request.put({ url: `/wms/issue-job-main/close?id=` + id })
 }
 
 // 执行发料任务

src/api/wms/locationcapacity/index.ts

@@ -42,10 +42,16 @@ export const deleteLocationcapacity = async (id: number) => {
 
 // 导出库位容量 Excel
 export const exportLocationcapacity = async (params) => {
-  return await request.download({ url: `/wms/locationcapacity/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.downloadPost({ url: '/wms/locationcapacity/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/locationcapacity/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/locationcapacity/get-import-template' })
-}
+}

src/api/wms/mesBarCode/index.ts

@@ -56,10 +56,16 @@ export const deleteMesBarCode = async (id: number) => {
 
 // 导出生产条码清单 Excel
 export const exportMesBarCode = async (params) => {
-  return await request.download({ url: `/wms/mes-bar-code/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.downloadPost({ url: '/wms/mes-bar-code/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/mes-bar-code/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/mes-bar-code/get-import-template' })
-}
+}

src/api/wms/package/index.ts

@@ -79,7 +79,7 @@ export const deletePackage = async (id: number) => {
 export const exportPackage = async (params) => {
   if (params.isSearch) {
     const data = {...params}
-    return await request.download({ url: `/wms/package/export-excel-senior`, data })
+    return await request.downloadPost({ url: `/wms/package/export-excel-senior`, data })
   } else {
       return await request.download({ url: `/wms/package/export-excel`, params })
     }
@@ -120,4 +120,4 @@ export const getBalanceToPackage = async (packingNumber: String) => {
 // 根据库存余额获取包装信息进行打印标签--批量打印
 export const getBalanceToPackageSelection = async (data: any) => {
   return await request.post({ url: `/wms/balance/batchPrintLabel` ,data})
-}
+}

src/api/wms/packageunit/index.ts

@@ -39,17 +39,17 @@ export const getPackageunit = async (id: number) => {
   return await request.get({ url: `/wms/packageunit/get?id=` + id })
 }
 
-// 新增物品包装规格信息 
+// 新增物品包装规格信息
 export const createPackageunit = async (data: PackageunitVO) => {
   return await request.post({ url: `/wms/packageunit/create`, data })
 }
 
-// 修改物品包装规格信息 
+// 修改物品包装规格信息
 export const updatePackageunit = async (data: PackageunitVO) => {
   return await request.put({ url: `/wms/packageunit/update`, data })
 }
 
-// 删除物品包装规格信息 
+// 删除物品包装规格信息
 export const deletePackageunit = async (id: number) => {
   return await request.delete({ url: `/wms/packageunit/delete?id=` + id })
 }
@@ -59,7 +59,7 @@ export const exportPackageunit = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/wms/packageunit/export-excel-senior', data })
+    return await request.downloadPost({ url: '/wms/packageunit/export-excel-senior', data })
   } else {
     return await request.download({ url: `/wms/packageunit/export-excel`, params })
   }
@@ -68,4 +68,4 @@ export const exportPackageunit = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/packageunit/get-import-template' })
-}
+}

src/api/wms/processproductionRecordMain/index.ts

@@ -48,10 +48,15 @@ export const deleteProcessproductionRecordMain = async (id: number) => {
 
 // 导出工序报产记录主 Excel
 export const exportProcessproductionRecordMain = async (params) => {
-  return await request.download({ url: `/wms/processproduction-record-main/export-excel`, params })
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/processproduction-record-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/processproduction-record-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/processproduction-record-main/get-import-template' })
-}
+}

src/api/wms/processproductionRequestMain/index.ts

@@ -48,7 +48,12 @@ export const deleteProcessproductionRequestMain = async (id: number) => {
 
 // 导出工序报产申请主 Excel
 export const exportProcessproductionRequestMain = async (params) => {
-  return await request.download({ url: `/wms/processproduction-request-main/export-excel`, params })
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/processproduction-request-main/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/processproduction-request-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
@@ -84,4 +89,4 @@ export const agreeProcessproductionRequestMain = async (id) => {
 // 处理
 export const handleProcessproductionRequestMain = async (id) => {
   return await request.put({ url: `/wms/processproduction-request-main/handle?id=` + id })
-}
+}

src/api/wms/productionreceiptRecordMain/index.ts

@@ -61,10 +61,16 @@ export const deleteProductionreceiptRecordMain = async (id: number) => {
 
 // 导出生产收料记录主 Excel
 export const exportProductionreceiptRecordMain = async (params) => {
-  return await request.download({ url: `/wms/productionreceipt-record-main/export-excel`, params })
+  if (params.isSearch){
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/productionreceipt-record-main/export-excel-senior`, data })
+  }else {
+    return await request.download({ url: `/wms/productionreceipt-record-main/export-excel`, params })
+  }
+
 }
 
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/productionreceipt-record-main/get-import-template' })
-}
+}

src/api/wms/productionreturnRecordMain/index.ts

@@ -60,10 +60,15 @@ export const deleteProductionreturnRecordMain = async (id: number) => {
 
 // 导出生产退料记录主 Excel
 export const exportProductionreturnRecordMain = async (params) => {
-  return await request.download({ url: `/wms/productionreturn-record-main/export-excel`, params })
+  if (params.isSearch){
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/productionreturn-record-main/export-excel-senior`, data })
+  }else {
+    return await request.download({ url: `/wms/productionreturn-record-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/productionreturn-record-main/get-import-template' })
-}
+}

src/api/wms/productputawayJobDetail/index.ts

@@ -76,4 +76,4 @@ export const exportProductputawayJobDetail = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/productputaway-job-detail/get-import-template' })
-}
+}

src/api/wms/productputawayRecordDetail/index.ts

@@ -38,6 +38,12 @@ export interface ProductputawayRecordDetailVO {
 export const getProductputawayRecordDetailPage = async (params) => {
   params.type = 'predict'
   if (params.isSearch) {
+    const cmd = {
+      'column':'type',
+      'action':'==',
+      'value':'predict'
+    }
+    params.filters.push(cmd)
     delete params.isSearch
     const data = {...params}
     return await request.post({ url: '/wms/productputaway-record-detail/senior', data })
@@ -50,6 +56,12 @@ export const getProductputawayRecordDetailPage = async (params) => {
 export const getProductputawayRecordDetailPageAssemble = async (params) => {
     params.type = 'assemble'
   if (params.isSearch) {
+    const cmd = {
+      'column':'type',
+      'action':'==',
+      'value':'assemble'
+    }
+    params.filters.push(cmd)
     delete params.isSearch
     const data = {...params}
     return await request.post({ url: '/wms/productputaway-record-detail/senior', data })
@@ -85,4 +97,4 @@ export const exportProductputawayRecordDetail = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/productputaway-record-detail/get-import-template' })
-}
+}

src/api/wms/productputawayRecordMain/index.ts

@@ -78,7 +78,7 @@ export const exportProductputawayRecordMain = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/wms/productputaway-record-main/export-excel-senior', data })
+    return await request.downloadPost({ url: '/wms/productputaway-record-main/export-excel-senior', data })
   } else {
     return await request.download({ url: `/wms/productputaway-record-main/export-excel`, params })
   }
@@ -90,7 +90,7 @@ export const exportProductputawayRecordMainAssemble = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/wms/productputaway-record-main/export-excel-senior', data })
+    return await request.downloadPost({ url: '/wms/productputaway-record-main/export-excel-senior', data })
   } else {
     return await request.download({ url: `/wms/productputaway-record-main/export-excel`, params })
   }
@@ -99,4 +99,4 @@ export const exportProductputawayRecordMainAssemble = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/productputaway-record-main/get-import-template' })
-}
+}

src/api/wms/productputawayRequestMain/index.ts

@@ -74,6 +74,12 @@ export const deleteProductputawayRequestMain = async (id: number) => {
 export const exportProductputawayRequestMain = async (params) => {
   params.type = 'predict'
   if (params.isSearch) {
+    const cmd = {
+      'column':'type',
+      'action':'==',
+      'value':'predict'
+    }
+    params.filters.push(cmd)
     const data = {...params}
     return await request.downloadPost({ url: `/wms/productputaway-request-main/export-excel-senior`, data })
   } else {
@@ -85,6 +91,12 @@ export const exportProductputawayRequestMain = async (params) => {
 export const exportProductputawayRequestMainAssemble = async (params) => {
   params.type = 'assemble'
   if (params.isSearch) {
+    const cmd = {
+      'column':'type',
+      'action':'==',
+      'value':'assemble'
+    }
+    params.filters.push(cmd)
     const data = {...params}
     return await request.downloadPost({ url: `/wms/productputaway-request-main/export-excel-senior`, data })
   } else {
@@ -126,4 +138,4 @@ export const agree = (id) => {
 // 处理
 export const handle = (id) => {
   return request.put({ url: '/wms/productputaway-request-main/handle?id=' + id })
-}
+}

src/api/wms/productreceiptJobMain/index.ts

@@ -103,6 +103,12 @@ export const deleteProductreceiptJobMain = async (id: number) => {
 export const exportProductreceiptJobMain = async (params) => {
   params.type = 'predict'
   if (params.isSearch) {
+    const cmd = {
+      'column':'type',
+      'action':'==',
+      'value':'predict'
+    }
+    params.filters.push(cmd)
     const data = {...params}
     return await request.downloadPost({ url: `/wms/productreceipt-job-main/export-excel-senior`, data })
   } else {
@@ -145,4 +151,4 @@ export const closeProductreceiptMain = async (id) => {
 // 执行发料任务
 export const executeProductreceiptMain = async (data) => {
   return await request.put({ url: `/wms/productreceipt-job-main/execute`, data})
-}
+}

src/api/wms/productreceiptRecordMain/index.ts

@@ -87,6 +87,12 @@ export const deleteProductreceiptRecordMain = async (id: number) => {
 export const exportProductreceiptRecordMain = async (params) => {
   params.type = 'predict'
   if (params.isSearch) {
+    const cmd = {
+      'column':'type',
+      'action':'==',
+      'value':'predict'
+    }
+    params.filters.push(cmd)
     delete params.isSearch
     const data = {...params}
     return await request.post({ url: '/wms/productreceipt-record-main/export-excel-senior', data })
@@ -119,4 +125,4 @@ export const createPutawayRequest = async (number:string) => {
 // 创建检验申请
 export const createInspectRequest = async (number:string) => {
   return await request.post({ url: `/wms/productreceipt-record-main/createInspectRequest?number=`+number })
-}
+}

src/api/wms/productredressRecordMain/index.ts

@@ -61,10 +61,15 @@ export const deleteProductredressRecordMain = async (id: number) => {
 
 // 导出制品回收记录主 Excel
 export const exportProductredressRecordMain = async (params) => {
-  return await request.download({ url: `/wms/productredress-record-main/export-excel`, params })
+  if (params.isSearch){
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/productredress-record-main/export-excel-senior`, data })
+  }else {
+    return await request.download({ url: `/wms/productredress-record-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/productredress-record-main/get-import-template' })
-}
+}

src/api/wms/productredressRequestMain/index.ts

@@ -60,7 +60,12 @@ export const deleteProductredressRequestMain = async (id: number) => {
 
 // 导出制品回收申请主 Excel
 export const exportProductredressRequestMain = async (params) => {
-  return await request.download({ url: `/wms/productredress-request-main/export-excel`, params })
+  if (params.isSearch){
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/productredress-request-main/export-excel-senior`, data })
+  }else {
+    return await request.download({ url: `/wms/productredress-request-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
@@ -97,4 +102,4 @@ export const agree = (id) => {
 // 处理
 export const handle = (id) => {
   return request.put({ url: '/wms/productredress-request-main/handle?id=' + id })
-}
+}

src/api/wms/productrepairRecordMain/index.ts

@@ -61,7 +61,7 @@ export const exportProductrepairRecordMain = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/wms/productrepair-record-main/export-excel-senior', data })
+    return await request.downloadPost({ url: '/wms/productrepair-record-main/export-excel-senior', data })
   } else {
     return await request.download({ url: `/wms/productrepair-record-main/export-excel`, params })
   }
@@ -70,4 +70,4 @@ export const exportProductrepairRecordMain = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/productrepair-record-main/get-import-template' })
-}
+}

src/api/wms/productrepairRequestMain/index.ts

@@ -57,7 +57,13 @@ export const deleteProductrepairRequestMain = async (id: number) => {
 
 // 导出制品返修申请主 Excel
 export const exportProductrepairRequestMain = async (params) => {
-  return await request.download({ url: `/wms/productrepair-request-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.downloadPost({ url: '/wms/productrepair-request-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/productrepair-request-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板

src/api/wms/productscrapRequestMain/index.ts

@@ -57,7 +57,7 @@ export const exportProductscrapRequestMain = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/wms/productscrap-request-main/export-excel-senior', data })
+    return await request.downloadPost({ url: '/wms/productscrap-request-main/export-excel-senior', data })
   } else {
     return await request.download({ url: `/wms/productscrap-request-main/export-excel`, params })
   }

src/api/wms/qadproductionplan/index.ts

@@ -60,7 +60,12 @@ export const deleteQadProductionPlanMain = async (id: number) => {
 
 // 导出QAD生产计划主 Excel
 export const exportQadProductionPlanMain = async (params) => {
-  return await request.download({ url: `/wms/qad-production-plan-main/export-excel`, params })
+  if (params.isSearch){
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/qad-production-plan-main/export-excel-senior`, data })
+  }else {
+    return await request.download({ url: `/wms/qad-production-plan-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板

src/api/wms/repleinshRecordMain/index.ts

@@ -59,10 +59,15 @@ export const deleteRepleinshRecordMain = async (id: number) => {
 
 // 导出补料记录主 Excel
 export const exportRepleinshRecordMain = async (params) => {
-  return await request.download({ url: `/wms/repleinsh-record-main/export-excel`, params })
+  if (params.isSearch){
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/repleinsh-record-main/export-excel-senior`, data })
+  }else {
+    return await request.download({ url: `/wms/repleinsh-record-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/repleinsh-record-main/get-import-template' })
-}
+}

src/api/wms/saleMain/index.ts

@@ -54,10 +54,16 @@ export const deleteSaleMain = async (id: number) => {
 
 // 导出销售订单主 Excel
 export const exportSaleMain = async (params) => {
-  return await request.download({ url: `/wms/sale-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.downloadPost({ url: '/wms/sale-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/sale-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/sale-main/get-import-template' })
-}
+}

src/api/wms/saleShipmentMain/index.ts

@@ -55,7 +55,13 @@ export const deleteSaleShipmentMain = async (id: number) => {
 
 // 导出结算出库申请主 Excel
 export const exportSaleShipmentMain = async (params) => {
-  return await request.download({ url: `/wms/sale-shipment-main-request/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.downloadPost({ url: '/wms/sale-shipment-main-request/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/sale-shipment-main-request/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
@@ -91,4 +97,4 @@ export const agree = async (id) => {
 // 处理-结算出库申请
 export const handle = async (id) => {
   return await request.put({ url: `/wms/sale-shipment-main-request/handle?id=` + id })
-}
+}

src/api/wms/saleShipmentMainRecord/index.ts

@@ -47,10 +47,16 @@ export const deleteSaleShipmentMainRecord = async (id: number) => {
 
 // 导出结算出库记录主 Excel
 export const exportSaleShipmentMainRecord = async (params) => {
-  return await request.download({ url: `/wms/sale-shipment-main-record/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.downloadPost({ url: '/wms/sale-shipment-main-record/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/sale-shipment-main-record/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/sale-shipment-main-record/get-import-template' })
-}
+}

src/api/wms/transaction/index.ts

@@ -65,7 +65,7 @@ export const exportTransaction = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/wms/transaction/export-excel-senior', data })
+    return await request.downloadPost({ url: '/wms/transaction/export-excel-senior', data })
   } else {
     return await request.download({ url: `/wms/transaction/export-excel`, params })
   }
@@ -74,4 +74,4 @@ export const exportTransaction = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/transaction/get-import-template' })
-}
+}

src/api/wms/transferlog/index.ts

@@ -74,7 +74,7 @@ export const exportTransferlog = async (params) => {
   if (params.isSearch) {
     delete params.isSearch
     const data = {...params}
-    return await request.post({ url: '/wms/transferlog/export-excel-senior', data })
+    return await request.downloadPost({ url: '/wms/transferlog/export-excel-senior', data })
   } else {
     return await request.download({ url: `/wms/transferlog/export-excel`, params })
   }
@@ -83,4 +83,4 @@ export const exportTransferlog = async (params) => {
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/transferlog/get-import-template' })
-}
+}

src/components/Table/src/Table.vue

@@ -136,11 +136,9 @@ export default defineComponent({
     const toggleAllSelection = (isAll)=>{
       if(isAll){
         //全选
-        if(elTableRef.value?.getSelectionRows().length<unref(getProps).data.length){
+        unref(getProps).data.forEach(row=>{
-          unref(getProps).data.forEach(row=>{
+          elTableRef.value!.toggleRowSelection(row,true)
-            elTableRef.value!.toggleRowSelection(row,true)
+        })
-          })
-        }
       }
     }
     

src/components/TableForm/src/TableForm.vue

@@ -4,7 +4,7 @@
     <el-table class="multipleTableComponents"
       ref="TableBaseComponents_Ref" 
       v-loading="tableLoading" 
-      :data="tableData"
+      :data="showTableData()"
       :max-height="maxHeight"
       row-key="id" 
       :border="border" 
@@ -13,7 +13,7 @@
       @row-click="handleTableSelect"
     >
       <!-- 删除按钮多选 -->
-      <el-table-column fixed="left" type="selection" width="50" v-if="isShowReduceButtonSelection" />
+      <el-table-column fixed="left" type="selection" width="50" v-if="isShowReduceButtonSelection"  :reserve-selection="true" />
       <!-- 删除按钮 -->
       <el-table-column
         fixed="left" 
@@ -26,10 +26,11 @@
       <!-- 多选 -->
       <el-table-column 
         fixed="left" 
+        v-if="selectionTable"
         :reserve-selection="true" 
         type="selection" 
         :width="50" 
-        v-if="selectionTable" 
+        
       />
       <!-- 序号 -->
       <el-table-column 
@@ -314,6 +315,15 @@
         <ButtonBase :Butttondata="[defaultButtons.mainListDeleteBtn(),]" @button-base-click="handleDeleteTable (row, $index)" />
       </el-table-column>
     </el-table>
+    <!-- :page-sizes="[ 10,20, 30, 50, 100]" sizes-->
+    <el-pagination v-show="tableData.length>5" style="margin-top:10px"
+          v-model:current-page="currentPage"
+          v-model:page-size="pageSize"
+          :small="true"
+          :background="false"
+          layout="total, prev, pager, next, jumper"
+          :total="tableData.length"
+        />
     <div class="button flex" v-if="isShowButton||isShowReduceButtonSelection">
       <div class="p-12px" v-if="isShowButton" @click="handleAddTable">
         <Icon icon="ep:circle-plus" color="#409eff" size="26" style="cursor: pointer;" />
@@ -453,6 +463,11 @@ const tableSelectionChange = (val) => {
 }
 const handleSelectionDelete = ()=>{
   emit('tableSelectionDelete', deleteTableData.value)
+  nextTick(()=>{
+    deleteTableData.value.forEach(row=>{
+      TableBaseComponents_Ref.value!.toggleRowSelection(row,false)
+    })
+  })
 }
 // 列表排序
 const tableSortChange = (column, prop, order) => {
@@ -497,6 +512,9 @@ const validateForm = () => {
 // 删除数据
 const handleDeleteTable = (row, index) => {
   emit('handleDeleteTable', row, index)
+  nextTick(()=>{
+    TableBaseComponents_Ref.value!.toggleRowSelection(row,false)
+  })
 }
 // 添加数据
 const handleAddTable = () => {
@@ -521,6 +539,16 @@ const buttonOperationClick = (row, label, index)=> {
   emit("buttonOperationClick", row, label, index);
 }
 
+const currentPage =ref(1)
+const pageSize = ref(10)
+const showTableData = ()=>{
+  console.log('props.tableData',props.tableData)
+  if(props.tableData.length>100){
+    return props.tableData.slice((currentPage.value-1)*pageSize.value,currentPage.value*pageSize.value)
+  }else{
+    return props.tableData
+  }
+}
 // setup 语法糖 抛出方法
 defineExpose({
   TableBaseComponents_Ref,

src/locales/en-US.ts

@@ -817,7 +817,7 @@ export default {
     供应商名称:'Supplier Name',
     税额:'Tax',
     税后金额:'After-tax Amount',
-    折扣金额:'Discount Amount',
+    调整价差:'Discount Amount',
     调整税额:'Adjusted Tax',
     总差额:'Under Coverage',
     金税票号:'Gold tax ticket number',

src/locales/zh-CN.ts

@@ -817,7 +817,7 @@ export default {
     供应商名称:'供应商名称',
     税额:'税额',
     税后金额:'税后金额',
-    折扣金额:'折扣金额',
+    调整价差:'调整价差',
     调整税额:'调整税额',
     总差额:'总差额',
     金税票号:'金税票号',

src/views/eam/equipmentRepairRecordMain/index.vue

@@ -242,7 +242,9 @@ const repairExperienceFormsSuccess = async (formType, data) => {
   const data1 = {
     repairNumber: data.number,
     name: data.name,
-    content: data.content
+    content: data.content,
+    masterId: data.id,
+    ooderType: 'REPAIR',
   }
   console.log(data1)
   try {

src/views/eam/equipmentTransferRecord/index.vue

@@ -89,7 +89,6 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
     const setV = {}
     setV[formField] = val[0][searchField]
     if(formField == 'equipmentCode'){
-      debugger
       setV['beforeStorageLocation'] = val[0]['storageLocation']
       setV['beforeWorkshopCode'] = val[0]['workshopCode']
       setV['beforeLineCode'] = val[0]['lineCode']

src/views/eam/repairExperience/index.vue

@@ -27,9 +27,9 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
+    <template #name="{ row }">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+        <el-button type="primary" link @click="openDetail(row, '经验标题', row.repairNumber)">
-          <span>{{ row.code }}</span>
+          <span>{{ row.name }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
@@ -51,8 +51,17 @@
   />
 
   <!-- 详情 -->
-  <Detail ref="detailRef" :isBasic="true" :allSchemas="RepairExperience.allSchemas" />
+  <Detail
-
+    ref="detailRef"
+    :isBasic="false"
+    :allSchemas="RepairExperience.allSchemas"
+    :detailAllSchemas="EquipmentRepairRecordDetail.allSchemas"
+    :detailAllSchemasRules="EquipmentRepairRecordDetailRules"
+    :apiPage="EquipmentRepairRecordDetailApi.getEquipmentRepairRecordDetailPage"
+    :detailButtonIsShowAdd="false"
+    :detailButtonIsShowEdit="false"
+    :detailButtonIsShowDelete="false"
+  />
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/record/repair-experience/import" :importTemplateData="importTemplateData" @success="importSuccess" />
 </template>
@@ -60,7 +69,13 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import { RepairExperience,RepairExperienceRules } from './repairExperience.data'
+
 import * as RepairExperienceApi from '@/api/eam/repairExperience/index'
+import {
+  EquipmentRepairRecordDetail,
+  EquipmentRepairRecordDetailRules
+} from '../equipmentRepairRecordDetail/equipmentRepairRecordDetail.data'
+import * as EquipmentRepairRecordDetailApi from '@/api/eam/equipmentRepairRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
@@ -238,7 +253,6 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async () => {
   getList()
-  importTemplateData.templateUrl = await RepairExperienceApi.importTemplate()
 })
 
 </script>

src/views/eam/repairExperience/repairExperience.data.ts

@@ -40,45 +40,55 @@ export const RepairExperience = useCrudSchemas(reactive<CrudSchema[]>([
   },
  
   {
-    label: '维修工单来源',
+    label: '来源字典',
-    field: 'repairNumber',
+    field: 'sources',
     sort: 'custom',
-    isSearch:false,
+    dictType: DICT_TYPE.EAM_MAINTENANCE_SOURCES,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    isSearch: false,
     isForm:false
   },
   {
     label: '报修类型',
-    field: 'repairNumber',
+    field: 'type',
     sort: 'custom',
-    isSearch:false,
+    dictType: DICT_TYPE.DEVICE_TYPE,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    isSearch: false,
     isForm:false
   },
   {
     label: '设备/工装编号',
-    field: 'repairNumber',
+    field: 'equipmentCode',
     sort: 'custom',
     isSearch:false,
     isForm:false
   },
   {
     label: '设备/工装名称',
-    field: 'repairNumber',
+    field: 'equipmentName',
     sort: 'custom',
     isSearch:false,
     isForm:false
   },
   {
     label: '故障时间',
-    field: 'repairNumber',
+    field: 'faultTime',
+    formatter: dateFormatter,
     sort: 'custom',
     isSearch:false,
-    isForm:false
+    isForm:false,
+    detail:{
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    }
   },
   {
     label: '故障类型',
-    field: 'repairNumber',
+    field: 'faultType',
     sort: 'custom',
-    isSearch:false,
+    dictType: DICT_TYPE.FAILURE_REASON,
+    dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+    isSearch: false,
     isForm:false
   },
   {
@@ -95,15 +105,9 @@ export const RepairExperience = useCrudSchemas(reactive<CrudSchema[]>([
     formatter: dateFormatter,
     isForm: false,
     isSearch:false,
+    detail:{
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    }
   },
  
-  {
-    label: '操作',
-    field: 'action',
-    isForm: false,
-    table: {
-      width: 150,
-      fixed: 'right'
-    }
-  }
 ]))

src/views/qms/inspectionTemplate/addForm.vue

@@ -839,14 +839,16 @@ const submitForm = async () => {
     // 检验上限值应大目标值大于下限值
     const arr2 = data.value.process.filter(
       (item) =>
-      // 上限值存在并且下限值存在时，上限值应大于下限值
+     {
-      (item.inspectionCharacteristicsBaseVO.quantifyIsCapping && item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit && (item.inspectionCharacteristicsBaseVO.quantifyCapping <=item.inspectionCharacteristicsBaseVO.quantifyLowlimit))||
+      // 上限值存在并且下限值存在时,目标值不存在，上限值应大于下限值
-      // 上限值存在并且目标值存在时，上限值应大于目标值
+     return (item.inspectionCharacteristicsBaseVO.quantifyIsCapping && item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit && !item.inspectionCharacteristicsBaseVO.quantifyIsTarget  &&  (parseFloat(item.inspectionCharacteristicsBaseVO.quantifyCapping) <=parseFloat(item.inspectionCharacteristicsBaseVO.quantifyLowlimit)))||
-      (item.inspectionCharacteristicsBaseVO.quantifyIsCapping && item.inspectionCharacteristicsBaseVO.quantifyIsTarget && (item.inspectionCharacteristicsBaseVO.quantifyCapping <=item.inspectionCharacteristicsBaseVO.quantifyTarget))||
+      // 上限值存在并且目标值存在时，下限值不存在，上限值应大于目标值
-      // 下限值存在并且目标值存在时，下限值应小于目标值
+      (item.inspectionCharacteristicsBaseVO.quantifyIsCapping && item.inspectionCharacteristicsBaseVO.quantifyIsTarget && !item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit  && (parseFloat(item.inspectionCharacteristicsBaseVO.quantifyCapping) <=parseFloat(item.inspectionCharacteristicsBaseVO.quantifyTarget)))||
-      ( item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit && item.inspectionCharacteristicsBaseVO.quantifyIsTarget && (item.inspectionCharacteristicsBaseVO.quantifyLowlimit >= item.inspectionCharacteristicsBaseVO.quantifyTarget))||
+      // 下限值存在并且目标值存在时，上限值不存在，下限值应小于目标值
+      ( item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit && item.inspectionCharacteristicsBaseVO.quantifyIsTarget&&!item.inspectionCharacteristicsBaseVO.quantifyIsCapping && (parseFloat(item.inspectionCharacteristicsBaseVO.quantifyLowlimit) >= parseFloat(item.inspectionCharacteristicsBaseVO.quantifyTarget)))||
       // 上限值，下限值，目标值都存在时，上限值应大于目标值大于下限值
-      (item.inspectionCharacteristicsBaseVO.quantifyIsCapping && item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit && item.inspectionCharacteristicsBaseVO.quantifyIsTarget && ((item.inspectionCharacteristicsBaseVO.quantifyCapping <=item.inspectionCharacteristicsBaseVO.quantifyLowlimit)||(item.inspectionCharacteristicsBaseVO.quantifyCapping <=item.inspectionCharacteristicsBaseVO.quantifyTarget)||(item.inspectionCharacteristicsBaseVO.quantifyLowlimit >= item.inspectionCharacteristicsBaseVO.quantifyTarget)))
+      (item.inspectionCharacteristicsBaseVO.quantifyIsCapping && item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit && item.inspectionCharacteristicsBaseVO.quantifyIsTarget && ((parseFloat(item.inspectionCharacteristicsBaseVO.quantifyCapping) <=parseFloat(item.inspectionCharacteristicsBaseVO.quantifyLowlimit) )||(parseFloat(item.inspectionCharacteristicsBaseVO.quantifyCapping) <=parseFloat(item.inspectionCharacteristicsBaseVO.quantifyTarget))||(parseFloat(item.inspectionCharacteristicsBaseVO.quantifyLowlimit) >= parseFloat(item.inspectionCharacteristicsBaseVO.quantifyTarget))))
+     }
     )
     console.log(99,arr2)
     if (arr2 && arr2.length > 0) {

src/views/wms/basicDataManage/itemManage/itemarea/index.vue

@@ -350,7 +350,10 @@ const handleAddTable = () => {
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))

src/views/wms/countManage/count/countPlanMain/index.vue

@@ -629,7 +629,10 @@ const handleAddTable = () => {
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter((item) => !selection.includes(item))

src/views/wms/countManage/count/countRequestMain/index.vue

@@ -507,7 +507,10 @@ const handleAddTable = () => {
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))

src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue

@@ -336,7 +336,10 @@ const handleAddTable = () => {
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))

src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue

@@ -348,7 +348,10 @@ const handleAddTable = () => {
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))

src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue

@@ -692,7 +692,10 @@ const searchTableSuccess1 = (formField, searchField, val, formRef, type, row) =>
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))

src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue

@@ -359,7 +359,10 @@ const handleAddTable = () => {
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))

src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue

@@ -493,7 +493,10 @@ const handleAddTable = () => {
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))

src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue

@@ -450,7 +450,10 @@ const handleAddTable = () => {
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))

src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue

@@ -275,7 +275,10 @@ const handleAddTable = () => {
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))

src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue

@@ -375,7 +375,10 @@ const handleAddTable = () => {
   }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))

src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue

@@ -425,7 +425,10 @@ const handleAddTable = () => {
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))

src/views/wms/inventoryManage/balance/index.vue

@@ -200,17 +200,17 @@ const handleSelectionPoint = async ()=>{
 }
 // 列表-操作按钮
 const butttondata = [
-  // {
+  {
-  //   label: '标签信息',
+    label: '标签信息',
-  //   name: 'bqxx',
+    name: 'bqxx',
-  //   hide: false,
+    hide: false,
-  //   type: 'primary',
+    type: 'primary',
-  //   icon: '',
+    icon: '',
-  //   color: '',
+    color: '',
-  //   link: true,
+    link: true,
-  //   float:'right',
+    float:'right',
-  //   hasPermi: ''
+    hasPermi: ''
-  // },
+  },
   defaultButtons.mainListPointBtn(null), // 标签打印
   // defaultButtons.mainListEditBtn({hasPermi:'wms:balance:update'}), // 编辑
   // defaultButtons.mainListDeleteBtn({hasPermi:'wms:balance:delete'}), // 删除

src/views/wms/inventoryManage/containerinit/containerBindRecord/index.vue

@@ -260,7 +260,10 @@ const handleAddTable = () => {
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))

src/views/wms/inventoryManage/containerinit/containerRepair/index.vue

@@ -259,7 +259,10 @@ const handleAddTable = () => {
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))

src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue

@@ -259,7 +259,10 @@ const handleAddTable = () => {
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))

src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue

@@ -428,7 +428,10 @@ const handleAddTable = () => {
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))

src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue

@@ -380,7 +380,10 @@ const handleAddTable = () => {
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))

src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue

@@ -406,7 +406,10 @@ const handleAddTable = () => {
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))

src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue

@@ -408,7 +408,10 @@ const handleAddTable = () => {
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))

src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue

@@ -390,7 +390,10 @@ const handleAddTable = () => {
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))

src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue

@@ -371,7 +371,10 @@ const handleAddTable = () => {
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))

src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue

@@ -398,7 +398,10 @@ const handleAddTable = () => {
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))

src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue

@@ -379,7 +379,10 @@ const handleAddTable = () => {
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))

src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue

@@ -391,7 +391,10 @@ const handleAddTable = () => {
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))

src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts

@@ -270,8 +270,8 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'fromAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -310,6 +310,9 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '优先级',
     field: 'priority',
     sort: 'custom',
+    isTable:false,
+    isForm:false,
+    isTableForm:false,
     table: {
       width: 150
     },
@@ -321,6 +324,9 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '优先级增量',
     field: 'priorityIncrement',
     sort: 'custom',
+    isTable:false,
+    isForm:false,
+    isTableForm:false,
     table: {
       width: 150
     },
@@ -357,7 +363,9 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoComplete',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable:false,
+    isForm:false,
+    isTableForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -376,7 +384,9 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyLocation',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable:false,
+    isForm:false,
+    isTableForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -395,7 +405,9 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable:false,
+    isForm:false,
+    isTableForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -414,7 +426,9 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowBiggerQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable:false,
+    isForm:false,
+    isTableForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -433,7 +447,9 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowSmallerQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable:false,
+    isForm:false,
+    isTableForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -452,7 +468,9 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyInventoryStatus',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable:false,
+    isForm:false,
+    isTableForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -471,7 +489,9 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowContinuousScanning',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable:false,
+    isForm:false,
+    isTableForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -490,7 +510,9 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowPartialComplete',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable:false,
+    isForm:false,
+    isTableForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -509,7 +531,9 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyBatch',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable:false,
+    isForm:false,
+    isTableForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -528,7 +552,9 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyPackingNumber',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable:false,
+    isForm:false,
+    isTableForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -630,6 +656,7 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '最后更新时间',
     field: 'updateTime',
     formatter: dateFormatter,
+    isTable:false,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
@@ -650,6 +677,7 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '最后更新者',
     field: 'updater',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -726,6 +754,7 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '单据号',
     field: 'number',
     sort: 'custom',
+    hiddenInMain:true,
     table: {
       width: 180
     },
@@ -782,6 +811,7 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '器具号',
     field: 'containerNumber',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -861,6 +891,9 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '成本中心代码',
     field: 'costcentreCode',
     sort: 'custom',
+    isTable:false,
+    isTableForm:false,
+    isForm:false,
     table: {
       width: 150
     },
@@ -869,6 +902,9 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '科目代码',
     field: 'qadProjectCode',
     sort: 'custom',
+    isTable:false,
+    isTableForm:false,
+    isForm:false,
     table: {
       width: 150
     },
@@ -898,6 +934,9 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '货主代码',
     field: 'ownerCode',
     sort: 'custom',
+    isTable:false,
+    isTableForm:false,
+    isForm:false,
     table: {
       width: 150
     },
@@ -906,6 +945,9 @@ export const UnplannedreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '项目代码',
     field: 'projectCode',
     sort: 'custom',
+    isTable:false,
+    isTableForm:false,
+    isForm:false,
     table: {
       width: 150
     },

src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts

@@ -298,6 +298,9 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     label: '领用描述',
     field: 'usageDescription',
     sort: 'custom',
+    isTable:false,
+    isForm:false,
+    isTableForm:false,
     table: {
       width: 150
     },
@@ -348,6 +351,7 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '备注',
     field: 'remark',
+    isTable:false,
     sort: 'custom',
     table: {
       width: 150
@@ -357,6 +361,7 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     label: '创建时间',
     field: 'createTime',
     formatter: dateFormatter,
+    isTable:false,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
@@ -377,6 +382,7 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     label: '创建者',
     field: 'creator',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -395,7 +401,7 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isSearch: false,
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -468,6 +474,7 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]
     label: '单据号',
     field: 'number',
     sort: 'custom',
+    hiddenInMain:true,
     table: {
       width: 180
     },
@@ -523,6 +530,9 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]
   {
     label: '器具号',
     field: 'containerNumber',
+    isTable:false,
+    isForm:false,
+    isTableForm:false,
     sort: 'custom',
     table: {
       width: 150
@@ -730,7 +740,9 @@ export const UnplannedreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]
     field: 'interfaceType',
     dictType: DICT_TYPE.INTERFACE_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
+    isForm:false,
+    isTableForm:false,
     sort: 'custom',
     table: {
       width: 150

src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue

@@ -600,7 +600,10 @@ const handleAddTable = () => {
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))

src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts

@@ -387,7 +387,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     field: 'autoCommit',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm: false,
     sort: 'custom',
     table: {
@@ -408,7 +408,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     field: 'autoAgree',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm: false,
     sort: 'custom',
     table: {
@@ -429,7 +429,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     field: 'autoExecute',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm: false,
     sort: 'custom',
     table: {
@@ -481,6 +481,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
+    isTable:false,
     sort: 'custom',
     table: {
       width: 180
@@ -500,6 +501,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     label: '创建者',
     field: 'creator',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -512,6 +514,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
+    isTable:false,
     sort: 'custom',
     table: {
       width: 180
@@ -530,6 +533,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     label: '最后更新者',
     field: 'updater',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -596,6 +600,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
       width: 180
     },
     isTableForm: false,
+    hiddenInMain:true,
     form: {
       componentProps: {
         disabled: true
@@ -972,6 +977,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     label: '到货主代码',
     field: 'toOwnerCode',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -1143,6 +1149,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
+    isTable:false,
     sort: 'custom',
     table: {
       width: 180
@@ -1162,6 +1169,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     label: '最后更新者',
     field: 'updater',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },

src/views/wms/issueManage/issue/issueJobMain/index.vue

@@ -170,9 +170,9 @@ const butttondata = (row,$index) => {
     return []
   }
   return [
-    // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
     defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
-    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃--取消承接
     // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
   ]
 }
@@ -268,13 +268,17 @@ const buttonTableClick = async (val, row) => {
           }]
       }]
     }
-    IssueJobMainApi.executeIssueMain(aaa)
+    await IssueJobMainApi.executeIssueMain(aaa)
+    getList()
   } else if (val == 'mainJobAba') { // 放弃
-    IssueJobMainApi.abandonIssueMain(row.masterId)
+    await IssueJobMainApi.abandonIssueMain(row.masterId)
+    getList()
   } else if (val == 'mainJobClo') { // 关闭
-    IssueJobMainApi.closeIssueMain(row.masterId)
+    await IssueJobMainApi.closeIssueMain(row.masterId)
+    getList()
   } else if (val == 'mainJobAcc') { // 承接
-    IssueJobMainApi.acceptIssueMain(row.masterId)
+    await IssueJobMainApi.acceptIssueMain(row.masterId)
+    getList()
   }
 }
 // 获取部门 用于详情 部门回显

src/views/wms/issueManage/issue/issueRequestMain/index.vue

@@ -377,7 +377,10 @@ const handleAddTable = () => {
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))

src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue

@@ -289,7 +289,10 @@ const handleAddTable = () => {
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))

src/views/wms/issueManage/pick/pickRequestMain/index.vue

@@ -294,7 +294,10 @@ const handleAddTable = () => {
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))

src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue

@@ -432,7 +432,10 @@ const handleAddTable = () => {
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))

src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue

@@ -618,7 +618,10 @@ const handleAddTable = () => {
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))

src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue

@@ -352,7 +352,10 @@ const handleAddTable = () => {
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))

src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue

@@ -417,7 +417,10 @@ const handleAddTable = () => {
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))

src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue

@@ -655,7 +655,10 @@ const handleAddTable = () => {
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))

src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/index.vue

@@ -302,7 +302,10 @@ const handleAddTable = () => {
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))

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

@@ -418,7 +418,10 @@ const handleAddTable = () => {
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))

src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue

@@ -538,7 +538,10 @@ const handleAddTable = () => {
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))

src/views/wms/productionManage/productionplan/productionMain/index.vue

@@ -450,7 +450,10 @@ const handleAddTable = () => {
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))

src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue

@@ -438,7 +438,10 @@ const handleAddTable = () => {
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))

src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue

@@ -438,7 +438,10 @@ const handleAddTable = () => {
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))

src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue

@@ -438,7 +438,10 @@ const handleAddTable = () => {
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))

src/views/wms/productionManage/productionplan/workMain/index.vue

@@ -262,7 +262,10 @@ const handleAddTable = () => {
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))

src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue

@@ -363,7 +363,10 @@ const handleAddTable = () => {
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))

src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue

@@ -355,7 +355,10 @@ const handleAddTable = () => {
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))

src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue

@@ -357,6 +357,12 @@ const handleExport = async () => {
 
 // 筛选提交
 const searchFormClick = (searchData) => {
+  const cmd = {
+    'column':'type',
+    'action':'==',
+    'value':'predict'
+  }
+  searchData.filters.push(cmd)
   tableObject.params = {
     isSearch: true,
     filters: searchData.filters

src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue

@@ -555,7 +555,10 @@ const handleAddTable = () => {
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))

src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue

@@ -264,7 +264,7 @@ const tableFormButton = async (val , row) => {
     mesModelVisible.value = true
     DialogTitle.value = '物料代码【' + row.itemCode + '】——Mes信息'
     detatableDataMes.params = {
-      masterId: row.masterId
+      masterId: row.id
     }
     await getDetailListMes()
   }

src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue

@@ -557,7 +557,10 @@ const handleAddTable = () => {
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))

src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue

@@ -292,6 +292,12 @@ const handleExport = async () => {
 
 // 筛选提交
 const searchFormClick = (searchData) => {
+  const cmd = {
+    'column':'type',
+    'action':'==',
+    'value':'predict'
+  }
+  searchData.filters.push(cmd)
   tableObject.params = {
     isSearch: true,
     filters: searchData.filters

src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue

@@ -547,7 +547,10 @@ const handleAddTable = () => {
 }
 // 删除明细
 const handleDeleteTable = (item, index) => {
-  tableData.value.splice(index, 1)
+  let itemIndex = tableData.value.indexOf(item)
+  if(itemIndex>-1){
+    tableData.value.splice(itemIndex, 1)
+  }
 }
 const tableSelectionDelete = (selection) => {
   tableData.value = tableData.value.filter(item => !selection.includes(item))