From 849ac8b15deb31ff27183c6e55cee02723b059be Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 25 Sep 2024 09:36:06 +0800 Subject: [PATCH 01/65] =?UTF-8?q?HL-6139=E5=88=B6=E5=93=81=E5=AD=90?= =?UTF-8?q?=E4=BB=B6=E6=8A=A5=E5=BA=9F=E7=94=B3=E8=AF=B7=E4=B8=AD=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E7=89=A9=E6=96=99=E5=90=8E=E5=86=8Dbom=E9=87=8C?= =?UTF-8?q?=E9=9D=A2=E5=8A=A0=E4=B8=80=E4=B8=AA=E6=90=9C=E7=B4=A2=E7=89=A9?= =?UTF-8?q?=E6=96=99=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/BasicForm/src/BasicForm.vue | 1 + .../productscrapRequestMain/index.vue | 33 +++++++++++++++++-- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 7daea779c..7421c79e0 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"/> +
+ > + + { 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, @@ -272,6 +296,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) @@ -330,6 +355,7 @@ const handleDeleteTableBom = (item, index) => { if (itemIndex > -1) { detatableDataBom.tableList.splice(itemIndex, 1) } + bomSearchClick() } const tableSelectionDeleteBom = (selection) => { @@ -369,6 +395,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 From 4a1238294e513fcfea458591d00db7c8b24346bc Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 25 Sep 2024 09:59:20 +0800 Subject: [PATCH 02/65] =?UTF-8?q?HL-6139=E5=A4=9A=E9=80=89=E5=88=A0?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productscrap/productscrapRequestMain/index.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue index 47dee5ebc..ce7bbc981 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue @@ -366,6 +366,8 @@ const tableSelectionDeleteBom = (selection) => { detatableDataBom.tableList = detatableDataBom.tableList.filter(item => !selection.includes(item)) + bomSearchClick() + } From 85d507ee8c1f13577960ef780759c3b3fa54903c Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 25 Sep 2024 10:18:07 +0800 Subject: [PATCH 03/65] HL-6139 --- .../productscrap/productscrapRequestMain/index.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue index ce7bbc981..cdff06e96 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue @@ -342,6 +342,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')//查看明细数据 } } From 27b484fb1b33b025329fe707624737f437df7810 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 25 Sep 2024 10:39:14 +0800 Subject: [PATCH 04/65] =?UTF-8?q?=E5=88=B6=E5=93=81=E5=AD=90=E4=BB=B6?= =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E7=94=B3=E8=AF=B7-=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productscrapRequestMain/index.vue | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue index cdff06e96..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" /> @@ -108,9 +109,8 @@ > + @@ -42,7 +43,7 @@ @@ -93,6 +95,10 @@ 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 defaultButtons from '@/utils/disposition/defaultButtons' import * as AreabasicApi from '@/api/wms/areabasic' import { formatDate } from '@/utils/formatTime' @@ -175,10 +181,29 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) = 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'] + let res = await CustomerdockApi.getCustomerdockPage({ + by:"ASC", + pageNo:1, + pageSize:20, + available: "TRUE", + customerCode: val[0]['customerCode'] + }) + 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['toWarehouseCode'] = ''//到仓库 + setV['toLocationCode'] = ''//到库位 + setV['deliverType'] = ''//发货类型 } + tableData.value = [] + + } else if(formField == 'customerDockCode') { //客户月台 setV['toWarehouseCode'] = val[0]['warehouseCode']//到仓库 @@ -187,13 +212,39 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) = if(res){ setV['deliverType'] = res['type'] } - } else { + } else if(formField == 'customerCode'){ + //客户代码 + 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: '', + deliverType: '', + }) + tableData.value = [] + }else if('customerDockCode'==field){ + basicFormRef.value.formRef.setValues({ + toWarehouseCode: '', + toLocationCode: '', + deliverType: '', + }) + } +} // 查询页面返回——详情 const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { nextTick(() => { @@ -383,7 +434,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 +465,7 @@ const openForm =async (type: string, row?: number) => { }) } tableData.value = [] // 重置明细数据 - formRef.value.open(type, row) + basicFormRef.value.open(type, row) } /** @@ -546,13 +597,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 +612,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 +620,7 @@ const submitForm = async (formType, submitData) => { buttonBaseClick('refresh',null) } } finally { - formRef.value.formLoading = false + basicFormRef.value.formLoading = false } } From cba013ebe736f6c3db313ec015a5789dd217fcc4 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 25 Sep 2024 14:28:17 +0800 Subject: [PATCH 18/65] =?UTF-8?q?=E6=B8=85=E7=A9=BA=E5=8C=85=E8=A3=85?= =?UTF-8?q?=E8=A7=84=E6=A0=BC2=EF=BC=8C=E6=95=B0=E9=87=8F=E4=B9=9F?= =?UTF-8?q?=E6=B8=85=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptscrapRequestMain/index.vue | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue index fd3704b0f..1d66f01c4 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" /> @@ -696,6 +697,12 @@ const searchFormClick = (searchData) => { getList() // 刷新当前列表 } +const clearInputLabel = (field, row, index) => { + if(field=='secondPackUnit'){ + row['secondPackQty'] = '' + } +} + // 创建标签 const submitFormLabel = async (formType, submitData) => { let data = {...submitData} From e51a2039acd0bc99abf1b82e8a01ba71a7b7ecc4 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 25 Sep 2024 14:34:52 +0800 Subject: [PATCH 19/65] =?UTF-8?q?HL-5978WMS=E5=8F=91=E8=B4=A7=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E6=96=B0=E5=A2=9E=E9=80=89=E6=8B=A9=E5=8F=91=E8=B4=A7?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=8D=95=E5=8F=B7=E5=90=8E=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=B8=A6=E5=87=BA=E6=9C=88=E5=8F=B0=E5=92=8C?= =?UTF-8?q?=E6=98=8E=E7=BB=86=EF=BC=8C=E7=9B=AE=E5=89=8D=E6=B2=A1=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=B8=A6=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliver/deliverRequestMain/index.vue | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue index fbeb1a6d7..edddd4ade 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue @@ -98,6 +98,7 @@ 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' @@ -202,7 +203,21 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) = setV['deliverType'] = ''//发货类型 } 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') { //客户月台 From aeb98ba5aca90ee0c7e9c4e00107296f10fe46b3 Mon Sep 17 00:00:00 2001 From: tengxiaofei <302828528@qq.com> Date: Wed, 25 Sep 2024 14:41:44 +0800 Subject: [PATCH 20/65] =?UTF-8?q?HL-6115=20=E7=A7=91=E7=9B=AE=E8=B4=A6?= =?UTF-8?q?=E6=88=B7=E9=85=8D=E7=BD=AE=E4=B8=AD=E6=88=90=E6=9C=AC=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=E9=BB=98=E8=AE=A4=E5=80=BC=E5=AD=97=E6=AE=B5=EF=BC=8C?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=9B=B4=E6=94=B9=E4=B8=BA=E6=88=90=E6=9C=AC?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E9=99=90=E5=88=B6=E4=BD=BF=E7=94=A8=E8=8C=83?= =?UTF-8?q?=E5=9B=B4=EF=BC=8C=E5=B9=B6=E4=B8=94=E5=85=81=E8=AE=B8=E5=A4=9A?= =?UTF-8?q?=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/qadCostcentre/index.ts | 7 ++++++- .../subject/subjectAccount/subjectAccount.data.ts | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) 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/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts b/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts index 3334e1888..42903d25b 100644 --- a/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts +++ b/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts @@ -275,6 +275,7 @@ export const SubjectAccount = useCrudSchemas( isMainValue: false } ], + verificationPage: QadCostcentreApi.getCostCenterByCodes, // 失去焦点校验输入框的数据内容存在 verificationParams: [ { key: 'costcentreCode', From 2b25510e1a6f9ef7b107dba46ba7f91ed9a83572 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 25 Sep 2024 14:54:53 +0800 Subject: [PATCH 21/65] =?UTF-8?q?HL-6082=E7=94=B1=E4=BA=8E=E7=BA=BF?= =?UTF-8?q?=E4=B8=8A=E9=97=AE=E9=A2=98=EF=BC=8C=E5=AF=BC=E8=87=B4=E8=BF=99?= =?UTF-8?q?=E4=B8=AA=E9=9C=80=E8=A6=81=E5=B0=81=E8=A3=85=E5=85=AC=E7=94=A8?= =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=8C=E9=87=8D=E6=96=B0=E5=81=9A=E4=BA=86?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/BasicForm/src/BasicForm.vue | 5 ++++ .../issueRequestMain/issueRequestMain.data.ts | 27 ++++++++++--------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 7421c79e0..017820e1b 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -527,6 +527,11 @@ const opensearchTable = ( ) return } + if(searchCondition[i].isRemoveParams){ + //有校验，但是不传参 + _searchCondition[searchCondition[i].key] = '' + } + } } else if (searchCondition[i].isTableRowValue) { if (searchCondition[i].required) { diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts index 5616fc28a..a0c375024 100644 --- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts +++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts @@ -852,18 +852,21 @@ export const IssueRequestDetail = useCrudSchemas( value: 'TRUE', isMainValue: false }, - // { - // key:'workshopCode', - // value:'workshopCode', - // message: '请填写车间代码！', - // isMainValue: true - // }, - // { - // key:'productionLineCode', - // value:'productionLineCode', - // message: '请填写生产线代码！', - // isMainValue: true - // }, + { + key:'workshopCode', + value:'workshopCode', + message: '请填写车间代码！', + isMainValue: true, + isRemoveParams: true // 不传参 + }, + { + key:'productionLineCode', + value:'productionLineCode', + message: '请填写生产线代码！', + isMainValue: true, + isRemoveParams: true // 不传参 + + }, { key: 'businessTypeCode', value: 'Issue', From c622109b0c109c13cdc2691e385800496b7b0424 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 25 Sep 2024 14:56:23 +0800 Subject: [PATCH 22/65] =?UTF-8?q?=E4=BB=85=E7=94=A8=E4=BA=8E=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E6=A0=A1=E9=AA=8C=EF=BC=8C=E4=B8=8D=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 9 ++++++++- .../issue/issueRequestMain/issueRequestMain.data.ts | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) 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/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts index a0c375024..1442d37b7 100644 --- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts +++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts @@ -857,14 +857,14 @@ export const IssueRequestDetail = useCrudSchemas( value:'workshopCode', message: '请填写车间代码！', isMainValue: true, - isRemoveParams: true // 不传参 + isRemoveParams: true // 仅用于前端校验，不传参 }, { key:'productionLineCode', value:'productionLineCode', message: '请填写生产线代码！', isMainValue: true, - isRemoveParams: true // 不传参 + isRemoveParams: true // 仅用于前端校验，不传参 }, { From 968094c8258d9fb7f33d4718546f8db0505cf0d8 Mon Sep 17 00:00:00 2001 From: bjang03 <259278618@qq.com> Date: Wed, 25 Sep 2024 16:07:48 +0800 Subject: [PATCH 23/65] =?UTF-8?q?=E7=9B=98=E7=82=B9=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=BF=94=E5=9B=9E=E6=89=BF=E6=8E=A5=E4=BA=BA?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=EF=BC=8C=E7=9B=98=E7=82=B9=E4=BA=BA=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E4=BA=BA=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/countManage/count/countJobMain/countJobMain.data.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts index d6590816b..0256bd71e 100644 --- a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts +++ b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts @@ -459,7 +459,7 @@ export const CountJobMain = useCrudSchemas(reactive([ }, { label: '承接人', - field: 'acceptUserId', + field: 'acceptUserName', sort: 'custom', table: { width: 150 @@ -489,7 +489,7 @@ export const CountJobMain = useCrudSchemas(reactive([ }, { label: '完成人', - field: 'completeUserId', + field: 'completeUserName', sort: 'custom', table: { width: 150 From 3c2f2fed1f0759b2a981016f46f94047905339ce Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 25 Sep 2024 17:03:33 +0800 Subject: [PATCH 24/65] =?UTF-8?q?HL-5978WMS=E5=8F=91=E8=B4=A7=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E6=96=B0=E5=A2=9E=E9=80=89=E6=8B=A9=E5=8F=91=E8=B4=A7?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=8D=95=E5=8F=B7=E5=90=8E=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=B8=A6=E5=87=BA=E6=9C=88=E5=8F=B0=E5=92=8C?= =?UTF-8?q?=E6=98=8E=E7=BB=86=EF=BC=8C=E7=9B=AE=E5=89=8D=E6=B2=A1=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=B8=A6=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliverRequestMain.data.ts | 6 +++ .../deliver/deliverRequestMain/index.vue | 54 +++++++++---------- 2 files changed, 33 insertions(+), 27 deletions(-) diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index 714ec07e9..5908ed991 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -234,6 +234,12 @@ export const DeliverRequestMain = useCrudSchemas( value: 'TRUE', isMainValue: false }, + { + key: 'customerCode', + value: 'customerCode', + message: '请填写客户代码！', + isMainValue: true + }, { key: 'status', value: '6', diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue index edddd4ade..b3db56944 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue @@ -181,27 +181,6 @@ 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'] - let res = await CustomerdockApi.getCustomerdockPage({ - by:"ASC", - pageNo:1, - pageSize:20, - available: "TRUE", - customerCode: val[0]['customerCode'] - }) - 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['toWarehouseCode'] = ''//到仓库 - setV['toLocationCode'] = ''//到库位 - setV['deliverType'] = ''//发货类型 - } tableData.value = [] //物料代码-子表 let subRes = await DeliverPlanDetailApi.getDeliverPlanDetailPage({ @@ -229,10 +208,28 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) = } } else if(formField == 'customerCode'){ //客户代码 - setV['customerDockCode'] = '' - setV['toWarehouseCode'] = '' - setV['toLocationCode'] = '' - setV['deliverType'] = '' + + 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] @@ -243,21 +240,24 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) = } const clearSearchInput = (field)=>{ console.log('field',field) - if('customerCode'==field){ + if('customerCode' == field){ //客户代码 basicFormRef.value.formRef.setValues({ customerDockCode: '', toWarehouseCode: '', toLocationCode: '', + deliverPlanNumber: '', deliverType: '', }) tableData.value = [] - }else if('customerDockCode'==field){ + }else if('customerDockCode' == field){ basicFormRef.value.formRef.setValues({ toWarehouseCode: '', toLocationCode: '', deliverType: '', }) + }else if('deliverPlanNumber' == field){ + tableData.value = [] } } // 查询页面返回——详情 From 90831d4c6ab7038141f1756e21b1acafcfb01f7c Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 25 Sep 2024 17:07:06 +0800 Subject: [PATCH 25/65] =?UTF-8?q?HL-6152WMS=20=E7=94=9F=E4=BA=A7=E9=80=80?= =?UTF-8?q?=E6=96=99=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=95=B0=E9=87=8F=E5=AD=97=E6=AE=B5=EF=BC=8C?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=8E=A5=E5=8F=A3=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionreturnRecordMain.data.ts | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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 Date: Wed, 25 Sep 2024 17:12:49 +0800 Subject: [PATCH 26/65] =?UTF-8?q?WMS=20bug=20=EF=BC=9AHL-6120=20=E6=88=90?= =?UTF-8?q?=E6=9C=AC=E5=8F=91=E8=B4=A7=E7=9B=AE=E5=89=8D=E4=B8=8D=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E6=89=AB=E6=8F=8F=E7=AE=B1=E7=AD=BE=E5=8F=91=E8=B4=A7?= =?UTF-8?q?=20=20=E8=AE=B0=E5=BD=95=E5=A2=9E=E5=8A=A0=E7=88=B6=E5=8C=85?= =?UTF-8?q?=E8=A3=85=E5=8F=B7=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliver/deliverRecordMain/deliverRecordMain.data.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts index c1d6e643e..ee9443402 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts @@ -552,6 +552,14 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '父包装号', + field: 'parentPackingNumber', + sort: 'custom', + table: { + width: 150 + }, + }, { label: '包装规格', field: 'packUnit', From a763ba151c2595bda29304b381affee67c16cc59 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Thu, 26 Sep 2024 08:49:28 +0800 Subject: [PATCH 27/65] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E7=94=B3=E8=AF=B7-=E6=B8=85=E7=A9=BA=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=85=B3=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreturnRequestMain/index.vue | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue index 21670b425..17f14e1e6 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue @@ -59,6 +59,7 @@ @submitForm="submitForm" @onEnter="onEnter" @inputNumberChange="inputNumberChange" + @clearSearchInput="clearSearchInput" /> @@ -725,7 +726,23 @@ const handleDeleteTable = (item, index) => { const tableSelectionDelete = (selection) => { tableData.value = tableData.value.filter(item => !selection.includes(item)) } - +const clearSearchInput = (field)=>{ + console.log('field',field) + if('customerCode' == field){ + //客户代码 + formRef.value.formRef.setValues({ + deliverRecordNumber: '', + customerDockCode:'', + }) + tableData.value = [] + }else if('deliverRecordNumber' == field){ + //发货记录单号 + formRef.value.formRef.setValues({ + customerDockCode:'', + }) + tableData.value = [] + } +} //为true表示子表数据中存在数量为0的数据 const inputNumberChange = (field, val,row, index) => { if(field=='qty'){ From 14a6e3490a43f43b5342b2bedb12b4dedbd35e3d Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Thu, 26 Sep 2024 09:22:01 +0800 Subject: [PATCH 28/65] =?UTF-8?q?HL-6135=E5=92=8C=E5=96=9C=E5=A9=B7?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=EF=BC=8C=E5=8E=BB=E6=8E=89=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E6=9C=88=E5=8F=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreturnRequestMain.data.ts | 88 +++++++++---------- .../customerreturnRequestMain/index.vue | 24 ++--- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts index f74036ea5..26c490e43 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts @@ -256,50 +256,50 @@ export const CustomerreturnRequestMain = useCrudSchemas( } } }, - { - label: '客户月台代码', - field: 'customerDockCode', - sort: 'custom', - table: { - width: 150 - }, - isTable: false, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - enterSearch: true, - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择客户月台代码', // 输入框占位文本 - searchField: 'code', // 查询弹窗赋值字段 - searchTitle: '客户月台信息', // 查询弹窗标题 - searchAllSchemas: Customerdock.allSchemas, // 查询弹窗所需类 - searchPage: CustomerdockApi.pageCustomerCodeToCustomerDockReceiving, // 查询弹窗所需分页方法 - searchCondition: [ - { - key: 'available', - value: 'TRUE', - isMainValue: false - }, - { - key: 'customerCode', - value: 'customerCode', - message: '请填写客户代码！', - isMainValue: true - } - ], - verificationParams: [ - { - key: 'code', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true - } - ] // 失去焦点校验参数 - } - } - }, + // { + // label: '客户月台代码', + // field: 'customerDockCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTable: false, + // form: { + // // labelMessage: '信息提示说明！！！', + // componentProps: { + // enterSearch: true, + // isSearchList: true, // 开启查询弹窗 + // searchListPlaceholder: '请选择客户月台代码', // 输入框占位文本 + // searchField: 'code', // 查询弹窗赋值字段 + // searchTitle: '客户月台信息', // 查询弹窗标题 + // searchAllSchemas: Customerdock.allSchemas, // 查询弹窗所需类 + // searchPage: CustomerdockApi.pageCustomerCodeToCustomerDockReceiving, // 查询弹窗所需分页方法 + // searchCondition: [ + // { + // key: 'available', + // value: 'TRUE', + // isMainValue: false + // }, + // { + // key: 'customerCode', + // value: 'customerCode', + // message: '请填写客户代码！', + // isMainValue: true + // } + // ], + // verificationParams: [ + // { + // key: 'code', + // action: '==', + // value: '', + // isMainValue: false, + // isSearch: true, + // isFormModel: true + // } + // ] // 失去焦点校验参数 + // } + // } + // }, { label: '承运商', field: 'carrierCode', diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue index 17f14e1e6..cff712b57 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue @@ -211,7 +211,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => setV['deliverRecordNumber'] = val[0]['number'] setV['deliverPlanNumber'] = val[0]['deliverPlanNumber'] // setV['customerCode'] = val[0]['customerCode'] - setV['customerDockCode'] = val[0]['customerDockCode'] + // setV['customerDockCode'] = val[0]['customerDockCode'] // 获取子表数据 DeliverRecordDetailApi.getDeliverRecordDetailPageCustomerreturn({pageSize:999,masterId:val[0]['masterId']}).then(res => { @@ -570,10 +570,10 @@ const openForm =async (type: string, row?: number) => { item.componentProps.isSearchList = false, item.componentProps.disabled = true } - if(item.field == 'customerDockCode'){ - item.componentProps.isSearchList = false, - item.componentProps.disabled = true - } + // if(item.field == 'customerDockCode'){ + // item.componentProps.isSearchList = false, + // item.componentProps.disabled = true + // } }) }else { CustomerreturnRequestMain.allSchemas.formSchema.forEach((item) => { @@ -583,9 +583,9 @@ const openForm =async (type: string, row?: number) => { if(item.field == 'customerCode'){ item.componentProps.isSearchList = true } - if(item.field == 'customerDockCode'){ - item.componentProps.isSearchList = true - } + // if(item.field == 'customerDockCode'){ + // item.componentProps.isSearchList = true + // } }) CustomerreturnRequestDetail.allSchemas.formSchema.forEach((itemDetail) => { if(itemDetail.field == 'packingNumber'){ @@ -732,14 +732,14 @@ const clearSearchInput = (field)=>{ //客户代码 formRef.value.formRef.setValues({ deliverRecordNumber: '', - customerDockCode:'', + // customerDockCode:'', }) tableData.value = [] }else if('deliverRecordNumber' == field){ //发货记录单号 - formRef.value.formRef.setValues({ - customerDockCode:'', - }) + // formRef.value.formRef.setValues({ + // customerDockCode:'', + // }) tableData.value = [] } } From 0a8d1a8aeb99a62442ec2c4226fd1af097a9e566 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Thu, 26 Sep 2024 10:31:03 +0800 Subject: [PATCH 29/65] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=B1=BB=E5=9E=8B=E5=8C=BA=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturnRecordMOrderTypeMain/index.vue | 4 ++-- .../purchasereturn/purchasereturnRecordMain/index.vue | 4 ++-- .../purchasereturnRequestMOrderTypeMain/index.vue | 2 +- .../purchasereturn/purchasereturnRequestMain/index.vue | 2 +- .../purchasereturn/purchasereturnRequestMainNew/index.vue | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) 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') } /** 添加/修改操作 */ From 19a43066641213108f0de7b229a134fb84cdcc7b Mon Sep 17 00:00:00 2001 From: tengxiaofei <302828528@qq.com> Date: Thu, 26 Sep 2024 11:05:32 +0800 Subject: [PATCH 30/65] =?UTF-8?q?HL-6133=20=20=E6=A3=80=E9=AA=8C=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E8=8F=9C=E5=8D=95=E8=B0=83=E6=95=B4=EF=BC=8C=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E5=88=97=E5=8F=AA=E5=B1=95=E7=A4=BA=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E8=B4=A8=E6=A3=80=E6=8A=A5=E5=91=8A=E5=92=8C=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E5=B1=A5=E5=8E=86=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionRecord/index.vue | 94 +++++++++++++----------- 1 file changed, 51 insertions(+), 43 deletions(-) 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' From 439dbe1e439945567ef4957689ef3cb7672b468e Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Thu, 26 Sep 2024 11:36:58 +0800 Subject: [PATCH 31/65] =?UTF-8?q?WMS=20bug=20=EF=BC=9AHL-6059=20=E7=89=A9?= =?UTF-8?q?=E6=96=99=E9=9A=94=E7=A6=BB=E7=94=B3=E8=AF=B7=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E6=97=B6=E6=B2=A1=E6=9C=89=E4=BE=9B=E5=BA=94=E5=95=86=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=88=96=E8=80=85=E5=90=8D=E7=A7=B0=20=20PDA=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E4=BB=BB=E5=8A=A1=E5=B8=A6=E5=87=BA=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/productionscrapRecordMain/index.ts | 7 ++++++- .../productionscrapRecordMain/index.vue | 20 +++++++++++++++++-- .../productionscrapRecordMain.data.ts | 10 ++++++++++ 3 files changed, 34 insertions(+), 3 deletions(-) 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/views/wms/issueManage/productionscrap/productionscrapRecordMain/index.vue b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/index.vue index 292b807ff..ad0813ccb 100644 --- a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/index.vue +++ b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/index.vue @@ -135,17 +135,33 @@ const buttonBaseClick = (val, item) => { } } +const isShowRevokeButton = (row,val) => { + if (val.indexOf(row.revokeFlag) > -1) { + return false + } else { + return true + } +} + // 列表-操作按钮 const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 if(findIndex>-1&&findIndex<$index){ - return [] + return [ + defaultButtons.backoutBtn({hide:isShowRevokeButton(row,['FALSE'])}) // 撤销 + ] } - return [] + return [ + defaultButtons.backoutBtn({hide:isShowRevokeButton(row,['FALSE'])}) // 撤销 + ] } // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { + if (val == 'backout') { // 撤销 + await 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..0c3355821 100644 --- a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts +++ b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts @@ -521,6 +521,16 @@ export const ProductionscrapRecordMain = useCrudSchemas( activeValue: 'TRUE' } } + }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + table: { + width: 120, + fixed: 'right' + }, } ]) ) From e436e14518cad31c748033ca655b63028b6014bf Mon Sep 17 00:00:00 2001 From: tengxiaofei <302828528@qq.com> Date: Thu, 26 Sep 2024 14:18:39 +0800 Subject: [PATCH 32/65] =?UTF-8?q?HL-6115=20=20=E5=8E=BB=E6=8E=89=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E7=9A=84=E9=80=97=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/business/inputBlur.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 } From 8f651f515e2ae7e9a787ffdd4ced5abcee9e25e7 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Thu, 26 Sep 2024 14:41:57 +0800 Subject: [PATCH 33/65] =?UTF-8?q?HL-6140WMS=E5=90=84=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=92=E6=9F=A5=E5=B9=B6=E8=A7=A3=E9=99=A4?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptscrapJobMain/index.vue | 2 +- .../productreceiptscrapRecordMain/index.vue | 2 +- .../productreceiptscrapRequestMain/index.vue | 23 ++++++++++--------- 3 files changed, 14 insertions(+), 13 deletions(-) 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 1d66f01c4..28777d6e8 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue @@ -152,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' @@ -290,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), // 设置 @@ -344,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', @@ -362,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'}), // 删除 ] } From aabaf27ac214c2079e4ff33782950b8873c1e028 Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Thu, 26 Sep 2024 17:44:56 +0800 Subject: [PATCH 34/65] =?UTF-8?q?WMS=20bug=20=EF=BC=9AHL-6101=20=20?= =?UTF-8?q?=E7=BA=BF=E8=BE=B9=E6=8A=A5=E5=BA=9F=E8=AE=B0=E5=BD=95=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=92=A4=E9=94=80=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionscrapRecordMain.data.ts | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts index 0c3355821..57a2e6531 100644 --- a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts +++ b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts @@ -607,6 +607,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', From 66b35b78673375cf8a8c3f3174bf2b8508fc87c0 Mon Sep 17 00:00:00 2001 From: lidm0086 Date: Thu, 26 Sep 2024 19:50:38 +0800 Subject: [PATCH 35/65] =?UTF-8?q?HL-6005=20=E5=AE=A2=E6=88=B7=E9=80=80?= =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7=EF=BC=8C=E9=80=80=E8=B4=A7=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E4=B8=8E=E9=80=80=E6=88=90=E5=8A=9F=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E4=B8=80=E8=87=B4=E6=97=B6=EF=BC=8C=E5=8F=91=E8=B4=A7?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=8D=95=E5=8F=B7=E4=B8=8D=E8=83=BD=E5=9C=A8?= =?UTF-8?q?=E9=80=89=E6=8B=A9=EF=BC=8C=E5=BA=94=E5=88=A0=E9=99=A4=E6=8E=89?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E8=83=BD=E5=9C=A8=E9=80=80=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreturnRequestMain.data.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts index 26c490e43..7f785a818 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts @@ -152,13 +152,20 @@ export const CustomerreturnRequestMain = useCrudSchemas( isConcatDetailSchemas: true, // 是否主子表合并 searchAllSchemas: DeliverRecordMain.allSchemas, // 查询弹窗所需类 searchDetailSchemas: DeliverRecordDetail.allSchemas, // 查询弹窗所需类 - searchPage: DeliverRecordDetailApi.getDeliverRecordDetailPageCustomerreturn, // 查询弹窗所需分页方法 + // searchPage: DeliverRecordDetailApi.getDeliverRecordDetailPageCustomerreturn, // 查询弹窗所需分页方法 + searchPage: DeliverRecordDetailApi.getDeliverRecordDetailPage, // 查询弹窗所需分页方法 searchCondition: [ { key: 'available', value: 'TRUE', isMainValue: false }, + { + key: 'isReturnedQty', // 查询列表中字段 + value: 'FALSE', // 指查询具体值 + action: '==', // 查询拼接条件 + isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用 + }, { key: 'createTime', // 查询列表中字段 value: dateTime - 30 * 24 * 60 * 60 * 1000 + ',' + dateTime, // 指查询具体值 From c1e060bce382f87b4deae3dec7b1c9ee7b696264 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 27 Sep 2024 08:49:10 +0800 Subject: [PATCH 36/65] =?UTF-8?q?=E8=BE=BE=E6=98=8EisReturnedQty=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreturnRequestMain/customerreturnRequestMain.data.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts index 7f785a818..e3f331227 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts @@ -164,6 +164,7 @@ export const CustomerreturnRequestMain = useCrudSchemas( key: 'isReturnedQty', // 查询列表中字段 value: 'FALSE', // 指查询具体值 action: '==', // 查询拼接条件 + isSearch: true, // 使用自定义拼接条件 isMainValue: false // 拼接条件必须要 false 同时不能与 isMainValue: true 同用 }, { From fe1d5a720597a58d068c31e378198150bcec7b47 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 27 Sep 2024 08:59:14 +0800 Subject: [PATCH 37/65] =?UTF-8?q?HL-6146=E5=88=B6=E5=93=81=E5=9B=9E?= =?UTF-8?q?=E6=94=B6=E7=94=B3=E8=AF=B7=E6=96=B0=E5=A2=9E=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E6=8A=8A=E5=B7=A5=E4=BD=8D=E4=BB=A3=E7=A0=81=E6=94=BE=E5=88=B0?= =?UTF-8?q?=E4=B8=BB=E6=95=B0=E6=8D=AE=E4=B8=AD=EF=BC=8C=E5=B9=B6=E4=B8=94?= =?UTF-8?q?=E6=8A=8A=E7=94=9F=E4=BA=A7=E7=BA=BF=E4=BB=A3=E7=A0=81=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E4=B8=BA=E9=9D=9E=E5=BF=85=E5=A1=AB=E9=A1=B9=EF=BC=8C?= =?UTF-8?q?=E5=90=8C=E6=97=B6=E5=9C=A8=E4=B8=BB=E6=95=B0=E6=8D=AE=E4=B8=AD?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=BB=E6=95=B0=E6=8D=AE=E5=A4=87=E6=B3=A8?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E3=80=82=E7=AD=9B=E9=80=89=E5=B7=A5=E4=BD=8D?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=97=B6=EF=BC=8C=E5=A6=82=E6=9E=9C=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E4=BA=86=E7=94=9F=E4=BA=A7=E7=BA=BF=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E5=88=99=E6=A0=B9=E6=8D=AE=E7=94=9F=E4=BA=A7=E7=BA=BF?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=AD=9B=E9=80=89=E5=B7=A5=E4=BD=8D=EF=BC=9B?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=B2=A1=E9=80=89=E7=94=9F=E4=BA=A7=E7=BA=BF?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=EF=BC=8C=E5=88=99=E6=A0=B9=E6=8D=AE=E8=BD=A6?= =?UTF-8?q?=E9=97=B4=E7=AD=9B=E9=80=89=E5=B7=A5=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productredressRequestMain.data.ts | 240 ++++++++++++------ 1 file changed, 163 insertions(+), 77 deletions(-) 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', From 594e6d892c451948a42c4a595178c16e7b850127 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 27 Sep 2024 09:00:47 +0800 Subject: [PATCH 38/65] =?UTF-8?q?HL-6140WMS=E5=90=84=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=92=E6=9F=A5=E5=B9=B6=E8=A7=A3=E9=99=A4?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E5=85=B3=E7=B3=BB----=E9=9A=94=E7=A6=BB?= =?UTF-8?q?=E5=90=88=E6=A0=BC=E4=B8=80=E5=A5=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/BasicForm/src/BasicForm.vue | 10 +- .../inventorymoveJobMain/index.vue | 11 +- .../inventorymoveRecordMain/index.vue | 4 +- .../inventorymoveRecordMainNew/index.vue | 14 +- .../inventorymoveRecordMainOKHOLD/index.vue | 14 +- .../inventorymoveRequestMain/index.vue | 48 ++---- .../inventorymoveRequestMainHOLDWIP/index.vue | 76 +++------ .../inventorymoveRequestMainMOVE/index.vue | 158 +++--------------- .../inventorymoveRequestMainOKHOLD/index.vue | 84 ++-------- 9 files changed, 95 insertions(+), 324 deletions(-) diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 017820e1b..3d0c9f2e5 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -555,10 +555,12 @@ const opensearchTable = ( formRef.value.formModel[searchCondition[i].value] == '' || formRef.value.formModel[searchCondition[i].value] == undefined ) { - message.warning( - searchCondition[i].message ? searchCondition[i].message : '前置条件未选择！' - ) - return + if(!searchCondition[i].isOptional){ // 添加参数可选可空的判断 + message.warning( + searchCondition[i].message ? searchCondition[i].message : '前置条件未选择！' + ) + return + } } } if(formRef.value.formModel[searchCondition[i].value]){ diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue index f242cd0cf..c28670512 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:inventorymove-${routeName.value}-job-main:export`}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 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/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue index 9b168764f..544171c9a 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') { diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue index fc2c1d1bc..dab484058 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`}), // 删除 ] } @@ -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..1b8afde8d 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() @@ -834,10 +721,9 @@ 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 a3cfa121a..ec29d03b2 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue @@ -95,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' }) @@ -117,6 +117,7 @@ const { tableObject, tableMethods } = useTable({ getListApi: InventorymoveRequestDetailApi.getInventorymoveRequestDetailPage // 分页接口 }) + if ( routeName.value == 'OktoholdRequestMain') { tableObject.params = { // fromInventoryStatus: 'OK', @@ -128,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') { @@ -451,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), // 设置 @@ -505,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`}), // 删除 ] } From 9c761204693439af7744f3dc03918181550f7e4a Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 27 Sep 2024 09:01:26 +0800 Subject: [PATCH 39/65] HL-6146 --- .../productredressRequestMain/index.vue | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue index eeb5c77e8..c445b8233 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,23 @@ 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:'', + }) + tableData.value = [] + }else if('productionLineCode' == field){ + //生产线代码 + formRef.value.formRef.setValues({ + workStationCode:'', + }) + tableData.value = [] + } +} // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { nextTick(() => { @@ -424,6 +441,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 From 81d557368de1cdf45202bea67ddff3532de60fc2 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 27 Sep 2024 10:31:16 +0800 Subject: [PATCH 40/65] =?UTF-8?q?HL-6140WMS=E5=90=84=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=92=E6=9F=A5=E5=B9=B6=E8=A7=A3=E9=99=A4?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliver/deliverJobMain/index.vue | 2 +- .../deliver/deliverRecordMain/index.vue | 2 +- .../deliverplan/deliverPlanMain/index.vue | 22 +++++----- .../containerMainRequest/index.vue | 22 +++++----- .../containerRecordMain/index.vue | 8 ++-- .../initialContainerMainRequest/index.vue | 23 +++++----- .../scrapContainerMainRequest/index.vue | 24 ++++++----- .../inventorychangeRecordMain/index.vue | 42 ------------------- 8 files changed, 53 insertions(+), 92 deletions(-) diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue index 42ceaed89..25d4c3990 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue @@ -161,7 +161,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultExportBtn({hasPermi:'wms:deliver-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/deliversettlementManage/deliver/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue index 9621df6bb..e687b739a 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue @@ -120,7 +120,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultExportBtn({hasPermi:'wms:deliver-record-main:export'}), // 导出 + defaultButtons.defaultExportBtn({hasPermi:`wms:${routeName.value}:export`}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 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/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 From 0c9ab952a871b03da814db8ecab9ee978aff0b81 Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Fri, 27 Sep 2024 10:42:55 +0800 Subject: [PATCH 41/65] =?UTF-8?q?WMS=20bug=20=EF=BC=9AHL-5912=20=20?= =?UTF-8?q?=E7=89=A9=E6=96=99=E9=9A=94=E7=A6=BB=EF=BC=8C=E5=BE=85=E6=A3=80?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=88=B0=E9=9A=94=E7=A6=BB=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=88=9B=E5=BB=BA=E4=B8=8D=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../moveManage/inventorymove/inventorymoveRequestMain/index.vue | 2 +- .../inventorymove/inventorymoveRequestMainHOLDWIP/index.vue | 2 +- .../inventorymove/inventorymoveRequestMainMOVE/index.vue | 2 +- .../inventorymove/inventorymoveRequestMainOKHOLD/index.vue | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue index 9b168764f..a7c5ccbde 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue @@ -753,7 +753,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/inventorymoveRequestMainHOLDWIP/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue index fc2c1d1bc..957a0bd01 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/index.vue @@ -657,7 +657,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/inventorymoveRequestMainMOVE/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue index f52cd62b5..52c164806 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue @@ -757,7 +757,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/inventorymoveRequestMainOKHOLD/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue index a3cfa121a..feceec4e5 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue @@ -739,7 +739,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){ From 9438c8b77ec2ea86210ac27154e4e687a41894f3 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 27 Sep 2024 10:57:19 +0800 Subject: [PATCH 42/65] =?UTF-8?q?HL-6005=E6=8F=90=E7=A4=BA=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E8=AE=B0=E5=BD=95=E5=8D=95=E5=8F=B7=E5=8D=A0=E7=94=A8?= =?UTF-8?q?=EF=BC=8C=E7=8E=B0=E9=80=89=E6=8B=A9=E5=AE=8C=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E6=98=BE=E7=A4=BA0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreturnRequestMain/index.vue | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue index cff712b57..e25e2f6f2 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue @@ -234,6 +234,15 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => tableData.value = [...res.list] originTableData.value = [...res.list] } + let messageItemCode = [] + tableData.value.forEach(item=>{ + if(item['subReturnedQty']<=0){ + messageItemCode.push(item['itemCode']) + } + }) + if(messageItemCode.length>0){ + message.error(`发货记录单号${val[0]['number']}物料${messageItemCode.join(',')}被占用`) + } }).catch(err => { console.log(err) message.error('错误') @@ -745,11 +754,16 @@ const clearSearchInput = (field)=>{ } //为true表示子表数据中存在数量为0的数据 const inputNumberChange = (field, val,row, index) => { + console.log('inputNumberChange',formRef.value.formRef) if(field=='qty'){ + if(row['subReturnedQty']<=0){ + message.error(`发货记录单号${formRef.value.formRef.formModel['deliverRecordNumber']}物料${row['itemCode']}被占用`) + } if(row['subReturnedQty']!=null&&row['qty']>row['subReturnedQty']){ message.error(`物料${row['itemCode']}最大数量为${row['subReturnedQty']}`) } } + console.log('inputNumberChange',field, val,row, index) } // 主子数据 提交 @@ -760,6 +774,10 @@ const submitForm = async (formType, submitData) => { } let flag = true tableData.value.forEach(item=>{ + if(item['subReturnedQty']<=0){ + flag = false + message.error(`发货记录单号${data['deliverRecordNumber']}物料${item['itemCode']}被占用`) + } if(item['subReturnedQty']!=null&&item['qty']>item['subReturnedQty']){ flag = false message.error(`物料${item['itemCode']}最大数量为${item['subReturnedQty']}`) From 3988ba82ec032b30fcdf0bfc9010637ac5ead3c9 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 27 Sep 2024 10:58:07 +0800 Subject: [PATCH 43/65] =?UTF-8?q?HL-6140WMS=E5=90=84=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=92=E6=9F=A5=E5=B9=B6=E8=A7=A3=E9=99=A4?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliver/deliverRequestMain/index.vue | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue index b3db56944..e338c9e1f 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue @@ -305,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), // 设置 @@ -360,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`}), // 删除 ] } From ea448563c66c4ba711a092ade306e826d04db3f3 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 27 Sep 2024 11:51:04 +0800 Subject: [PATCH 44/65] =?UTF-8?q?=E5=92=8C=E8=BE=BE=E6=98=8E=E5=95=86?= =?UTF-8?q?=E9=87=8F=E5=8E=BB=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreturn/customerreturnRequestMain/index.vue | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue index e25e2f6f2..fe1b05e35 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue @@ -234,15 +234,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => tableData.value = [...res.list] originTableData.value = [...res.list] } - let messageItemCode = [] - tableData.value.forEach(item=>{ - if(item['subReturnedQty']<=0){ - messageItemCode.push(item['itemCode']) - } - }) - if(messageItemCode.length>0){ - message.error(`发货记录单号${val[0]['number']}物料${messageItemCode.join(',')}被占用`) - } + }).catch(err => { console.log(err) message.error('错误') From 328b972534563f8c04236907924c0e425554cd61 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 27 Sep 2024 13:13:49 +0800 Subject: [PATCH 45/65] =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=9C=AA=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E4=BB=BB=E5=8A=A1=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repleinshRequestMain.data.ts | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts index 2a01e2205..2d8b4948c 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts +++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts @@ -899,19 +899,19 @@ export const RepleinshRequestDetail = 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', From 952c2c728cd6c5e63d3c30bf78e260d821962fc9 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 27 Sep 2024 14:20:36 +0800 Subject: [PATCH 46/65] =?UTF-8?q?HL-6005=E6=8F=90=E7=A4=BA=E6=97=B6?= =?UTF-8?q?=E5=80=99=E5=BA=94=E5=8A=A0=E4=B8=AA=E6=89=B9=E6=AC=A1=EF=BC=8C?= =?UTF-8?q?=E7=8E=B0=E5=90=8C=E4=B8=80=E7=89=A9=E6=96=99=E4=B8=8D=E5=90=8C?= =?UTF-8?q?=E6=89=B9=E6=AC=A1=EF=BC=8C=E4=B8=8D=E7=9F=A5=E9=81=93=E5=93=AA?= =?UTF-8?q?=E4=B8=AA=E8=A2=AB=E5=8D=A0=E7=94=A8=20@=E7=8E=8B=E5=AE=87?= =?UTF-8?q?=E9=A3=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreturn/customerreturnRequestMain/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue index fe1b05e35..13502edaa 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue @@ -749,7 +749,7 @@ const inputNumberChange = (field, val,row, index) => { console.log('inputNumberChange',formRef.value.formRef) if(field=='qty'){ if(row['subReturnedQty']<=0){ - message.error(`发货记录单号${formRef.value.formRef.formModel['deliverRecordNumber']}物料${row['itemCode']}被占用`) + message.error(`发货记录单号${formRef.value.formRef.formModel['deliverRecordNumber']}物料${row['itemCode']}批次${row['batch']}被占用`) } if(row['subReturnedQty']!=null&&row['qty']>row['subReturnedQty']){ message.error(`物料${row['itemCode']}最大数量为${row['subReturnedQty']}`) @@ -768,7 +768,7 @@ const submitForm = async (formType, submitData) => { tableData.value.forEach(item=>{ if(item['subReturnedQty']<=0){ flag = false - message.error(`发货记录单号${data['deliverRecordNumber']}物料${item['itemCode']}被占用`) + message.error(`发货记录单号${data['deliverRecordNumber']}物料${item['itemCode']}批次${item['batch']}被占用`) } if(item['subReturnedQty']!=null&&item['qty']>item['subReturnedQty']){ flag = false From 0c8b4f38d1983b93e98157428d5af64322fb01b0 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 27 Sep 2024 14:36:15 +0800 Subject: [PATCH 47/65] =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreturn/customerreturnRequestMain/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue index 13502edaa..a59d3eecd 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue @@ -782,11 +782,11 @@ const submitForm = async (formType, submitData) => { data.subList.forEach(obj => { if(obj.qty == 0){ message.error(`数量不能为0!`) - flag.value = true + flag = true return; } }) - if(flag.value){ + if(flag){ return } formRef.value.formLoading = true From f51ca44f71ba4496909c614cf2fdf8e1fbb7e5c0 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 27 Sep 2024 14:43:44 +0800 Subject: [PATCH 48/65] =?UTF-8?q?=E8=A3=85=E9=85=8D=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=EF=BC=8C=E9=A2=84=E7=94=9F=E4=BA=A7=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E8=AE=B0=E5=BD=95-=E6=98=8E=E7=BB=86bom=E6=8C=89?= =?UTF-8?q?=E9=92=AE=EF=BC=8C=E5=8F=82=E6=95=B0masterId=E6=94=B9=E4=B8=BAn?= =?UTF-8?q?umber?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceipt/productreceiptRecordMain/index.vue | 2 +- .../productreceiptAssembleRecordMain/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/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() } From 26df37b7540b2ed39683f3bf99c75a2c5b0f96ec Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 27 Sep 2024 15:04:18 +0800 Subject: [PATCH 49/65] =?UTF-8?q?HL-6005=E4=BF=9D=E5=AD=98=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E4=B8=8D=E5=A5=BD=E4=BD=BF=E4=BA=86=EF=BC=8C=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E6=97=A0=E5=8F=8D=E5=BA=94=EF=BC=8C=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E4=B8=8D=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreturnRequestMain/index.vue | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue index a59d3eecd..dfeeb45b7 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue @@ -775,20 +775,11 @@ const submitForm = async (formType, submitData) => { message.error(`物料${item['itemCode']}最大数量为${item['subReturnedQty']}`) } }) + if(!flag){ return } data.subList = tableData.value // 拼接子表数据参数 - data.subList.forEach(obj => { - if(obj.qty == 0){ - message.error(`数量不能为0!`) - flag = true - return; - } - }) - if(flag){ - return - } formRef.value.formLoading = true try { if (formType === 'create') { From ef7e0668a0560d29793d310cca368662502afc5c Mon Sep 17 00:00:00 2001 From: tengxiaofei <302828528@qq.com> Date: Fri, 27 Sep 2024 15:23:57 +0800 Subject: [PATCH 50/65] =?UTF-8?q?HL-6144=20=E9=A2=84=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E3=80=81=E8=A3=85=E9=85=8D=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E3=80=81=E9=9A=94=E7=A6=BB=E6=94=B6=E8=B4=A7=E3=80=82=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E7=9A=84=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2=EF=BC=8C?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E4=B8=AD=E7=9A=84=E5=B7=A5=E5=BA=8F=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=EF=BC=8C=E8=BF=9B=E8=A1=8C=E9=80=89=E6=8B=A9=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E5=BA=94=E8=AF=A5=E4=B8=8E=E4=B8=BB=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=9A=84=E8=BD=A6=E9=97=B4=E4=BB=A3=E7=A0=81=E5=AF=B9=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptRequestMain.data.ts | 28 ++++++++++++++++-- .../productreceiptAssembleRequestMain.data.ts | 29 +++++++++++++++++-- .../productreceiptscrapRequestMain.data.ts | 29 +++++++++++++++++-- 3 files changed, 80 insertions(+), 6 deletions(-) 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/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/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts index 20af979d6..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: '==', From 7972b55da25506a7e00f3ca3e433d4155a94cb38 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 27 Sep 2024 19:11:18 +0800 Subject: [PATCH 51/65] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/moveManage/inventorymove/inventorymoveJobMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue index c28670512..d75ff12ce 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue @@ -231,7 +231,7 @@ const HeadButttondata = [ - defaultButtons.defaultExportBtn({hasPermi:`wms:inventorymove-${routeName.value}-job-main:export`}), // 导出 + defaultButtons.defaultExportBtn({hasPermi:`wms:${routeName.value}:export`}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 From 00ac67bc681efad1a2df99834dbd7d6cf8c02dca Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Sun, 29 Sep 2024 09:47:48 +0800 Subject: [PATCH 52/65] =?UTF-8?q?WMS=20bug=20=EF=BC=9AHL-6156=20=20?= =?UTF-8?q?=E7=89=A9=E6=96=99=E9=9A=94=E7=A6=BB=E7=94=B3=E8=AF=B7=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E5=95=86=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymoveRequestMain.data.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts index 87f123b0d..ede868261 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts @@ -562,7 +562,7 @@ export const BalanceShow = useCrudSchemas( label: '供应商代码', field: 'supplierCode', sort: 'custom', - isSearch: true, + isSearch: false, table: { width: 150, }, @@ -1134,7 +1134,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( label: '供应商代码', field: 'supplierCode', sort: 'custom', - isSearch: true, + isSearch: false, isDetail: true, table: { width: 150, @@ -1181,7 +1181,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( field: 'altBatch', sort: 'custom', isForm:false, - isSearch: true, + isSearch: false, table: { width: 150 }, From 78084f7d57589d481728be8af67afae92ed0317d Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Sun, 29 Sep 2024 10:42:54 +0800 Subject: [PATCH 53/65] =?UTF-8?q?WMS=20bug=20=EF=BC=9AHL-6185=20=20?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=80=80=E8=B4=A7=E7=94=B3=E8=AF=B7=EF=BC=8C?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E4=BB=A3=E7=A0=81=E3=80=81=E5=8F=91=E8=B4=A7?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=8D=95=E5=8F=B7=E6=9F=A5=E8=AF=A2=E4=B8=8D?= =?UTF-8?q?=E5=A5=BD=E4=BD=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreturnRequestMain.data.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts index e3f331227..4d8d23151 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts @@ -141,6 +141,7 @@ export const CustomerreturnRequestMain = useCrudSchemas( table: { width: 180 }, + isSearch: true, form: { // labelMessage: '信息提示说明！！！', componentProps: { @@ -207,7 +208,7 @@ export const CustomerreturnRequestMain = useCrudSchemas( width: 150 }, isTable: true, - isSearch: true, + isSearch: false, form: { componentProps: { disabled: true From 631a6c16b81a10956fd2b4624c1fe69727de20be Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Sun, 29 Sep 2024 13:08:53 +0800 Subject: [PATCH 54/65] =?UTF-8?q?HL-6146=E9=80=89=E6=8B=A9=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E7=BA=BF=E6=97=B6=E6=8A=8A=E5=B7=A5=E4=BD=8D=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=B8=85=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productredress/productredressRequestMain/index.vue | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue index c445b8233..afc628a9d 100644 --- a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue +++ b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue @@ -171,6 +171,16 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => } else { const setV = {} setV[formField] = val[0][searchField] + if('workshopCode'==formField){ + //车间代码 + setV['productionLineCode'] = '' + setV['workStationCode'] = '' + tableData.value = [] + }else if('productionLineCode'==formField){ + //生产线 + setV['workStationCode'] = '' + tableData.value = [] + } formRef.setValues(setV) } }) From 1beadad10f6d789ca723d00507a915e346ce9966 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Sun, 29 Sep 2024 13:35:39 +0800 Subject: [PATCH 55/65] =?UTF-8?q?=E5=AD=90=E8=A1=A8=E6=B8=85=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productredress/productredressRequestMain/index.vue | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue index afc628a9d..d79ad0225 100644 --- a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue +++ b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue @@ -134,13 +134,11 @@ const clearSearchInput = (field)=>{ productionLineCode: '', workStationCode:'', }) - tableData.value = [] }else if('productionLineCode' == field){ //生产线代码 formRef.value.formRef.setValues({ workStationCode:'', }) - tableData.value = [] } } // 查询页面返回 @@ -175,11 +173,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => //车间代码 setV['productionLineCode'] = '' setV['workStationCode'] = '' - tableData.value = [] }else if('productionLineCode'==formField){ //生产线 setV['workStationCode'] = '' - tableData.value = [] } formRef.setValues(setV) } From 798ff0eefcb1e9986e957b620ab6e24402de4a52 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Sun, 29 Sep 2024 14:38:25 +0800 Subject: [PATCH 56/65] =?UTF-8?q?HL-6165=E5=BA=94=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E7=89=A9=E6=96=99=E7=B1=BB=E5=9E=8B=E4=B8=8D=E4=B8=80=E8=87=B4?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=EF=BC=8C=E7=8E=B0=E6=9C=89=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=20@=E7=8E=8B=E5=AE=87=E9=A3=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionscrapRequestMain/index.vue | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) 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'] From f4d6516673a9a75c2b7cafe347d2e9d1b9c633f8 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Sun, 29 Sep 2024 15:37:11 +0800 Subject: [PATCH 57/65] =?UTF-8?q?HL-6166SCP=E6=AD=A3=E5=BC=8F=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=EF=BC=8C=E6=93=8D=E4=BD=9C=E5=8F=91=E7=A5=A8=E5=9B=9E?= =?UTF-8?q?=E8=BD=AC=E6=97=B6=EF=BC=8C=E8=AF=B4=E6=98=8E=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E4=B8=BA=EF=BC=9A=E5=86=B2=E9=94=80=E5=87=AD=E8=AF=810000000xx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoice/supplierinvoiceRecordMain/index.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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']}` + }) }) From 1fd60cb5cee086abe695d02d6a1b48422d6e3ac8 Mon Sep 17 00:00:00 2001 From: tengxiaofei <302828528@qq.com> Date: Mon, 30 Sep 2024 10:59:59 +0800 Subject: [PATCH 58/65] =?UTF-8?q?HL-6191=20SCP=EF=BC=8C=E4=BE=9B=E5=BA=94?= =?UTF-8?q?=E5=95=86=E5=BF=98=E8=AE=B0=E5=AF=86=E7=A0=81=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E9=82=AE=E7=AE=B1=E6=9C=AA=E6=94=B6=E5=88=B0=E9=82=AE=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/user/index.ts | 4 ++++ src/views/login/updatePassword.vue | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) 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/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) From 2c9d62dcca4f368394140a0eb9f3be12528ec079 Mon Sep 17 00:00:00 2001 From: bjang03 <259278618@qq.com> Date: Mon, 30 Sep 2024 12:11:53 +0800 Subject: [PATCH 59/65] =?UTF-8?q?1.=20=E5=AF=86=E7=A0=81=E7=AD=96=E7=95=A5?= =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4=EF=BC=8CHL-6189?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/axios/service.ts | 2 +- src/views/login/components/LoginForm.vue | 26 +++++++++++++++--------- src/views/system/user/index.vue | 3 ++- 3 files changed, 19 insertions(+), 12 deletions(-) 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/views/login/components/LoginForm.vue b/src/views/login/components/LoginForm.vue index ed783f5c6..17461d467 100644 --- a/src/views/login/components/LoginForm.vue +++ b/src/views/login/components/LoginForm.vue @@ -262,7 +262,7 @@ switch (differenceDays){ case null: break - case 0: + case 0 || 1: await ElMessageBox.alert( '密码到期，请立即修改', '重要提示', @@ -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/system/user/index.vue b/src/views/system/user/index.vue index d2d28220c..ba402fc09 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -59,6 +59,8 @@ + +