From 5688ab6d7355e109825a89314e5cbc9cb5b578df Mon Sep 17 00:00:00 2001 From: chenfang Date: Sun, 4 Aug 2024 16:32:03 +0800 Subject: [PATCH 01/26] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BA=BF=E4=B8=8A?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20=20=20=E6=96=B0=E5=A2=9E=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=B8=85=E5=8D=95=E7=AE=A1=E7=90=86=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E6=98=AF=E5=90=A6=E5=8F=AF=E7=94=A8=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itemManage/relegate/relegateRequest/index.vue | 1 + src/views/wms/buttMesManage/mesBarCode/index.vue | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue index 51a9c00ee..37b174f56 100644 --- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue +++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue @@ -187,6 +187,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => newRow['fromPackingNumber'] = item['packingNumber'] newRow['toBatch'] = item['batch'] newRow['fromLocationCode'] = item['locationCode'] + newRow['toLocationCode'] = item['locationCode'] newRow['inventoryStatus'] = item['inventoryStatus'] newRow['packUnit'] = item['packUnit'] newRow['packQty'] = item['packQty'] diff --git a/src/views/wms/buttMesManage/mesBarCode/index.vue b/src/views/wms/buttMesManage/mesBarCode/index.vue index 8fcfd22b5..5d441845d 100644 --- a/src/views/wms/buttMesManage/mesBarCode/index.vue +++ b/src/views/wms/buttMesManage/mesBarCode/index.vue @@ -72,6 +72,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import { getTenantId }from '@/utils/auth' + defineOptions({ name: 'MesBarCode' }) @@ -83,6 +85,9 @@ const routeName = ref() routeName.value = route.name const tableColumns = ref(MesBarCode.allSchemas.tableColumns) +let names =[{"text":"1379","value":1},{"text":"1397","value":2},{"text":"2379","value":3}] +let tenant = names.find(item=>item.value == getTenantId()) + // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef) => { nextTick(() => { @@ -165,6 +170,7 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = true try { if (formType === 'create') { + data.plnt = tenant?.text await MesBarCodeApi.createMesBarCode(data) message.success(t('common.createSuccess')) } else { From 81335fe15dbf40c4d98e3fb781573727295728cf Mon Sep 17 00:00:00 2001 From: chenfang Date: Sun, 4 Aug 2024 16:33:31 +0800 Subject: [PATCH 02/26] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E8=AF=AF=E6=8F=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itemManage/relegate/relegateRequest/index.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue index 37b174f56..51a9c00ee 100644 --- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue +++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue @@ -187,7 +187,6 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => newRow['fromPackingNumber'] = item['packingNumber'] newRow['toBatch'] = item['batch'] newRow['fromLocationCode'] = item['locationCode'] - newRow['toLocationCode'] = item['locationCode'] newRow['inventoryStatus'] = item['inventoryStatus'] newRow['packUnit'] = item['packUnit'] newRow['packQty'] = item['packQty'] From acc129663201c602c9860e13d269e4305387d126 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Sun, 4 Aug 2024 20:36:31 +0800 Subject: [PATCH 03/26] =?UTF-8?q?=E6=94=B6=E4=BB=B6=E6=A3=80=E9=AA=8C?= =?UTF-8?q?=E5=90=88=E6=A0=BC=E6=95=B0=E9=87=8F=E6=98=BE=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionJob/addForm.vue | 7 +---- .../qms/inspectionRecordFirst/addForm.vue | 28 +++---------------- 2 files changed, 5 insertions(+), 30 deletions(-) diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue index cbd83e82a..1607c4db5 100644 --- a/src/views/qms/inspectionJob/addForm.vue +++ b/src/views/qms/inspectionJob/addForm.vue @@ -773,12 +773,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any inspectionValue: '', //检验值 qualitativeCode: '', //定性字典项值 defectLevel: '', //缺陷级别 - qualifiedQuantity: parseFloat( - ( - parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty) * - parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.samplePieceSize) - ).toFixed(6) - ), //合格数量 + qualifiedQuantity:parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty), //合格数量 unqualifiedQuantity: '0' //不合格数量 }) } diff --git a/src/views/qms/inspectionRecordFirst/addForm.vue b/src/views/qms/inspectionRecordFirst/addForm.vue index f44ed7bc0..ad2321b7e 100644 --- a/src/views/qms/inspectionRecordFirst/addForm.vue +++ b/src/views/qms/inspectionRecordFirst/addForm.vue @@ -257,7 +257,7 @@ @@ -842,12 +842,7 @@ const processList = async (InspectionSchemeObj, list) => { inspectionValue: '', //检验值 qualitativeCode: '', //定性字典项值 defectLevel: '', //缺陷级别 - qualifiedQuantity: parseFloat( - ( - parseFloat(item.samplingProcessRespVO.sampleQty) * - parseFloat(InspectionSchemeObj.samplePieceSize) - ).toFixed(6) - ), //合格数量 + qualifiedQuantity:parseFloat(item.samplingProcessRespVO.sampleQty), //合格数量 unqualifiedQuantity: '0' //不合格数量 }) } @@ -1250,12 +1245,7 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => { inspectionValue: '', //检验值 qualitativeCode: '', //定性字典项值 defectLevel: '', //缺陷级别 - qualifiedQuantity: parseFloat( - ( - parseFloat(item.samplingProcessRespVO.sampleQty) * - parseFloat(InspectionSchemeObj.samplePieceSize) - ).toFixed(6) - ), //合格数量 + qualifiedQuantity: parseFloat(item.samplingProcessRespVO.sampleQty), //合格数量 unqualifiedQuantity: '0' //不合格数量 }) } @@ -1329,12 +1319,7 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => { inspectionValue: '', //检验值 qualitativeCode: '', //定性字典项值 defectLevel: '', //缺陷级别 - qualifiedQuantity: parseFloat( - ( - parseFloat(item.samplingProcessRespVO.sampleQty) * - parseFloat(InspectionSchemeObj.samplePieceSize) - ).toFixed(6) - ), //合格数量 + qualifiedQuantity: parseFloat(item.samplingProcessRespVO.sampleQty), //合格数量 unqualifiedQuantity: '0' //不合格数量 }) } @@ -1560,11 +1545,6 @@ const onItemBlur = async (field, pageApi) => { column: 'code', action: '==', value: data.value[field]?.trim() - }, - { - column: 'status', - action: 'in', - value: 'ENABLE' } ) // 参数整理 From a1c7d16e60d3bbd9b6e50354c42b95e2361005bf Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Mon, 5 Aug 2024 08:58:38 +0800 Subject: [PATCH 04/26] =?UTF-8?q?=E8=BF=90=E8=BE=93=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=A0=BC=E5=BC=8Fbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts | 1 + .../purchasereturnRecordMain/purchasereturnRecordMain.data.ts | 1 + .../supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts | 1 + 3 files changed, 3 insertions(+) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index fdb884f3d..5ee0e745c 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -109,6 +109,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ { label: '运输方式', field: 'transferMode', + dictType: DICT_TYPE.TRANSFER_MODE, sort: 'custom', table: { width: 150 diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts index 292b32b4e..ff8ee85f8 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts @@ -159,6 +159,7 @@ export const PurchasereturnRecordMain = useCrudSchemas( { label: '运输方式', field: 'transferMode', + dictType: DICT_TYPE.TRANSFER_MODE, sort: 'custom', table: { width: 150 diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts index dc585dab9..bc1b0ad40 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts @@ -136,6 +136,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive([ { label: '运输方式', field: 'transferMode', + dictType: DICT_TYPE.TRANSFER_MODE, sort: 'custom', table: { width: 150 From 95ca7dce4d03656d221ab0245776986c4a53fb08 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Mon, 5 Aug 2024 09:15:04 +0800 Subject: [PATCH 05/26] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BD=99=E9=A2=9D?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=B6=88=E5=A4=B1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/basicDataManage/itemManage/itembasic/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/index.vue b/src/views/wms/basicDataManage/itemManage/itembasic/index.vue index 31a154a5c..2a331987c 100644 --- a/src/views/wms/basicDataManage/itemManage/itembasic/index.vue +++ b/src/views/wms/basicDataManage/itemManage/itembasic/index.vue @@ -317,7 +317,7 @@ const changeTabs = (item) => { } else if(item.prop == 'InventoryBalance'){ tabsExtend.value = true apiPage.value = BalanceApi.getBalancePage - detailAllSchemas.value = Balance.allSchemas + detailAllSchemas.value = JSON.parse(JSON.stringify(Balance.allSchemas)) } else if(item.prop == 'ExpectedIn'){ tabsExtend.value = true apiPage.value = ExpectinApi.getExpectinPage From ca40c3980f630a48d4f9437a088c8345f351b3f8 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Mon, 5 Aug 2024 13:12:23 +0800 Subject: [PATCH 06/26] =?UTF-8?q?=E5=BF=85=E5=A1=AB=E6=A0=A1=E9=AA=8Cbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturnRequestMain.data.ts | 6 +++--- .../supplierdeliverRequestMain.data.ts | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts index ee4876511..1132680fb 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts @@ -1570,9 +1570,9 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive //表单校验 export const PurchasereturnRequestDetailRules = reactive({ - packingNumber: [ - { required: true, message: '请输入包装号', trigger: 'blur' } - ], + // packingNumber: [ + // { required: true, message: '请输入包装号', trigger: 'blur' } + // ], // batch: [ // { required: true, message: '请输入批次', trigger: 'blur' } // ], diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index f3405d481..154d21323 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -1261,6 +1261,9 @@ export const SupplierdeliverRequestDetailRules = reactive({ { required: true, message: '请输入发货数量1', trigger: 'change' }, // { validator: validateQty, trigger: 'change' }, ], + supplierBatch: [ + { required: true, message: '请输入供应商批次', trigger: 'blur' } + ], batch: [ { required: true, message: '请输入批次', trigger: 'blur' }, { max: 50, message: '不得超过50个字符', trigger: 'blur' }, From ef22f92b758e16f27e7d2727c56a1eee4cb01176 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 5 Aug 2024 13:21:38 +0800 Subject: [PATCH 07/26] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=96=B9=E6=A1=88?= =?UTF-8?q?=E5=A4=B1=E5=8E=BB=E7=84=A6=E7=82=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionScheme/addForm.vue | 47 +++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/src/views/qms/inspectionScheme/addForm.vue b/src/views/qms/inspectionScheme/addForm.vue index 7001ee25a..950e2c522 100644 --- a/src/views/qms/inspectionScheme/addForm.vue +++ b/src/views/qms/inspectionScheme/addForm.vue @@ -21,7 +21,7 @@ { rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = false } } +// 物料失去焦点校验 +const onItemBlur= async (field, pageApi, item) => { + const dataObj = item ? item.inspectionCharacteristicsBaseVO : data.value + if (dataObj[field + 'Code']) { + const _searchCondition = {} + const filters: any[] = [] + filters.push( + { + action: '==', + column: 'available', + value: 'TRUE' + }, + { + column: 'code', + action: '==', + value: dataObj[field + 'Code']?.trim() + } + ) + // 参数整理 + _searchCondition.isSearch = true + _searchCondition.filters = filters + const array = await pageApi(_searchCondition) + Butttondata = [ + defaultButtons.formSaveBtn(null), // 保存 + defaultButtons.formCloseBtn(null) // 关闭 + ] + count.value++ + const obj = array.list[0] + if (obj) { + dataObj['itemName'] = obj.name + dataObj['description'] = obj.desc1 + } else { + message.alert('暂无数据') + dataObj[field + 'Code'] = '' + dataObj[field + 'Name'] = '' + } + } else { + dataObj[field + 'Name'] = '' + Butttondata = [ + defaultButtons.formSaveBtn(null), // 保存 + defaultButtons.formCloseBtn(null) // 关闭 + ] + count.value++ + } +} //失去焦点 const onBlur = async (field, pageApi, item) => { const dataObj = item ? item.inspectionCharacteristicsBaseVO : data.value From ce30485f504b9f886634f00f4c5c6523065b1bb1 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Mon, 5 Aug 2024 14:50:29 +0800 Subject: [PATCH 08/26] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E8=AE=B0=E5=BD=95=E6=B7=BB=E5=8A=A0=E5=8F=91=E8=B4=A7?= =?UTF-8?q?=E5=8D=95=E5=8F=B7=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 8 ++++---- .../supplierdeliverRecordMain.data.ts | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.env.development b/.env.development index 13dee5d41..cb5caf0db 100644 --- a/.env.development +++ b/.env.development @@ -4,10 +4,10 @@ NODE_ENV=development VITE_DEV=false # 请求路径 -VITE_BASE_URL='http://localhost:12080' +VITE_BASE_URL='http://192.168.0.106:12080' # 上传路径 -VITE_UPLOAD_URL='http://localhost:12080/admin-api/infra/file/upload' +VITE_UPLOAD_URL='http://192.168.0.106:12080/admin-api/infra/file/upload' # 接口前缀 VITE_API_BASEPATH=/dev-api @@ -31,10 +31,10 @@ VITE_SOURCEMAP=false VITE_OUT_DIR=dist # 自定义接口路径 -VITE_INTERFACE_URL='http://localhost:12080/magic/web/index.html' +VITE_INTERFACE_URL='http://192.168.0.106:12080/magic/web/index.html' # 积木报表请求路径 -VITE_JMREPORT_BASE_URL='http://localhost:12080' +VITE_JMREPORT_BASE_URL='http://192.168.0.106:12080' # 租户配置 VITE_TENANT='["长春1379","成都1397","长春2379"]' diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts index bc1b0ad40..3794079fb 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts @@ -39,6 +39,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isSearch: true }, { label: '供应商代码', From 3e7442ff1fa1eee10675be43b9e1b6063cded71a Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Mon, 5 Aug 2024 14:51:35 +0800 Subject: [PATCH 09/26] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.env.development b/.env.development index cb5caf0db..13dee5d41 100644 --- a/.env.development +++ b/.env.development @@ -4,10 +4,10 @@ NODE_ENV=development VITE_DEV=false # 请求路径 -VITE_BASE_URL='http://192.168.0.106:12080' +VITE_BASE_URL='http://localhost:12080' # 上传路径 -VITE_UPLOAD_URL='http://192.168.0.106:12080/admin-api/infra/file/upload' +VITE_UPLOAD_URL='http://localhost:12080/admin-api/infra/file/upload' # 接口前缀 VITE_API_BASEPATH=/dev-api @@ -31,10 +31,10 @@ VITE_SOURCEMAP=false VITE_OUT_DIR=dist # 自定义接口路径 -VITE_INTERFACE_URL='http://192.168.0.106:12080/magic/web/index.html' +VITE_INTERFACE_URL='http://localhost:12080/magic/web/index.html' # 积木报表请求路径 -VITE_JMREPORT_BASE_URL='http://192.168.0.106:12080' +VITE_JMREPORT_BASE_URL='http://localhost:12080' # 租户配置 VITE_TENANT='["长春1379","成都1397","长春2379"]' From 331399a77ab8faea8ab48439063aac3de6888658 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Mon, 5 Aug 2024 14:54:07 +0800 Subject: [PATCH 10/26] =?UTF-8?q?=E5=96=9C=E5=A9=B7=E7=8E=B0=E5=9C=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=9A=E6=89=93=E5=8D=B0=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E6=9C=AC=E5=9C=B0=E7=89=A9=E6=96=99?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SearchTable/src/SearchTable.vue | 12 ++++-- .../purchasereceiptRequestMain/index.vue | 42 ++++++++++++++++++- 2 files changed, 48 insertions(+), 6 deletions(-) diff --git a/src/components/SearchTable/src/SearchTable.vue b/src/components/SearchTable/src/SearchTable.vue index 64e3f6b7e..38336acc4 100644 --- a/src/components/SearchTable/src/SearchTable.vue +++ b/src/components/SearchTable/src/SearchTable.vue @@ -93,7 +93,7 @@ const tableObjectRef = ref() const getPage: any = ref() const searchSchema = ref() const tableColumns = ref() -const formFieldRef = ref() +const formFieldRef = ref('') const searchFieldRef = ref() const typeRef = ref() const rowRef = ref() @@ -102,6 +102,10 @@ const searchConditionRef = ref() const searchTableSelectionsList = ref() //表格弹窗回显的列表 const searchQuery = ref(false) const hiddenFilterBtn = ref(false) +const updateData = (list:any)=>{ + tableObjectRef.value.tableList = list + searchTableRef.value.clearSelection() +} const openData = (titleName: any, tableObject:any ,allSchemas: any,multiple: any) => { dialogWidth.value = '80%' multipleBol.value = multiple @@ -110,10 +114,10 @@ const openData = (titleName: any, tableObject:any ,allSchemas: any,multiple: any defaultButtons.defaultWhenPageBtn(null), // 选择当页 defaultButtons.defaultUnselectPageBtn(null), // 反选当页 // defaultButtons.defaultDeselectAllBtn(null), // 取消全选 - defaultButtons.defaultFilterBtn(null) // 筛选 + // defaultButtons.defaultFilterBtn(null) // 筛选 ] : [ - defaultButtons.defaultFilterBtn(null) // 筛选 + // defaultButtons.defaultFilterBtn(null) // 筛选 ] dialogTitle.value = t(`ts.${titleName}`).replace('ts.', '') tableObjectRef.value = tableObject @@ -238,7 +242,7 @@ const buttonBaseClick = (val, item) => { } -defineExpose({ open,openData,hiddenFilterButton ,changeDialogWidth,searchFormClick}) // 提供 open 方法，用于打开弹窗 +defineExpose({ open,openData,updateData,hiddenFilterButton ,changeDialogWidth,searchFormClick}) // 提供 open 方法，用于打开弹窗 // Table 组件 ref const searchTableRef = ref() diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue index d34af2d33..d6396821a 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue @@ -128,7 +128,23 @@ :isShowFooterButtton="false" /> - + + + { + printItemCode.value = printItemCode.value.trim() + if(printItemCode.value == ''){ + searchTableRef.value.updateData(printTableList.value) + }else{ + console.log(printItemCode.value) + let printItemCodes = printItemCode.value.split(',') + console.log(printItemCodes) + let itemCodesList = printTableList.value.filter(item=>!!printItemCodes.find(item1=>item['itemCode']==item1)) + searchTableRef.value.updateData(itemCodesList) + } + +} +const resetPrint = ()=>{ + printItemCode.value = '' + searchPrint() +} const labelPrint = async (row) => { tableObject.loading = true const defaultParams = {'moduleName':'purchasereceipt_request','recordNumber':row.asnNumber} @@ -488,12 +525,13 @@ const labelPrint = async (row) => { // 获得表格的各种操作 const { getList:getListPrint } = tableMethods - getListPrint() + await getListPrint() tableObject.loading = false const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns tableColumns.forEach((item) => { item.width = item.table?.width }) + printTableList.value = JSON.parse(JSON.stringify(tableObjectPrint.tableList)) searchTableRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true) } From 08d8214c274adc869862fc115b9a3553ef7fdd3e Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 5 Aug 2024 15:26:16 +0800 Subject: [PATCH 11/26] =?UTF-8?q?=E7=BF=BB=E5=8C=85=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../packageoverMain/packageoverRecordMain/index.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue index 493689051..286652a40 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue @@ -143,7 +143,9 @@ const labelType = ref('') // 标签类别 采购还是制造等 const handlePoint = async (row) => { // 查询是否已创建过标签 await PackageApi.getPackagePage({ - requestNumber: row.number + requestNumber: row.number, + pageSize: 500, + pageNo: 1 }).then((res) => { if(res.list.length > 0) { if (res.list[0].productionLineCode != null) { From 5f4156907ee314dab52162f5202a85de0faa37b6 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Mon, 5 Aug 2024 15:48:25 +0800 Subject: [PATCH 12/26] =?UTF-8?q?=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/purchasePlanMain/index.vue | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index 2c40fa884..013ff8a88 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -96,6 +96,7 @@ editHasPermi="wms:purchase-plan-main:update" deleteHasPermi="wms:purchase-plan-main:delete" :isOpenSearchTable="true" + :mainSubmitCreateApi="true" fieldTableColumn="poLine" /> @@ -302,8 +303,23 @@ const getSearchTableData = async (number,formField,searchField)=>{ }) } // 查询页面返回——详情 - const searchTableSuccessDetail = (formField, searchField, val, formRef) => { + const searchTableSuccessDetail = (formField, searchField, val, formRef,formModel) => { + console.log('searchTableSuccessDetail',formField, searchField, val, formRef,formModel) nextTick(async () => { + if(formModel){ + console.log(formModel) + //明细中新增 + let data = {...val[0]} + data['planQty'] = val[0]['orderQty'] + data['poLine'] = val[0]['lineNumber'] + data['number'] = formModel['number'] + data['poNumber'] = formModel['poNumber'] + console.log('data',data) + await PurchasePlanDetailApi.createPurchasePlanDetail(data) + message.success(t('common.createSuccess')) + detailRef.value.updateList() + return + } const setV = {} setV[formField] = val[0][searchField] setV['poNumber'] = val[0]['number'] From a531aea8510cfa60afa2219e951d8e5506175dbd Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Mon, 5 Aug 2024 16:33:44 +0800 Subject: [PATCH 13/26] =?UTF-8?q?=E9=87=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceipt/purchasereceiptRequestMain/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue index d6396821a..2fe873942 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue @@ -531,6 +531,7 @@ const labelPrint = async (row) => { tableColumns.forEach((item) => { item.width = item.table?.width }) + printItemCode.value = '' printTableList.value = JSON.parse(JSON.stringify(tableObjectPrint.tableList)) searchTableRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true) } From c3bb58e28683e94bd017014bde19646f2efa8d04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Tue, 6 Aug 2024 00:40:41 +0800 Subject: [PATCH 14/26] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=BC=80=E5=85=B3=20?= =?UTF-8?q?=E5=BC=80=E6=94=BE=E6=8C=89=E9=92=AE=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/basicDataManage/documentSetting/switch/index.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/wms/basicDataManage/documentSetting/switch/index.vue b/src/views/wms/basicDataManage/documentSetting/switch/index.vue index 3b94a5363..100d91892 100644 --- a/src/views/wms/basicDataManage/documentSetting/switch/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/switch/index.vue @@ -133,7 +133,6 @@ const buttonBaseClick = (val, item) => { const butttondata = (row, $index)=>{ const hiddenArray = ['CreatePutawayRequestAfterInspectRecordCreated', 'CreateBackflushRecordAfterProductreceiptRecordCreated', - 'CreateProductputawayRequestAfterProductreceiptRecordCreated', 'CreatePurchasePlanAfterDiscretePurchaseOrderPublished', 'ExemptItemCreatePutawayRequestAfterPurchaseReceiptRecordCreated', 'CreatePurchaseReceiptRequestAfterSupplierDeliverRecordCreated' From 6382731281f648ceba5e7e6f0787c3ca47157994 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 6 Aug 2024 10:05:26 +0800 Subject: [PATCH 15/26] =?UTF-8?q?=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/locales/en-US.ts | 6 +++++- src/locales/zh-CN.ts | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index 938bcb939..2fc4a6ceb 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -1157,7 +1157,11 @@ export default { 计划员:'Planner', 最小值:'Min', 最大值:'Max', - + 富维海拉供应商系统:'FAWAY HELLA Supplier System', + 系统管理:'System Management', + 基础设施:'Infrastructure Construction', + 报表管理:'Report Management', + 报表:'Report' }, diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 103a1a95f..38ae256ee 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -1157,6 +1157,7 @@ export default { 计划员:'计划员', 最小值:'最小值', 最大值:'最大值', + 富维海拉供应商系统:'富维海拉供应商系统' }, From 3e38753dbbe37af2118edf4421415e2b36ff35fb Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 6 Aug 2024 10:33:26 +0800 Subject: [PATCH 16/26] =?UTF-8?q?=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/locales/en-US.ts | 14 +++++++++++++- src/locales/zh-CN.ts | 12 +++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index 2fc4a6ceb..2a84dc25b 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -1161,7 +1161,19 @@ export default { 系统管理:'System Management', 基础设施:'Infrastructure Construction', 报表管理:'Report Management', - 报表:'Report' + 报表:'Report', + 物料包装信息:'Material packaging information', + 仓库管理:'store management', + 库区管理:'reservoir region management', + 库位组管理:'Warehouse location group management', + 库位管理:'Warehouse location management', + 月台管理:'Platform management', + 采购计划策略:'Procurement Planning Strategy', + 要货预测周期管理:'Demand forecasting cycle management', + 价差数据查看:'Spread data view', + 待开票数据查询:'Invoicing data query' + + }, diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 38ae256ee..255e68bc6 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -1157,7 +1157,17 @@ export default { 计划员:'计划员', 最小值:'最小值', 最大值:'最大值', - 富维海拉供应商系统:'富维海拉供应商系统' + 富维海拉供应商系统:'富维海拉供应商系统', + 物料包装信息:'物料包装信息', + 仓库管理:'仓库管理', + 库区管理:'库区管理', + 库位组管理:'库位组管理', + 库位管理:'库位管理', + 月台管理:'月台管理', + 采购计划策略:'采购计划策略', + 要货预测周期管理:'要货预测周期管理', + 价差数据查看:'价差数据查看', + 待开票数据查询:'待开票数据查询' }, From c4d3155181e1e159b8227c41d8e6c1856e5c32cc Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 6 Aug 2024 11:57:03 +0800 Subject: [PATCH 17/26] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=A3=80=E9=AA=8C=E5=80=BC=E5=88=A4=E6=96=AD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionJob/addForm.vue | 27 ++++++++++--------- src/views/qms/inspectionRecord/addForm.vue | 20 +++++++------- .../qms/inspectionRecordFirst/addForm.vue | 24 ++++++++--------- 3 files changed, 37 insertions(+), 34 deletions(-) diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue index 1607c4db5..2a44e6eb0 100644 --- a/src/views/qms/inspectionJob/addForm.vue +++ b/src/views/qms/inspectionJob/addForm.vue @@ -478,10 +478,10 @@ " > - @@ -643,7 +643,7 @@ const formProcessRef = ref() const formSchema = ref(props.formAllSchemas?.formSchema) const tableAllSchemas = ref(props.tableAllSchemas) const tableFormRules = ref(props.tableFormRules) -const collapseShow = ref(['1','2','3']) +const collapseShow = ref(['1', '2', '3']) const data = ref({ code: '', @@ -773,7 +773,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any inspectionValue: '', //检验值 qualitativeCode: '', //定性字典项值 defectLevel: '', //缺陷级别 - qualifiedQuantity:parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty), //合格数量 + qualifiedQuantity: parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty), //合格数量 unqualifiedQuantity: '0' //不合格数量 }) } @@ -1412,6 +1412,9 @@ const inspectionValueInput = (item, cur) => { i++ ) { item.isPass = true + item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit = false + item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget = 10 + item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping = 10.1 // 如果上限值存在,下限值和目标值不存在 大于上限值显示红色图标 if ( item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping && @@ -1479,22 +1482,22 @@ const inspectionValueInput = (item, cur) => { item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget && item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i] .inspectionValue && - (parseFloat(cur.inspectionValue) > + (parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) || - parseFloat(cur.inspectionValue) < + parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget)) ) { item.isPass = false return } - // 如果下限值和目标值存在,下限值不存在 大于上限并且小于目标值显示红色图标 + // 如果下限值和目标值存在,上限值不存在 小于下限并且大于目标值显示红色图标 if ( - item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping && - !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit && + !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping && + item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget && - (parseFloat(cur.inspectionValue) > + (parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget) || - parseFloat(cur.inspectionValue) < + parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit)) ) { item.isPass = false diff --git a/src/views/qms/inspectionRecord/addForm.vue b/src/views/qms/inspectionRecord/addForm.vue index 337ae5b8d..030c4d595 100644 --- a/src/views/qms/inspectionRecord/addForm.vue +++ b/src/views/qms/inspectionRecord/addForm.vue @@ -478,10 +478,10 @@ " > - @@ -1492,22 +1492,22 @@ const inspectionValueInput = (item, cur) => { item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget && item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i] .inspectionValue && - (parseFloat(cur.inspectionValue) > + (parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) || - parseFloat(cur.inspectionValue) < + parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget)) ) { item.isPass = false return } - // 如果下限值和目标值存在,下限值不存在 大于上限并且小于目标值显示红色图标 + // 如果下限值和目标值存在,上限值不存在 小于下限并且大于目标值显示红色图标 if ( - item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping && - !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit && + !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping && + item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget && - (parseFloat(cur.inspectionValue) > + (parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget) || - parseFloat(cur.inspectionValue) < + parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit)) ) { item.isPass = false diff --git a/src/views/qms/inspectionRecordFirst/addForm.vue b/src/views/qms/inspectionRecordFirst/addForm.vue index ad2321b7e..d3c12f30a 100644 --- a/src/views/qms/inspectionRecordFirst/addForm.vue +++ b/src/views/qms/inspectionRecordFirst/addForm.vue @@ -535,10 +535,10 @@ v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == '0'" > - @@ -693,7 +693,7 @@ const formMainRef = ref() const formFeaturesRef = ref() const formProcessRef = ref() const formSchema = ref(props.formAllSchemas?.formSchema) -const collapseShow = ref(['1','2','3']) +const collapseShow = ref(['1', '2', '3']) const data = ref({ code: '', @@ -842,7 +842,7 @@ const processList = async (InspectionSchemeObj, list) => { inspectionValue: '', //检验值 qualitativeCode: '', //定性字典项值 defectLevel: '', //缺陷级别 - qualifiedQuantity:parseFloat(item.samplingProcessRespVO.sampleQty), //合格数量 + qualifiedQuantity: parseFloat(item.samplingProcessRespVO.sampleQty), //合格数量 unqualifiedQuantity: '0' //不合格数量 }) } @@ -1485,22 +1485,22 @@ const inspectionValueInput = (item, cur) => { item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget && item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i] .inspectionValue && - (parseFloat(cur.inspectionValue) > + (parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping) || - parseFloat(cur.inspectionValue) < + parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget)) ) { item.isPass = false return } - // 如果下限值和目标值存在,下限值不存在 大于上限并且小于目标值显示红色图标 + // 如果下限值和目标值存在,上限值不存在 小于下限并且大于目标值显示红色图标 if ( - item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping && - !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit && + !item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping && + item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit && item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsTarget && - (parseFloat(cur.inspectionValue) > + (parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) > parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget) || - parseFloat(cur.inspectionValue) < + parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList[i].inspectionValue) < parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.quantifyLowlimit)) ) { item.isPass = false From 474ba952061b0737605fa9f5534a256a12735c86 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 6 Aug 2024 11:59:30 +0800 Subject: [PATCH 18/26] =?UTF-8?q?=E4=B8=AD=E8=8B=B1=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/locales/en-US.ts | 111 +++++++++++++++++- src/locales/zh-CN.ts | 110 ++++++++++++++++- .../supplieDeliveryStrategy/AddForm.vue | 78 ++++++------ .../supplieDeliveryStrategy/index.vue | 24 ++-- 4 files changed, 268 insertions(+), 55 deletions(-) diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index 2a84dc25b..27b9c7ea8 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -1171,8 +1171,115 @@ export default { 采购计划策略:'Procurement Planning Strategy', 要货预测周期管理:'Demand forecasting cycle management', 价差数据查看:'Spread data view', - 待开票数据查询:'Invoicing data query' - + 待开票数据查询:'Invoicing data query', + 待开票单据号:'Document number to be invoiced', + 未审核:'unreviewed', + 通过:'pass', + 已开票:'Invoiced out', + 采购审批中:'Under procurement approval', + 采购审批通过:'Approval of procurement', + 发票寄出:'Send invoice', + 采购审批驳回:'Rejection of procurement approval', + 财务审批驳回:'Rejection of financial approval', + 货运单号:'number of a cargo waybill', + 差价范围:'Range of price difference', + 供应商创建时间:'Vendor creation time', + 未税金额:'Amount not taxed', + 价税合计金额:'Total amount of value and tax', + 是否有价差:'Is there a price difference', + 税额差异:'tax difference', + 价税合计差额:'Total difference between price and tax', + 系统税额:'System tax amount', + 系统价税合计:'Total system price and tax', + 系统未税金额:'System untaxed amount', + 开票日期:'invoice date', + 采购驳回原因:'Reasons for rejection of procurement', + 财务驳回原因:'Reasons for financial Rejection', + 包装名称:'Name of package', + 包装类型:'packaging type', + 默认包装规格:'Default packaging specifications', + 项:'item', + 次:'time', + 套:'set', + 年:'year', + 根:'root', + 批:'batch', + 默认:'default', + 管理精度:'Management accuracy', + 是否是功能区:'Is it a functional area', + 按数量:'exponential quantity', + 按批次:'By batch', + 按包装:'By package', + 按唯一ID:'By unique ID', + 收货待检区:'Receiving goods for inspection area', + 原料存储区:'Raw material storage area', + 化学品区:'Chemical area', + 超市区:'Super urban area', + 线边区:'Line edge area', + 半成品存储区:'Storage area for semi-finished products', + 成品存储区:'Finished product storage area', + 发货准备区:'Shipment preparation area', + 发货在途区:'The shipment is in transit', + 三方库区:'Three party reservoir area', + 客户寄售区:'Customer consignment area', + 厂内隔离区:'Isolation area inside the factory', + 客户退货隔离区:'Customer return quarantine area', + 报废区:'Scrap area', + 备货区:'storage area', + 差异调整:'Difference adjustment', + 在途区:'Area in transit', + 溢出区:'overflow area', + 器具库区:'Appliance warehouse area', + 成品器具库区:'Finished equipment warehouse area', + 线边器具库区:'Line edge appliance warehouse area', + 客户器具库区:'Customer equipment warehouse area', + 报废器具库区:'Scrap equipment storage area', + ERP库位类型:'ERP location type', + QAD库位代码:'QAD library bit code', + 巷道:'roadway', + 货架:'goods shelf', + 行:'line', + 列:'column', + 备货优先级:'Inventory priority', + 最大承重:'maximum load bearing', + 最大面积:'maximum area', + 最大体积:'maximum volume', + 默认库位代码:'Default library bit code', + 收货口:'Port of receip', + 发货口:'port of dispatch', + 星期一:'Monday', + 星期二:'Tuesday', + 星期三:'Wednesday', + 星期四:'Thursday', + 星期五:'Friday', + 星期六:'Saturday', + 星期日:'Sunday', + 策略名称:'Policy name', + 策略代码:'Policy code', + 策略描述:'Policy Description', + 优先级:'priority', + 请输入策略名称:'Please enter a policy name', + 请输入优先级:'Please enter the priority', + 规则:'rule', + 请输入名称:'Please enter a name', + 请输入描述:'Please enter description', + 规则条件:'Rule condition', + 供应商类型:'supplier type', + 请选择供应商类型:'Please select the supplier type', + 星期几:'what day', + 请输入代码:'Please enter the code', + 请选择开始时间:'Please select a start time', + 请选择结束时间:'Please select the end time', + 仓库:'warehouse', + 请选择:'please choose', + 月台:'platform', + 请选择月台:'Please select the platform', + 在途库位:'in transit', + 请选择在途库位:'Please select the location in transit', + 请输入收货人名称:'Please enter the name of consignee', + 规则配置:'Rule configuration', + 请输入联系电话:'Please enter a contact number', + 请选择范围:'Please enter a name', }, diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 255e68bc6..e0624a8ee 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -1167,8 +1167,114 @@ export default { 采购计划策略:'采购计划策略', 要货预测周期管理:'要货预测周期管理', 价差数据查看:'价差数据查看', - 待开票数据查询:'待开票数据查询' - + 待开票数据查询:'待开票数据查询', + 未审核:'未审核', + 通过:'通过', + 已开票:'已开票', + 采购审批中:'采购审批中', + 采购审批通过:'采购审批通过', + 发票寄出:'发票寄出', + 采购审批驳回:'采购审批驳回', + 财务审批驳回:'财务审批驳回', + 货运单号:'货运单号', + 差价范围:'差价范围', + 供应商创建时间:'供应商创建时间', + 未税金额:'未税金额', + 价税合计金额:'价税合计金额', + 是否有价差:'是否有价差', + 税额差异:'税额差异', + 价税合计差额:'价税合计差额', + 系统税额:'系统税额', + 系统价税合计:'系统价税合计', + 系统未税金额:'系统未税金额', + 开票日期:'开票日期', + 采购驳回原因:'采购驳回原因', + 财务驳回原因:'财务驳回原因', + 包装名称:'包装名称', + 包装类型:'包装类型', + 默认包装规格:'默认包装规格', + 项:'项', + 次:'次', + 套:'套', + 年:'年', + 根:'根', + 批:'批', + 默认:'默认', + 管理精度:'管理精度', + 是否是功能区:'是否是功能区', + 按数量:'按数量', + 按批次:'按批次', + 按包装:'按包装', + 按唯一ID:'按唯一ID', + 收货待检区:'收货待检区', + 原料存储区:'原料存储区', + 化学品区:'化学品区', + 超市区:'超市区', + 线边区:'线边区', + 半成品存储区:'半成品存储区', + 成品存储区:'成品存储区', + 发货准备区:'发货准备区', + 发货在途区:'发货在途区', + 三方库区:'三方库区', + 客户寄售区:'客户寄售区', + 厂内隔离区:'厂内隔离区', + 客户退货隔离区:'客户退货隔离区', + 报废区:'报废区', + 备货区:'备货区', + 差异调整:'差异调整', + 在途区:'在途区', + 溢出区:'溢出区', + 器具库区:'器具库区', + 成品器具库区:'成品器具库区', + 线边器具库区:'线边器具库区', + 客户器具库区:'客户器具库区', + 报废器具库区:'报废器具库区', + ERP库位类型:'ERP库位类型', + QAD库位代码:'QAD库位代码', + 巷道:'巷道', + 货架:'货架', + 行:'行', + 列:'列', + 备货优先级:'备货优先级', + 最大承重:'最大承重', + 最大面积:'最大面积', + 最大体积:'最大体积', + 默认库位代码:'默认库位代码', + 收货口:'收货口', + 发货口:'发货口', + 星期一:'星期一', + 星期二:'星期二', + 星期三:'星期三', + 星期四:'星期四', + 星期五:'星期五', + 星期六:'星期六', + 星期日:'星期日', + 策略名称:'策略名称', + 策略代码:'策略代码', + 策略描述:'策略描述', + 优先级:'优先级', + 请输入策略名称:'请输入策略名称', + 请输入优先级:'请输入优先级', + 规则:'规则', + 请输入名称:'请输入名称', + 请输入描述:'请输入描述', + 规则条件:'规则条件', + 供应商类型:'供应商类型', + 请选择供应商类型:'请选择供应商类型', + 星期几:'星期几', + 请输入代码:'请输入代码', + 请选择开始时间:'请选择开始时间', + 请选择结束时间:'请选择结束时间', + 仓库:'仓库', + 请选择:'请选择', + 月台:'月台', + 请选择月台:'请选择月台', + 在途库位:'在途库位', + 请选择在途库位:'请选择在途库位', + 请输入收货人名称:'请输入收货人名称', + 规则配置:'规则配置', + 请输入联系电话:'请输入联系电话', + 请选择范围:'请选择范围', }, } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue index 9f88fa00e..4bc82a3f3 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue @@ -12,35 +12,35 @@ >
-
规则
+
{{t('ts.规则').replace('ts.','')}}
- + - - + + - - + + - + - + @@ -48,22 +48,22 @@
-
规则条件
+
{{t('ts.规则条件').replace('ts.','')}}
@@ -87,16 +87,16 @@ @@ -121,7 +121,7 @@ @@ -139,7 +139,7 @@
@@ -151,37 +151,37 @@
-
规则配置
+
{{t('ts.规则配置').replace('ts.','')}}
- + - + - + - + - + - - + + - - + + diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue index 9e358a5d5..b6b18e322 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue @@ -4,19 +4,19 @@ - - + - - + + - 搜索 + {{t('ts.搜索')}} - 重置 + {{t('ts.重置')}} @@ -26,16 +26,16 @@ - - - - - + + + + + - + From 24adaca354f6c9c13cc4f981c975c77efa3d092f Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 6 Aug 2024 12:00:56 +0800 Subject: [PATCH 19/26] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionJob/addForm.vue | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue index 2a44e6eb0..6775e1ea5 100644 --- a/src/views/qms/inspectionJob/addForm.vue +++ b/src/views/qms/inspectionJob/addForm.vue @@ -1412,9 +1412,6 @@ const inspectionValueInput = (item, cur) => { i++ ) { item.isPass = true - item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsLowlimit = false - item.inspectionJobCharacteristicsUpdateReqVO.quantifyTarget = 10 - item.inspectionJobCharacteristicsUpdateReqVO.quantifyCapping = 10.1 // 如果上限值存在,下限值和目标值不存在 大于上限值显示红色图标 if ( item.inspectionJobCharacteristicsUpdateReqVO.quantifyIsCapping && From 33946a5da98b765742967960e5d8da70888e3e03 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Tue, 6 Aug 2024 13:03:16 +0800 Subject: [PATCH 20/26] =?UTF-8?q?=E7=BA=BF=E8=BE=B9=E5=8E=9F=E6=96=99?= =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionscrapRequestMain/index.vue | 48 +++++++------- .../productionscrapRequestMain.data.ts | 66 ++++++++++++++++--- 2 files changed, 82 insertions(+), 32 deletions(-) diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue index 0ca2ebe15..c3496eea1 100644 --- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue +++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue @@ -341,17 +341,17 @@ const butttondata = (row,$index) => { defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productionscrap-request-main:update'}), // 编辑 // defaultButtons.mainListDeleteBtn({hasPermi:'wms:productionreturn-request-main:delete'}), // 删除 // 创建标签 - { - label: '创建标签', - name: 'cjbq', - hide: isShowMainButton(row,['3']), - type: 'primary', - icon: '', - color: '', - hasPermi: '', - link: true, // 文本展现按钮 - }, - defaultButtons.mainListPointBtn({hide:isShowMainButton(row,['3','6','8'])}), // 标签打印 + // { + // label: '创建标签', + // name: 'cjbq', + // hide: isShowMainButton(row,['3']), + // type: 'primary', + // icon: '', + // color: '', + // hasPermi: '', + // link: true, // 文本展现按钮 + // }, + // defaultButtons.mainListPointBtn({hide:isShowMainButton(row,['3','6','8'])}), // 标签打印 ] } @@ -483,19 +483,19 @@ const buttonTableClick = async (val, row) => { }) } else if (val == 'mainHandle') { // 处理 - // 判断 是否已创建标签 - let isCreateLabel = false - await PackageApi.getPackagePage({ - requestNumber: row.number - }).then(res => { - if (res) { - if (res.list.length > 0) isCreateLabel = true - } - }) - if (!isCreateLabel) { - message.warning('请先创建标签') - return - } + // // 判断 是否已创建标签 + // let isCreateLabel = false + // await PackageApi.getPackagePage({ + // requestNumber: row.number + // }).then(res => { + // if (res) { + // if (res.list.length > 0) isCreateLabel = true + // } + // }) + // if (!isCreateLabel) { + // message.warning('请先创建标签') + // return + // } tableObject.loading = true ProductionscrapRequestMainApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts index 5f5c3248e..5acd62749 100644 --- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts +++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts @@ -26,6 +26,9 @@ import { TableColumn } from '@/types/table' import * as InspectionQ3Api from '@/api/qms/inspectionQ3' import { Q3 } from '@/views/qms/inspectionQ3/inspectionQ3.data' +// import * as LocationApi from '@/api/wms/location' +// import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data' + const { t } = useI18n() // 国际化 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值 @@ -697,6 +700,53 @@ export const ProductionscrapRequestDetail = useCrudSchemas(reactive Date: Tue, 6 Aug 2024 14:50:13 +0800 Subject: [PATCH 21/26] =?UTF-8?q?HL-4929=20=20=E7=89=A9=E6=96=99=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E5=88=B0=E5=BA=93=E4=BD=8D=E8=87=AA=E5=8A=A8=E8=B5=8B?= =?UTF-8?q?=E5=80=BC=E4=BB=8E=E5=BA=93=E4=BD=8D=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../relegate/relegateRequest/index.vue | 5 ++-- .../relegateRequestMain.data.ts | 25 ++++++------------- 2 files changed, 9 insertions(+), 21 deletions(-) diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue index 51a9c00ee..c2f08f68a 100644 --- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue +++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue @@ -187,6 +187,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => newRow['fromPackingNumber'] = item['packingNumber'] newRow['toBatch'] = item['batch'] newRow['fromLocationCode'] = item['locationCode'] + newRow['toLocationCode'] = item['locationCode'] newRow['inventoryStatus'] = item['inventoryStatus'] newRow['packUnit'] = item['packUnit'] newRow['packQty'] = item['packQty'] @@ -227,9 +228,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => // console.log(row['itemCode']); // ItembasicApi.getItemListByCodes(row['itemCode']) row['downItemCode'] = val[0]['code'] - } else if (formField == 'toLocationCode') { - row['toLocationCode'] = val[0]['code'] - } else { + } else { row[formField] = val[0][searchField] } } else { diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts index 7d116d022..7d06ecb7e 100644 --- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts +++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts @@ -491,28 +491,17 @@ export const RelegateRequestDetail = useCrudSchemas(reactive([ label: '库位代码', field: 'toLocationCode', sort: 'custom', - tableForm:{ - isInpuFocusShow: true, // 开启查询弹窗 - searchListPlaceholder: '请选择到库位代码', - searchField: 'code', - searchTitle: '库位信息', - searchAllSchemas: Location.allSchemas, - searchPage: LocationApi.selectBusinessTypeToLocation, + table: { + width: 100 + }, + tableForm: { + disabled: true }, form: { - // labelMessage: '信息提示说明！！！', componentProps: { - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择到库位代码', - searchField: 'code', - searchTitle: '库位信息', - searchAllSchemas: Location.allSchemas, - searchPage: LocationApi.selectBusinessTypeToLocation, + disabled: true } - }, - table: { - width: 120 - }, + } }, { label: '到包装号', From 792e07050c79122a05ad209fac9c48309cd6f597 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 6 Aug 2024 16:44:25 +0800 Subject: [PATCH 22/26] =?UTF-8?q?=E5=A4=B1=E5=8E=BB=E7=84=A6=E7=82=B9?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=8F=AF=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/business/inputBlur.ts | 34 ++++++++++--------- .../inventorymoveRequestMain.data.ts | 1 + 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/src/api/wms/business/inputBlur.ts b/src/api/wms/business/inputBlur.ts index 9fb2ca26e..0bd0e3d38 100644 --- a/src/api/wms/business/inputBlur.ts +++ b/src/api/wms/business/inputBlur.ts @@ -158,24 +158,26 @@ export const tableFormBlurVer = async (headerItem, val, row, index, routeName, f } } } - // 判断改包装号是否已经添加 - const seen = new Set() - const repeatCode = new Set() - const arr = tableData.map((item) => item[headerItem.field]?.trim()) - arr.forEach((item) => { - if (item) { - if (seen.has(item)) { - repeatCode.add(item) - } else { - seen.add(item) + // 判断代码是否存在 + if (!headerItem?.tableForm.isRepeat) { + const seen = new Set() + const repeatCode = new Set() + const arr = tableData.map((item) => item[headerItem.field]?.trim()) + arr.forEach((item) => { + if (item) { + if (seen.has(item)) { + repeatCode.add(item) + } else { + seen.add(item) + } } + }) + const arr1 = Array.from(repeatCode) + if (arr1.length > 0) { + message.warning(`${arr1.join(',')}${t('ts.已经存在')}`) + row[headerItem.field] = '' + return } - }) - const arr1 = Array.from(repeatCode) - if (arr1.length > 0) { - message.warning(`${arr1.join(',')}${t('ts.已经存在')}`) - row[headerItem.field] = '' - return } if (filters.length > 0) { params.value.isSearch = true diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts index 539a42f47..b90d7a7c3 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts @@ -709,6 +709,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( value: 'in', isMainValue: false }], + isRepeat:true, verificationParams: [{ key: 'code', action: '==', From c92ff3a09203e36d5466dc95985e2b73cfe475c7 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 6 Aug 2024 17:05:16 +0800 Subject: [PATCH 23/26] =?UTF-8?q?=E5=8C=85=E8=A3=85=E5=8F=B7=E9=87=8D?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymove/inventorymoveRequestMain/index.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue index 32f943672..88f278275 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue @@ -701,8 +701,8 @@ const submitForm = async (formType, submitData) => { data.subList = tableData.value // 拼接子表数据参数 let isExist = false tableData.value.forEach(item => { - let rs = tableData.value.filter(filterItem => (filterItem.fromPackingNumber == item.fromPackingNumber) ) - console.log(rs,5666); + let rs = tableData.value.filter(filterItem => (filterItem.fromPackingNumber&&filterItem.fromPackingNumber == item.fromPackingNumber) ) + console.log(rs,5666); if(rs.length > 1) isExist = true }) if (isExist) { @@ -710,6 +710,7 @@ const submitForm = async (formType, submitData) => { isExist = false return message.warning('包装号重复') } + flag.value = false data.subList.forEach(item => { console.log(556565,item); if(fromInventoryStatus.value){ From 000fd9dd0fdadd11403c596beb643543612f726c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Tue, 6 Aug 2024 17:14:08 +0800 Subject: [PATCH 24/26] =?UTF-8?q?=E5=8F=91=E6=96=99=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=83=A8=E5=88=86=E5=AE=8C=E6=88=90=E6=8C=89?= =?UTF-8?q?=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/issueManage/issue/issueRequestMain/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/wms/issueManage/issue/issueRequestMain/index.vue b/src/views/wms/issueManage/issue/issueRequestMain/index.vue index 9f65f96aa..43b0edb6f 100644 --- a/src/views/wms/issueManage/issue/issueRequestMain/index.vue +++ b/src/views/wms/issueManage/issue/issueRequestMain/index.vue @@ -300,7 +300,8 @@ const butttondata = (row,$index) => { defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:issue-request-main:submit'}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:issue-request-main:refused'}), // 驳回 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:issue-request-main:handle'}), // 审批通过 - defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3','7']), hasPermi:'wms:issue-request-main:update'}), // 处理 + // defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3','7']), hasPermi:'wms:issue-request-main:update'}), // 处理 + defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']), hasPermi:'wms:issue-request-main:update'}), // 处理 defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:issue-request-main:update'}), // 编辑 // defaultButtons.mainListDeleteBtn({hasPermi:'wms:issue-request-main:delete'}), // 删除 ] From 8d5137887d757cbf580c493a79917f37496207e5 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Tue, 6 Aug 2024 17:24:33 +0800 Subject: [PATCH 25/26] =?UTF-8?q?=E9=97=AE=E9=A2=98HL-4966=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionscrapRequestMain/index.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue index c3496eea1..3f8cae170 100644 --- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue +++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue @@ -654,11 +654,11 @@ const submitForm = async (formType, submitData) => { isZC = false } }) - if(!isZC) { - formRef.value.formLoading = false - await message.confirm('含有不整箱情况,是否继续?') - formRef.value.formLoading = true - } + // if(!isZC) { + // formRef.value.formLoading = false + // await message.confirm('含有不整箱情况,是否继续?') + // formRef.value.formLoading = true + // } // 合格退料 添加参数 isOK data.isOK = true try { From 27575488aca320461d7607ac8e222df4f91f97e4 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 6 Aug 2024 19:25:33 +0800 Subject: [PATCH 26/26] =?UTF-8?q?=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymoveRequestMain/inventorymoveRequestMain.data.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts index b90d7a7c3..5899a7623 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts @@ -921,6 +921,9 @@ export const InventorymoveRequestDetailRules = reactive({ fromLocationCode: [ { required: true, message: '请选择从库位代码', trigger: 'change' } ], + fromPackingNumber: [ + { required: true, message: '请选择从包装号', trigger: 'change' } + ], fromInventoryStatus: [ { required: true, message: '请选择从库存状态', trigger: 'change' } ],