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

src/api/wms/unplannedreceiptRecordMain/index.ts

@@ -69,3 +69,8 @@ export const exportUnplannedreceiptRecordMain = async (params) => {
 export const importTemplate = () => {
   return request.download({ url: '/wms/unplannedreceipt-record-main/get-import-template' })
 }
+
+// 撤销
+export const revoke = async (id: number) => {
+  return await request.get({ url: `/wms/unplannedreceipt-record-main/revoke?id=` + id })
+}

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

@@ -128,17 +128,33 @@ const buttonBaseClick = (val, item) => {
   }
 }
 
+const isShowRevokeButton = (row,val) => {
+  if (val.indexOf(row.revokeFlag) > -1) {
+    return false
+  } else {
+    return true
+  }
+}
+
 // 列表-操作按钮
 const butttondata = (row,$index) => {
   const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
   if(findIndex>-1&&findIndex<$index){
-    return []
+    return [
+      defaultButtons.backoutBtn({hide:isShowRevokeButton(row,['FALSE'])}) // 撤销
+    ]
   }
-  return []
+  return [
+    defaultButtons.backoutBtn({hide:isShowRevokeButton(row,['FALSE'])}) // 撤销
+  ]
 }
 
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
+  if (val == 'backout') { // 撤销
+    await UnplannedreceiptRecordMainApi.revoke(row.masterId)
+    buttonBaseClick('refresh',null)
+  }
 }
 // 获取部门 用于详情 部门回显
 const { wsCache } = useCache()

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

@@ -467,6 +467,16 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
       }
     }
   },
+  {
+    label: '操作',
+    field: 'action',
+    isDetail: false,
+    isForm: false,
+    table: {
+      width: 120,
+      fixed: 'right'
+    },
+  }
 ]))
 
 //表单校验