陈薪名 12 months ago
parent
commit
dba2d11377
  1. 8
      src/api/wms/customerreturnJobMain/index.ts
  2. 5
      src/api/wms/deliverPlanDetail/index.ts
  3. 7
      src/api/wms/package/index.ts
  4. 32
      src/api/wms/transferreceiptRequestMain/index.ts
  5. 2
      src/components/ImportForm/src/ImportForm.vue
  6. 14
      src/views/system/tenant/TenantForm.vue
  7. 2
      src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue
  8. 1
      src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts
  9. 98
      src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue
  10. 50
      src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
  11. 27
      src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
  12. 30
      src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue
  13. 22
      src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
  14. 58
      src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
  15. 2
      src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue
  16. 2
      src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue
  17. 6
      src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/index.vue
  18. 95
      src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue

8
src/api/wms/customerreturnJobMain/index.ts

@ -95,17 +95,17 @@ export const importTemplate = () => {
} }
// 承接客户退货任务主 Excel // 承接客户退货任务主 Excel
export const submitCustomerreturnJobMain = async (id) => { export const acceptCustomerreturnJobMain = async (id) => {
return await request.put({ url: `/wms/customerreturn-job-main/accept?id=` + id }) return await request.put({ url: `/wms/customerreturn-job-main/accept?id=` + id })
} }
// 取消承接客户退货任务主 Excel // 取消承接客户退货任务主 Excel
export const agreeCustomerreturnJobMain = async (id) => { export const abandonCustomerreturnJobMain = async (id) => {
return await request.put({ url: `/wms/customerreturn-job-main/abandon?id=` + id }) return await request.put({ url: `/wms/customerreturn-job-main/abandon?id=` + id })
} }
// 取消客户退货任务主 Excel // 关闭客户退货任务主 Excel
export const refusedCustomerreturnJobMain = async (id) => { export const closeCustomerreturnJobMain = async (id) => {
return await request.put({ url: `/wms/customerreturn-job-main/close?id=` + id }) return await request.put({ url: `/wms/customerreturn-job-main/close?id=` + id })
} }

5
src/api/wms/deliverPlanDetail/index.ts

@ -17,6 +17,11 @@ export interface DeliverPlanDetailVO {
available: string available: string
} }
// 查询发货计划子列表
export const selectDetailByMasterID = async (id: number) => {
return await request.get({ url: `/wms/deliver-plan-detail/detailList?id=` + id })
}
// 查询发货计划子列表 // 查询发货计划子列表
export const getDeliverPlanDetailPage = async (params) => { export const getDeliverPlanDetailPage = async (params) => {
return await request.get({ url: `/wms/deliver-plan-detail/page`, params }) return await request.get({ url: `/wms/deliver-plan-detail/page`, params })

7
src/api/wms/package/index.ts

@ -77,8 +77,13 @@ export const deletePackage = async (id: number) => {
// 导出包装 Excel // 导出包装 Excel
export const exportPackage = async (params) => { export const exportPackage = async (params) => {
if (params.isSearch) {
const data = {...params}
return await request.download({ url: `/wms/package/export-excel-senior`, data })
} else {
return await request.download({ url: `/wms/package/export-excel`, params }) return await request.download({ url: `/wms/package/export-excel`, params })
} }
}
// 下载用户导入模板 // 下载用户导入模板
export const importTemplate = () => { export const importTemplate = () => {

32
src/api/wms/transferreceiptRequestMain/index.ts

@ -66,5 +66,35 @@ export const exportTransferreceiptRequestMain = async (params) => {
// 下载用户导入模板 // 下载用户导入模板
export const importTemplate = () => { export const importTemplate = () => {
return request.download({ url: '/wms/transferreceipt-request-main/get-import-template' }) // return request.download({ url: '/wms/transferreceipt-request-main/get-import-template' })
}
// 关闭-调拨入库申请
export const closeTransferreceiptRequestMain = async (id) => {
return await request.put({ url: `/wms/transferreceipt-request-main/close?id=` + id })
}
// 重新添加-调拨入库申请
export const reAddTransferreceiptRequestMain = async (id) => {
return await request.put({ url: `/wms/transferreceipt-request-main/reAdd?id=` + id })
}
// 提交审批-调拨入库申请
export const submitTransferreceiptRequestMain = async (id) => {
return await request.put({ url: `/wms/transferreceipt-request-main/submit?id=` + id })
}
// 审批驳回-调拨入库申请
export const refusedTransferreceiptRequestMain = async (id) => {
return await request.put({ url: `/wms/transferreceipt-request-main/refused?id=` + id })
}
// 审批通过-调拨入库申请
export const agreeTransferreceiptRequestMain = async (id) => {
return await request.put({ url: `/wms/transferreceipt-request-main/agree?id=` + id })
}
// 处理-调拨入库申请
export const handleTransferreceiptRequestMain = async (id) => {
return await request.put({ url: `/wms/transferreceipt-request-main/handle?id=` + id })
} }

2
src/components/ImportForm/src/ImportForm.vue

@ -223,7 +223,7 @@ const submitFormSuccess = (response: any) => {
// console.log(172, import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + '/' + response.data.errorFile) // console.log(172, import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + '/' + response.data.errorFile)
// console.log(172, import.meta.env.VITE_BASE_URL + '/admin-api/opt/profile/' + response.data.errorFile) // console.log(172, import.meta.env.VITE_BASE_URL + '/admin-api/opt/profile/' + response.data.errorFile)
window.open( window.open(
import.meta.env.VITE_BASE_URL + '/admin-api/profile/' + response.data.errorFile, import.meta.env.VITE_BASE_URL + '/admin-api' + response.data.errorFile,
'222' '222'
) )
// downloadElement.setAttribute('href', import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + response.data.errorFile ) // downloadElement.setAttribute('href', import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + response.data.errorFile )

14
src/views/system/tenant/TenantForm.vue

@ -26,8 +26,8 @@
<el-form-item label="联系手机" prop="contactMobile"> <el-form-item label="联系手机" prop="contactMobile">
<el-input v-model="formData.contactMobile" placeholder="请输入联系手机" /> <el-input v-model="formData.contactMobile" placeholder="请输入联系手机" />
</el-form-item> </el-form-item>
<el-form-item v-if="formData.id === undefined" label="用户名称" prop="username"> <el-form-item v-if="formData.id === undefined" label="用户账号" prop="username">
<el-input v-model="formData.username" placeholder="请输入用户名称" /> <el-input v-model="formData.username" placeholder="请输入用户账号" />
</el-form-item> </el-form-item>
<el-form-item v-if="formData.id === undefined" label="用户密码" prop="password"> <el-form-item v-if="formData.id === undefined" label="用户密码" prop="password">
<el-input <el-input
@ -50,6 +50,7 @@
v-model="formData.expireTime" v-model="formData.expireTime"
clearable clearable
placeholder="请选择过期时间" placeholder="请选择过期时间"
:disabled-date="disabledDate"
type="date" type="date"
value-format="x" value-format="x"
/> />
@ -175,4 +176,13 @@ const resetForm = () => {
} }
formRef.value?.resetFields() formRef.value?.resetFields()
} }
/**只能选取当前日期以后的日期 */
const disabledDate =(time) => {
if (time.getTime() < Date.now()) {
return true;
} else {
return false;
}
}
</script> </script>

2
src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue

@ -218,7 +218,7 @@ const handleExport = async () => {
await message.exportConfirm() await message.exportConfirm()
// //
exportLoading.value = true exportLoading.value = true
const data = await PackageApi.exportPackage(setSearchParams) const data = await PackageApi.exportPackage(tableObject.params)
download.excel(data, '包装.xlsx') download.excel(data, '包装.xlsx')
} catch { } catch {
} finally { } finally {

1
src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts

@ -88,6 +88,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '运输方式', label: '运输方式',
field: 'transferMode', field: 'transferMode',
sort: 'custom', sort: 'custom',
dictType: DICT_TYPE.TRANSFER_MODE,
table: { table: {
width: 150 width: 150
}, },

98
src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue

@ -184,45 +184,46 @@ const butttondata = (row) => {
// - // -
const buttonTableClick = async (val, row) => { const buttonTableClick = async (val, row) => {
if (val == 'mainJobExe') { // if (val == 'mainJobExe') { //
let aaa = { let aaa = {
"id": "1809200001805505470", "id": "1809200001805505476",
"requestNumber": "REQ1820231124-0007", "requestNumber": "REQ1820231205-0005",
"deliverRecordNumber": "D001", "deliverRecordNumber": "JOB2420231205-0002",
"deliverPlanNumber": "F001", "deliverPlanNumber": "DP20231205-0002",
"customerCode": "K001", "customerCode": "CF",
"customerDockCode": "CD001", "customerDockCode": "CFCKYT",
"receiptDock": null, "receiptDock": null,
"carrierCode": "", "carrierCode": "cys-001",
"transferMode": "", "transferMode": "AIR",
"vehiclePlateNumber": "", "vehiclePlateNumber": "车牌号",
"fromWarehouseCode": null, "fromWarehouseCode": null,
"toWarehouseCode": null, "toWarehouseCode": null,
"requestTime": null, "requestTime": 1701756307000,
"requestDueTime": null, "requestDueTime": 1704470400000,
"status": "2", "status": "2",
"expiredTime": null, "expiredTime": null,
"updateTime": 1700788390000, "updateTime": 1701764165000,
"updater": "1", "updater": "1",
"jobStageStatus": null, "jobStageStatus": null,
"priority": null, "priority": null,
"priorityIncrement": null, "priorityIncrement": null,
"departmentCode": "研发部门", "departmentCode": "研发部门",
"acceptUserId": null, "acceptUserId": "1",
"acceptTime": null, "acceptTime": 1701764178000,
"completeUserId": null, "completeUserId": null,
"completeTime": null, "completeTime": null,
"fromLocationTypes": "INSP", "fromLocationTypes": "INSP,HOLD",
"toLocationTypes": "HOLD", "toLocationTypes": "HOLD,INSP",
"number": "JOB2520231124-0007", "number": "JOB2520231205-0014",
"businessType": "CustomerRejectJob", "businessType": "CustomerRejectJob",
"remark": "", "remark": "主表备注",
"createTime": 1700788390000, "createTime": 1701764165000,
"creator": "1", "creator": "1",
"fromAreaCodes": "采购在途库", "fromAreaCodes": "采购在途库",
"toAreaCodes": "采购在途库", "toAreaCodes": "采购在途库",
"toDockCode": null, "toDockCode": null,
"autoComplete": "FALSE", "autoComplete": "FALSE",
"allowModifyLocation": "TRUE", "allowModifyLocation": "FALSE",
"allowModifyQty": "TRUE", "allowModifyQty": "TRUE",
"allowBiggerQty": "TRUE", "allowBiggerQty": "TRUE",
"allowSmallerQty": "TRUE", "allowSmallerQty": "TRUE",
@ -231,43 +232,58 @@ const buttonTableClick = async (val, row) => {
"allowPartialComplete": "TRUE", "allowPartialComplete": "TRUE",
"allowModifyBatch": "FALSE", "allowModifyBatch": "FALSE",
"allowModifyPackingNumber": "FALSE", "allowModifyPackingNumber": "FALSE",
"subList": [{
"subList": [{"id": "1809200000441442033", "id": "1809200000441442040",
"soNumber": "222", "soNumber": null,
"soLine": "22", "soLine": null,
"packingNumber": "P20230427000026", "packingNumber": "testCF",
"batch": "20231120001", "batch": "20230808",
"inventoryStatus": "OK", "inventoryStatus": "OK",
"ownerCode": null, "ownerCode": null,
"containerNumber": "", "containerNumber": null,
"fromLocationCode": "INSPECT", "fromLocationCode": "Loc_testCF",
"toLocationCode": "CF1111", "toLocationCode": "INSPECT",
"itemCode": "CE115F11161AG", "itemCode": "testCF",
"itemName": null, "itemName": null,
"itemDesc1": null, "itemDesc1": null,
"itemDesc2": null, "itemDesc2": null,
"projectCode": null, "projectCode": null,
"qty": 5, "qty": 22,
"uom": null, "uom": "EA",
"number": null, "number": "REQ1820231206-0001",
"remark": "", "remark": "子表备注",
"createtime": null, "createtime": null,
"creator": "1", "creator": "1"
handleQty: 10,
toPackingNumber: '12',
toContainerNumber: '001',
toBatch: '21',
toInventoryStatus: 'OK',
supplierCode: '31213',
}] }]
} }
handleHandle(aaa) handleHandle(aaa)
} else if (val == 'mainJobAba') { // } else if (val == 'mainJobAba') { //
await message.confirm('确认要放弃吗?')
console.log('列表-操作按钮事件-放弃') console.log('列表-操作按钮事件-放弃')
CustomerreturnJobMainApi.abandonCustomerreturnJobMain(row.id).then(() => {
message.success(t('common.updateSuccess'))
getList()
}).catch(err => {
console.log(err)
})
} else if (val == 'mainJobClo') { // } else if (val == 'mainJobClo') { //
await message.confirm('确认要关闭吗?')
console.log('列表-操作按钮事件-关闭') console.log('列表-操作按钮事件-关闭')
CustomerreturnJobMainApi.closeCustomerreturnJobMain(row.id).then(() => {
message.success(t('common.updateSuccess'))
getList()
}).catch(err => {
console.log(err)
})
} else if (val == 'mainJobAcc') { // } else if (val == 'mainJobAcc') { //
await message.confirm('确认要承接吗?')
console.log('列表-操作按钮事件-承接') console.log('列表-操作按钮事件-承接')
CustomerreturnJobMainApi.acceptCustomerreturnJobMain(row.id).then(() => {
message.success(t('common.updateSuccess'))
getList()
}).catch(err => {
console.log(err)
})
} }
} }

50
src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts

@ -14,9 +14,15 @@ import { SaleDetail, SaleMain } from '../../deliverplan/saleMain/saleMain.data'
import * as BalanceApi from '@/api/wms/balance' import * as BalanceApi from '@/api/wms/balance'
import { Balance } from '@/views/wms/inventoryManage/balance/balance.data' import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
import * as CarrierApi from '@/api/wms/carrier'
import { Carrier } from '@/views/wms/basicDataManage/orderManage/carrier/carrier.data'
import * as LocationApi from '@/api/wms/location' import * as LocationApi from '@/api/wms/location'
import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data' import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
import * as ItembasicApi from '@/api/wms/itembasic'
import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
const { t } = useI18n() // 国际化 const { t } = useI18n() // 国际化
// 获取自动提交自动通过自动执行,跳过任务直接删生成记录的默认值 // 获取自动提交自动通过自动执行,跳过任务直接删生成记录的默认值
@ -128,10 +134,27 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择承运商', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '承运商信息', // 查询弹窗标题
searchAllSchemas: Carrier.allSchemas, // 查询弹窗所需类
searchPage: CarrierApi.getCarrierPage, // 查询弹窗所需分页方法
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
}]
}
}
}, },
{ {
label: '运输方式', label: '运输方式',
field: 'transferMode', field: 'transferMode',
dictType: DICT_TYPE.TRANSFER_MODE,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -594,12 +617,33 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
tableForm: { tableForm:{
disabled: true isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择物品代码',
searchField: 'code',
searchTitle: '物品基础信息',
searchAllSchemas: Itembasic.allSchemas,
searchPage: ItembasicApi.getItembasicPage,
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
}]
}, },
form: { form: {
// labelMessage: '信息提示说明!!!',
componentProps: { componentProps: {
disabled: true isSearchList: true,
searchListPlaceholder: '请选择物品代码',
searchField: 'code',
searchTitle: '物品基础信息',
searchAllSchemas: Itembasic.allSchemas,
searchPage: ItembasicApi.getItembasicPage,
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
}]
} }
} }
}, },

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

@ -117,11 +117,14 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
} }
} else { } else {
const setV = {} const setV = {}
setV[formField] = val[0][searchField] if(formField == 'deliverRecordNumber') {
setV['deliverRecordNumber'] = val[0]['number'] setV['deliverRecordNumber'] = val[0]['number']
setV['deliverPlanNumber'] = val[0]['deliverPlanNumber'] setV['deliverPlanNumber'] = val[0]['deliverPlanNumber']
setV['customerCode'] = val[0]['customerCode'] setV['customerCode'] = val[0]['customerCode']
setV['customerDockCode'] = val[0]['customerDockCode'] setV['customerDockCode'] = val[0]['customerDockCode']
} else {
setV[formField] = val[0][searchField]
}
formRef.setValues(setV) formRef.setValues(setV)
} }
}) })
@ -139,11 +142,10 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
setV['fromLocationCode'] = val[0]['locationCode'] setV['fromLocationCode'] = val[0]['locationCode']
setV['itemCode'] = val[0]['itemCode'] setV['itemCode'] = val[0]['itemCode']
setV['uom'] = val[0]['uom'] setV['uom'] = val[0]['uom']
formRef.setValues(setV)
} else { } else {
setV[formField] = val[0][searchField] setV[formField] = val[0][searchField]
formRef.setValues(setV)
} }
formRef.setValues(setV)
}) })
} }
@ -204,13 +206,14 @@ const isShowMainButton = (row,val) => {
// - // -
const butttondata = (row) => { const butttondata = (row) => {
return [ return [
defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6'])}), // defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:customerreturn-request-main:close'}), //
defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5'])}), // defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:customerreturn-request-main:reAdd'}), //
defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1'])}), // defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:customerreturn-request-main:submit'}), //
defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2'])}), // defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:customerreturn-request-main:refused'}), //
defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2'])}), // defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:customerreturn-request-main:agree'}), //
defaultButtons.mainListEditBtn({hasPermi:'wms:customerreturn-request-main:update'}), // defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:customerreturn-request-main:handle'}), //
defaultButtons.mainListDeleteBtn({hasPermi:'wms:customerreturn-request-main:delete'}), // defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:customerreturn-request-main:update'}), //
// defaultButtons.mainListDeleteBtn({hasPermi:'wms:customerreturn-request-main:delete'}), //
] ]
} }
@ -242,7 +245,7 @@ const buttonTableClick = async (val, row) => {
console.log(err) console.log(err)
}) })
} else if (val == 'mainTurnDown') { // } else if (val == 'mainTurnDown') { //
await message.confirm('确认要重新添加吗?') await message.confirm('确认要驳回审批吗?')
CustomerreturnRequestMainApi.refused(row.id).then(() => { CustomerreturnRequestMainApi.refused(row.id).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
getList() getList()
@ -250,6 +253,7 @@ const buttonTableClick = async (val, row) => {
console.log(err) console.log(err)
}) })
} else if (val == 'mainApprove') { // } else if (val == 'mainApprove') { //
await message.confirm('确认要审批通过吗?')
CustomerreturnRequestMainApi.agree(row.id).then(() => { CustomerreturnRequestMainApi.agree(row.id).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
getList() getList()
@ -257,6 +261,7 @@ const buttonTableClick = async (val, row) => {
console.log(err) console.log(err)
}) })
} else if (val == 'mainHandle') { // } else if (val == 'mainHandle') { //
await message.confirm('确认要处理吗?')
CustomerreturnRequestMainApi.handle(row.id).then(() => { CustomerreturnRequestMainApi.handle(row.id).then(() => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
getList() getList()

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

@ -103,11 +103,12 @@ const updataTableColumns = (val) => {
const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
nextTick(() => { nextTick(() => {
if (type == 'tableForm') { if (type == 'tableForm') {
console.log(106, val[0])
row['soNumber'] = val[0]['soNumber'] row['soNumber'] = val[0]['soNumber']
row['soLine'] = val[0]['soLine'] row['soLine'] = val[0]['soLine']
row['packingNumber'] = val[0]['packingNumber'] row['packingNumber'] = val[0]['packingNumber']
row['batch'] = val[0]['batch'] row['batch'] = val[0]['batch']
row['itemCode'] = val[0]['itemCode'] row['itemCode'] = val[0]['code']
} else { } else {
const setV = {} const setV = {}
setV[formField] = val[0][searchField] setV[formField] = val[0][searchField]
@ -122,12 +123,18 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
nextTick(() => { nextTick(() => {
const setV = {} const setV = {}
setV[formField] = val[0][searchField] if(formField == 'deliverRecordNumber') {
setV['soNumber'] = val[0]['soNumber'] setV['deliverRecordNumber'] = val[0]['deliverRecordNumber']
setV['soLine'] = val[0]['soLine'] setV['deliverPlanNumber'] = val[0]['deliverPlanNumber']
setV['customerCode'] = val[0]['customerCode']
}else if(formField == 'itemCode') {
setV['packingNumber'] = val[0]['packingNumber'] setV['packingNumber'] = val[0]['packingNumber']
setV['batch'] = val[0]['batch'] setV['batch'] = val[0]['batch']
setV['itemCode'] = val[0]['itemCode'] setV['itemCode'] = val[0]['itemCode']
}
else {
setV[formField] = val[0][searchField]
}
formRef.setValues(setV) formRef.setValues(setV)
}) })
} }
@ -145,8 +152,8 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'wms:customersettle-request-main:create'}), // // defaultButtons.defaultAddBtn({hasPermi:'wms:customersettle-request-main:create'}), //
defaultButtons.defaultImportBtn({hasPermi:'wms:customersettle-request-main:import'}), // // defaultButtons.defaultImportBtn({hasPermi:'wms:customersettle-request-main:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:customersettle-request-main:export'}), // defaultButtons.defaultExportBtn({hasPermi:'wms:customersettle-request-main:export'}), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), // defaultButtons.defaultFilterBtn(null), //
@ -163,11 +170,12 @@ const HeadButttondata = [
// //
const buttonBaseClick = (val, item) => { const buttonBaseClick = (val, item) => {
if (val == 'add') { // // if (val == 'add') { //
openForm('create') // openForm('create')
} else if (val == 'import') { // // } else if (val == 'import') { //
handleImport() // handleImport()
} else if (val == 'export') { // // } else
if (val == 'export') { //
handleExport() handleExport()
} else if (val == 'refresh') { // } else if (val == 'refresh') { //
getList() getList()

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

@ -185,23 +185,23 @@ const butttondata = (row) => {
const buttonTableClick = async (val, row) => { const buttonTableClick = async (val, row) => {
 if (val == 'mainJobExe') { //  if (val == 'mainJobExe') { //
    let aaa = {     let aaa = {
"id": "1809190002130023676", "id": "1809200001805505477",
"requestNumber": "REQ1720231205-0001", "requestNumber": "REQ1820231206-0001",
"deliverRecordNumber": "JOB2420231206-0005",
"deliverPlanNumber": "DP20231205-0002", "deliverPlanNumber": "DP20231205-0002",
"customerDeliverNumber": "CUST20231205-00000001",
"customerCode": "CF", "customerCode": "CF",
"customerDockCode": "CFCKYT", "customerDockCode": "CFCKYT",
"deliverDock": null, "receiptDock": null,
"carrierCode": "cys-001", "carrierCode": "cys-001",
"transferMode": "LOAD", "transferMode": "LOAD",
"vehiclePlateNumber": "车牌号", "vehiclePlateNumber": "车牌号",
"fromWarehouseCode": null, "fromWarehouseCode": null,
"toWarehouseCode": "CFCK", "toWarehouseCode": null,
"requestTime": 1701740774000, "requestTime": 1701826510000,
"requestDueTime": 1704470400000, "requestDueTime": 1704470400000,
"status": "2", "status": "2",
"expiredTime": null, "expiredTime": null,
"updateTime": 1701740969000, "updateTime": 1701827786000,
"updater": "1", "updater": "1",
"jobStageStatus": null, "jobStageStatus": null,
"priority": null, "priority": null,
@ -218,7 +218,6 @@ const buttonTableClick = async (val, row) => {
"remark": "主表备注", "remark": "主表备注",
"createTime": 1701740969000, "createTime": 1701740969000,
"creator": "1", "creator": "1",
"ruleUserId": null,
"fromAreaCodes": "采购在途库", "fromAreaCodes": "采购在途库",
"toAreaCodes": "采购在途库", "toAreaCodes": "采购在途库",
"fromDockCode": null, "fromDockCode": null,
@ -232,8 +231,6 @@ const buttonTableClick = async (val, row) => {
"allowPartialComplete": "TRUE", "allowPartialComplete": "TRUE",
"allowModifyBatch": "FALSE", "allowModifyBatch": "FALSE",
"allowModifyPackingNumber": "FALSE", "allowModifyPackingNumber": "FALSE",
"inInventoryStatuses": "OK",
"outInventoryStatuses": "OK",
"subList": [{ "subList": [{
"id": "1809190001245559377", "id": "1809190001245559377",
"soNumber": null, "soNumber": null,
@ -259,7 +256,6 @@ const buttonTableClick = async (val, row) => {
"toPackingNumber": null, "toPackingNumber": null,
"toContainerNumber": null, "toContainerNumber": null,
"toBatch": null, "toBatch": null,
"handleQty": null,
"toInventoryStatus": null, "toInventoryStatus": null,
recordList: [{ recordList: [{
handleQty: 10, handleQty: 10,
@ -286,8 +282,8 @@ const buttonTableClick = async (val, row) => {
DeliverJobMainApi.abandonDeliverJobMain(row.id) DeliverJobMainApi.abandonDeliverJobMain(row.id)
} else if (val == 'mainJobClo') { // } else if (val == 'mainJobClo') { //
DeliverJobMainApi.closeDeliverJobMain(row.id) DeliverJobMainApi.closeDeliverJobMain(row.id)
} else if (val == 'mainJobAcc') { // } else if (val == 'mainJobAcc') { //
DeliverJobMainApi.executeDeliverJobMain(row.id) DeliverJobMainApi.acceptDeliverJobMain(row.id)
} }
} }

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

@ -83,6 +83,7 @@ import { DeliverRequestMain,DeliverRequestMainRules,DeliverRequestDetail,Deliver
import * as DeliverRequestMainApi from '@/api/wms/deliverRequestMain' import * as DeliverRequestMainApi from '@/api/wms/deliverRequestMain'
import * as DeliverRequestDetailApi from '@/api/wms/deliverRequestDetail' import * as DeliverRequestDetailApi from '@/api/wms/deliverRequestDetail'
import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as defaultButtons from '@/utils/disposition/defaultButtons'
import * as DeliverPlanDetailApi from '@/api/wms/deliverPlanDetail'
// //
defineOptions({ name: 'DeliverRequestMain' }) defineOptions({ name: 'DeliverRequestMain' })
@ -95,6 +96,8 @@ const routeName = ref()
routeName.value = route.name routeName.value = route.name
const tableColumns = ref(DeliverRequestMain.allSchemas.tableColumns) const tableColumns = ref(DeliverRequestMain.allSchemas.tableColumns)
const isShowButton = ref(true)
// //
const updataTableColumns = (val) => { const updataTableColumns = (val) => {
tableColumns.value = val tableColumns.value = val
@ -111,11 +114,37 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
if(formField == 'deliverPlanNumber') { if(formField == 'deliverPlanNumber') {
setV['deliverPlanNumber'] = val[0]['number'] setV['deliverPlanNumber'] = val[0]['number']
setV['customerCode'] = val[0]['customerCode'] setV['customerCode'] = val[0]['customerCode']
formRef.setValues(setV) isShowButton.value = false
// getBomDisassemble
DeliverPlanDetailApi.selectDetailByMasterID(val[0]['id'])
.then(res => {
console.log(120,res)
res.forEach(item => {
item.qty = item.planQty
})
if (res) tableData.value = res
// tableform
DeliverRequestDetail.allSchemas.tableFormColumns.map(item => {
if(item.field == 'itemCode') {
item.isInpuFocusShow = false
item.tableForm.isInpuFocusShow = false
item.tableForm.disabled = true
}
if(item.field == 'qty') {
item.tableForm.disabled = true
}
if(item.field == 'uom') {
item.tableForm.disabled = true
}
})
}).catch(err => {
console.log(err)
message.error('错误')
})
} else { } else {
setV[formField] = val[0][searchField] setV[formField] = val[0][searchField]
formRef.setValues(setV)
} }
formRef.setValues(setV)
} }
}) })
} }
@ -161,6 +190,7 @@ const HeadButttondata = [
const buttonBaseClick = (val, item) => { const buttonBaseClick = (val, item) => {
if (val == 'add') { // if (val == 'add') { //
openForm('create') openForm('create')
resetShow()
} else if (val == 'import') { // } else if (val == 'import') { //
handleImport() handleImport()
} else if (val == 'export') { // } else if (val == 'export') { //
@ -360,6 +390,30 @@ const searchFormClick = (searchData) => {
getList() // getList() //
} }
// /
//
const resetShow = async () => {
isShowButton.value = true // tableform
// tableform
DeliverRequestDetail.allSchemas.tableFormColumns.map(item => {
if(item.field == 'itemCode') {
item.isInpuFocusShow = true
item.tableForm.isInpuFocusShow = true
item.tableForm.disabled = false
}
if(item.field == 'planQty') {
item.tableForm.disabled = false
}
if(item.field == 'uom') {
item.tableForm.disabled = false
}
if(item.field == 'available') {
item.tableForm.disabled = false
}
})
}
/** 初始化 **/ /** 初始化 **/
onMounted(async () => { onMounted(async () => {
getList() getList()

2
src/views/wms/inventoryjobManage/transferissue/transferissueJobMain/index.vue

@ -178,7 +178,7 @@ const butttondata = (row) => {
return [ return [
// defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), //
// defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:transferissue-job-main:close'}), // // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:transferissue-job-main:close'}), //
//defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), //
// defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), //
] ]
} }

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

@ -204,7 +204,7 @@ const butttondata = (row) => {
defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:transferissue-request-main:submit'}), // defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:transferissue-request-main:submit'}), //
defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:transferissue-request-main:refused'}), // defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:transferissue-request-main:refused'}), //
defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:transferissue-request-main:agree'}), // defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:transferissue-request-main:agree'}), //
defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:transferissue-request-main:handle'}), // defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:transferissue-request-main:handle'}), //
defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:transferissue-request-main:update'}), // defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:transferissue-request-main:update'}), //
] ]
} }

6
src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/index.vue

@ -174,9 +174,9 @@ const isShowMainButton = (row,val) => {
// - // -
const butttondata = (row) => { const butttondata = (row) => {
return [ return [
defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), //
defaultButtons.mainListJobCloBtn({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'])}), // // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), //
] ]
} }

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

@ -84,6 +84,11 @@ import * as TransferreceiptRequestMainApi from '@/api/wms/transferreceiptRequest
import * as TransferreceiptRequestDetailApi from '@/api/wms/transferreceiptRequestDetail' import * as TransferreceiptRequestDetailApi from '@/api/wms/transferreceiptRequestDetail'
import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as defaultButtons from '@/utils/disposition/defaultButtons'
import {
closeTransferissueRequestMain,
closeTransferreceiptRequestMain, submitTransferreceiptRequestMain
} from "@/api/wms/transferreceiptRequestMain";
// //
defineOptions({ name: 'TransferreceiptRequestMain' }) defineOptions({ name: 'TransferreceiptRequestMain' })
@ -148,8 +153,8 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'wms:transferreceipt-request-main:create'}), // // defaultButtons.defaultAddBtn({hasPermi:'wms:transferreceipt-request-main:create'}), //
defaultButtons.defaultImportBtn({hasPermi:'wms:transferreceipt-request-main:import'}), // // defaultButtons.defaultImportBtn({hasPermi:'wms:transferreceipt-request-main:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:transferreceipt-request-main:export'}), // defaultButtons.defaultExportBtn({hasPermi:'wms:transferreceipt-request-main:export'}), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), // defaultButtons.defaultFilterBtn(null), //
@ -192,37 +197,105 @@ const isShowMainButton = (row,val) => {
// - // -
const butttondata = (row) => { const butttondata = (row) => {
return [ return [
defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6'])}), // defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:transferreceipt-request-main:close'}), //
defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5'])}), // defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:transferreceipt-request-main:reAdd'}), //
defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1'])}), // defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:transferreceipt-request-main:submit'}), //
defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2'])}), // defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:transferreceipt-request-main:refused'}), //
defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2'])}), // defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:transferreceipt-request-main:agree'}), //
defaultButtons.mainListEditBtn({hasPermi:'wms:transferreceipt-request-main:update'}), // defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:transferreceipt-request-main:handle'}), //
defaultButtons.mainListDeleteBtn({hasPermi:'wms:transferreceipt-request-main:delete'}), // // defaultButtons.mainListEditBtn({hasPermi:'wms:transferreceipt-request-main:update'}), //
// defaultButtons.mainListDeleteBtn({hasPermi:'wms:transferreceipt-request-main:delete'}), //
] ]
} }
// - // -
const buttonTableClick = async (val, row) => { const buttonTableClick = async (val, row) => {
if (val == 'mainClose') { // if (val == 'mainClose') { //
console.log('列表-操作按钮事件-关闭') console.log('列表-操作按钮事件-关闭')
handleClose(row.id)
} else if (val == 'mainReAdd') { // } else if (val == 'mainReAdd') { //
console.log('列表-操作按钮事件-重新添加') console.log('列表-操作按钮事件-重新添加')
handleReAdd(row.id)
} else if (val == 'mainSubmit') { // } else if (val == 'mainSubmit') { //
console.log('列表-操作按钮事件-提交审批') console.log('列表-操作按钮事件-提交审批')
handleSubmit(row.id)
} else if (val == 'mainTurnDown') { // } else if (val == 'mainTurnDown') { //
console.log('列表-操作按钮事件-驳回') console.log('列表-操作按钮事件-驳回')
handleRefused(row.id)
} else if (val == 'mainApprove') { // } else if (val == 'mainApprove') { //
console.log('列表-操作按钮事件-审批通过') console.log('列表-操作按钮事件-审批通过')
} else if (val == 'edit') { // handleAgree(row.id)
} else if (val == 'mainHandle') { //
handleHandle(row.id)
}else if (val == 'edit') { //
openForm('update', row) openForm('update', row)
} else if (val == 'delete') { // } else if (val == 'delete') { //
handleDelete(row.id) handleDelete(row.id)
} }
} }
/** 处理按钮操作 */
const handleHandle = async (id: number) => {
try {
await message.confirm(t('common.confirmHandle'))
await TransferreceiptRequestMainApi.handleTransferreceiptRequestMain(id)
message.success(t('common.handleSuccess'))
await getList()
} catch {}
}
/** 审批通过按钮操作 */
const handleAgree = async (id: number) => {
try {
await message.confirm(t('common.confirmAgree'))
await TransferreceiptRequestMainApi.agreeTransferreceiptRequestMain(id)
message.success(t('common.agreeSuccess'))
await getList()
} catch {}
}
/** 审批驳回按钮操作 */
const handleRefused = async (id: number) => {
try {
await message.confirm(t('common.confirmRefused'))
await TransferreceiptRequestMainApi.refusedTransferreceiptRequestMain(id)
message.success(t('common.refusedSuccess'))
await getList()
} catch {}
}
/** 提交按钮操作 */
const handleSubmit = async (id: number) => {
try {
await message.confirm(t('common.confirmSubmit'))
await TransferreceiptRequestMainApi.submitTransferreceiptRequestMain(id)
message.success(t('common.submitSuccess'))
await getList()
} catch {}
}
/** 重新添加按钮操作 */
const handleReAdd = async (id: number) => {
try {
await message.confirm(t('common.confirmReAdd'))
await TransferreceiptRequestMainApi.reAddTransferreceiptRequestMain(id)
message.success(t('common.reAddSuccess'))
await getList()
} catch {}
}
/** 关闭按钮操作 */
const handleClose = async (id: number) => {
try {
await message.confirm(t('common.confirmColse'))
await TransferreceiptRequestMainApi.closeTransferreceiptRequestMain(id)
message.success(t('common.closeSuccess'))
await getList()
} catch {}
}
/** 添加/修改操作 */ /** 添加/修改操作 */
const formRef = ref() const formRef = ref()
const openForm =async (type: string, row?: number) => { const openForm =async (type: string, row?: number) => {

Loading…
Cancel
Save