diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue index 6b49cb703..6bcfed52c 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue @@ -174,10 +174,10 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row) => { return [ - // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接 - // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭 - // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃 - // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行 + defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接 + defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭 + defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃 + defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行 ] } @@ -186,39 +186,39 @@ const buttonTableClick = async (val, row) => { if (val == 'mainJobExe') { // 执行 let aaa = { - "id": "1809200001805505476", - "requestNumber": "REQ1820231205-0005", - "deliverRecordNumber": "JOB2420231205-0002", + "id": "1809200001805505479", + "requestNumber": "REQ1820231220-0002", + "deliverRecordNumber": "JOB2420231206-0005", "deliverPlanNumber": "DP20231205-0002", "customerCode": "CF", "customerDockCode": "CFCKYT", "receiptDock": null, - "carrierCode": "cys-001", - "transferMode": "AIR", - "vehiclePlateNumber": "车牌号", + "carrierCode": "", + "transferMode": "", + "vehiclePlateNumber": "", "fromWarehouseCode": null, "toWarehouseCode": null, - "requestTime": 1701756307000, - "requestDueTime": 1704470400000, - "status": "2", + "requestTime": 1703056874000, + "requestDueTime": 0, + "status": "1", "expiredTime": null, - "updateTime": 1701764165000, - "updater": "1", + "updateTime": 1703056901000, + "updater": "超级管理员", "jobStageStatus": null, "priority": null, "priorityIncrement": null, - "departmentCode": "研发部门", - "acceptUserId": "1", - "acceptTime": 1701764178000, + "departmentCode": "闻荫源码", + "acceptUserId": null, + "acceptTime": null, "completeUserId": null, "completeTime": null, - "fromLocationTypes": "INSP,HOLD", - "toLocationTypes": "HOLD,INSP", - "number": "JOB2520231205-0014", + "fromLocationTypes": "INSP,HOLD,SCRAP", + "toLocationTypes": "HOLD,INSP,SEMI,RAW", + "number": "JOB2520231220-0007", "businessType": "CustomerRejectJob", - "remark": "主表备注", - "createTime": 1701764165000, - "creator": "1", + "remark": "", + "createTime": 1703056901000, + "creator": "超级管理员", "fromAreaCodes": "采购在途库", "toAreaCodes": "采购在途库", "toDockCode": null, @@ -232,29 +232,64 @@ const buttonTableClick = async (val, row) => { "allowPartialComplete": "TRUE", "allowModifyBatch": "FALSE", "allowModifyPackingNumber": "FALSE", - "subList": [{ - "id": "1809200000441442040", - "soNumber": null, - "soLine": null, - "packingNumber": "testCF", - "batch": "20230808", - "inventoryStatus": "OK", - "ownerCode": null, - "containerNumber": null, - "fromLocationCode": "Loc_testCF", - "toLocationCode": "INSPECT", - "itemCode": "testCF", - "itemName": null, - "itemDesc1": null, - "itemDesc2": null, - "projectCode": null, - "qty": 22, - "uom": "EA", - "number": "REQ1820231206-0001", - "remark": "子表备注", - "createtime": null, - "creator": "1" -}] + "subList": [ + { + "id": "1809200000441442043", + "soNumber": null, + "soLine": null, + "packingNumber": "M20230421000005", + "batch": "20230808", + "inventoryStatus": "OK", + "ownerCode": null, + "containerNumber": null, + "fromLocationCode": "Loc_testCF", + "toLocationCode": "SFG", + "itemCode": "testCF", + "itemName": "陈放测试物品", + "itemDesc1": "测试用", + "itemDesc2": "测试用", + "projectCode": "5", + "qty": 22, + "uom": "EA", + "number": "REQ1820231220-0002", + "remark": "子表备注", + "createtime": null, + "creator": "超级管理员", + "handleQty": null, + "toPackingNumber": null, + "toContainerNumber": null, + "toBatch": null, + "toInventoryStatus": null + }, + { + "id": "1809200000441442042", + "soNumber": null, + "soLine": null, + "packingNumber": "12", + "batch": "21", + "inventoryStatus": "OK", + "ownerCode": null, + "containerNumber": null, + "fromLocationCode": "Loc_testCF", + "toLocationCode": "H03", + "itemCode": "testCF", + "itemName": "陈放测试物品", + "itemDesc1": "测试用", + "itemDesc2": "测试用", + "projectCode": "5", + "qty": 10, + "uom": "EA", + "number": "REQ1820231220-0002", + "remark": "子表备注", + "createtime": null, + "creator": "超级管理员", + "handleQty": null, + "toPackingNumber": null, + "toContainerNumber": null, + "toBatch": null, + "toInventoryStatus": null + } + ] } handleHandle(aaa) } else if (val == 'mainJobAba') { // 放弃 diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts index d37dc7586..c22b5bcc2 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts @@ -3,26 +3,11 @@ import { dateFormatter } from '@/utils/formatTime' import * as getRequestsettingApi from '@/api/wms/requestsetting/index' import * as DeliverRecordMainApi from '@/api/wms/deliverRecordMain' -import * as DeliverPlanMainApi from '@/api/wms/deliverPlanMain' import { DeliverRecordMain } from '../../deliver/deliverRecordMain/deliverRecordMain.data' -import { DeliverPlanMain } from '../../deliverplan/deliverPlanMain/deliverPlanMain.data' - -import * as SaleMainApi from '@/api/wms/saleMain' -import * as SaleDetailApi from '@/api/wms/saleDetail' -import { SaleDetail, SaleMain } from '../../deliverplan/saleMain/saleMain.data' - -import * as BalanceApi from '@/api/wms/balance' -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 { 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() // 国际化 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值 @@ -617,33 +602,12 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive table: { width: 150 }, - tableForm:{ - isInpuFocusShow: true, // 开启查询弹窗 - searchListPlaceholder: '请选择物品代码', - searchField: 'code', - searchTitle: '物品基础信息', - searchAllSchemas: Itembasic.allSchemas, - searchPage: ItembasicApi.getItembasicPage, - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - }] + tableForm: { + disabled: true }, form: { - // labelMessage: '信息提示说明！！！', componentProps: { - isSearchList: true, - searchListPlaceholder: '请选择物品代码', - searchField: 'code', - searchTitle: '物品基础信息', - searchAllSchemas: Itembasic.allSchemas, - searchPage: ItembasicApi.getItembasicPage, - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - }] + disabled: true } } }, @@ -700,23 +664,12 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive table: { width: 150 }, - tableForm:{ - isInpuFocusShow: true, // 开启查询弹窗 - searchListPlaceholder: '请选择包装号', - searchField: 'packingNumber', - searchTitle: '库存余额信息', - searchAllSchemas: Balance.allSchemas, - searchPage: BalanceApi.getBalancePage + tableForm: { + disabled: true }, form: { - // labelMessage: '信息提示说明！！！', componentProps: { - isSearchList: true, - searchListPlaceholder: '请选择包装号', - searchField: 'packingNumber', - searchTitle: '库存余额信息', - searchAllSchemas: Balance.allSchemas, - searchPage: BalanceApi.getBalancePage + disabled: true } } }, @@ -767,7 +720,12 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive width: 150 }, tableForm: { - type: 'Select' + disabled: true + }, + form: { + componentProps: { + disabled: true + } } }, { @@ -793,33 +751,12 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive table: { width: 150 }, - tableForm:{ - isInpuFocusShow: true, // 开启查询弹窗 - searchListPlaceholder: '请选择到库位代码', - searchField: 'code', - searchTitle: '库存余额信息', - searchAllSchemas: Location.allSchemas, - searchPage: LocationApi.getLocationPage, - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - }] + tableForm: { + disabled: true }, form: { - // labelMessage: '信息提示说明！！！', componentProps: { - isSearchList: true, - searchListPlaceholder: '请选择到库位代码', - searchField: 'code', - searchTitle: '库存余额信息', - searchAllSchemas: Location.allSchemas, - searchPage: LocationApi.getLocationPage, - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - }] + disabled: true } } }, @@ -880,7 +817,14 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive table: { width: 150 }, - isTable: false + tableForm: { + disabled: true + }, + form: { + componentProps: { + disabled: true + } + } }, { label: '创建时间', diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue index e24806d3e..de6e10bc9 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue @@ -82,6 +82,7 @@ import { CustomerreturnRequestMain,CustomerreturnRequestMainRules,Customerreturn import * as CustomerreturnRequestMainApi from '@/api/wms/customerreturnRequestMain' import * as CustomerreturnRequestDetailApi from '@/api/wms/customerreturnRequestDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' +import * as DeliverRecordDetailApi from '@/api/wms/deliverRecordDetail' // 客户退货申请 defineOptions({ name: 'CustomerreturnRequestMain' }) @@ -116,12 +117,22 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => row[formField] = val[0][searchField] } } else { + console.log(11111111) const setV = {} if(formField == 'deliverRecordNumber') { setV['deliverRecordNumber'] = val[0]['number'] setV['deliverPlanNumber'] = val[0]['deliverPlanNumber'] setV['customerCode'] = val[0]['customerCode'] setV['customerDockCode'] = val[0]['customerDockCode'] + // 获取子表数据 getBomDisassemble + DeliverRecordDetailApi.getDeliverRecordDetailPage(val[0]['id']) + .then(res => { + console.log(555,res) + if (res) tableData.value = res.list + }).catch(err => { + console.log(err) + message.error('错误') + }) } else { setV[formField] = val[0][searchField] } diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue index ad83d263e..5155d507d 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue @@ -83,6 +83,9 @@ const routeName = ref() routeName.value = route.name const tableColumns = ref(InventorymoveJobMain.allSchemas.tableColumns) +const fromInventoryStatus = ref() +const toInventoryStatus = ref() + // 字段设置 更新主列表字段 const updataTableColumns = (val) => { tableColumns.value = val @@ -130,6 +133,50 @@ const Echo = [] const { tableObject, tableMethods } = useTable({ getListApi: InventorymoveJobMainApi.getInventorymoveJobMainPage // 分页接口 }) +console.log(99 , routeName.value) +// 判断 路由名称 进行条件过滤 +/** + * OktoholdJobMain 合格转隔离 + */ + if ( routeName.value == 'OktoholdJobMain') { + tableObject.params = { + fromInventoryStatus: 'OK', + toInventoryStatus:'HOLD' + } + fromInventoryStatus.value = 'OK' + toInventoryStatus.value = "HOLD" +} else if ( routeName.value == 'HoldtookJobMain') { + tableObject.params = { + fromInventoryStatus: 'HOLD', + toInventoryStatus:'OK' + } + fromInventoryStatus.value = 'HOLD' + toInventoryStatus.value = "OK" +} else if ( routeName.value == 'HoldtoscrapJobMain') { + tableObject.params = { + fromInventoryStatus: 'HOLD', + toInventoryStatus:'SCRAP' + } + fromInventoryStatus.value = 'HOLD' + toInventoryStatus.value = "SCRAP" +} else if ( routeName.value == 'OktoscrapJobMain') { + tableObject.params = { + fromInventoryStatus: 'OK', + toInventoryStatus:'SCRAP' + } + fromInventoryStatus.value = 'OK' + toInventoryStatus.value = "SCRAP" +} else if ( routeName.value == 'ScraptoholdJobMain') { + tableObject.params = { + fromInventoryStatus: 'SCRAP', + toInventoryStatus:'HOLD' + } + fromInventoryStatus.value = 'SCRAP' + toInventoryStatus.value = "HOLD" +} else { + console.log(146 , fromInventoryStatus.value) + fromInventoryStatus.value = null +} // 获得表格的各种操作 const { getList, setSearchParams } = tableMethods diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue index ca67f769b..d00702a05 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue @@ -78,6 +78,10 @@ const routeName = ref() routeName.value = route.name const tableColumns = ref(InventorymoveRecordMain.allSchemas.tableColumns) +console.log(99 , routeName.value) +const fromInventoryStatus = ref() +const toInventoryStatus = ref() + // 字段设置 更新主列表字段 const updataTableColumns = (val) => { tableColumns.value = val @@ -87,6 +91,50 @@ const { tableObject, tableMethods } = useTable({ getListApi: InventorymoveRecordMainApi.getInventorymoveRecordMainPage // 分页接口 }) +// 判断 路由名称 进行条件过滤 +/** + * OktoholdRequestMain 合格转隔离 + */ + if ( routeName.value == 'OktoholdRecordMain') { + tableObject.params = { + fromInventoryStatus: 'OK', + toInventoryStatus:'HOLD' + } + fromInventoryStatus.value = 'OK' + toInventoryStatus.value = "HOLD" +} else if ( routeName.value == 'HoldtookRecordMain') { + tableObject.params = { + fromInventoryStatus: 'HOLD', + toInventoryStatus:'OK' + } + fromInventoryStatus.value = 'HOLD' + toInventoryStatus.value = "OK" +} else if ( routeName.value == 'HoldtoscrapRecordMain') { + tableObject.params = { + fromInventoryStatus: 'HOLD', + toInventoryStatus:'SCRAP' + } + fromInventoryStatus.value = 'HOLD' + toInventoryStatus.value = "SCRAP" +} else if ( routeName.value == 'OktoscrapRecordMain') { + tableObject.params = { + fromInventoryStatus: 'OK', + toInventoryStatus:'SCRAP' + } + fromInventoryStatus.value = 'OK' + toInventoryStatus.value = "SCRAP" +} else if ( routeName.value == 'ScraptoholdRecordMain') { + tableObject.params = { + fromInventoryStatus: 'SCRAP', + toInventoryStatus:'HOLD' + } + fromInventoryStatus.value = 'SCRAP' + toInventoryStatus.value = "HOLD" +} else { + console.log(146 , fromInventoryStatus.value) + fromInventoryStatus.value = null +} + // 获得表格的各种操作 const { getList, setSearchParams } = tableMethods diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue index 978cfb3fa..1d82a833f 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue @@ -160,6 +160,13 @@ InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => { delete item.tableForm.searchCondition } } + if(item.field == "toInventoryStatus"){ + if (fromInventoryStatus.value) { + item.tableForm.disabled = true + } else { + item.tableForm.disabled = false + } + } }) // 字段设置 更新主列表字段 @@ -178,6 +185,20 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => row['fromBatch'] = val[0]['batch'] row['fromInventoryStatus'] = val[0]['inventoryStatus'] row['fromLocationCode'] = val[0]['locationCode'] + row['uom'] = val[0]['uom'] + if(routeName.value == 'OktoholdRequestMain'){ + row['toInventoryStatus'] = "HOLD" + }else if ( routeName.value == 'HoldtookRequestMain') { + row['toInventoryStatus'] = "OK" + }else if ( routeName.value == 'HoldtoscrapRequestMain') { + row['toInventoryStatus'] = "SCRAP" + }else if ( routeName.value == 'OktoscrapRequestMain') { + row['toInventoryStatus'] = "SCRAP" + }else if ( routeName.value == 'ScraptoholdRequestMain') { + row['toInventoryStatus'] = "HOLD" + }else{ + row['toInventoryStatus'] = null + } } else { row[formField] = val[0][searchField] } @@ -393,8 +414,12 @@ const handleDeleteTable = (item, index) => { const submitForm = async (formType, data) => { data.subList = tableData.value // 拼接子表数据参数 data.subList.forEach(item => { - item.fromInventoryStatus = fromInventoryStatus.value - item.toInventoryStatus = toInventoryStatus.value + console.log(fromInventoryStatus.value) + console.log(!fromInventoryStatus.value) + if(fromInventoryStatus.value){ + item.fromInventoryStatus = fromInventoryStatus.value + item.toInventoryStatus = toInventoryStatus.value + } }) try { if (formType === 'create') {