@@ -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,
diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
index c3ef67643..f15b4ed74 100644
--- a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
+++ b/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))
diff --git a/src/views/wms/countManage/count/countPlanMain/index.vue b/src/views/wms/countManage/count/countPlanMain/index.vue
index a0ca72e63..4cfefed4a 100644
--- a/src/views/wms/countManage/count/countPlanMain/index.vue
+++ b/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))
diff --git a/src/views/wms/countManage/count/countRequestMain/index.vue b/src/views/wms/countManage/count/countRequestMain/index.vue
index 5ae51ee1e..5b65dd4f1 100644
--- a/src/views/wms/countManage/count/countRequestMain/index.vue
+++ b/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))
diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
index 3d13f5f6b..7f06f76f3 100644
--- a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue
+++ b/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))
diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue
index b1af5ce1e..ec184bff3 100644
--- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue
+++ b/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))
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
index e138e2dce..599867dd7 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
+++ b/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))
diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue
index fc8514503..2aa4d3f9a 100644
--- a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue
+++ b/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))
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
index 67a8c6bf2..df44730fd 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
+++ b/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))
diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
index 06531a9df..83b901650 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
+++ b/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))
diff --git a/src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue b/src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue
index 739840f9e..04aac908e 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue
+++ b/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))
diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
index 32a090eb1..9f9165ebd 100644
--- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue
+++ b/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))
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
index 1b210a28f..77554c490 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
+++ b/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))
diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue
index c546435e2..8e5432f6e 100644
--- a/src/views/wms/inventoryManage/balance/index.vue
+++ b/src/views/wms/inventoryManage/balance/index.vue
@@ -200,17 +200,17 @@ const handleSelectionPoint = async ()=>{
}
// 列表-操作按钮
const butttondata = [
- // {
- // label: '标签信息',
- // name: 'bqxx',
- // hide: false,
- // type: 'primary',
- // icon: '',
- // color: '',
- // link: true,
- // float:'right',
- // hasPermi: ''
- // },
+ {
+ label: '标签信息',
+ name: 'bqxx',
+ hide: false,
+ type: 'primary',
+ icon: '',
+ color: '',
+ link: true,
+ float:'right',
+ hasPermi: ''
+ },
defaultButtons.mainListPointBtn(null), // 标签打印
// defaultButtons.mainListEditBtn({hasPermi:'wms:balance:update'}), // 编辑
// defaultButtons.mainListDeleteBtn({hasPermi:'wms:balance:delete'}), // 删除
diff --git a/src/views/wms/inventoryManage/containerinit/containerBindRecord/index.vue b/src/views/wms/inventoryManage/containerinit/containerBindRecord/index.vue
index c445bd5aa..94f4f18c6 100644
--- a/src/views/wms/inventoryManage/containerinit/containerBindRecord/index.vue
+++ b/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))
diff --git a/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue b/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue
index 1e7d7c8e9..9b60a6338 100644
--- a/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue
+++ b/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))
diff --git a/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue b/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue
index 7cb703a5d..dddc7cb22 100644
--- a/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue
+++ b/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))
diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue
index d03824483..db23f1dca 100644
--- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue
+++ b/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))
diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
index 425e776f9..b37e88036 100644
--- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue
+++ b/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))
diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue
index 84d9af692..f014cff4b 100644
--- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue
+++ b/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))
diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
index a79c4221d..fd19b5f1d 100644
--- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
+++ b/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))
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
index d8bbf336e..a49a6598e 100644
--- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue
+++ b/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))
diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
index 905718b2b..8dd499624 100644
--- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue
+++ b/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))
diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
index 6d1743a0a..7196e5f01 100644
--- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
+++ b/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))
diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue
index 098f29296..06c820e4f 100644
--- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue
+++ b/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))
diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
index 26021eeda..4befdd5ec 100644
--- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue
+++ b/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))
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
index 28ee29b26..5f0dc22e8 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
+++ b/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))
diff --git a/src/views/wms/issueManage/issue/issueJobMain/index.vue b/src/views/wms/issueManage/issue/issueJobMain/index.vue
index 16d31db17..c751f298b 100644
--- a/src/views/wms/issueManage/issue/issueJobMain/index.vue
+++ b/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'])}), // 执行
]
}
diff --git a/src/views/wms/issueManage/issue/issueRequestMain/index.vue b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
index 358850dc5..299c93049 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/index.vue
+++ b/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))
diff --git a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue
index 0a5943fd2..b21efc68b 100644
--- a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue
+++ b/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))
diff --git a/src/views/wms/issueManage/pick/pickRequestMain/index.vue b/src/views/wms/issueManage/pick/pickRequestMain/index.vue
index 509c35ffe..38f9777c0 100644
--- a/src/views/wms/issueManage/pick/pickRequestMain/index.vue
+++ b/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))
diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
index df5f57e12..d01791d34 100644
--- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
+++ b/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))
diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
index 410cf97f0..541ff60c3 100644
--- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue
+++ b/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))
diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
index 6d284844a..844973658 100644
--- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue
+++ b/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))
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
index 43e8abec4..49b9f297e 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue
+++ b/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))
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
index 11719d58a..de4582cb8 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue
+++ b/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))
diff --git a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/index.vue b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/index.vue
index 569b95755..15b6e76a2 100644
--- a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/index.vue
+++ b/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))
diff --git a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
index 3ac03937e..e13672e97 100644
--- a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue
+++ b/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))
diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
index cd7c3af6a..fa0a7166c 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/index.vue
+++ b/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))
diff --git a/src/views/wms/productionManage/productionplan/productionMain/index.vue b/src/views/wms/productionManage/productionplan/productionMain/index.vue
index 4d1503c0a..a093ced2a 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/index.vue
+++ b/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))
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
index 4c0d3956b..f8dab6fc1 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
+++ b/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))
diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
index 1e078b89c..338d62945 100644
--- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
+++ b/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))
diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
index 164a58c10..186b60738 100644
--- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
+++ b/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))
diff --git a/src/views/wms/productionManage/productionplan/workMain/index.vue b/src/views/wms/productionManage/productionplan/workMain/index.vue
index c3cca0a34..1935f4027 100644
--- a/src/views/wms/productionManage/productionplan/workMain/index.vue
+++ b/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))
diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
index b2a0b323e..43d105679 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
+++ b/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))
diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue
index 7e13b6fd0..fe3749a7e 100644
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue
+++ b/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))
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
index 20c11885a..93d80734e 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
+++ b/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))
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
index 45187dc30..50110ead5 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
+++ b/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))
diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
index 0946338d2..8494ac698 100644
--- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue
+++ b/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))
diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue
index 6aeaac98e..01f9d762d 100644
--- a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue
+++ b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue
@@ -396,7 +396,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))
diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
index 290d50683..3e735bd9e 100644
--- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
+++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
@@ -637,7 +637,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))
diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
index a12607b61..a71224618 100644
--- a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue
@@ -344,7 +344,10 @@
}
// 删除明细
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))
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
index 77db0f9c4..6d43e8b9c 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
@@ -699,7 +699,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))
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
index a4b470ed9..8b785e5fc 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
@@ -798,7 +798,10 @@ const searchTableSuccess1 = (formField, searchField, val, formRef, type, row) =>
}
// 删除明细
const handleDeleteTable = (item, index, formRef) => {
- tableData.value.splice(index, 1)
+ let itemIndex = tableData.value.indexOf(item)
+ if(itemIndex>-1){
+ tableData.value.splice(itemIndex, 1)
+ }
if (tableData.value.length == 0) {
isShowButton.value = true
PurchasereturnRequestMain.allSchemas.formSchema.forEach((item) => {
diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
index 8f2633ccf..b9caddd35 100644
--- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue
@@ -427,8 +427,12 @@ const handleAddTable = () => {
tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
}
// 删除明细
+// 删除明细
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))
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
index 8b39059f1..e880e074d 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
@@ -564,8 +564,12 @@ const handleAddTable = () => {
tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
}
// 删除明细
+// 删除明细
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))
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
index 8d65d6966..efa13a5bb 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue
@@ -356,8 +356,12 @@ const handleAddTable = () => {
tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
}
// 删除明细
+// 删除明细
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))
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
index a3d026459..4bbc39b34 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
@@ -511,7 +511,10 @@ console.log('PurchaseMain.allSchemas.searchSchema',PurchaseMain.allSchemas.searc
}
// 删除明细
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) => {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index a24c869b3..c061fa810 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -581,7 +581,10 @@ const handleSelectionPublish = async ()=>{
}
// 删除明细
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))
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 6d4d63c3c..c87a8cf35 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -946,7 +946,8 @@ const handleAddTable = () => {
}
// 删除明细
const handleDeleteTable = (item, index) => {
- tableData.value.splice(index, 1)
+ let itemIndex = tableData.value.findIndex(item)
+ tableData.value.splice(itemIndex, 1)
}
// 主子数据 提交
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
index 0964a5025..5e6427097 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
@@ -68,8 +68,12 @@ const handleAddTable = () => {
tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
}
// 删除明细
+// 删除明细
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))
diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue
index 7e2039f16..5057b380c 100644
--- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue
+++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue
@@ -441,8 +441,12 @@
tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys)))
}
// 删除明细
+ // 删除明细
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))
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index ce8d4ae21..7d368e710 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -254,6 +254,7 @@ const searchTableSuccessDetail = async (formField, searchField, val, formRef,sea
const newRow = {...row}
newRow[formField] = item[searchField]
if (formField == 'poLine') {
+ newRow['id'] = item['id']
newRow['poNumber'] = item['poNumber']
newRow['poLine'] = item['poLine']
newRow['tax'] =item['tax']
@@ -851,7 +852,10 @@ const handleImport = () => {
}
// 删除明细
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))
From 1148ad40e03e5c25954832c75f414043763b7baf Mon Sep 17 00:00:00 2001
From: chenfang
Date: Thu, 20 Jun 2024 16:59:48 +0800
Subject: [PATCH 123/200] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=A7=BB=E5=8A=A8?=
=?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../moveManage/inventorymove/inventorymoveRecordMain/index.vue | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue
index 53692862e..99361d936 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue
@@ -152,6 +152,7 @@ const { getList, setSearchParams } = tableMethods
// 列表头部按钮
const HeadButttondata = [
defaultButtons.defaultExportBtn({hasPermi:'wms:inventorymove-record-main:export'}), // 导出
+ defaultButtons.defaultImportBtn({hasPermi:'wms:inventorymove-record-main:import'}), // 导入
defaultButtons.defaultFreshBtn(null), // 刷新
defaultButtons.defaultFilterBtn(null), // 筛选
defaultButtons.defaultSetBtn(null), // 设置
@@ -272,7 +273,7 @@ onMounted(async () => {
if(routeName.value == "InventorymoveRecordMain"){
importTemplateData.templateUrl = await InventorymoveRecordMainApi.importTemplate()
}else {
- //importTemplateData.templateUrl = await InventorymoveRecordMainApi.importTemplateExceptMove()
+ importTemplateData.templateUrl = await InventorymoveRecordMainApi.importTemplateExceptMove()
}
})
From 89d5083bcaa18fec862fb399ce415316e915089d Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 20 Jun 2024 17:11:16 +0800
Subject: [PATCH 124/200] =?UTF-8?q?=E6=80=A7=E8=83=BD=E5=8D=A1=E9=A1=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/wms/basicDataManage/itemManage/itemarea/index.vue | 1 +
.../deliversettlementManage/deliver/deliverRequestMain/index.vue | 1 +
.../deliverplan/deliverPlanMain/index.vue | 1 +
.../deliversettlementManage/stockup/stockupMainRequest/index.vue | 1 +
.../wms/productionManage/productionplan/productionMain/index.vue | 1 +
.../productputaway/productputawayRequestMain/index.vue | 1 +
.../productredress/productredressRequestMain/index.vue | 1 +
.../sparereceipt/sparereceiptRequestMain/index.vue | 1 +
.../purchasereceiptManage/supplierdeliver/purchaseMain/index.vue | 1 +
.../supplierdeliver/purchasePlanMain/index.vue | 1 +
.../supplierdeliverRequestMain/supplierdeliverBasicForm.vue | 1 +
.../supplierinvoice/supplierinvoiceRequestMain/index.vue | 1 +
12 files changed, 12 insertions(+)
diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
index f15b4ed74..b4bd4fd9d 100644
--- a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
@@ -130,6 +130,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
}else{
newRow[formField] = item[searchField]
}
+ newRow['id'] = item['id']
tableData.value.push(newRow)
})
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
index df44730fd..56519fa52 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
@@ -154,6 +154,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =
if(tableData.value.find(item1=>item1['itemCode'] == item['itemCode'])) return
const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
newRow['uom'] = item['customerUom']
+ newRow['id'] = item['id']
tableData.value.push(newRow)
})
}else{
diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
index 83b901650..5602c5b13 100644
--- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue
@@ -161,6 +161,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
if(tableData.value.find(item1=>item1['itemCode'] == item['itemCode'])) return
const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
newRow['uom'] = item['customerUom']
+ newRow['id'] = item['id']
tableData.value.push(newRow)
})
}
diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
index 77554c490..4a5b06a11 100644
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue
@@ -133,6 +133,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
newRow['uom'] = item['uom']
newRow['itemCode'] = item['code']
+ newRow['id'] = item['id']
tableData.value.push(newRow)
})
}
diff --git a/src/views/wms/productionManage/productionplan/productionMain/index.vue b/src/views/wms/productionManage/productionplan/productionMain/index.vue
index a093ced2a..25e53a661 100644
--- a/src/views/wms/productionManage/productionplan/productionMain/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMain/index.vue
@@ -122,6 +122,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
val.forEach(item=>{
if(tableData.value.find(item1=>item1['id'] == item['id'])) return
const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
+ newRow['id'] = item['id']
tableData.value.push(newRow)
})
} else {
diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
index 43d105679..00cc330b8 100644
--- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
+++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue
@@ -122,6 +122,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
newRow['qty'] = item['qty']
newRow['inventoryStatus'] = item['inventoryStatus']
newRow['fromLocationCode'] = item['locationCode']
+ newRow['id'] = item['id']
tableData.value.push(newRow)
})
} else {
diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue
index 01f9d762d..a6fe9dc21 100644
--- a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue
+++ b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue
@@ -142,6 +142,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
newRow['packUnit'] = item['packUnit']
newRow['inventoryStatus'] = item['inventoryStatus']
newRow['toLocationCode'] = item['locationCode']
+ newRow['id'] = item['id']
tableData.value.push(newRow)
})
}
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
index e880e074d..096077b6b 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
@@ -176,6 +176,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
newRow['uom'] = item['uom']
newRow['poNumber'] = item['number']
newRow['poLineType'] = item['poLineType']
+ newRow['id'] = item['id']
let supplierCode = formRef.formModel.supplierCode;
let queryData = {
supplierCode:supplierCode,
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
index 4bbc39b34..ca9434450 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
@@ -171,6 +171,7 @@ console.log('PurchaseMain.allSchemas.searchSchema',PurchaseMain.allSchemas.searc
}
newRow['lineNumber'] = lineNumber
newRow['uom'] = item['supplierUom']
+ newRow['id'] = item['id']
tableData.value.push(newRow)
})
// const itemCodes = val.map(valItem=>valItem['itemCode'])
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index c061fa810..51b649f5c 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -121,6 +121,7 @@
newRow['itemCode'] = item['code']
newRow['poNumber'] = item['number']
newRow['poLine'] = item['lineNumber']
+ newRow['id'] = item['id']
if (formField == 'poLine') {
//添加费用明细--点击确定
newRow['itemCode'] = item['itemCode']
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
index 5e6427097..deb5889d4 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
@@ -190,6 +190,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
newRow['poLine'] = item['poLine']
newRow['orderQty'] = item['orderQty']
newRow['uom'] = item['uom']
+ newRow['id'] = item['id']
if(tableData.value.find(item1=>item1['itemCode'] == item['itemCode']&&item1['poLine'] == item['poLine']&&item1['poNumber'] == item['poNumber'])) return
itemCodes.push(item['itemCode'])
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 7d368e710..3eb368a79 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -269,6 +269,7 @@ const searchTableSuccessDetail = async (formField, searchField, val, formRef,sea
newRow['itemCode'] = item['itemCode']
newRow['deliveryDate'] = item['prhRcpDate']
newRow['arrivalQty'] = item['prhRcvd']
+ newRow['id'] = item['id']
}
tableData.value.push(newRow)
})
From a00d7f41518d94b4a89b0c786090eae526b3c800 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 20 Jun 2024 17:23:38 +0800
Subject: [PATCH 125/200] =?UTF-8?q?=E9=98=B2=E6=AD=A2=E9=87=8D=E5=A4=8D?=
=?UTF-8?q?=E7=82=B9=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/XButton/src/ButtonBase.vue | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/components/XButton/src/ButtonBase.vue b/src/components/XButton/src/ButtonBase.vue
index e9486efe3..5741536c4 100644
--- a/src/components/XButton/src/ButtonBase.vue
+++ b/src/components/XButton/src/ButtonBase.vue
@@ -73,18 +73,18 @@ const emit = defineEmits(['buttonBaseClick', 'updataTableColumns'])
let timer = ref(null)
const buttonBaseClick = (val, item, $event) => {
- if(!timer.value){
- timer.value = setTimeout(()=>{
- if(timer.value){
- console.log('清空timer',timer.value)
- clearTimeout(timer.value)
- timer.value = null
- }
- },2000)
+ // if(!timer.value){
+ // timer.value = setTimeout(()=>{
+ // if(timer.value){
+ // console.log('清空timer',timer.value)
+ // clearTimeout(timer.value)
+ // timer.value = null
+ // }
+ // },2000)
clearButtonBlurHandle($event) //解决el-button点击后颜色不恢复问题
emit('buttonBaseClick', val, item, $event)
- }
+ // }
}
onUnmounted(() => {
From b43a6c3ac232adfdbb3115c18cc024639b122f34 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 20 Jun 2024 18:45:04 +0800
Subject: [PATCH 126/200] =?UTF-8?q?=E4=BF=9D=E5=85=BB=E7=BB=8F=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/eam/maintainExperience/index.ts | 51 ++++
src/utils/disposition/defaultButtons.ts | 14 +-
.../equipmentMaintenanceRecordMain/index.vue | 43 ++-
.../eam/equipmentRepairRecordMain/index.vue | 6 +-
src/views/eam/maintainExperience/index.vue | 256 ++++++++++++++++++
.../maintainExperience.data.ts | 93 +++++++
6 files changed, 457 insertions(+), 6 deletions(-)
create mode 100644 src/api/eam/maintainExperience/index.ts
create mode 100644 src/views/eam/maintainExperience/index.vue
create mode 100644 src/views/eam/maintainExperience/maintainExperience.data.ts
diff --git a/src/api/eam/maintainExperience/index.ts b/src/api/eam/maintainExperience/index.ts
new file mode 100644
index 000000000..f85ae6eba
--- /dev/null
+++ b/src/api/eam/maintainExperience/index.ts
@@ -0,0 +1,51 @@
+import request from '@/config/axios'
+
+export interface MaintainExperienceVO {
+ id: number
+ name: string
+ content: string
+ masterId: number
+ orderType: string
+ maintainNumber: string
+}
+
+// 查询保养经验记录列表
+export const getMaintainExperiencePage = async (params) => {
+ if (params.isSearch) {
+ delete params.isSearch
+ const data = {...params}
+ return await request.post({ url: '/record/maintain-experience/senior', data })
+ } else {
+ return await request.get({ url: `/record/maintain-experience/page`, params })
+ }
+}
+
+// 查询保养经验记录详情
+export const getMaintainExperience = async (id: number) => {
+ return await request.get({ url: `/record/maintain-experience/get?id=` + id })
+}
+
+// 新增保养经验记录
+export const createMaintainExperience = async (data: MaintainExperienceVO) => {
+ return await request.post({ url: `/record/maintain-experience/create`, data })
+}
+
+// 修改保养经验记录
+export const updateMaintainExperience = async (data: MaintainExperienceVO) => {
+ return await request.put({ url: `/record/maintain-experience/update`, data })
+}
+
+// 删除保养经验记录
+export const deleteMaintainExperience = async (id: number) => {
+ return await request.delete({ url: `/record/maintain-experience/delete?id=` + id })
+}
+
+// 导出保养经验记录 Excel
+export const exportMaintainExperience = async (params) => {
+ return await request.download({ url: `/record/maintain-experience/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+ return request.download({ url: '/record/maintain-experience/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts
index 477b8905b..f9db6f08e 100644
--- a/src/utils/disposition/defaultButtons.ts
+++ b/src/utils/disposition/defaultButtons.ts
@@ -1136,7 +1136,7 @@ export function sparePartBtn(option:any) {
hasPermi: ''
})
}
-// 主列表-备件
+// 主列表-生成维修经验
export function repairExperienceBtn(option:any) {
return __defaultBtnOption(option,{
label: '生成维修经验',
@@ -1148,6 +1148,18 @@ export function repairExperienceBtn(option:any) {
hasPermi: ''
})
}
+// 主列表-生成保养经验
+export function maintainExperienceBtn(option:any) {
+ return __defaultBtnOption(option,{
+ label: '生成保养经验',
+ name: 'maintainExperience',
+ hide: false,
+ type: 'primary',
+ color: '',
+ link: true, // 文本展现按钮
+ hasPermi: ''
+ })
+}
// 默认按钮规则
function __defaultBtnOption(option:any,specific:any){
return {
diff --git a/src/views/eam/equipmentMaintenanceRecordMain/index.vue b/src/views/eam/equipmentMaintenanceRecordMain/index.vue
index 44f0c2e27..228b3f7e9 100644
--- a/src/views/eam/equipmentMaintenanceRecordMain/index.vue
+++ b/src/views/eam/equipmentMaintenanceRecordMain/index.vue
@@ -62,7 +62,16 @@
:detailButtonIsShowDelete=false
/>
-
+
+
@@ -73,6 +82,8 @@ import { EquipmentMaintenanceRecordMain,EquipmentMaintenanceRecordMainRules } fr
import { EquipmentMaintenanceRecordDetail,EquipmentMaintenanceRecordDetailRules } from '../equipmentMaintenanceRecordDetail/equipmentMaintenanceRecordDetail.data'
import * as EquipmentMaintenanceRecordMainApi from '@/api/eam/equipmentMaintenanceRecordMain'
import * as EquipmentMaintenanceRecordDetailApi from '@/api/eam/equipmentMaintenanceRecordDetail'
+import { MaintainExperience,MaintainExperienceRules } from '../maintainExperience/maintainExperience.data'
+import * as MaintainExperienceApi from '@/api/eam/maintainExperience'
import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
@@ -147,6 +158,7 @@ const buttonBaseClick = (val, item) => {
const butttondata = [
//defaultButtons.mainListEditBtn({hasPermi:'eam:equipmentMaintenanceRecordMain:update'}), // 编辑
//defaultButtons.mainListDeleteBtn({hasPermi:'eam:equipmentMaintenanceRecordMain:delete'}), // 删除
+ defaultButtons.maintainExperienceBtn({ hasPermi: 'eam:equipmentMaintenanceRecordMain:maintainExperience' }) // 生成保养经验
]
// 列表-操作按钮事件
@@ -155,6 +167,9 @@ const buttonTableClick = async (val, row) => {
openForm('update', row)
} else if (val == 'delete') { // 删除
handleDelete(row.id)
+ } else if (val == 'maintainExperience') {
+ //生成保养经验
+ openMaintainExperience('update', row)
}
}
@@ -163,7 +178,11 @@ const basicFormRef = ref()
const openForm = (type: string, row?: any) => {
basicFormRef.value.open(type, row)
}
-
+//打开维修经验坦诚
+const maintainExperienceFormRef = ref()
+const openMaintainExperience = (type: string, row?: any) => {
+ maintainExperienceFormRef.value.open(type, row)
+}
// form表单提交
const formsSuccess = async (formType,data) => {
var isHave =EquipmentMaintenanceRecordMain.allSchemas.formSchema.some(function (item) {
@@ -193,6 +212,26 @@ const detailRef = ref()
const openDetail = (row: any, titleName: any, titleValue: any) => {
detailRef.value.openDetail(row, titleName, titleValue, 'basicEquipmentMaintenanceRecordMain')
}
+// 新增生成维修经验
+const maintainExperienceFormsSuccess = async (formType, data) => {
+ console.log(data)
+ const data1 = {
+ maintainRecordNumber: data.recordNo,
+ name: data.name,
+ content: data.content,
+ masterId: data.id,
+ orderType: 'MAINTAIN',
+ }
+ console.log(data1)
+ try {
+ await MaintainExperienceApi.createMaintainExperience(data1)
+ message.success(t('common.createSuccess'))
+ maintainExperienceFormRef.value.dialogVisible = false
+ getList()
+ } finally {
+ maintainExperienceFormRef.value.formLoading = false
+ }
+}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
diff --git a/src/views/eam/equipmentRepairRecordMain/index.vue b/src/views/eam/equipmentRepairRecordMain/index.vue
index d9b2fe9bc..91aa00756 100644
--- a/src/views/eam/equipmentRepairRecordMain/index.vue
+++ b/src/views/eam/equipmentRepairRecordMain/index.vue
@@ -70,7 +70,7 @@
{
name: data.name,
content: data.content,
masterId: data.id,
- ooderType: 'REPAIR',
+ orderType: 'REPAIR',
}
console.log(data1)
try {
diff --git a/src/views/eam/maintainExperience/index.vue b/src/views/eam/maintainExperience/index.vue
new file mode 100644
index 000000000..d1b8c1620
--- /dev/null
+++ b/src/views/eam/maintainExperience/index.vue
@@ -0,0 +1,256 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/eam/maintainExperience/maintainExperience.data.ts b/src/views/eam/maintainExperience/maintainExperience.data.ts
new file mode 100644
index 000000000..48c468fbc
--- /dev/null
+++ b/src/views/eam/maintainExperience/maintainExperience.data.ts
@@ -0,0 +1,93 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const MaintainExperienceRules = reactive({
+ name: [required],
+ maintainNumber: [required],
+})
+
+export const MaintainExperience = useCrudSchemas(reactive([
+
+ {
+ label: '经验标题',
+ field: 'name',
+ sort: 'custom',
+ isSearch: true,
+ },
+ {
+ label: '经验内容',
+ field: 'content',
+ sort: 'custom',
+ isTable:false,
+ form: {
+ componentProps: {
+ type: 'textarea',
+ height: 200
+ }
+ },
+ },
+
+ {
+ label: '保养工单编号',
+ field: 'maintainNumber',
+ sort: 'custom',
+ isSearch: true,
+ isForm: false,
+ },
+ {
+ label: '工单类型',
+ field: 'orderType',
+ sort: 'custom',
+ isForm: false,
+ isTable: false,
+ form: {
+ component: 'SelectV2'
+ },
+ },
+ {
+ label: '来源字典',
+ field: 'sources',
+ sort: 'custom',
+ dictType: DICT_TYPE.EAM_MAINTENANCE_SOURCES,
+ dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+ isSearch: false,
+ isForm:false
+ },
+ {
+ label: '保养类型',
+ field: 'type',
+ sort: 'custom',
+ dictType: DICT_TYPE.DEVICE_TYPE,
+ dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+ isSearch: false,
+ isForm:false
+ },
+ {
+ label: '设备/工装编号',
+ field: 'equipmentCode',
+ sort: 'custom',
+ isSearch:false,
+ isForm:false
+ },
+ {
+ label: '设备/工装名称',
+ field: 'equipmentName',
+ sort: 'custom',
+ isSearch:false,
+ isForm:false
+ },
+ {
+ label: '创建时间',
+ field: 'createTime',
+ sort: 'custom',
+ formatter: dateFormatter,
+ isForm: false,
+ detail:{
+ dateFormat: 'YYYY-MM-DD HH:mm:ss'
+ }
+ },
+
+
+
+]))
From dd4d8137a895608459ecc33d3682d73060e39f80 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 20 Jun 2024 18:46:08 +0800
Subject: [PATCH 127/200] =?UTF-8?q?=E7=A8=8E=E9=A2=9D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../supplierinvoice/supplierinvoiceRequestMain/index.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 3eb368a79..a01953172 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -54,9 +54,9 @@
:tableFormRules="SupplierinvoiceRequestDetailRules"
:tableData="tableData"
:sumFormDataByForm ="(formRef,formModel)=>{
- const {taxRate=0,amount=0} = formModel
+ const {taxRate=0,amount=0,adjustingTaxAmount=0} = formModel
formRef.value.setValues({
- taxAmount:taxRate*amount*0.01,
+ taxAmount:taxRate*amount*0.01+adjustingTaxAmount,
afterTaxAmount:amount+taxRate*amount*0.01
})
}"
From 4498ffc0185a421b8288471da4ce4677769669e1 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 20 Jun 2024 19:07:07 +0800
Subject: [PATCH 128/200] =?UTF-8?q?=E9=A2=84=E7=94=9F=E4=BA=A7=E6=94=B6?=
=?UTF-8?q?=E8=B4=A7=E8=AE=B0=E5=BD=95=EF=BC=8C=E8=A3=85=E9=85=8D=E6=94=B6?=
=?UTF-8?q?=E8=B4=A7=E8=AE=B0=E5=BD=95=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../productreceiptRecordMain/index.vue | 73 +++++++++++++++++
.../index.vue | 81 +++++++++++++++++++
2 files changed, 154 insertions(+)
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
index 183f15541..339d7bde1 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue
@@ -82,6 +82,8 @@
v-model:sort="detatableDataBom.sort"
/>
+
+