diff --git a/README.md b/README.md index 99e590948..2953275d5 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,14 @@ form: { key:'available', // 查询列表中字段 value:'TRUE', // 指查询具体值 isMainValue: false // 表示查询条件不是主表的字段的值 - } + }, + { + key:'workshopCode', + value:'workshopCode', + message: '请填写车间代码！', + isMainValue: true, + isRemoveParams: true // 仅用于前端校验，不传参 + }, ], verificationPage: ItembasicApi.getItemListByCodes, // tableForm下方输入框校验失去焦点之后是否正确的方法 isShowTableFormSearch: true, //tableForm下方是否出现输入框 diff --git a/src/api/system/user/index.ts b/src/api/system/user/index.ts index ba8802e36..bbf043064 100644 --- a/src/api/system/user/index.ts +++ b/src/api/system/user/index.ts @@ -100,6 +100,10 @@ export const forgetPassword = (data : UserVO) => { export const updatePassword = (data : UserVO) => { return request.put({ url: '/system/user/updatePassword', data }) } +// 重置密码 +export const updateUserPassword = (data : UserVO) => { + return request.put({ url: '/system/user/update-password', data }) +} export const getPassWordConfig = () => { return request.get({ url: '/system/password/getConfig' }) diff --git a/src/api/wms/business/inputBlur.ts b/src/api/wms/business/inputBlur.ts index 47e660eb3..2ae9504a0 100644 --- a/src/api/wms/business/inputBlur.ts +++ b/src/api/wms/business/inputBlur.ts @@ -453,7 +453,8 @@ export const FormBlur = async (field, val, routeName, formRef, detailData, formS ...arr1.filter((item) => !arr2.includes(item)), ...arr2.filter((item) => !arr1.includes(item)) ].join(',') - message.alert('代码' + str + '没有找到对应数据') + const cleanedStr = str.replace(/[,]+$/, ''); // 去掉末尾的逗号// 去掉所有非字母和数字的符号 + message.alert('代码' + cleanedStr + '没有找到对应数据') formRef.setValues(setV) return } diff --git a/src/api/wms/productionscrapRecordMain/index.ts b/src/api/wms/productionscrapRecordMain/index.ts index 8cde1c0b8..a464277b7 100644 --- a/src/api/wms/productionscrapRecordMain/index.ts +++ b/src/api/wms/productionscrapRecordMain/index.ts @@ -69,4 +69,9 @@ export const exportProductionscrapRecordMain = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/productionscrap-record-main/get-import-template' }) -} \ No newline at end of file +} + +// 撤销 +export const revoke = async (id: number) => { + return await request.get({ url: `/wms/productionscrap-record-main/revoke?id=` + id }) +} diff --git a/src/api/wms/purchasereceiptRecordMain/index.ts b/src/api/wms/purchasereceiptRecordMain/index.ts index 017f12336..13ff984b6 100644 --- a/src/api/wms/purchasereceiptRecordMain/index.ts +++ b/src/api/wms/purchasereceiptRecordMain/index.ts @@ -134,3 +134,8 @@ export const createPutawayRequest = async (number:string) => { export const createInspectRequest = async (number:string) => { return await request.post({ url: `/wms/purchasereceipt-record-main/createInspectRequest?number=`+number }) } + +// 创建采购退货记录申请 +export const createPurchasereturnRecord = async (number:string) => { + return await request.post({ url: `/wms/purchasereceipt-record-main/createPurchasereturnRecord?number=`+number }) +} \ No newline at end of file diff --git a/src/api/wms/qadCostcentre/index.ts b/src/api/wms/qadCostcentre/index.ts index 02fe9df8e..752e436a3 100644 --- a/src/api/wms/qadCostcentre/index.ts +++ b/src/api/wms/qadCostcentre/index.ts @@ -57,4 +57,9 @@ export const exportQadCostcentre = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/qad-costcentre/get-import-template' }) -} \ No newline at end of file +} + +// 根据code获取数据列表 +export const getCostCenterByCodes = async (params) => { + return await request.get({ url: `/wms/qad-costcentre/listByCostcentreCode`, params }) +} diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 7daea779c..3d0c9f2e5 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -85,6 +85,7 @@ label: '汇总', prop: 'CollectionTable' }]" v-model="tabSheet" @change="tabChange"/> +
@@ -672,7 +672,7 @@ const handleAddTable = () => { } // 输入框聚焦 const inpuFocus = (headerItem, row, index) => { - if (headerItem?.tableForm?.isInpuFocusShow) { + if (headerItem?.tableForm?.isInpuFocusShow||showInputSearch(headerItem, row)) { emit('inpuFocus', headerItem, row, index) } } @@ -721,6 +721,12 @@ const batchAdd = () => { } emit('batchAdd', keyWord.value) } + + +const showInputSearch = (headerItem, row) => { + // 子表单独控制显示 + return Boolean(row['isInpuFocusShow_' + headerItem.field]) +} const disabledInput = (headerItem, row) => { if (headerItem.tableForm?.isInpuFocusShow) { if (headerItem.tableForm?.enterSearch) { diff --git a/src/config/axios/service.ts b/src/config/axios/service.ts index 9f38c95eb..958d2a79b 100644 --- a/src/config/axios/service.ts +++ b/src/config/axios/service.ts @@ -182,7 +182,7 @@ service.interceptors.response.use( '
5 分钟搭建本地环境
' }) return Promise.reject(new Error(msg)) - } else if (code === 1002000010) { + } else if (code === 1002000008) { if (msg === '无效的刷新令牌') { // hard coding：忽略这个提示，直接登出 console.log(msg) diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index ab2bdf9bf..9d4a6b2c2 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -996,6 +996,7 @@ export default { 生成采购收货申请:'Generate purchase receipt request', 发送到货检验申请:'Send the arrival inspection request', 生成采购上架申请:'Generate a purchase listing request', + 生成采购退货记录:'Generate purchase return records', 生成制品上架申请:'Generate a purchase listing request', 生成盘点调整申请:'Generate inventory adjustment request', 重盘:'New Inventory', @@ -1041,7 +1042,9 @@ export default { '确认生成上架申请吗？':'Are you sure to generate a listing application?', 上架申请生成成功:'The listing application was successfully generated', '确认生成到货检验申请吗？':'Is the arrival inspection application confirmed to be generated?', + '确认生成采购退货记录吗？':'Are you sure to generate a purchase return record?', 到货检验申请生成成功:'The arrival inspection application was successfully generated', + 采购退货记录生成成功:'Purchase return record generated successfully', 采购收货记录主:'Purchase receipt record master data', 采购退货记录主:'Purchase return record master data', 合同附件:'Appendix to the contract', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 7c72bc20a..dc482ff9c 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -998,6 +998,7 @@ export default { 生成采购收货申请:'生成采购收货申请', 发送到货检验申请:'发送到货检验申请', 生成采购上架申请:'生成采购上架申请', + 生成采购退货记录:'生成采购退货记录', 生成制品上架申请:'生成制品上架申请', 生成盘点调整申请:'生成盘点调整申请', 重盘:'重盘', @@ -1043,7 +1044,9 @@ export default { '确认生成上架申请吗？':'确认生成上架申请吗？', 上架申请生成成功:'上架申请生成成功', '确认生成到货检验申请吗？':'确认生成到货检验申请吗？', + '确认生成采购退货记录吗？':'确认生成采购退货记录吗？', 到货检验申请生成成功:'到货检验申请生成成功', + 采购退货记录生成成功:'采购退货记录生成成功', 采购收货记录主:'采购收货记录主', 采购退货记录主:'采购退货记录主', 采购拒收记录主:'采购拒收记录主', diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts index d06beb311..73b968041 100644 --- a/src/utils/disposition/defaultButtons.ts +++ b/src/utils/disposition/defaultButtons.ts @@ -1175,6 +1175,19 @@ export function mainPutawayRequestBtn(option: any) { }) } +// 主列表-生成采购退货记录 +export function mainPurchasereturnRecordBtn(option: any) { + return __defaultBtnOption(option, { + label: t(`ts.生成采购退货记录`).replace('ts.', ''), + name: 'purchasereturnRecord', + hide: false, + type: 'primary', + color: '', + link: true, // 文本展现按钮 + hasPermi: '' + }) +} + // 主列表-生成制品上架申请 export function mainPutawayRequestCpBtn(option: any) { return __defaultBtnOption(option, { diff --git a/src/views/login/components/LoginForm.vue b/src/views/login/components/LoginForm.vue index ed783f5c6..5ab2c3bbc 100644 --- a/src/views/login/components/LoginForm.vue +++ b/src/views/login/components/LoginForm.vue @@ -57,9 +57,9 @@ - + 密码到期，请立即修改', '重要提示', @@ -272,15 +272,15 @@ ) router.push({path:"/updatePasswordNewTips",query:{username:loginData.loginForm.username}}) return - case 1: - await ElMessageBox.alert( - '密码过期，请联系管理员修改', - '重要提示', - { - dangerouslyUseHTMLString: true, - } - ) - return + // case 1: + // await ElMessageBox.alert( + // '密码过期，请联系管理员修改', + // '重要提示', + // { + // dangerouslyUseHTMLString: true, + // } + // ) + // return default: await ElMessageBox.alert( '密码'+differenceDays+'到期，请尽快修改。', @@ -330,6 +330,12 @@ // 存储 部门信息 const { wsCache } = useCache() wsCache.set(CACHE_KEY.DEPT, await DeptApi.getSimpleDeptList()) + }catch (e){ + if(e.code === 1002000008){ + setTimeout(function (){ + router.push({path:"/updatePasswordNewTips",query:{username:loginData.loginForm.username}}) + },1500) + } }finally { console.log('登录-224') loginLoading.value = false diff --git a/src/views/login/updatePassword.vue b/src/views/login/updatePassword.vue index cbebe4dff..29150d64b 100644 --- a/src/views/login/updatePassword.vue +++ b/src/views/login/updatePassword.vue @@ -36,6 +36,7 @@ import { getTenantIdByName, sendSmsCode, smsLogin } from '@/api/login' import * as UserApi from '@/api/system/user' import { View,Hide } from '@element-plus/icons-vue' + import {updateUserPassword} from "@/api/system/user"; const { t } = useI18n() const message = useMessage() const permissionStore = usePermissionStore() @@ -65,7 +66,7 @@ message.error('两次输入的密码不一致，请重新输入!') } else { const data = loginData as unknown as UserApi.UserVO - await UserApi.updatePassword(data) + await UserApi.updateUserPassword(data) // 发送操作成功的事件 message.success(t('common.updateSuccess'))  router.go(-1) diff --git a/src/views/qms/inspectionRecord/index.vue b/src/views/qms/inspectionRecord/index.vue index f61aae936..30c69f3e9 100644 --- a/src/views/qms/inspectionRecord/index.vue +++ b/src/views/qms/inspectionRecord/index.vue @@ -141,21 +141,21 @@ const route = useRoute() // 路由信息 const routeName = ref() routeName.value = route.name const tableColumns = ref(InspectionRecordMain.allSchemas.tableColumns) -if (routeName.value == 'InspectRecordMain') { - tableColumns.value = tableColumns.value.filter((item) => { - return item.label != '操作' - }) -} -// 字段设置 更新主列表字段 -const updataTableColumns = (val) => { - if (routeName.value == 'InspectRecordMain') { - tableColumns.value = val.filter((item) => { - return item.label != '操作' - }) - } else { - tableColumns.value = val - } -} +// if (routeName.value == 'InspectRecordMain') { +// tableColumns.value = tableColumns.value.filter((item) => { +// return item.label != '操作' +// }) +// } +//// 字段设置 更新主列表字段 +// const updataTableColumns = (val) => { +// if (routeName.value == 'InspectRecordMain') { +// tableColumns.value = val.filter((item) => { +// return item.label != '操作' +// }) +// } else { +// tableColumns.value = val +// } +// } // 子表新增的时候选择表格之后需要会显得字段 const { tableObject, tableMethods } = useTable({ @@ -166,10 +166,10 @@ const { tableObject, tableMethods } = useTable({ const { getList, setSearchParams } = tableMethods const searchParams = (model) => { - if (route.name == 'inspectionRecordProduction') { + if (route.name == 'inspectionRecordProduction' ) { model.available = 'TRUE' model.inspectionType = '4' - } else if (route.name == 'inspectionRecordPurchase') { + } else if (route.name == 'inspectionRecordPurchase' || route.name == 'InspectRecordMain') { model.available = 'TRUE' model.inspectionType = '1' } else { @@ -235,31 +235,39 @@ const isShowPackageBtn = (row, val) => { } // 列表-操作按钮 const butttondata = (row) => { - return [ - // defaultButtons.mainListOrderCOMPLETEBtn({ hide: isShowMainButton(row, ['INCOMPLETE']) }), // 完成 + if(route.name == 'InspectRecordMain'){ + return [ + defaultButtons.mainListPlanCheckQualityReportBtn({}), // 查看质检报告 + defaultButtons.mainListSupplierResumeBtn({}) // 查看履历表 + ] + }else { + return [ + // defaultButtons.mainListOrderCOMPLETEBtn({ hide: isShowMainButton(row, ['INCOMPLETE']) }), // 完成 + + defaultButtons.mainApplyDecisionBtn({ + // hide: isShowMainButton(row, null), + hasPermi: 'qms:inspection-recode-main:edit' + }), // 使用决策 + // defaultButtons.mainListDeleteBtn(null), // 删除 + defaultButtons.mainListOrderPubBtn({ + hide: isShowMainButton(row, 'publish'), + hasPermi: 'qms:inspection-recode-main:pub' + }), // 发布 + defaultButtons.mainListCloseBtn({ + hide: isShowMainButton(row, 'publish'), + hasPermi: 'qms:inspection-recode-main:close' + }), // 关闭 + defaultButtons.mainListPackageBtn({ hide: isShowPackageBtn(row, ['11']) }), // 包装 + // defaultButtons.mainListJobExeBtn({ + // hide:row.useDecision, + // hasPermi: 'qms:inspection-recode-main:execute', + // }), // 执行 + defaultButtons.mainListEditBtn({ hide: isShowEditBtn(row, ['11']) }), // 编辑 + defaultButtons.mainListPlanCheckQualityReportBtn({}), // 查看质检报告 + defaultButtons.mainListSupplierResumeBtn({}) // 查看履历表 + ] + } - defaultButtons.mainApplyDecisionBtn({ - // hide: isShowMainButton(row, null), - hasPermi: 'qms:inspection-recode-main:edit' - }), // 使用决策 - // defaultButtons.mainListDeleteBtn(null), // 删除 - defaultButtons.mainListOrderPubBtn({ - hide: isShowMainButton(row, 'publish'), - hasPermi: 'qms:inspection-recode-main:pub' - }), // 发布 - defaultButtons.mainListCloseBtn({ - hide: isShowMainButton(row, 'publish'), - hasPermi: 'qms:inspection-recode-main:close' - }), // 关闭 - defaultButtons.mainListPackageBtn({ hide: isShowPackageBtn(row, ['11']) }), // 包装 - // defaultButtons.mainListJobExeBtn({ - // hide:row.useDecision, - // hasPermi: 'qms:inspection-recode-main:execute', - // }), // 执行 - defaultButtons.mainListEditBtn({ hide: isShowEditBtn(row, ['11']) }), // 编辑 - defaultButtons.mainListPlanCheckQualityReportBtn({}), // 查看质检报告 - defaultButtons.mainListSupplierResumeBtn({}) // 查看履历表 - ] } const listTableRef = ref() @@ -471,7 +479,7 @@ const submitFormExecute = async (formType, data) => { const searchFormClick = (searchData) => { let isHave = searchData?.filters?.some((item) => item.column == 'inspectionType') if (!isHave) { - if (route.name == 'inspectionRecordPurchase') { + if (route.name == 'inspectionRecordPurchase' || route.name == 'InspectRecordMain') { searchData.filters.push( { action: '==', @@ -514,7 +522,7 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async () => { - if (route.name == 'inspectionRecordPurchase') { + if (route.name == 'inspectionRecordPurchase' || route.name == 'InspectRecordMain') { tableObject.params = { available: true, inspectionType: '1' diff --git a/src/views/system/user/UserForm.vue b/src/views/system/user/UserForm.vue index c6ec91013..e42c54144 100644 --- a/src/views/system/user/UserForm.vue +++ b/src/views/system/user/UserForm.vue @@ -69,7 +69,7 @@ - + + + + @@ -42,7 +43,7 @@ @@ -93,6 +95,11 @@ import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import { DeliverRequestMain,DeliverRequestMainRules,DeliverRequestDetail,DeliverRequestDetailRules } from './deliverRequestMain.data' import * as DeliverRequestMainApi from '@/api/wms/deliverRequestMain' import * as DeliverRequestDetailApi from '@/api/wms/deliverRequestDetail' +import * as CustomerdockApi from '@/api/wms/customerdock' +import * as CustomerItemApi from '@/api/wms/customeritem' +import { Customeritem } from '@/views/wms/basicDataManage/customerManage/customeritem/customeritem.data' +import * as DeliverPlanDetailApi from '@/api/wms/deliverPlanDetail' + import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as AreabasicApi from '@/api/wms/areabasic' import { formatDate } from '@/utils/formatTime' @@ -174,11 +181,23 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) = setV[formField] = val[0][searchField] if(formField == 'deliverPlanNumber') { setV['deliverPlanNumber'] = val[0]['number'] - setV['customerCode'] = val[0]['customerCode'] - if(formField == 'itemCode'){ - console.log( val[0]); - row['uom'] = val[0]['customerUom'] + tableData.value = [] + //物料代码-子表 + let subRes = await DeliverPlanDetailApi.getDeliverPlanDetailPage({ + number:val[0]['number'] + }) + if(subRes&&subRes.list&&subRes.list.length>0){ + const tableFormKeys = {} + DeliverRequestDetail.allSchemas.tableFormColumns.forEach(item => { + tableFormKeys[item.field] = item.default ? item.default : '' + }) + val.forEach(item=>{ + const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) + tableData.value.push(newRow) + }) } + console.log('subRes',subRes) + } else if(formField == 'customerDockCode') { //客户月台 setV['toWarehouseCode'] = val[0]['warehouseCode']//到仓库 @@ -187,13 +206,60 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) = if(res){ setV['deliverType'] = res['type'] } - } else { + } else if(formField == 'customerCode'){ + //客户代码 + + let res = await CustomerdockApi.getCustomerdockPage({ + by:"ASC", + pageNo:1, + pageSize:20, + available: "TRUE", + customerCode: val[0]['code'] + }) + if(res&&res.list&&res.list.length>0){ + setV['customerDockCode'] = res.list[0]['code']//客户月台默认取第一条-喜婷 + setV['toWarehouseCode'] = res.list[0]['warehouseCode']//到仓库 + setV['toLocationCode'] = res.list[0]['defaultLocationCode']//到库位 + let res2 = await AreabasicApi.selectAreabasicDOByCode(res.list[0]['defaultLocationCode']) + if(res2){ + setV['deliverType'] = res2['type'] + } + }else{ + setV['customerDockCode'] = '' + setV['toWarehouseCode'] = ''//到仓库 + setV['toLocationCode'] = ''//到库位 + setV['deliverType'] = ''//发货类型 + } + tableData.value = [] + }else { setV[formField] = val[0][searchField] } formRef.setValues(setV) } }) } +const clearSearchInput = (field)=>{ + console.log('field',field) + if('customerCode' == field){ + //客户代码 + basicFormRef.value.formRef.setValues({ + customerDockCode: '', + toWarehouseCode: '', + toLocationCode: '', + deliverPlanNumber: '', + deliverType: '', + }) + tableData.value = [] + }else if('customerDockCode' == field){ + basicFormRef.value.formRef.setValues({ + toWarehouseCode: '', + toLocationCode: '', + deliverType: '', + }) + }else if('deliverPlanNumber' == field){ + tableData.value = [] + } +} // 查询页面返回——详情 const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { nextTick(() => { @@ -239,9 +305,9 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'wms:deliver-request-main:create'}), // 新增 - defaultButtons.defaultImportBtn({hasPermi:'wms:deliver-request-main:import'}), // 导入 - defaultButtons.defaultExportBtn({hasPermi:'wms:deliver-request-main:export'}), // 导出 + defaultButtons.defaultAddBtn({hasPermi:`wms:${routeName.value}:create`}), // 新增 + defaultButtons.defaultImportBtn({hasPermi:`wms:${routeName.value}:import`}), // 导入 + defaultButtons.defaultExportBtn({hasPermi:`wms:${routeName.value}:export`}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -294,14 +360,14 @@ const butttondata = (row,$index) => { return [] } return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:deliver-request-main:close'}), // 关闭 - defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','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','7']),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'}), // 删除 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:`wms:${routeName.value}:close`}), // 关闭 + defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:`wms:${routeName.value}:reAdd`}), //重新添加 + defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:`wms:${routeName.value}:submit`}), // 提交审批 + defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:`wms:${routeName.value}:refused`}), // 驳回 + defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:`wms:${routeName.value}:agree`}), // 审批通过 + defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3','7']),hasPermi:`wms:${routeName.value}:handle`}), // 处理 + defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:`wms:${routeName.value}:update`}), // 编辑 + // defaultButtons.mainListDeleteBtn({hasPermi:`wms:${routeName.value}:delete`}), // 删除 ] } @@ -383,7 +449,7 @@ const buttonTableClick = async (val, row) => { } /** 添加/修改操作 */ -const formRef = ref() +const basicFormRef = ref() const openForm =async (type: string, row?: number) => { if(type == "update"){ DeliverRequestMain.allSchemas.formSchema.forEach((item) => { @@ -414,7 +480,7 @@ const openForm =async (type: string, row?: number) => { }) } tableData.value = [] // 重置明细数据 - formRef.value.open(type, row) + basicFormRef.value.open(type, row) } /** @@ -546,13 +612,13 @@ const submitForm = async (formType, submitData) => { if(flag.value){ return } - formRef.value.formLoading = true + basicFormRef.value.formLoading = true try { if (formType === 'create') { if(tableData.value.length <= 0){ message.warning(`子表明细不能为空!`) flag.value = true - formRef.value.formLoading = false + basicFormRef.value.formLoading = false return; } await DeliverRequestMainApi.createDeliverRequestMain(data) @@ -561,7 +627,7 @@ const submitForm = async (formType, submitData) => { await DeliverRequestMainApi.updateDeliverRequestMain(data) message.success(t('common.updateSuccess')) } - formRef.value.dialogVisible = false + basicFormRef.value.dialogVisible = false // 刷新当前列表 if (formType === 'create') { getList() @@ -569,7 +635,7 @@ const submitForm = async (formType, submitData) => { buttonBaseClick('refresh',null) } } finally { - formRef.value.formLoading = false + basicFormRef.value.formLoading = false } } diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue index 65ad32e20..78cbad88b 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue @@ -249,9 +249,9 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'wms:deliver-plan-main:create'}), // 新增 - defaultButtons.defaultImportBtn({hasPermi:'wms:deliver-plan-main:import'}), // 导入 - defaultButtons.defaultExportBtn({hasPermi:'wms:deliver-plan-main:export'}), // 导出 + defaultButtons.defaultAddBtn({hasPermi:`wms:${routeName.value}:create` }), // 新增 + defaultButtons.defaultImportBtn({hasPermi:`wms:${routeName.value}:import` }), // 导入 + defaultButtons.defaultExportBtn({hasPermi:`wms:${routeName.value}:export` }), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -303,14 +303,14 @@ const butttondata = (row,$index) => { return [] } return [ - defaultButtons.mainListPlanOpeBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:deliver-plan-main:open'}), // 打开 - defaultButtons.mainListPlanCloBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:deliver-plan-main:close'}), // 关闭 - defaultButtons.mainListPlanSubBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:deliver-plan-main:submit'}), // 提交审批 - defaultButtons.mainListPlanTurBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:deliver-plan-main:reject'}), // 驳回 - defaultButtons.mainListPlanAppBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:deliver-plan-main:agree'}), // 审批通过 - defaultButtons.mainListPlanPubBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:deliver-plan-main:publish'}), // 发布 - defaultButtons.mainListPlanResBtn({hide:isShowMainButton(row,['4']),hasPermi:'wms:deliver-plan-main:resetting'}), // 重置 - defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:deliver-plan-main:update'}), // 编辑 + defaultButtons.mainListPlanOpeBtn({hide:isShowMainButton(row,['5']),hasPermi:`wms:${routeName.value}:open`}), // 打开 + defaultButtons.mainListPlanCloBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:`wms:${routeName.value}:close`}), // 关闭 + defaultButtons.mainListPlanSubBtn({hide:isShowMainButton(row,['1']),hasPermi:`wms:${routeName.value}:submit`}), // 提交审批 + defaultButtons.mainListPlanTurBtn({hide:isShowMainButton(row,['2']),hasPermi:`wms:${routeName.value}:reject`}), // 驳回 + defaultButtons.mainListPlanAppBtn({hide:isShowMainButton(row,['2']),hasPermi:`wms:${routeName.value}:agree`}), // 审批通过 + defaultButtons.mainListPlanPubBtn({hide:isShowMainButton(row,['3']),hasPermi:`wms:${routeName.value}:publish`}), // 发布 + defaultButtons.mainListPlanResBtn({hide:isShowMainButton(row,['4']),hasPermi:`wms:${routeName.value}:resetting`}), // 重置 + defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:`wms:${routeName.value}:update`}), // 编辑 ] } diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue index 0e52f7c66..b57594389 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue @@ -292,9 +292,9 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'wms:container-main-request:create'}), // 新增 - defaultButtons.defaultImportBtn({hasPermi:'wms:container-main-request:import'}), // 导入 - defaultButtons.defaultExportBtn({hasPermi:'wms:container-main-request:export'}), // 导出 + defaultButtons.defaultAddBtn({hasPermi:`wms:${routeName.value}:create`}), // 新增 + defaultButtons.defaultImportBtn({hasPermi:`wms:${routeName.value}:import`}), // 导入 + defaultButtons.defaultExportBtn({hasPermi:`wms:${routeName.value}:export`}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -346,14 +346,14 @@ const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['ma return [] } return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['2','3','4','6']),hasPermi:'wms:container-main-request:close'}), // 关闭 - defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:container-main-request:reAdd'}), //重新添加 - defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:container-main-request:submit'}), // 提交审批 - defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:container-main-request:refused'}), // 驳回 - defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:container-main-request:agree'}), // 审批通过 - defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:container-main-request:handle'}), // 处理 - defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:container-main-request:update'}), // 编辑 - // defaultButtons.mainListDeleteBtn({hasPermi:'wms:container-main-request:delete'}), // 删除 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['2','3','4','6']),hasPermi:`wms:${routeName.value}:close`}), // 关闭 + defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:`wms:${routeName.value}:reAdd`}), //重新添加 + defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:`wms:${routeName.value}:submit`}), // 提交审批 + defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:`wms:${routeName.value}:refused`}), // 驳回 + defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:`wms:${routeName.value}:agree`}), // 审批通过 + defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:`wms:${routeName.value}:handle`}), // 处理 + defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:`wms:${routeName.value}:update`}), // 编辑 + // defaultButtons.mainListDeleteBtn({hasPermi:`wms:${routeName.value}:delete`}), // 删除 ] } diff --git a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue index c6c7e41c5..c3411002f 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue @@ -142,8 +142,8 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - // defaultButtons.defaultAddBtn({hasPermi:'wms:container-record-detail:create'}), // 新增 - defaultButtons.defaultExportBtn({hasPermi:'wms:container-record-detail:export'}), // 导出 + // defaultButtons.defaultAddBtn({hasPermi:`wms:{routeName.value}:create`}), // 新增 + defaultButtons.defaultExportBtn({hasPermi:`wms:{routeName.value}:export`}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -184,8 +184,8 @@ const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['ma return [] } return [ - // defaultButtons.mainListEditBtn({hasPermi:'wms:container-record-main:update'}), // 编辑 - // defaultButtons.mainListDeleteBtn({hasPermi:'wms:container-record-main:delete'}), // 删除 + // defaultButtons.mainListEditBtn({hasPermi:`wms:{routeName.value}:update`}), // 编辑 + // defaultButtons.mainListDeleteBtn({hasPermi:`wms:{routeName.value}:delete`}), // 删除 ] } diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue index f13238f80..7458d4eac 100644 --- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue @@ -115,6 +115,7 @@ const { tableObject, tableMethods } = useTable({ /** * */ + if ( routeName.value == 'InitialContainerManageRequest') { tableObject.params = { type:'INITIAL', @@ -245,9 +246,9 @@ const isShowMainButton = (row,val) => { // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'wms:container-main-request:create'}), // 新增 - defaultButtons.defaultImportBtn({hasPermi:'wms:container-main-request:import'}), // 导入 - defaultButtons.defaultExportBtn({hasPermi:'wms:container-main-request:export'}), // 导出 + defaultButtons.defaultAddBtn({hasPermi:'wms:initial-container-main-request:create'}), // 新增 + defaultButtons.defaultImportBtn({hasPermi:'wms:initial-container-main-request:import'}), // 导入 + defaultButtons.defaultExportBtn({hasPermi:'wms:initial-container-main-request:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -290,14 +291,14 @@ const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['ma return [] } return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['2','3','4','6']),hasPermi:'wms:container-main-request:close'}), // 关闭 - defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:container-main-request:reAdd'}), //重新添加 - defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:container-main-request:submit'}), // 提交审批 - defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:container-main-request:refused'}), // 驳回 - defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:container-main-request:agree'}), // 审批通过 - defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:container-main-request:handle'}), // 处理 - defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:container-main-request:update'}), // 编辑 - // defaultButtons.mainListDeleteBtn({hasPermi:'wms:container-main-request:delete'}), // 删除 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['2','3','4','6']),hasPermi:'wms:initial-container-main-request:close'}), // 关闭 + defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:initial-container-main-request:reAdd'}), //重新添加 + defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:initial-container-main-request:submit'}), // 提交审批 + defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:initial-container-main-request:refused'}), // 驳回 + defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:initial-container-main-request:agree'}), // 审批通过 + defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:initial-container-main-request:handle'}), // 处理 + defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:initial-container-main-request:update'}), // 编辑 + // defaultButtons.mainListDeleteBtn({hasPermi:'wms:initial-container-main-request:delete'}), // 删除 ] } diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue index 3be8fb002..48289d112 100644 --- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue @@ -96,6 +96,8 @@ import Detail from '@/components/Detail/src/Detail.vue' import { formatDate } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' const { loadStart, loadDone } = usePageLoading() +// 器具报废申请 +// 仅有器具报废申请在使用的 defineOptions({ name: 'ScrapContainerManageRequest' }) const message = useMessage() // 消息弹窗 @@ -267,9 +269,9 @@ const isShowMainButton = (row,val) => { // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'wms:container-main-request:create'}), // 新增 - defaultButtons.defaultImportBtn({hasPermi:'wms:container-main-request:import'}), // 导入 - defaultButtons.defaultExportBtn({hasPermi:'wms:container-main-request:export'}), // 导出 + defaultButtons.defaultAddBtn({hasPermi:'wms:scrap-container-main-request:create'}), // 新增 + defaultButtons.defaultImportBtn({hasPermi:'wms:scrap-container-main-request:import'}), // 导入 + defaultButtons.defaultExportBtn({hasPermi:'wms:scrap-container-main-request:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -312,14 +314,14 @@ const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['ma return [] } return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['2','3','4','6']),hasPermi:'wms:container-main-request:close'}), // 关闭 - defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:container-main-request:reAdd'}), //重新添加 - defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:container-main-request:submit'}), // 提交审批 - defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:container-main-request:refused'}), // 驳回 - defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:container-main-request:agree'}), // 审批通过 - defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:container-main-request:handle'}), // 处理 - defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:container-main-request:update'}), // 编辑 - // defaultButtons.mainListDeleteBtn({hasPermi:'wms:container-main-request:delete'}), // 删除 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['2','3','4','6']),hasPermi:'wms:scrap-container-main-request:close'}), // 关闭 + defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:scrap-container-main-request:reAdd'}), //重新添加 + defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:scrap-container-main-request:submit'}), // 提交审批 + defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:scrap-container-main-request:refused'}), // 驳回 + defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:scrap-container-main-request:agree'}), // 审批通过 + defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:scrap-container-main-request:handle'}), // 处理 + defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:scrap-container-main-request:update'}), // 编辑 + // defaultButtons.mainListDeleteBtn({hasPermi:'wms:scrap-container-main-request:delete'}), // 删除 ] } diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts index 913c0b2d6..1442d37b7 100644 --- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts +++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts @@ -852,17 +852,20 @@ export const IssueRequestDetail = useCrudSchemas( value: 'TRUE', isMainValue: false }, - // { - // key:'workshopCode', - // value:'workshopCode', - // message: '请填写车间代码！', - // isMainValue: true - // }, + { + key:'workshopCode', + value:'workshopCode', + message: '请填写车间代码！', + isMainValue: true, + isRemoveParams: true // 仅用于前端校验，不传参 + }, { key:'productionLineCode', value:'productionLineCode', message: '请填写生产线代码！', - isMainValue: true + isMainValue: true, + isRemoveParams: true // 仅用于前端校验，不传参 + }, { key: 'businessTypeCode', diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts index 9ccd2f3ac..b80264573 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts @@ -447,17 +447,19 @@ export const ProductionreturnRecordDetail = useCrudSchemas(reactive( label: '申请单号', field: 'requestNumber', sort: 'custom', - sortTableDefault:996, + sortTableDefault:1, table: { width: 180 }, @@ -30,7 +30,7 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive( label: '任务单号', field: 'jobNumber', sort: 'custom', - sortTableDefault:997, + sortTableDefault:2, table: { width: 180 }, @@ -56,6 +56,7 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive( table: { width: 150 }, + sortTableDefault:4, }, { @@ -438,7 +439,7 @@ export const ProductionreturnRecordDetail = useCrudSchemas(reactive { } } +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 ProductionscrapRecordMainApi.revoke(row.masterId) + buttonBaseClick('refresh',null) + } } // 获取部门 用于详情 部门回显 const { wsCache } = useCache() diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts index beee18e09..b8cb9edf4 100644 --- a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts +++ b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts @@ -372,13 +372,12 @@ export const ProductionscrapRecordMain = useCrudSchemas( isTable: false }, { - label: '备注', - field: 'remark', + label: '主备注', + field: 'mainRemark', sort: 'custom', table: { width: 150 }, - isTable: false }, // { // label: '创建者', @@ -521,6 +520,16 @@ export const ProductionscrapRecordMain = useCrudSchemas( activeValue: 'TRUE' } } + }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 120, + fixed: 'right' + }, } ]) ) @@ -597,6 +606,23 @@ export const ProductionscrapRecordDetail = useCrudSchemas(reactive width: 150 }, }, + { + label: '是否已撤销', + field: 'revokeFlag', + sort: 'custom', + dictType: DICT_TYPE.TRUE_FALSE, + table: { + width: 150 + }, + }, + { + label: '关联单据号', + field: 'relateRecordNumber', + sort: 'custom', + table: { + width: 150 + }, + }, { label: '物料代码', field: 'itemCode', @@ -818,13 +844,12 @@ export const ProductionscrapRecordDetail = useCrudSchemas(reactive hiddenInMain: true, }, { - label: '备注', + label: '明细备注', field: 'remark', sort: 'custom', table: { width: 150 }, - hiddenInMain: true, }, { label: '创建者', diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue index 7fd5471f6..68a12bbec 100644 --- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue +++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue @@ -235,10 +235,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => return } - const isType = await isItemType(val[0]['itemCode'], labelType.value) - if(!isType){ - message.warning('当前物料可制造与其他数据不一致，请重新选择！') - } else { + // const isType = await isItemType(val[0]['itemCode'], labelType.value) + // if(!isType){ + // message.warning('当前物料可制造与其他数据不一致，请重新选择！') + // } else { row['itemCode'] = val[0]['itemCode'] row['uom'] = val[0]['uom'] row['inventoryStatus'] = val[0]['inventoryStatus'] @@ -263,7 +263,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => row['singlePrice'] = resyStdcost[0].price row['amount'] = Number(Number(resyStdcost[0].price * row['qty']).toFixed(2)) } - } + // } } else if(formField == 'workStationCode') { // 明细查询页赋值 val.forEach(item=>{ @@ -302,10 +302,10 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { nextTick(async () => { const setV = {} if(formField == 'itemCode') { - const isType = await isItemType(val[0]['itemCode'], labelType.value) - if(!isType){ - message.warning('当前物料可制造与其他数据不一致，请重新选择！') - } else { + // const isType = await isItemType(val[0]['itemCode'], labelType.value) + // if(!isType){ + // message.warning('当前物料可制造与其他数据不一致，请重新选择！') + // } else { setV['itemCode'] = val[0]['itemCode'] setV['uom'] = val[0]['uom'] setV['inventoryStatus'] = val[0]['inventoryStatus'] @@ -322,7 +322,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { item.tableForm.max = val[0]['qty'] } }) - } + // } } else if(formField == 'workStationCode') { setV['workStationCode'] = val[0]['code'] setV['fromLocationCode'] = val[0]['rawLocationCode'] diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts index 3948c7119..75923063c 100644 --- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts +++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts @@ -839,15 +839,12 @@ export const ProductionscrapRequestMain = useCrudSchemas( isForm: false }, { - label: '备注', - field: 'remark', + label: '主备注', + field: 'mainRemark', sort: 'custom', table: { width: 150 }, - isForm:false, - isTableForm:false, - isTable: false, }, { label: '业务类型', @@ -1340,7 +1337,7 @@ export const ProductionscrapRequestDetail = useCrudSchemas(reactive([ isTable:false, isForm: false }, - { - label: '未执行任务数量', - field: 'unexecutedQty', - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'InputNumber', - }, - isTableForm:false, - hiddenInMain:true, - }, + // { + // label: '未执行任务数量', + // field: 'unexecutedQty', + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // component: 'InputNumber', + // }, + // isTableForm:false, + // hiddenInMain:true, + // }, { label: '操作', field: 'action', diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue index 767925dd8..3f44d4305 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/index.vue @@ -95,48 +95,6 @@ const { tableObject, tableMethods } = useTable({ getListApi: InventorychangeRecordDetailApi.getInventorychangeRecordDetailPage // 分页接口 }) - -// 判断 路由名称 进行条件过滤 -/** - * OktoholdRecordMain 合格转隔离 - */ - if ( routeName.value == 'OktoholdReqordMain') { - 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" -} - // 获得表格的各种操作 const { getList, setSearchParams } = tableMethods diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue index f242cd0cf..d75ff12ce 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue @@ -139,9 +139,10 @@ const { tableObject, tableMethods } = useTable({ getListApi: InventorymoveJobDetailApi.getInventorymoveJobDetailPage // 分页接口 }) const importFileName = ref() + // 判断 路由名称 进行条件过滤 /** - * OktoholdJobMain 合格转隔离 + * OktoholdJobMain 合格转隔离 物料隔离 */ if ( routeName.value == 'OktoholdJobMain') { tableObject.params = { @@ -213,7 +214,7 @@ const importFileName = ref() // toInventoryStatus.value = "HOLD" businessType.value = 'ScrapToHold' importFileName.value = '报废转隔离任务' -} else { +} else {//InventorymoveJobMain console.log(146 , fromInventoryStatus.value) tableObject.params = { businessType :'Move' @@ -225,10 +226,12 @@ const importFileName = ref() // 获得表格的各种操作 const { getList, setSearchParams } = tableMethods - // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultExportBtn({hasPermi:'wms:inventorymove-job-main:export'}), // 导出 + + + + defaultButtons.defaultExportBtn({hasPermi:`wms:${routeName.value}:export`}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts index 589131ff1..058c95482 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts @@ -1,5 +1,7 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' +import {Supplier} from "@/views/wms/basicDataManage/supplierManage/supplier/supplier.data"; +import * as SupplierApi from "@/api/wms/supplier"; /** * @returns {Array} 库存转移任务主表 @@ -680,6 +682,23 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '供应商代码', + field: 'supplierCode', + sort: 'custom', + isDetail: true, + table: { + width: 150, + }, + }, + { + label: '供应商名称', + field: 'supplierName', + isDetail: true, + table: { + width: 180 + }, + }, { label: '供应商批次', field: 'altBatch', diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue index 5cd8e4be7..a3d8860bb 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue @@ -193,8 +193,8 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultExportBtn({hasPermi:'wms:inventorymove-record-main:export'}), // 导出 - defaultButtons.defaultImportBtn({hide:recordImport.value}), // 导入 + defaultButtons.defaultExportBtn({hasPermi:`wms:${routeName.value}:export`}), // 导出 + defaultButtons.defaultImportBtn({hide:recordImport.value,hasPermi:`wms:${routeName.value}:import`}), // 导入 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue index e9a747cf1..0e1f26bf6 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue @@ -100,7 +100,7 @@ import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import { formatDate } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' const { loadStart, loadDone } = usePageLoading() -// 库存转移记录主 +// 库存转移记录(新)InventorymoveRecordMainNew defineOptions({ name: 'InventorymoveRecordMainNew' }) const message = useMessage() // 消息弹窗 @@ -111,7 +111,6 @@ const route = useRoute() // 路由信息 const routeName = ref() routeName.value = route.name const tableColumns = ref([...InventorymoveRecordMainNew.allSchemas.tableColumns,...InventorymoveRecordDetailNew.allSchemas.tableMainColumns]) - console.log(99 , routeName.value) const fromInventoryStatus = ref() const toInventoryStatus = ref() @@ -137,8 +136,8 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ defaultButtons.defaultAddBtn(null), // 新增 - defaultButtons.defaultExportBtn({hasPermi:'wms:inventorymove-record-main:export'}), // 导出 - // defaultButtons.defaultImportBtn({hasPermi:'wms:inventorymove-record-main:import'}), // 导入 + defaultButtons.defaultExportBtn({hasPermi:`wms:${routeName.value}:export`}), // 导出 + // defaultButtons.defaultImportBtn({hasPermi:`wms:${routeName.value}:import`}), // 导入 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -463,11 +462,8 @@ const searchList = (model)=>{ /** 初始化 **/ onMounted(async () => { getList() - if(routeName.value == "InventorymoveRecordMain"){ - importTemplateData.templateUrl = await InventorymoveRecordMainApi.importTemplate() - }else { - importTemplateData.templateUrl = await InventorymoveRecordMainApi.importTemplateExceptMove() - } + // 库存转移记录(新)InventorymoveRecordMainNew + importTemplateData.templateUrl = await InventorymoveRecordMainApi.importTemplateExceptMove() }) ./inventorymoveRecordRequestMain.data diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/index.vue index 953950d79..317389888 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/index.vue @@ -74,7 +74,8 @@ import { CACHE_KEY, useCache } from '@/hooks/web/useCache' import { formatDate } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' const { loadStart, loadDone } = usePageLoading() -// 库存转移记录主 +// 物料隔离记录 InventorymoveRecordMainOKHOLD +// 仅有物料隔离记录在使用的 defineOptions({ name: 'InventorymoveRecordMainOKHOLD' }) const message = useMessage() // 消息弹窗 @@ -113,8 +114,8 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultExportBtn({hasPermi:'wms:inventorymove-record-main:export'}), // 导出 - //defaultButtons.defaultImportBtn({hasPermi:'wms:inventorymove-record-main:import'}), // 导入 + defaultButtons.defaultExportBtn({hasPermi:`wms:${routeName.value}:export`}), // 导出 + //defaultButtons.defaultImportBtn({hasPermi:`wms:${routeName.value}:import`}), // 导入 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -300,10 +301,7 @@ const searchList = (model)=>{ /** 初始化 **/ onMounted(async () => { getList() - if(routeName.value == "InventorymoveRecordMain"){ - importTemplateData.templateUrl = await InventorymoveRecordMainApi.importTemplate() - }else { - importTemplateData.templateUrl = await InventorymoveRecordMainApi.importTemplateExceptMove() - } + // 物料隔离记录 InventorymoveRecordMainOKHOLD + importTemplateData.templateUrl = await InventorymoveRecordMainApi.importTemplateExceptMove() }) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts index b0d75482a..07a03471a 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts @@ -487,6 +487,23 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '供应商代码', + field: 'supplierCode', + sort: 'custom', + isDetail: true, + table: { + width: 150, + }, + }, + { + label: '供应商名称', + field: 'supplierName', + isDetail: true, + table: { + width: 180 + }, + }, { label: '供应商批次', field: 'altBatch', diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue index 9b168764f..c36666030 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue @@ -117,18 +117,7 @@ const { tableObject, tableMethods } = useTable({ /** * OktoholdRequestMain 合格转隔离 */ -if ( routeName.value == 'OktoholdRequestMain') { - tableObject.params = { - // fromInventoryStatus: 'OK', - // toInventoryStatus:'HOLD', - businessType :'OkToHold' - } - fromInventoryStatus.value = 'OK' - toInventoryStatus.value = "HOLD" - businessType.value = 'OkToHold' - importFileName.value = '物料转隔离申请' -} -else if ( routeName.value == 'NoktoholdRequestMain') { +if ( routeName.value == 'NoktoholdRequestMain') { tableObject.params = { // fromInventoryStatus: 'NOK', // toInventoryStatus:'HOLD', @@ -377,9 +366,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => newRow['fromLocationCode'] = item['locationCode'] newRow['uom'] = item['uom'] newRow['qty'] = item['qty'] - if(routeName.value == 'OktoholdRequestMain'){ - newRow['toInventoryStatus'] = "HOLD" - }else if(routeName.value == 'NoktoholdRequestMain'){ + if(routeName.value == 'NoktoholdRequestMain'){ newRow['toInventoryStatus'] = "HOLD" }else if ( routeName.value == 'HoldtookRequestMain') { newRow['toInventoryStatus'] = "OK" @@ -431,9 +418,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { setV['fromInventoryStatus'] = val[0]['inventoryStatus'] setV['fromLocationCode'] = val[0]['locationCode'] setV['uom'] = val[0]['uom'] - if(routeName.value == 'OktoholdRequestMain'){ - setV['toInventoryStatus'] = "HOLD" - }else if(routeName.value == 'NoktoholdRequestMain'){ + if(routeName.value == 'NoktoholdRequestMain'){ setV['toInventoryStatus'] = "HOLD" }else if ( routeName.value == 'HoldtookRequestMain') { setV['toInventoryStatus'] = "OK" @@ -458,9 +443,9 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'wms:inventorymove-request-main:create'}), // 新增 - defaultButtons.defaultImportBtn({hasPermi:'wms:inventorymove-request-main:import'}), // 导入 - defaultButtons.defaultExportBtn({hasPermi:'wms:inventorymove-request-main:export'}), // 导出 + defaultButtons.defaultAddBtn({hasPermi:`wms:${routeName.value}:create`}), // 新增 + defaultButtons.defaultImportBtn({hasPermi:`wms:${routeName.value}:import`}), // 导入 + defaultButtons.defaultExportBtn({hasPermi:`wms:${routeName.value}:export`}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -512,14 +497,14 @@ const butttondata = (row,$index) => { return [] } return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:inventorymove-request-main:close'}), // 关闭 - defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:inventorymove-request-main:reAdd'}), //重新添加 - defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:inventorymove-request-main:submit'}), // 提交审批 - defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:inventorymove-request-main:refused'}), // 驳回 - defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:inventorymove-request-main:agree'}), // 审批通过 - defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:inventorymove-request-main:handle'}), // 处理 - defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:inventorymove-request-main:update'}), // 编辑 - // defaultButtons.mainListDeleteBtn({hasPermi:'wms:inventorymove-request-main:delete'}), // 删除 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:`wms:${routeName.value}:close`}), // 关闭 + defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:`wms:${routeName.value}:reAdd`}), //重新添加 + defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:`wms:${routeName.value}:submit`}), // 提交审批 + defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:`wms:${routeName.value}:refused`}), // 驳回 + defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:`wms:${routeName.value}:agree`}), // 审批通过 + defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:`wms:${routeName.value}:handle`}), // 处理 + defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:`wms:${routeName.value}:update`}), // 编辑 + // defaultButtons.mainListDeleteBtn({hasPermi:`wms:${routeName.value}:delete`}), // 删除 ] } @@ -672,10 +657,7 @@ const handleExport = async () => { // 发起导出 loadStart() const excelTitle = ref(route.meta.title) - if(routeName.value == 'OktoholdRequestMain'){ - const data = await InventorymoveRequestMainApi.exportOkToHoldRequestMain(tableObject.params) - download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) - }else if ( routeName.value == 'HoldtookRequestMain') { + if ( routeName.value == 'HoldtookRequestMain') { const data = await InventorymoveRequestMainApi.exportHoldToOkRequestMain(tableObject.params) download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) }else if ( routeName.value == 'HoldtoscrapRequestMain') { @@ -753,7 +735,7 @@ const submitForm = async (formType, submitData) => { data.subList.forEach(item => { console.log(556565,item); if(fromInventoryStatus.value){ - item.fromInventoryStatus = fromInventoryStatus.value + //item.fromInventoryStatus = fromInventoryStatus.value item.toInventoryStatus = toInventoryStatus.value } if(item.qty == 0){ diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts index 96f8366ab..e9a81cc5d 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts @@ -256,15 +256,16 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive([ // } // } // }, - // { - // label: '备注', - // field: 'remark', - // sort: 'custom', - // table: { - // width: 150 - // }, - // isTable: false, - // }, + { + label: '备注', + field: 'remark', + sort: 'custom', + table: { + width: 150 + }, + isTable: true, + sortTableDefault:1000 + }, // { // label: '自动提交', // field: 'autoCommit', diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue index fc2c1d1bc..4d9f82d06 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue @@ -92,7 +92,8 @@ import { formatDate } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' import {importTemplateHoldOk} from "@/api/wms/inventorymoveRequestMain"; const { loadStart, loadDone } = usePageLoading() -// 库存转移申请 +// 隔离转线边申请HoldtoWipRequestMain +// 只有隔离转线边申请在使用的 defineOptions({ name: 'InventorymoveRequestMain' }) const message = useMessage() // 消息弹窗 @@ -305,23 +306,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => newRow['fromLocationCode'] = item['locationCode'] newRow['uom'] = item['uom'] newRow['qty'] = item['qty'] - if(routeName.value == 'OktoholdRequestMain'){ - newRow['toInventoryStatus'] = "HOLD" - }else if(routeName.value == 'NoktoholdRequestMain'){ - newRow['toInventoryStatus'] = "HOLD" - }else if ( routeName.value == 'HoldtookRequestMain') { - newRow['toInventoryStatus'] = "OK" - }else if ( routeName.value == 'HoldtoWipRequestMain') { - newRow['toInventoryStatus'] = "OK" - }else if ( routeName.value == 'HoldtoscrapRequestMain') { - newRow['toInventoryStatus'] = "SCRAP" - }else if ( routeName.value == 'OktoscrapRequestMain') { - newRow['toInventoryStatus'] = "SCRAP" - }else if ( routeName.value == 'ScraptoholdRequestMain') { - newRow['toInventoryStatus'] = "HOLD" - }else{ - newRow['toInventoryStatus'] = item['inventoryStatus'] - } + + newRow['toInventoryStatus'] = "OK" //HoldtoWipRequestMain 隔离转线边 tableData.value.push(newRow) }) } else { @@ -362,23 +348,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { setV['fromInventoryStatus'] = val[0]['inventoryStatus'] setV['fromLocationCode'] = val[0]['locationCode'] setV['uom'] = val[0]['uom'] - if(routeName.value == 'OktoholdRequestMain'){ - setV['toInventoryStatus'] = "HOLD" - }else if(routeName.value == 'NoktoholdRequestMain'){ - setV['toInventoryStatus'] = "HOLD" - }else if ( routeName.value == 'HoldtookRequestMain') { - setV['toInventoryStatus'] = "OK" - }else if ( routeName.value == 'HoldtoWipRequestMain') { - setV['toInventoryStatus'] = "OK" - }else if ( routeName.value == 'HoldtoscrapRequestMain') { - setV['toInventoryStatus'] = "SCRAP" - }else if ( routeName.value == 'OktoscrapRequestMain') { - setV['toInventoryStatus'] = "SCRAP" - }else if ( routeName.value == 'ScraptoholdRequestMain') { - setV['toInventoryStatus'] = "HOLD" - }else{ - setV['toInventoryStatus'] = val[0]['inventoryStatus'] - } + setV['toInventoryStatus'] = "OK" // HoldtoWipRequestMain 隔离转线边 } else { setV[formField] = val[0][searchField] } @@ -391,9 +361,9 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'wms:inventorymove-request-main:create'}), // 新增 - //defaultButtons.defaultImportBtn({hasPermi:'wms:inventorymove-request-main:import'}), // 导入 - defaultButtons.defaultExportBtn({hasPermi:'wms:inventorymove-request-main:export'}), // 导出 + defaultButtons.defaultAddBtn({hasPermi:`wms:${routeName.value}:create`}), // 新增 + //defaultButtons.defaultImportBtn({hasPermi:'wms:${routeName.value}:import'}), // 导入 + defaultButtons.defaultExportBtn({hasPermi:`wms:${routeName.value}:export`}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -445,14 +415,14 @@ const butttondata = (row,$index) => { return [] } return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:inventorymove-request-main:close'}), // 关闭 - defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:inventorymove-request-main:reAdd'}), //重新添加 - defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:inventorymove-request-main:submit'}), // 提交审批 - defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:inventorymove-request-main:refused'}), // 驳回 - defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:inventorymove-request-main:agree'}), // 审批通过 - defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:inventorymove-request-main:handle'}), // 处理 - defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:inventorymove-request-main:update'}), // 编辑 - // defaultButtons.mainListDeleteBtn({hasPermi:'wms:inventorymove-request-main:delete'}), // 删除 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:`wms:${routeName.value}:close`}), // 关闭 + defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:`wms:${routeName.value}:reAdd`}), //重新添加 + defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:`wms:${routeName.value}:submit`}), // 提交审批 + defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:`wms:${routeName.value}:refused`}), // 驳回 + defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:`wms:${routeName.value}:agree`}), // 审批通过 + defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:`wms:${routeName.value}:handle`}), // 处理 + defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:`wms:${routeName.value}:update`}), // 编辑 + // defaultButtons.mainListDeleteBtn({hasPermi:`wms:${routeName.value}:delete`}), // 删除 ] } @@ -657,7 +627,7 @@ const submitForm = async (formType, submitData) => { data.subList.forEach(item => { console.log(556565,item); if(fromInventoryStatus.value){ - item.fromInventoryStatus = fromInventoryStatus.value + //item.fromInventoryStatus = fromInventoryStatus.value item.toInventoryStatus = toInventoryStatus.value } if(item.qty == 0){ @@ -734,16 +704,8 @@ const searchList = (model)=>{ /** 初始化 **/ onMounted(async () => { getList() - //库存移动 - if(routeName.value == "InventorymoveRequestMain"){ - importTemplateData.templateUrl = await InventorymoveRequestMainApi.importTemplate() - } - //隔离转合格 - else if(routeName.value == "HoldtookRequestMain"){ - importTemplateData.templateUrl = await InventorymoveRequestMainApi.importTemplateHoldOk() - } - else { - importTemplateData.templateUrl = await InventorymoveRequestMainApi.importTemplateExceptMove() - } + // HoldtoWipRequestMain 隔离转线边 + importTemplateData.templateUrl = await InventorymoveRequestMainApi.importTemplateExceptMove() + }) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue index f52cd62b5..85e52d3bb 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue @@ -93,6 +93,7 @@ import { formatDate } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' const { loadStart, loadDone } = usePageLoading() // 库存转移申请 +// 只有库存转移申请在使用的 defineOptions({ name: 'InventorymoveRequestMain' }) const message = useMessage() // 消息弹窗 @@ -112,75 +113,9 @@ const importFileName = ref() const { tableObject, tableMethods } = useTable({ getListApi: InventorymoveRequestDetailApi.getInventorymoveRequestDetailPage // 分页接口 }) - -// 判断 路由名称 进行条件过滤 -/** - * OktoholdRequestMain 合格转隔离 - */ -if ( routeName.value == 'OktoholdRequestMain') { - tableObject.params = { - // fromInventoryStatus: 'OK', - // toInventoryStatus:'HOLD', - businessType :'OkToHold' - } - fromInventoryStatus.value = 'OK' - toInventoryStatus.value = "HOLD" - businessType.value = 'OkToHold' - importFileName.value = '物料转隔离申请' -} -else if ( routeName.value == 'NoktoholdRequestMain') { - tableObject.params = { - // fromInventoryStatus: 'NOK', - // toInventoryStatus:'HOLD', - businessType :'NokToHold' - } - fromInventoryStatus.value = 'NOK' - toInventoryStatus.value = "HOLD" - businessType.value = 'NokToHold' - importFileName.value = '不合格转隔离申请' -} -else if ( routeName.value == 'HoldtookRequestMain') { - tableObject.params = { - // fromInventoryStatus: 'HOLD', - // toInventoryStatus:'OK', - businessType :'HoldToOk' - } - fromInventoryStatus.value = 'HOLD' - toInventoryStatus.value = "OK" - businessType.value = 'HoldToOk' - importFileName.value = '隔离转合格申请' -} else if ( routeName.value == 'HoldtoscrapRequestMain') { - tableObject.params = { - // fromInventoryStatus: 'HOLD', - // toInventoryStatus:'SCRAP', - businessType:'HoldToScrap' - } - fromInventoryStatus.value = 'HOLD' - toInventoryStatus.value = "SCRAP" - businessType.value = 'HoldToScrap' - importFileName.value = '隔离转报废申请' -} else if ( routeName.value == 'OktoscrapRequestMain') { - tableObject.params = { - // fromInventoryStatus: 'OK', - // toInventoryStatus:'SCRAP', - businessType :'OkToScrap' - } - fromInventoryStatus.value = 'OK' - toInventoryStatus.value = "SCRAP" - businessType.value = 'OkToScrap' - importFileName.value = '合格转报废申请' -} -else if ( routeName.value == 'ScraptoholdRequestMain') { - tableObject.params = { - // fromInventoryStatus: 'SCRAP', - // toInventoryStatus:'HOLD', - businessType :'ScrapToHold' - } - fromInventoryStatus.value = 'SCRAP' - toInventoryStatus.value = "HOLD" - businessType.value = 'ScrapToHold' - importFileName.value = '报废转隔离申请' -} else { +// 库存移动申请 InventorymoveRequestMain +// 仅有库存移动申请在使用 +if ( routeName.value == 'InventorymoveRequestMain') { tableObject.params = { businessType :'Move' } @@ -389,26 +324,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => newRow['fromLocationCode'] = item['locationCode'] newRow['uom'] = item['uom'] newRow['qty'] = item['qty'] - if(routeName.value == 'OktoholdRequestMain'){ - newRow['toInventoryStatus'] = "HOLD" - }else if(routeName.value == 'NoktoholdRequestMain'){ - newRow['toInventoryStatus'] = "HOLD" - }else if ( routeName.value == 'HoldtookRequestMain') { - newRow['toInventoryStatus'] = "OK" - }else if ( routeName.value == 'HoldtoscrapRequestMain') { - newRow['toInventoryStatus'] = "SCRAP" - }else if ( routeName.value == 'OktoscrapRequestMain') { - newRow['toInventoryStatus'] = "SCRAP" - }else if ( routeName.value == 'ScraptoholdRequestMain') { - newRow['toInventoryStatus'] = "HOLD" - }else{ - newRow['toInventoryStatus'] = item['inventoryStatus'] - } + newRow['toInventoryStatus'] = item['inventoryStatus']//库存移动申请 tableData.value.push(newRow) }) - if(routeName.value == 'OktoholdRequestMain'){ - getDefaultToLocationCode() - } } else { row[formField] = val[0][searchField] } @@ -446,21 +364,8 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { setV['fromInventoryStatus'] = val[0]['inventoryStatus'] setV['fromLocationCode'] = val[0]['locationCode'] setV['uom'] = val[0]['uom'] - if(routeName.value == 'OktoholdRequestMain'){ - setV['toInventoryStatus'] = "HOLD" - }else if(routeName.value == 'NoktoholdRequestMain'){ - setV['toInventoryStatus'] = "HOLD" - }else if ( routeName.value == 'HoldtookRequestMain') { - setV['toInventoryStatus'] = "OK" - }else if ( routeName.value == 'HoldtoscrapRequestMain') { - setV['toInventoryStatus'] = "SCRAP" - }else if ( routeName.value == 'OktoscrapRequestMain') { - setV['toInventoryStatus'] = "SCRAP" - }else if ( routeName.value == 'ScraptoholdRequestMain') { - setV['toInventoryStatus'] = "HOLD" - }else{ - setV['toInventoryStatus'] = val[0]['inventoryStatus'] - } + setV['toInventoryStatus'] = val[0]['inventoryStatus'] //库存移动申请InventorymoveRequestMain + } else { setV[formField] = val[0][searchField] } @@ -473,9 +378,9 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'wms:inventorymove-request-main:create'}), // 新增 - defaultButtons.defaultImportBtn({hasPermi:'wms:inventorymove-request-main:import'}), // 导入 - defaultButtons.defaultExportBtn({hasPermi:'wms:inventorymove-request-main:export'}), // 导出 + defaultButtons.defaultAddBtn({hasPermi:`wms:${routeName.value}:create`}), // 新增 + defaultButtons.defaultImportBtn({hasPermi:`wms:${routeName.value}:import`}), // 导入 + defaultButtons.defaultExportBtn({hasPermi:`wms:${routeName.value}:export`}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -527,14 +432,14 @@ const butttondata = (row,$index) => { return [] } return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:inventorymove-request-main:close'}), // 关闭 - defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:inventorymove-request-main:reAdd'}), //重新添加 - defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:inventorymove-request-main:submit'}), // 提交审批 - defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:inventorymove-request-main:refused'}), // 驳回 - defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:inventorymove-request-main:agree'}), // 审批通过 - defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:inventorymove-request-main:handle'}), // 处理 - defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:inventorymove-request-main:update'}), // 编辑 - // defaultButtons.mainListDeleteBtn({hasPermi:'wms:inventorymove-request-main:delete'}), // 删除 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:`wms:${routeName.value}:close`}), // 关闭 + defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:`wms:${routeName.value}:reAdd`}), //重新添加 + defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:`wms:${routeName.value}:submit`}), // 提交审批 + defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:`wms:${routeName.value}:refused`}), // 驳回 + defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:`wms:${routeName.value}:agree`}), // 审批通过 + defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:`wms:${routeName.value}:handle`}), // 处理 + defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:`wms:${routeName.value}:update`}), // 编辑 + // defaultButtons.mainListDeleteBtn({hasPermi:`wms:${routeName.value}:delete`}), // 删除 ] } @@ -677,27 +582,9 @@ const handleExport = async () => { // 发起导出 loadStart() const excelTitle = ref(route.meta.title) - if(routeName.value == 'OktoholdRequestMain'){ - const data = await InventorymoveRequestMainApi.exportOkToHoldRequestMain(tableObject.params) - download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) - }else if ( routeName.value == 'HoldtookRequestMain') { - const data = await InventorymoveRequestMainApi.exportHoldToOkRequestMain(tableObject.params) - download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) - }else if ( routeName.value == 'HoldtoscrapRequestMain') { - const data = await InventorymoveRequestMainApi.exportHoldToScrapRequestMain(tableObject.params) - download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) - }else if ( routeName.value == 'OktoscrapRequestMain') { - const data = await InventorymoveRequestMainApi.exportOkToScrapRequestMain(tableObject.params) - download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) - } - // else if ( routeName.value == 'ScraptoholdRequestMain') { - // const data = await InventorymoveRequestMainApi.exportScrapToHoldRequestMain(tableObject.params) - // download.excel(data, '报废转隔离申请主.xlsx') - // } - else{ - const data = await InventorymoveRequestMainApi.exportInventorymoveRequestMain(tableObject.params) - download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) - } + // 库存移动申请InventorymoveRequestMain + const data = await InventorymoveRequestMainApi.exportInventorymoveRequestMain(tableObject.params) + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { loadDone() @@ -757,7 +644,7 @@ const submitForm = async (formType, submitData) => { data.subList.forEach(item => { console.log(556565,item); if(fromInventoryStatus.value){ - item.fromInventoryStatus = fromInventoryStatus.value + //item.fromInventoryStatus = fromInventoryStatus.value item.toInventoryStatus = toInventoryStatus.value } if(item.qty == 0){ @@ -833,11 +720,11 @@ const searchList = (model)=>{ /** 初始化 **/ onMounted(async () => { + getList() + // 库存移动申请InventorymoveRequestMain if(routeName.value == "InventorymoveRequestMain"){ importTemplateData.templateUrl = await InventorymoveRequestMainApi.importTemplate() - }else { - importTemplateData.templateUrl = await InventorymoveRequestMainApi.importTemplateExceptMove() } }) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue index 0be2f9677..d7ab786b0 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue @@ -60,6 +60,7 @@ @tableSelectionDelete="tableSelectionDelete" @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" + @clearInput="clearInput" /> @@ -94,7 +95,7 @@ import { formatDate } from '@/utils/formatTime' import dayjs from 'dayjs' import { usePageLoading } from '@/hooks/web/usePageLoading' const { loadStart, loadDone } = usePageLoading() -// 物料隔离申请 +// 物料隔离申请OktoholdRequestMain // 只有物料隔离申请在使用的 defineOptions({ name: 'InventorymoveRequestMain' }) @@ -116,6 +117,7 @@ const { tableObject, tableMethods } = useTable({ getListApi: InventorymoveRequestDetailApi.getInventorymoveRequestDetailPage // 分页接口 }) + if ( routeName.value == 'OktoholdRequestMain') { tableObject.params = { // fromInventoryStatus: 'OK', @@ -127,65 +129,6 @@ if ( routeName.value == 'OktoholdRequestMain') { businessType.value = 'OkToHold' importFileName.value = '物料转隔离申请' } -else if ( routeName.value == 'NoktoholdRequestMain') { - tableObject.params = { - // fromInventoryStatus: 'NOK', - // toInventoryStatus:'HOLD', - businessType :'NokToHold' - } - fromInventoryStatus.value = 'NOK' - toInventoryStatus.value = "HOLD" - businessType.value = 'NokToHold' - importFileName.value = '不合格转隔离申请' -} -else if ( routeName.value == 'HoldtookRequestMain') { - tableObject.params = { - // fromInventoryStatus: 'HOLD', - // toInventoryStatus:'OK', - businessType :'HoldToOk' - } - fromInventoryStatus.value = 'HOLD' - toInventoryStatus.value = "OK" - businessType.value = 'HoldToOk' - importFileName.value = '隔离转合格申请' -} else if ( routeName.value == 'HoldtoscrapRequestMain') { - tableObject.params = { - // fromInventoryStatus: 'HOLD', - // toInventoryStatus:'SCRAP', - businessType:'HoldToScrap' - } - fromInventoryStatus.value = 'HOLD' - toInventoryStatus.value = "SCRAP" - businessType.value = 'HoldToScrap' - importFileName.value = '隔离转报废申请' -} else if ( routeName.value == 'OktoscrapRequestMain') { - tableObject.params = { - // fromInventoryStatus: 'OK', - // toInventoryStatus:'SCRAP', - businessType :'OkToScrap' - } - fromInventoryStatus.value = 'OK' - toInventoryStatus.value = "SCRAP" - businessType.value = 'OkToScrap' - importFileName.value = '合格转报废申请' -} -else if ( routeName.value == 'ScraptoholdRequestMain') { - tableObject.params = { - // fromInventoryStatus: 'SCRAP', - // toInventoryStatus:'HOLD', - businessType :'ScrapToHold' - } - fromInventoryStatus.value = 'SCRAP' - toInventoryStatus.value = "HOLD" - businessType.value = 'ScrapToHold' - importFileName.value = '报废转隔离申请' -} else { - tableObject.params = { - businessType :'Move' - } - businessType.value = 'Move' - importFileName.value = '库存移动申请' -} InventorymoveRequestMain.allSchemas.tableFormColumns.map(item =>{ if(item.field == 'fromWarehouseCode') { @@ -361,6 +304,11 @@ const getDefaultToLocationCode = async ()=>{ formRef.value.formRef.formModel["toLocationCode"] = res.list[0]['code'] } } +const clearInput = (field, row, index) => { + if(field=='supplierCode'){ + row['supplierName'] = '' + } +} // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { nextTick(() => { @@ -379,9 +327,22 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => newRow['uom'] = item['uom'] newRow['qty'] = item['qty'] newRow['toInventoryStatus'] = "HOLD" // 物料隔离申请 + newRow['supplierCode'] = item['supplierCode'] + newRow['supplierName'] = item['supplierName'] + if(!newRow['supplierCode']){ + newRow.disabled_supplierCode = false + newRow.isInpuFocusShow_supplierCode = true + }else{ + newRow.disabled_supplierCode = true + newRow.isInpuFocusShow_supplierCode = false + } tableData.value.push(newRow) }) - } else { + } else if(formField == 'supplierCode'){ + row[formField] = val[0][searchField] + row['supplierName'] = val[0]['supplierName'] + row['supplierCode'] = val[0]['supplierCode'] + } else{ row[formField] = val[0][searchField] } } else { @@ -432,9 +393,9 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'wms:inventorymove-request-main:create'}), // 新增 - defaultButtons.defaultImportBtn({hasPermi:'wms:inventorymove-request-main:import'}), // 导入 - defaultButtons.defaultExportBtn({hasPermi:'wms:inventorymove-request-main:export'}), // 导出 + defaultButtons.defaultAddBtn({hasPermi:`wms:${routeName.value}:create`}), // 新增 + defaultButtons.defaultImportBtn({hasPermi:`wms:${routeName.value}:import`}), // 导入 + defaultButtons.defaultExportBtn({hasPermi:`wms:${routeName.value}:export`}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -486,14 +447,14 @@ const butttondata = (row,$index) => { return [] } return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:inventorymove-request-main:close'}), // 关闭 - defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:inventorymove-request-main:reAdd'}), //重新添加 - defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:inventorymove-request-main:submit'}), // 提交审批 - defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:inventorymove-request-main:refused'}), // 驳回 - defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:inventorymove-request-main:agree'}), // 审批通过 - defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:inventorymove-request-main:handle'}), // 处理 - defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:inventorymove-request-main:update'}), // 编辑 - // defaultButtons.mainListDeleteBtn({hasPermi:'wms:inventorymove-request-main:delete'}), // 删除 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:`wms:${routeName.value}:close`}), // 关闭 + defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:`wms:${routeName.value}:reAdd`}), //重新添加 + defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:`wms:${routeName.value}:submit`}), // 提交审批 + defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:`wms:${routeName.value}:refused`}), // 驳回 + defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:`wms:${routeName.value}:agree`}), // 审批通过 + defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:`wms:${routeName.value}:handle`}), // 处理 + defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:`wms:${routeName.value}:update`}), // 编辑 + // defaultButtons.mainListDeleteBtn({hasPermi:`wms:${routeName.value}:delete`}), // 删除 ] } @@ -720,7 +681,7 @@ const submitForm = async (formType, submitData) => { data.subList.forEach(item => { console.log(556565,item); if(fromInventoryStatus.value){ - item.fromInventoryStatus = fromInventoryStatus.value + //item.fromInventoryStatus = fromInventoryStatus.value item.toInventoryStatus = toInventoryStatus.value } if(item.qty == 0){ @@ -797,6 +758,7 @@ const searchList = (model)=>{ /** 初始化 **/ onMounted(async () => { getList() + console.log(routeName.value) if(routeName.value == "InventorymoveRequestMain"){ importTemplateData.templateUrl = await InventorymoveRequestMainApi.importTemplate() }else { diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts index a9b187270..aad9685fe 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts @@ -25,7 +25,11 @@ const queryParams = { // 获取当前操作人的部门 import { useUserStore } from '@/store/modules/user' - import { TableColumn } from '@/types/table' +import * as SupplierItemApi from "@/api/wms/supplieritem"; +import { + Supplieritem +} from "@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data"; +import {getSupplieritemPage} from "@/api/wms/supplieritem"; const userStore = useUserStore() const userDept = userStore.userSelfInfo.dept // id 转str 否则form回显匹配不到 @@ -554,6 +558,28 @@ export const BalanceShow = useCrudSchemas( }, isSearch: false }, + { + label: '供应商代码', + field: 'supplierCode', + sort: 'custom', + isSearch: false, + table: { + width: 150, + }, + }, + { + label: '供应商名称', + field: 'supplierName', + isForm:true, + form:{ + componentProps:{ + disabled: true + } + }, + table: { + width: 180 + } + }, { label: '库存数量', field: 'qty', @@ -1104,12 +1130,58 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( isTableForm: false, isForm: false, }, + { + label: '供应商代码', + field: 'supplierCode', + sort: 'custom', + isSearch: false, + isDetail: true, + table: { + width: 150, + }, + tableForm: { + // isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择供应商', + searchField: 'code', + searchTitle: '供应商信息', + searchAllSchemas: Supplieritem.allSchemas, + searchPage: SupplierItemApi.getSupplieritemPage, + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + },{ + key: 'itemCode', + value: 'itemCode', + message: '物料代码不能为空!', + isTableRowValue: true, //查询当前searchTable表中行数据的值 + isMainValue:false + }] + } + }, + { + label: '供应商名称', + field: 'supplierName', + isForm:true, + isDetail: true, + form:{ + componentProps:{ + disabled: true + } + }, + table: { + width: 180 + }, + tableForm: { + disabled: true + } + }, { label: '供应商批次', field: 'altBatch', sort: 'custom', isForm:false, - isSearch: true, + isSearch: false, table: { width: 150 }, diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue index b06333e58..758726fc4 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue @@ -383,7 +383,7 @@ const tableFormButton = async (val , row) => { bomModelVisible.value = true DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息' detatableDataBom.params = { - masterId: row.masterId + number: row.number } await getDetailListBom() } diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts index 85e460036..dd1669767 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts @@ -768,7 +768,19 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive key: 'available', value: 'TRUE', isMainValue: false - }], + }, { + key: 'workshopCode', + value: 'workshopCode', + message: '请填写车间代码！', + isMainValue: true + }, + // { + // key: 'productionLineCode', + // value: 'productionLineCode', + // message: '请填写生产线代码！', + // isMainValue: true + // } + ], isRepeat: true,//tableForm下方输入框是否可以重复添加该条数据 verificationParams: [{ key: 'code', @@ -793,7 +805,19 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive key: 'available', value: 'TRUE', isMainValue: false - }], + },{ + key: 'workshopCode', + value: 'workshopCode', + message: '请填写车间代码！', + isMainValue: true + }, + // { + // key: 'productionLineCode', + // value: 'productionLineCode', + // message: '请填写生产线代码！', + // isMainValue: true + // } + ], verificationParams: [{ key: 'code', action: '==', diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue index 9a55e91c3..461e4c9fd 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue @@ -423,7 +423,7 @@ const tableFormButton = async (val , row) => { bomModelVisible.value = true BomDialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息' detatableDataBom.params = { - masterId: row.id + number: row.number } await getDetailListBom() } diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts index 2c1becb57..e632c9a82 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts @@ -777,7 +777,20 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive key: 'available', value: 'TRUE', isMainValue: false - }], + }, + { + key: 'workshopCode', + value: 'workshopCode', + message: '请填写车间代码！', + isMainValue: true + }, + // { + // key: 'productionLineCode', + // value: 'productionLineCode', + // message: '请填写生产线代码！', + // isMainValue: true + // } + ], isRepeat: true,//tableForm下方输入框是否可以重复添加该条数据 verificationParams: [{ key: 'code', @@ -802,7 +815,19 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive key: 'available', value: 'TRUE', isMainValue: false - }], + }, { + key: 'workshopCode', + value: 'workshopCode', + message: '请填写车间代码！', + isMainValue: true + }, + // { + // key: 'productionLineCode', + // value: 'productionLineCode', + // message: '请填写生产线代码！', + // isMainValue: true + // } + ], verificationParams: [{ key: 'code', action: '==', diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue index a738a7da0..6d4ce9739 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue @@ -120,7 +120,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultExportBtn({hasPermi:'wms:productreceipt-job-main:export'}), // 导出 + defaultButtons.defaultExportBtn({hasPermi:'wms:productreceiptscrap-job-main:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue index 23af043e0..f472d7177 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue @@ -139,7 +139,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultExportBtn({hasPermi:'wms:productreceipt-record-main:export'}), // 导出 + defaultButtons.defaultExportBtn({hasPermi:'wms:productreceiptscrap-record-main:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue index dce606da1..28777d6e8 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue @@ -105,6 +105,7 @@ @handleDeleteTable="handleDeleteTable" @searchTableSuccess="searchTableSuccess" @submitForm="submitFormLabel" + @clearInput="clearInputLabel" /> @@ -151,6 +152,7 @@ import * as PackageApi from '@/api/wms/package' import { formatTime } from '@/utils/index' import { getAccessToken } from '@/utils/auth' import * as BomApi from "@/api/wms/bom"; + import { SupplierdeliverRequestPackage } from '../../../purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts' @@ -165,6 +167,7 @@ const { loadStart, loadDone } = usePageLoading() // 隔离收货申请 defineOptions({ name: 'ProductreceiptRequestMain' }) + const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 @@ -288,9 +291,9 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'wms:productreceipt-request-main:create'}), // 新增 - defaultButtons.defaultImportBtn({hasPermi:'wms:productreceipt-request-main:import'}), // 导入 - defaultButtons.defaultExportBtn({hasPermi:'wms:productreceipt-request-main:export'}), // 导出 + defaultButtons.defaultAddBtn({hasPermi:'wms:productreceiptscrap-request-main:create'}), // 新增 + defaultButtons.defaultImportBtn({hasPermi:'wms:productreceiptscrap-request-main:import'}), // 导入 + defaultButtons.defaultExportBtn({hasPermi:'wms:productreceiptscrap-request-main:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -342,13 +345,13 @@ const butttondata = (row,$index) => { return [] } return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']), hasPermi:'wms:productreceipt-request-main:close'}), // 关闭 - defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:productreceipt-request-main:reAdd'}), // 重新添加 - defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productreceipt-request-main:submit'}), // 提交审批 - defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productreceipt-request-main:refused'}), // 驳回 - defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productreceipt-request-main:agree'}), // 审批通过 - defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']), hasPermi:'wms:productreceipt-request-main:handle'}), // 处理 - defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productreceipt-request-main:update'}), // 编辑 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']), hasPermi:'wms:productreceiptscrap-request-main:close'}), // 关闭 + defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:productreceiptscrap-request-main:reAdd'}), // 重新添加 + defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productreceiptscrap-request-main:submit'}), // 提交审批 + defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productreceiptscrap-request-main:refused'}), // 驳回 + defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:productreceiptscrap-request-main:agree'}), // 审批通过 + defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']), hasPermi:'wms:productreceiptscrap-request-main:handle'}), // 处理 + defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productreceiptscrap-request-main:update'}), // 编辑 { label: '创建标签', name: 'cjbq', @@ -360,7 +363,7 @@ const butttondata = (row,$index) => { link: true, // 文本展现按钮 }, defaultButtons.mainListPointBtn({hide:isShowMainButton(row,['3','6','8'])}), // 标签打印 - // defaultButtons.mainListDeleteBtn({hasPermi:'wms:productreceipt-request-main:delete'}), // 删除 + // defaultButtons.mainListDeleteBtn({hasPermi:'wms:productreceiptscrap-request-main:delete'}), // 删除 ] } @@ -695,6 +698,12 @@ const searchFormClick = (searchData) => { getList() // 刷新当前列表 } +const clearInputLabel = (field, row, index) => { + if(field=='secondPackUnit'){ + row['secondPackQty'] = '' + } +} + // 创建标签 const submitFormLabel = async (formType, submitData) => { let data = {...submitData} @@ -703,12 +712,13 @@ const submitFormLabel = async (formType, submitData) => { } let messageList = [] detatableData.tableList.forEach(item=>{ - if(item['packUnit'] == item['secondPackUnit']){ + if(item['secondPackUnit']&&item['packUnit'] == item['secondPackUnit']){ messageList.push(item['itemCode']) } }) if(messageList.length>0){ message.error(`物料${messageList.join(',')}包装规格1和包装规格2不能相同`) + return } try { detatableData.tableList.forEach(async (item) => { diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts index 6ae43110c..fd3e49d1e 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts @@ -777,7 +777,20 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive key: 'available', value: 'TRUE', isMainValue: false - }], + }, + { + key: 'workshopCode', + value: 'workshopCode', + message: '请填写车间代码！', + isMainValue: true + }, + // { + // key: 'productionLineCode', + // value: 'productionLineCode', + // message: '请填写生产线代码！', + // isMainValue: true + // } + ], verificationParams: [{ key: 'code', action: '==', @@ -801,7 +814,19 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive key: 'available', value: 'TRUE', isMainValue: false - }], + },{ + key: 'workshopCode', + value: 'workshopCode', + message: '请填写车间代码！', + isMainValue: true + }, + // { + // key: 'productionLineCode', + // value: 'productionLineCode', + // message: '请填写生产线代码！', + // isMainValue: true + // } + ], verificationParams: [{ key: 'code', action: '==', @@ -1981,8 +2006,27 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive( width: 180 }, tableForm: { - disabled: true - }, + enterSearch:true, + disabled: true, + isInpuFocusShow: true, + searchListPlaceholder: '请选择包装', + searchField: 'packUnit', + searchTitle: '物品包装信息', + searchAllSchemas: Itempackaging.allSchemas, + searchPage: ItemPackageApi.getItempackagingPageByProductreceipt, + searchCondition: [ + { + key: 'itemCode', + value: 'itemCode', + message: '请选择订单行', + isMainValue: true + }, + { + key: 'available', + value: 'TRUE', + isMainValue: false + }] + } }, { label: '包装数量1', @@ -2074,9 +2118,6 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive( //表单校验 export const ProductreceiptRequestLabelRules = reactive({ - secondPackUnit: [ - { required: true, message: '请选择包装规格2', trigger: 'change' } - ], supplierItemCode: [ { required: true, message: '请选择供应商', trigger: 'change' } ], diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue index eeb5c77e8..d79ad0225 100644 --- a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue +++ b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue @@ -59,6 +59,7 @@ @tableSelectionDelete="tableSelectionDelete" @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" + @clearSearchInput="clearSearchInput" /> @@ -125,7 +126,21 @@ const route = useRoute() // 路由信息 const routeName = ref() routeName.value = route.name const tableColumns = ref([...ProductredressRequestMain.allSchemas.tableColumns,...ProductredressRequestDetail.allSchemas.tableMainColumns]) - +const clearSearchInput = (field)=>{ + console.log('field',field) + if('workshopCode' == field){ + //车间代码 + formRef.value.formRef.setValues({ + productionLineCode: '', + workStationCode:'', + }) + }else if('productionLineCode' == field){ + //生产线代码 + formRef.value.formRef.setValues({ + workStationCode:'', + }) + } +} // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { nextTick(() => { @@ -154,6 +169,14 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => } else { const setV = {} setV[formField] = val[0][searchField] + if('workshopCode'==formField){ + //车间代码 + setV['productionLineCode'] = '' + setV['workStationCode'] = '' + }else if('productionLineCode'==formField){ + //生产线 + setV['workStationCode'] = '' + } formRef.setValues(setV) } }) @@ -424,6 +447,9 @@ const submitForm = async (formType, submitData) => { data.id = data.masterId } data.subList = tableData.value // 拼接子表数据参数 + data.subList.forEach(item=>{ + item['workStationCode'] = data['workStationCode'] + }) if(data.subList.find(item => (item.qty <= 0))) { message.warning('数量必须大于0') formRef.value.formLoading = false diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts index a49fe6d9c..87b4036e2 100644 --- a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts +++ b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts @@ -27,8 +27,8 @@ export const ProductredressRequestMainRules = reactive({ workshopCode: [ { required: true, message: '请选择车间代码', trigger: 'change' } ], - productionLineCode: [ - { required: true, message: '请选择生产线代码', trigger: 'change' } + workStationCode: [ + { required: true, message: '请选择工位代码', trigger: 'change' } ], }) @@ -169,6 +169,84 @@ export const ProductredressRequestMain = useCrudSchemas(reactive([ } } }, + { + label: '工位代码', + field: 'workStationCode', + sort: 'custom', + table: { + width: 150 + }, + isTable: true, + tableForm: { + isInpuFocusShow: true, + searchListPlaceholder: '请选择工位代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '工位信息', // 查询弹窗标题 + searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类 + searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法 + searchCondition: [ + { + key: 'productionLineCode', + value: 'productionLineCode', + message: '请填写生产线代码！', + isMainValue: true + }, + { + key: 'available', + value: 'TRUE', + isMainValue: false + } + ], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + enterSearch: true, + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择工位代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '工位信息', // 查询弹窗标题 + searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类 + searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法 + searchCondition: [ + { + key: 'workshopCode', + value: 'workshopCode', + message: '请填写车间代码！', + isMainValue: true + }, + { + key: 'productionLineCode', + value: 'productionLineCode', + message: '请填写生产线代码！', + isMainValue: true, + isOptional:true, // isMainValue=true情况，添加参数可选可空的判断 + }, + { + key: 'available', + value: 'TRUE', + isMainValue: false + } + ], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 + } + } + }, // { // label: '车间代码', // field: 'workshopCode', @@ -417,14 +495,20 @@ export const ProductredressRequestMain = useCrudSchemas(reactive([ width: 180, fixed: 'right' } - } + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + table: { + width: 150 + } + }, ])) // 表单校验 export const ProductredressRequestDetailRules = reactive({ - workStationCode: [ - { required: true, message: '请选择工位代码', trigger: 'change' } - ], + }) export const ProductredressRequestDetail = useCrudSchemas(reactive([ @@ -503,6 +587,8 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive isFormModel:true, // filters中添加筛选的数据--取于formModel required:true, // 前置添加必有，和isFormModel结合使用 message: '请选择生产线代码！', // 前置添加没填的提示语 + isOptional:true, // isMainValue=true情况，添加参数可选可空的判断 + } ] @@ -573,77 +659,77 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive } } }, - { - label: '工位代码', - field: 'workStationCode', - sort: 'custom', - table: { - width: 150 - }, - isTable: true, - tableForm: { - isInpuFocusShow: true, - searchListPlaceholder: '请选择工位代码', // 输入框占位文本 - searchField: 'code', // 查询弹窗赋值字段 - searchTitle: '工位信息', // 查询弹窗标题 - searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类 - searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法 - searchCondition: [ - { - key: 'productionLineCode', - value: 'productionLineCode', - message: '请填写生产线代码！', - isMainValue: true - }, - { - key: 'available', - value: 'TRUE', - isMainValue: false - } - ], - verificationParams: [{ - key: 'code', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true, - }], // 失去焦点校验参数 - }, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - enterSearch: true, - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择工位代码', // 输入框占位文本 - searchField: 'code', // 查询弹窗赋值字段 - searchTitle: '工位信息', // 查询弹窗标题 - searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类 - searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法 - searchCondition: [ - { - key: 'productionLineCode', - value: 'productionLineCode', - message: '请填写生产线代码！', - isMainValue: true - }, - { - key: 'available', - value: 'TRUE', - isMainValue: false - } - ], - verificationParams: [{ - key: 'code', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true, - }], // 失去焦点校验参数 - } - } - }, + // { + // label: '工位代码', + // field: 'workStationCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTable: true, + // tableForm: { + // isInpuFocusShow: true, + // searchListPlaceholder: '请选择工位代码', // 输入框占位文本 + // searchField: 'code', // 查询弹窗赋值字段 + // searchTitle: '工位信息', // 查询弹窗标题 + // searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类 + // searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法 + // searchCondition: [ + // { + // key: 'productionLineCode', + // value: 'productionLineCode', + // message: '请填写生产线代码！', + // isMainValue: true + // }, + // { + // key: 'available', + // value: 'TRUE', + // isMainValue: false + // } + // ], + // verificationParams: [{ + // key: 'code', + // action: '==', + // value: '', + // isMainValue: false, + // isSearch: true, + // isFormModel: true, + // }], // 失去焦点校验参数 + // }, + // form: { + // // labelMessage: '信息提示说明！！！', + // componentProps: { + // enterSearch: true, + // isSearchList: true, // 开启查询弹窗 + // searchListPlaceholder: '请选择工位代码', // 输入框占位文本 + // searchField: 'code', // 查询弹窗赋值字段 + // searchTitle: '工位信息', // 查询弹窗标题 + // searchAllSchemas: Workstation.allSchemas, // 查询弹窗所需类 + // searchPage: WorkstationApi.getWorkstationPage, // 查询弹窗所需分页方法 + // searchCondition: [ + // { + // key: 'productionLineCode', + // value: 'productionLineCode', + // message: '请填写生产线代码！', + // isMainValue: true + // }, + // { + // key: 'available', + // value: 'TRUE', + // isMainValue: false + // } + // ], + // verificationParams: [{ + // key: 'code', + // action: '==', + // value: '', + // isMainValue: false, + // isSearch: true, + // isFormModel: true, + // }], // 失去焦点校验参数 + // } + // } + // }, { label: '包装号', field: 'packingNumber', diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue index d4413d88f..aee3e1a01 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue @@ -62,6 +62,7 @@ @inputNumberChange="inputNumberChange" @submitForm="submitForm" @buttonOperationClick="buttonOperationClick" + @clearSearchInput="clearSearchInput" /> @@ -92,7 +93,7 @@ @success="getList" :tableAllSchemas="ProdcutscrapBomScrap.allSchemas" :tableFormRules="ProdcutscrapBomScrapRules" - :tableData="detatableDataBom.tableList" + :tableData="bomTableList" :isBusiness="true" :isShowButton="false" :isShowReduceButton="false" @@ -105,8 +106,19 @@ :footButttondata="footButttondata" @footButtonClick="buttonBaseClickBom" @formSelectChange="formSelectChange" - - /> + > + + { detailBomRef.value.dialogVisible = false } } +const bomTableList = ref([]) +const bomSearchData = ref('') +const bomSearchClick = ()=>{ + if(!bomSearchData.value){ + bomTableList.value = detatableDataBom.tableList + }else{ + let itemCodes = bomSearchData.value.split(',') + console.log('itemCodes',itemCodes) + bomTableList.value = detatableDataBom.tableList.filter(item=>itemCodes.indexOf(item['itemCode'])>-1) + } +} + const banchBomPage = async (fromLocationCode,item) => { const params = { location_code:fromLocationCode, @@ -248,7 +272,18 @@ const banchBomPage = async (fromLocationCode,item) => { return obj } - +const clearSearchInput = (formField) => { + if(formField=='workshopCode'){ + //车间 + formRef.value.formRef.setValues({ + productionLineCode:'',//生产线代码 + }) + tableData.value = [] + }else if(formField=='productionLineCode'){ + //生产线代码 + tableData.value = [] + } +} // 新增 tableform 按钮 const buttonOperationClick = async (row, label, index,isSave = false)=> { console.log('buttonOperationClick',row, label, index) @@ -272,6 +307,7 @@ const buttonOperationClick = async (row, label, index,isSave = false)=> { detatableDataBom.params.fromLocationCode = row.fromLocationCode await getDetailListBom() + bomTableList.value = detatableDataBom.tableList console.log(row.fromLocationCode); detatableDataBom.tableList.forEach(async (item) => { console.log(333,item) @@ -317,6 +353,8 @@ const buttonOperationClick = async (row, label, index,isSave = false)=> { item.tableForm.disabled = false } }) + bomSearchData.value = '' + bomTableList.value = detatableDataBom.tableList detailBomRef.value.open('create', row, null,'viewDetail')//查看明细数据 } } @@ -330,6 +368,7 @@ const handleDeleteTableBom = (item, index) => { if (itemIndex > -1) { detatableDataBom.tableList.splice(itemIndex, 1) } + bomSearchClick() } const tableSelectionDeleteBom = (selection) => { @@ -340,6 +379,8 @@ const tableSelectionDeleteBom = (selection) => { detatableDataBom.tableList = detatableDataBom.tableList.filter(item => !selection.includes(item)) + bomSearchClick() + } @@ -369,6 +410,7 @@ const tableFormButton = async (val , row) => { detailQty.value = row.qty detatableDataBom.params.isRecord = true await getDetailListBom() + bomTableList.value = detatableDataBom.tableList //详情 isShowFooterButtton.value = false isShowReduceButtonSelection.value = false diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue index 4d2541053..e5f926a9b 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue @@ -188,6 +188,7 @@ const butttondata = (row,$index) => { return [ defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请 defaultButtons.mainPutawayRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createPutawayRequest',hide:row.putawayRequestFlag == "FALSE" }),// 生成采购上架申请 + defaultButtons.mainPurchasereturnRecordBtn({hasPermi:'wms:purchasereceipt-record-main:createPurchasereturnRecord',hide:row.purchasereturnRecordFlag == "FALSE" }),// 生成采购退后记录申请 //defaultButtons.mainListPlanCheckQualityReportBtn({hide:row.orderTypeM == "2"}), // 查看质检报告 defaultButtons.mainListPlanCheckQualityReportBtn({hide:isShowSourceTypeButton(row)}), // 查看质检报告 defaultButtons.mainListPrintInspectionBtn({hide:routeName.value.includes('SCP')}) @@ -200,6 +201,8 @@ const buttonTableClick = async (val, row) => { handleCreatePutawayRequest(row.number) }else if(val == 'inspectRequest'){//生成到货检验申请 handleCreateInspectRequest(row.number) + }else if(val == 'purchasereturnRecord'){//生成采购退后记录申请 + handleCreatePurchasereturnRecord(row.number) }else if(val == 'mainPlanCheckQualityReport'){ // 查看质检报告 checkQualityReport(row) @@ -262,6 +265,18 @@ const handleCreateInspectRequest = async (number:string) => { } } +/** 生成采购退货记录按钮操作 */ +const handleCreatePurchasereturnRecord = async (number:string) => { + try{ + await message.confirm(t('ts.确认生成采购退货记录吗？')) + tableObject.loading = true + await PurchasereceiptRecordMainApi.createPurchasereturnRecord(number) + message.success(t('ts.采购退货记录生成成功')) + buttonBaseClick('refresh',null) + }catch{}finally{ + tableObject.loading = false + } +} // 子包装数据 const detailParenPackingRef = ref() diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/index.vue index 9e4eb4be9..0f06827f3 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMOrderTypeMain/index.vue @@ -143,7 +143,7 @@ const butttondata = (row,$index) => { const buttonTableClick = async (val, row) => { if (val == 'documentPrint') { // 单据打印 - handleDocumentPrint(row.requestNumber,row.itemCode) + handleDocumentPrint(row.number,row.itemCode) } } @@ -151,7 +151,7 @@ const buttonTableClick = async (val, row) => { const BASE_URL = getJmreportBaseUrl() const documentSrc = ref(BASE_URL + '/jmreport/view/920874172025987072?token=' + getAccessToken()) const handleDocumentPrint = async (requestNumber,itemCode) => { - window.open(documentSrc.value + '&requestNumber=' + requestNumber +'&itemCode=' + itemCode) + window.open(documentSrc.value + '&requestNumber=' + requestNumber +'&itemCode=' + itemCode + '&reqType=record') } // 获取部门 用于详情 部门回显 const { wsCache } = useCache() diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue index 4a4db0820..8dfa91796 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue @@ -143,7 +143,7 @@ const butttondata = (row,$index) => { const buttonTableClick = async (val, row) => { if (val == 'documentPrint') { // 单据打印 - handleDocumentPrint(row.requestNumber,row.itemCode) + handleDocumentPrint(row.number,row.itemCode) } } @@ -151,7 +151,7 @@ const buttonTableClick = async (val, row) => { const BASE_URL = getJmreportBaseUrl() const documentSrc = ref(BASE_URL + '/jmreport/view/920874172025987072?token=' + getAccessToken()) const handleDocumentPrint = async (requestNumber,itemCode) => { - window.open(documentSrc.value + '&requestNumber=' + requestNumber +'&itemCode=' + itemCode) + window.open(documentSrc.value + '&requestNumber=' + requestNumber +'&itemCode=' + itemCode + '&reqType=record') } // 获取部门 用于详情 部门回显 const { wsCache } = useCache() diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue index fe72a010c..7bf47d7e8 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue @@ -637,7 +637,7 @@ const buttonTableClick = async (val, row) => { const BASE_URL2 = getJmreportBaseUrl() const documentSrc = ref(BASE_URL2 + '/jmreport/view/920874172025987072?token=' + getAccessToken()) const handleDocumentPrint = async (number,itemCode) => { - window.open(documentSrc.value + '&requestNumber=' + number +'&itemCode=' + itemCode) + window.open(documentSrc.value + '&requestNumber=' + number +'&itemCode=' + itemCode+'&reqType=request') } /** 添加/修改操作 */ diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index 58b7ad142..02e56721a 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -623,7 +623,7 @@ const buttonTableClick = async (val, row) => { const BASE_URL2 = getJmreportBaseUrl() const documentSrc = ref(BASE_URL2 + '/jmreport/view/920874172025987072?token=' + getAccessToken()) const handleDocumentPrint = async (number,itemCode) => { - window.open(documentSrc.value + '&requestNumber=' + number +'&itemCode=' + itemCode) + window.open(documentSrc.value + '&requestNumber=' + number +'&itemCode=' + itemCode + '&reqType=request') } /** 添加/修改操作 */ diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue index 81e824a23..cf11e26b5 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue @@ -539,7 +539,7 @@ const buttonTableClick = async (val, row) => { const BASE_URL2 = getJmreportBaseUrl() const documentSrc = ref(BASE_URL2 + '/jmreport/view/920874172025987072?token=' + getAccessToken()) const handleDocumentPrint = async (number,itemCode) => { - window.open(documentSrc.value + '&requestNumber=' + number +'&itemCode=' + itemCode) + window.open(documentSrc.value + '&requestNumber=' + number +'&itemCode=' + itemCode + '&reqType=request') } /** 添加/修改操作 */ diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue index 49634b251..e35619051 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue @@ -286,7 +286,9 @@ const buttonTableClick = async (val, row) => { nextTick(()=>{ basicFormRef.value.formRef.setValues({ reversepostingdate:dayjs().valueOf(), - tcCInvoiceRemark:`回转${row['supplierName']}发票 ${row['goldenTaxInvoiceNumber']}` + // tcCInvoiceRemark:`回转${row['supplierName']}发票 ${row['goldenTaxInvoiceNumber']}` + tcCInvoiceRemark:`冲销凭证${row['voucherNumber']}` + }) }) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index bdd554d54..dbd13c731 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -1819,6 +1819,7 @@ export const SupplierinvoiceRecordMainTransfer = useCrudSchemas(reactive