Browse Source

发货申请/任务 按钮路径

master
chenfang 10 months ago
parent
commit
84beca2864
  1. 12
      src/api/wms/customerreturnRequestMain/index.ts
  2. 30
      src/api/wms/customersettleRequestMain/index.ts
  3. 14
      src/api/wms/deliverJobMain/index.ts
  4. 29
      src/api/wms/deliverRequestMain/index.ts
  5. 49
      src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
  6. 63
      src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue
  7. 142
      src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
  8. 65
      src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
  9. 44
      src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts
  10. 5
      src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue

12
src/api/wms/customerreturnRequestMain/index.ts

@ -80,31 +80,31 @@ export const importTemplate = () => {
}
// 关闭客户退货申请主 Excel
export const closeProductreceiptRequestMain = async (id) => {
export const close = async (id) => {
return await request.put({ url: `/wms/customerreturn-request-main/close?id=` + id })
}
// 重新添加客户退货申请主 Excel
export const reAddProductreceiptRequestMain = async (id) => {
export const reAdd = async (id) => {
return await request.put({ url: `/wms/customerreturn-request-main/reAdd?id=` + id })
}
// 提交客户退货申请主 Excel
export const submitProductreceiptRequestMain = async (id) => {
export const submit = async (id) => {
return await request.put({ url: `/wms/customerreturn-request-main/submit?id=` + id })
}
// 审批通过客户退货申请主 Excel
export const agreeProductreceiptRequestMain = async (id) => {
export const agree = async (id) => {
return await request.put({ url: `/wms/customerreturn-request-main/agree?id=` + id })
}
// 审批驳回客户退货申请主 Excel
export const refusedProductreceiptRequestMain = async (id) => {
export const refused = async (id) => {
return await request.put({ url: `/wms/customerreturn-request-main/refused?id=` + id })
}
// 处理驳回客户退货申请主 Excel
export const handleProductreceiptRequestMain = async (id) => {
export const handle = async (id) => {
return await request.put({ url: `/wms/customerreturn-request-main/handle?id=` + id })
}

30
src/api/wms/customersettleRequestMain/index.ts

@ -63,4 +63,34 @@ export const exportCustomersettleRequestMain = async (params) => {
// 下载用户导入模板
export const importTemplate = () => {
return request.download({ url: '/wms/customersettle-request-main/get-import-template' })
}
// 关闭
export const close = (id) => {
return request.put({ url: '/wms/customersettle-request-main/close?id=' + id })
}
// 重新添加
export const reAdd = (id) => {
return request.put({ url: '/wms/customersettle-request-main/reAdd?id=' + id })
}
// 提交审批
export const submit = (id) => {
return request.put({ url: '/wms/customersettle-request-main/submit?id=' + id })
}
// 驳回
export const refused = (id) => {
return request.put({ url: '/wms/customersettle-request-main/refused?id=' + id })
}
// 审批通过
export const agree = (id) => {
return request.put({ url: '/wms/customersettle-request-main/agree?id=' + id })
}
// 处理
export const handle = (id) => {
return request.put({ url: '/wms/customersettle-request-main/handle?id=' + id })
}

14
src/api/wms/deliverJobMain/index.ts

@ -94,22 +94,22 @@ export const importTemplate = () => {
return request.download({ url: '/wms/deliver-job-main/get-import-template' })
}
// 承接客户退货任务主 Excel
export const submitDeliverJobMain = async (id) => {
// 承接发货任务 Excel
export const acceptDeliverJobMain = async (id) => {
return await request.put({ url: `/wms/deliver-job-main/accept?id=` + id })
}
// 取消承接客户退货任务主 Excel
export const agreeDeliverJobMain = async (id) => {
// 取消承接发货任务 Excel
export const abandonDeliverJobMain = async (id) => {
return await request.put({ url: `/wms/deliver-job-main/abandon?id=` + id })
}
// 取消客户退货任务主 Excel
export const refusedDeliverJobMain = async (id) => {
// 关闭发货任务主 Excel
export const closeDeliverJobMain = async (id) => {
return await request.put({ url: `/wms/deliver-job-main/close?id=` + id })
}
// 执行客户退货任务主
// 执行货任务主
export const executeDeliverJobMain = async (data: DeliverJobMainVO) => {
return await request.put({ url: `/wms/deliver-job-main/execute`, data })
}

29
src/api/wms/deliverRequestMain/index.ts

@ -71,4 +71,33 @@ export const exportDeliverRequestMain = async (params) => {
// 下载用户导入模板
export const importTemplate = () => {
return request.download({ url: '/wms/deliver-request-main/get-import-template' })
}
// 关闭
export const close = (id) => {
return request.put({ url: '/wms/deliver-request-main/close?id=' + id })
}
// 重新添加
export const reAdd = (id) => {
return request.put({ url: '/wms/deliver-request-main/reAdd?id=' + id })
}
// 提交审批
export const submit = (id) => {
return request.put({ url: '/wms/deliver-request-main/submit?id=' + id })
}
// 驳回
export const refused = (id) => {
return request.put({ url: '/wms/deliver-request-main/refused?id=' + id })
}
// 审批通过
export const agree = (id) => {
return request.put({ url: '/wms/deliver-request-main/agree?id=' + id })
}
// 处理
export const handle = (id) => {
return request.put({ url: '/wms/deliver-request-main/handle?id=' + id })
}

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

@ -219,16 +219,51 @@ const butttondata = (row) => {
// -
const buttonTableClick = async (val, row) => {
if (val == 'mainClose') { //
console.log('列表-操作按钮事件-关闭')
} else if (val == 'mainReAdd') { //
console.log('列表-操作按钮事件-重新添加')
await message.confirm('确认要关闭吗?')
CustomerreturnRequestMainApi.close(row.id).then(() => {
message.success(t('common.updateSuccess'))
getList()
}).catch(err => {
console.log(err)
}) } else if (val == 'mainReAdd') { //
await message.confirm('确认要重新添加吗?')
CustomerreturnRequestMainApi.reAdd(row.id).then(() => {
message.success(t('common.updateSuccess'))
getList()
}).catch(err => {
console.log(err)
})
} else if (val == 'mainSubmit') { //
console.log('列表-操作按钮事件-提交审批')
await message.confirm('确认要提交审批吗?')
CustomerreturnRequestMainApi.submit(row.id).then(() => {
message.success(t('common.updateSuccess'))
getList()
}).catch(err => {
console.log(err)
})
} else if (val == 'mainTurnDown') { //
console.log('列表-操作按钮事件-驳回')
await message.confirm('确认要重新添加吗?')
CustomerreturnRequestMainApi.refused(row.id).then(() => {
message.success(t('common.updateSuccess'))
getList()
}).catch(err => {
console.log(err)
})
} else if (val == 'mainApprove') { //
console.log('列表-操作按钮事件-审批通过')
} else if (val == 'edit') { //
CustomerreturnRequestMainApi.agree(row.id).then(() => {
message.success(t('common.updateSuccess'))
getList()
}).catch(err => {
console.log(err)
})
} else if (val == 'mainHandle') { //
CustomerreturnRequestMainApi.handle(row.id).then(() => {
message.success(t('common.updateSuccess'))
getList()
}).catch(err => {
console.log(err)
})
} else if (val == 'edit') { //
openForm('update', row)
} else if (val == 'delete') { //
handleDelete(row.id)

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

@ -189,13 +189,13 @@ const isShowMainButton = (row,val) => {
// -
const butttondata = (row) => {
return [
defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6'])}), //
defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5'])}), //
defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1'])}), //
defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2'])}), //
defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2'])}), //
defaultButtons.mainListEditBtn({hasPermi:'wms:customersettle-request-main:update'}), //
defaultButtons.mainListDeleteBtn({hasPermi:'wms:customersettle-request-main:delete'}), //
defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:customersettle-request-main:close'}), //
defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:customersettle-request-main:reAdd'}), //
defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:customersettle-request-main:submit'}), //
defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:customersettle-request-main:refused'}), //
defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:customersettle-request-main:agree'}), //
defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:customersettle-request-main:handle'}), //
defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:customersettle-request-main:update'}), //
]
}
@ -204,16 +204,51 @@ const butttondata = (row) => {
// -
const buttonTableClick = async (val, row) => {
if (val == 'mainClose') { //
console.log('列表-操作按钮事件-关闭')
} else if (val == 'mainReAdd') { //
console.log('列表-操作按钮事件-重新添加')
await message.confirm('确认要关闭吗?')
CustomersettleRequestMainApi.close(row.id).then(() => {
message.success(t('common.updateSuccess'))
getList()
}).catch(err => {
console.log(err)
}) } else if (val == 'mainReAdd') { //
await message.confirm('确认要重新添加吗?')
CustomersettleRequestMainApi.reAdd(row.id).then(() => {
message.success(t('common.updateSuccess'))
getList()
}).catch(err => {
console.log(err)
})
} else if (val == 'mainSubmit') { //
console.log('列表-操作按钮事件-提交审批')
await message.confirm('确认要提交审批吗?')
CustomersettleRequestMainApi.submit(row.id).then(() => {
message.success(t('common.updateSuccess'))
getList()
}).catch(err => {
console.log(err)
})
} else if (val == 'mainTurnDown') { //
console.log('列表-操作按钮事件-驳回')
await message.confirm('确认要重新添加吗?')
CustomersettleRequestMainApi.refused(row.id).then(() => {
message.success(t('common.updateSuccess'))
getList()
}).catch(err => {
console.log(err)
})
} else if (val == 'mainApprove') { //
console.log('列表-操作按钮事件-审批通过')
} else if (val == 'edit') { //
CustomersettleRequestMainApi.agree(row.id).then(() => {
message.success(t('common.updateSuccess'))
getList()
}).catch(err => {
console.log(err)
})
} else if (val == 'mainHandle') { //
CustomersettleRequestMainApi.handle(row.id).then(() => {
message.success(t('common.updateSuccess'))
getList()
}).catch(err => {
console.log(err)
})
} else if (val == 'edit') { //
openForm('update', row)
} else if (val == 'delete') { //
handleDelete(row.id)

142
src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue

@ -183,75 +183,77 @@ const butttondata = (row) => {
// -
const buttonTableClick = async (val, row) => {
if (val == 'mainJobExe') { //
let aaa = {
"id": "1809190002130023642",
"requestNumber": "REQ1720231128-0001",
"deliverPlanNumber": "REQ0120231116-0001",
"customerDeliverNumber": null,
"customerCode": "customer01",
"customerDockCode": "测试",
"deliverDock": null,
"carrierCode": "cys-001",
"transferMode": "",
"vehiclePlateNumber": "",
"fromWarehouseCode": null,
"toWarehouseCode": null,
"requestTime": 1701137233000,
"requestDueTime": 0,
"status": "2",
"expiredTime": null,
"updateTime": 1701137233000,
"updater": "1",
"jobStageStatus": null,
"priority": null,
"priorityincrement": null,
"departmentCode": "研发部门",
"acceptUserId": null,
"acceptTime": null,
"completeUserId": "1",
"completeTime": 1701137339000,
"fromLocationTypes": "FG",
"toLocationTypes": "CUST",
"number": "JOB2420231128-0001",
"businessType": "DeliverJob",
"remark": "",
"createTime": 1701137233000,
"creator": "1",
"ruleUserId": null,
"fromAreaCodes": "采购在途库",
"toAreaCodes": "采购在途库",
"fromDockCode": null,
"autoComplete": "FALSE",
"allowModifyLocation": "TRUE",
"allowModifyQty": "TRUE",
"allowBiggerQty": "TRUE",
"allowSmallerQty": "TRUE",
"allowModifyInventoryStatus": "TRUE",
"allowContinuousScanning": "TRUE",
"allowPartialComplete": "TRUE",
"allowModifyBatch": "FALSE",
"allowModifyPackingNumber": "FALSE",
"subList": [{
"id": "1809190001245559365",
"soNumber": "222",
"soLine": "1",
"packingNumber": "PN20230112300001",
"batch": "20231123",
"inventoryStatus": null,
"ownerCode": null,
"containerNumber": null,
"fromLocationCode": "INSPECT",
"toLocationCode": null,
"itemCode": "THILDD0A701AG",
"itemName": "HL后雾灯(新)-右\r\n",
"itemDesc1": "HL后雾灯(新)-右\r\n",
"itemDesc2": "",
"projectCode": "P0001",
"qty": 1,
"uom": "EA",
"number": "JOB2420231128-0001",
"remark": "",
 if (val == 'mainJobExe') { //
    let aaa = {
    "id": "1809190002130023675",
    "requestNumber": "REQ1720231201-0002",
    "deliverPlanNumber": "DP20231130-0001",
    "customerDeliverNumber": null,
    "customerCode": "CF",
    "customerDockCode": "CFCKYT",
    "deliverDock": null,
    "carrierCode": "cys-001",
    "transferMode": "",
    "vehiclePlateNumber": "",
    "fromWarehouseCode": null,
    "toWarehouseCode": "CFCK",
    "requestTime": 1701420156000,
    "requestDueTime": 0,
    "status": "1",
    "expiredTime": null,
    "updateTime": 1701420722000,
    "updater": "1",
    "jobStageStatus": null,
    "priority": null,
    "priorityincrement": null,
    "departmentCode": "研发部门",
    "acceptUserId": null,
    "acceptTime": null,
    "completeUserId": null,
    "completeTime": null,
    "fromLocationTypes": "FG",
    "toLocationTypes": "CUST",
    "number": "JOB2420231201-0018",
    "businessType": "DeliverJob",
    "remark": "测试用的!!!!!!",
    "createTime": 1701420722000,
    "creator": "1",
    "ruleUserId": null,
    "fromAreaCodes": "采购在途库",
    "toAreaCodes": "采购在途库",
    "fromDockCode": null,
    "autoComplete": "FALSE",
    "allowModifyLocation": "FALSE",
    "allowModifyQty": "TRUE",
    "allowBiggerQty": "TRUE",
    "allowSmallerQty": "TRUE",
    "allowModifyInventoryStatus": "TRUE",
    "allowContinuousScanning": "TRUE",
    "allowPartialComplete": "TRUE",
    "allowModifyBatch": "FALSE",
    "allowModifyPackingNumber": "FALSE",
    "inInventoryStatuses": "OK",
    "outInventoryStatuses": "OK",
    "subList": [{
      "id": "1809190001245559376",
    "soNumber": "",
    "soLine": "",
    "packingNumber": null,
    "batch": "20231130",
    "inventoryStatus": "OK",
    "ownerCode": null,
    "containerNumber": null,
    "fromLocationCode": "Loc_testCF",
    "toLocationCode": "CUST",
    "itemCode": "testCF",
    "itemName": "陈放测试物品",
    "itemDesc1": "测试用",
    "itemDesc2": "测试用",
    "projectCode": "5",
    "qty": 1,
    "uom": "EA",
    "number": "JOB2420231201-0018",
    "remark": "",
"createTime": 1701137234000,
"creator": "1",
"toPackingNumber": null,
@ -259,7 +261,7 @@ const buttonTableClick = async (val, row) => {
"toBatch": null,
"handleQty": null,
"toInventoryStatus": null,
recordLst: [{
recordList: [{
handleQty: 10,
toPackingNumber: '12',
toContainerNumber: '001',

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

@ -184,13 +184,14 @@ const isShowMainButton = (row,val) => {
// -
const butttondata = (row) => {
return [
defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6'])}), //
defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5'])}), //
defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1'])}), //
defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2'])}), //
defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2'])}), //
defaultButtons.mainListEditBtn({hasPermi:'wms:deliver-request-main:update'}), //
defaultButtons.mainListDeleteBtn({hasPermi:'wms:deliver-request-main:delete'}), //
defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:deliver-request-main:close'}), //
defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:deliver-request-main:reAdd'}), //
defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:deliver-request-main:submit'}), //
defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:deliver-request-main:refused'}), //
defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:deliver-request-main:agree'}), //
defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:deliver-request-main:handle'}), //
defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:deliver-request-main:update'}), //
// defaultButtons.mainListDeleteBtn({hasPermi:'wms:deliver-request-main:delete'}), //
]
}
@ -199,16 +200,54 @@ const butttondata = (row) => {
// -
const buttonTableClick = async (val, row) => {
if (val == 'mainClose') { //
console.log('列表-操作按钮事件-关闭')
await message.confirm('确认要关闭吗?')
DeliverRequestMainApi.close(row.id).then(() => {
message.success(t('common.updateSuccess'))
getList()
}).catch(err => {
console.log(err)
})
} else if (val == 'mainReAdd') { //
console.log('列表-操作按钮事件-重新添加')
await message.confirm('确认要重新添加吗?')
DeliverRequestMainApi.reAdd(row.id).then(() => {
message.success(t('common.updateSuccess'))
getList()
}).catch(err => {
console.log(err)
})
} else if (val == 'mainSubmit') { //
console.log('列表-操作按钮事件-提交审批')
await message.confirm('确认要重新添加吗?')
DeliverRequestMainApi.submit(row.id).then(() => {
message.success(t('common.updateSuccess'))
getList()
}).catch(err => {
console.log(err)
})
} else if (val == 'mainTurnDown') { //
console.log('列表-操作按钮事件-驳回')
await message.confirm('确认要重新添加吗?')
DeliverRequestMainApi.refused(row.id).then(() => {
message.success(t('common.updateSuccess'))
getList()
}).catch(err => {
console.log(err)
})
} else if (val == 'mainApprove') { //
console.log('列表-操作按钮事件-审批通过')
} else if (val == 'edit') { //
await message.confirm('确认要审批通过吗?')
DeliverRequestMainApi.agree(row.id).then(() => {
message.success(t('common.updateSuccess'))
getList()
}).catch(err => {
console.log(err)
})
} else if (val == 'mainHandle') { //
await message.confirm('确认要 处理吗?')
DeliverRequestMainApi.handle(row.id).then(() => {
message.success(t('common.updateSuccess'))
getList()
}).catch(err => {
console.log(err)
})
} else if (val == 'edit') { //
openForm('update', row)
} else if (val == 'delete') { //
handleDelete(row.id)

44
src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts

@ -272,8 +272,8 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
searchListPlaceholder: '请选择销售订单号',
searchField: 'number',
searchTitle: '销售订单信息',
searchAllSchemas: SaleMain.allSchemas,
searchPage: SaleMainApi.getSaleMainPage,
searchAllSchemas: SaleDetail.allSchemas,
searchPage: SaleDetailApi.getSaleDetailPage,
searchCondition: [{
key: 'available',
value: 'TRUE',
@ -283,12 +283,12 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
isInpuFocusShow: true,
isSearchList: true,
searchListPlaceholder: '请选择销售订单号',
searchField: 'number',
searchTitle: '销售订单信息',
searchAllSchemas: SaleMain.allSchemas,
searchPage: SaleMainApi.getSaleMainPage,
searchAllSchemas: SaleDetail.allSchemas,
searchPage: SaleDetailApi.getSaleDetailPage,
searchCondition: [{
key: 'available',
value: 'TRUE',
@ -304,33 +304,12 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
tableForm:{
isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择销售订单行',
searchField: 'lineNumber',
searchTitle: '销售订单信息',
searchAllSchemas: SaleDetail.allSchemas,
searchPage: SaleDetailApi.getSaleDetailPage,
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
}]
tableForm: {
disabled: true
},
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
isInpuFocusShow: true,
searchListPlaceholder: '请选择销售订单行',
searchField: 'lineNumber',
searchTitle: '销售订单信息',
searchAllSchemas: SaleDetail.allSchemas,
searchPage: SaleDetailApi.getSaleDetailPage,
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
}]
disabled: true
}
}
},
@ -389,7 +368,6 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
}]
},
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
isInpuFocusShow: true,
searchListPlaceholder: '请选择物品代码',
@ -561,7 +539,7 @@ export const DeliverPlanDetailRules = reactive({
planQty: [
{ required: true, message: '请输入计划数量', trigger: 'blur' }
],
soNumber: [
{ required: true, message: '请选择销售订单号', trigger: 'change' }
],
// soNumber: [
// { required: true, message: '请选择销售订单号', trigger: 'change' }
// ],
})

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

@ -116,6 +116,11 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
nextTick(() => {
const setV = {}
setV[formField] = val[0][searchField]
// setV['soLine'] = val[0]['lineNumber']
// setV['lineNumber'] = val[0]['lineNumber']
// setV['itemCode'] = val[0]['itemCode']
// setV['remark'] = val[0]['remark']
// setV['uom'] = val[0]['uom']
formRef.setValues(setV)
})
}

Loading…
Cancel
Save