From 9cecf4290ca8fc0e9322e9e49e3b956907780f36 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 21 Aug 2024 10:49:39 +0800 Subject: [PATCH 01/62] =?UTF-8?q?HL-5458=20=E7=AD=9B=E9=80=89=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E6=97=A0=E7=94=9F=E6=95=88=E6=97=A5=E6=9C=9F=E9=80=89?= =?UTF-8?q?=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unplannedreceiptRecordMain.data.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts index b67ca0711..381a511d7 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts @@ -125,6 +125,14 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive( valueFormat: 'x', } }, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD', + type: 'daterange', + defaultTime: [new Date('1'), new Date('1')] + } + }, }, { label: '成本中心代码', From ce925b696d01fc62febb40f67e0d1f78068c00fa Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 21 Aug 2024 10:50:27 +0800 Subject: [PATCH 02/62] =?UTF-8?q?HL-5489=E6=89=80=E6=9C=89=E7=AD=9B?= =?UTF-8?q?=E9=80=89=EF=BC=8C=E9=80=89=E6=8B=A9=E5=88=9B=E5=BB=BA=E4=BA=BA?= =?UTF-8?q?=EF=BC=8C=E5=8F=AA=E8=83=BD=E4=B8=8B=E6=8B=89=E9=80=89=E6=8B=A9?= =?UTF-8?q?=EF=BC=8C=E6=97=A0=E6=B3=95=E8=BE=93=E5=85=A5=EF=BC=8C=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=BE=88=E5=A4=9A=E6=97=B6=EF=BC=8C=E6=8C=91=E9=80=89?= =?UTF-8?q?=E5=9B=B0=E9=9A=BE=EF=BC=8C=E6=9C=9F=E6=9C=9B=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=A7=93=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/SearchHigh/src/SearchHigh.vue | 50 ++++++++++++++++++-- 1 file changed, 45 insertions(+), 5 deletions(-) diff --git a/src/components/SearchHigh/src/SearchHigh.vue b/src/components/SearchHigh/src/SearchHigh.vue index 728fbd500..62eb8ae89 100644 --- a/src/components/SearchHigh/src/SearchHigh.vue +++ b/src/components/SearchHigh/src/SearchHigh.vue @@ -23,11 +23,30 @@ - + - + + + @@ -68,6 +87,12 @@ UserApi.getUserListAll().then((res) => { value: item.id } }) + options.value = res.map((item) => { + return { + label: item.nickname, + value: item.id + } + }) }) const props = defineProps({ @@ -171,9 +196,9 @@ const getFilterable = (val) => { const type = searchOption_high.value.find(item => (item.field == val)) // 下拉列表过长，去掉筛选功能 if (type?.field == 'creator' || type?.field == 'updater' || type?.field == 'worker') { - return false - }else{ return true + }else{ + return false } } // 判断数字输入框小数点位数 @@ -330,6 +355,21 @@ const changeDateTimePicker = (e, val,from) =>{ val.value = e.join(',') } } +const loading = ref(false) +const options = ref([]) +const remoteMethod = (query, array) => { + if (query) { + loading.value = true + setTimeout(() => { + loading.value = false + options.value = userListAll.value.filter((item) => { + return item.label.toLowerCase().includes(query.toLowerCase()) + }) + }, 200) + } else { + options.value = userListAll.value + } +} defineExpose({ popoverVisible From a1ccde6fa6f7426b2828fa6fb6e2df6526cf1e04 Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Wed, 21 Aug 2024 10:52:58 +0800 Subject: [PATCH 03/62] =?UTF-8?q?HL-5424=20QAD=E9=A1=B9=E7=9B=AE=20?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicDataManage/subject/qadCostcentre/qadCostcentre.data.ts | 1 + .../wms/basicDataManage/subject/qadProject/qadProject.data.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/wms/basicDataManage/subject/qadCostcentre/qadCostcentre.data.ts b/src/views/wms/basicDataManage/subject/qadCostcentre/qadCostcentre.data.ts index 1278bf90a..7783cebfb 100644 --- a/src/views/wms/basicDataManage/subject/qadCostcentre/qadCostcentre.data.ts +++ b/src/views/wms/basicDataManage/subject/qadCostcentre/qadCostcentre.data.ts @@ -89,6 +89,7 @@ export const QadCostcentre = useCrudSchemas(reactive([ sort: 'custom', formatter: dateFormatter, isSearch: false, + isSearch: true, search: { component: 'DatePicker', componentProps: { diff --git a/src/views/wms/basicDataManage/subject/qadProject/qadProject.data.ts b/src/views/wms/basicDataManage/subject/qadProject/qadProject.data.ts index 9191d3ffc..c04e55f5f 100644 --- a/src/views/wms/basicDataManage/subject/qadProject/qadProject.data.ts +++ b/src/views/wms/basicDataManage/subject/qadProject/qadProject.data.ts @@ -107,7 +107,7 @@ export const QadProject = useCrudSchemas(reactive([ field: 'createTime', sort: 'custom', formatter: dateFormatter, - isSearch: false, + isSearch: true, search: { component: 'DatePicker', componentProps: { From 7c4fcb16fda385c7b2b831049849dca2be19c557 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Wed, 21 Aug 2024 11:51:40 +0800 Subject: [PATCH 04/62] =?UTF-8?q?HL-5466=E6=8A=A5=E5=BA=9F=E5=8E=9F?= =?UTF-8?q?=E5=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/dict.ts | 1 + .../productscrapRecordMain.data.ts | 12 ++++++++++++ .../productscrapRequestMain.data.ts | 15 +++++++++++++++ 3 files changed, 28 insertions(+) diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 11aca3804..7f6ceb033 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -401,4 +401,5 @@ export enum DICT_TYPE { PUBLISHE_STATUS = 'publishe_status', // 采购收货任务状态 PUBLISHE_STATUS_FIRST_INSPECTION = 'publishe_status_first_inspection', // 首件检验记录发布状态 RETURN_REASON_TYPE = 'return_reason_type', // 采购退货原因类型 + SCRAPPING_REASON = 'scrapping_reason', //制品子件报废原因 } diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts index 16a0a352d..551eca89d 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts @@ -116,6 +116,18 @@ export const ProductscrapRecordMain = useCrudSchemas( width: 150 } }, + { + label: '报废原因', + field: 'scrappingReason', + dictType: DICT_TYPE.SCRAPPING_REASON, + dictClass: 'string', + isForm: true, + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + }, { label: '任务单号', field: 'jobNumber', diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts index 881153b74..d88934572 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts @@ -310,6 +310,18 @@ export const ProductscrapRequestMain = useCrudSchemas( } } }, + { + label: '报废原因', + field: 'scrappingReason', + dictType: DICT_TYPE.SCRAPPING_REASON, + dictClass: 'string', + isForm: true, + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + }, { label: '从仓库代码', field: 'fromWarehouseCode', @@ -644,6 +656,9 @@ export const ProductscrapRequestMainRules = reactive({ remark: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], + scrappingReason: [ + { required: true, message: '请输入报废原因', trigger: 'blur' } + ], }) /** From 33dd2ef702186a23721f06f683631d153d50ecbb Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Wed, 21 Aug 2024 11:59:44 +0800 Subject: [PATCH 05/62] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E9=87=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionRequest/index.vue | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/views/qms/inspectionRequest/index.vue b/src/views/qms/inspectionRequest/index.vue index 4e6ea8443..b863a1a02 100644 --- a/src/views/qms/inspectionRequest/index.vue +++ b/src/views/qms/inspectionRequest/index.vue @@ -5,9 +5,7 @@ @@ -510,7 +508,7 @@ const ListTableSubmit = async (formType, data) => { /** 初始化 **/ onMounted(async () => { tableObject.params = { - available: true + available: 'TRUE' } getList() importTemplateData.templateUrl = await InspectionMainApi.importTemplate() From 7f4604928e3c0a302421c4666c6c5177340a8136 Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Wed, 21 Aug 2024 12:00:39 +0800 Subject: [PATCH 06/62] =?UTF-8?q?WMS=20bug=EF=BC=9AHL-5531=20=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E6=A0=87=E7=AD=BE=E9=A1=B5=E9=9D=A2=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E7=A1=AE=E5=AE=9A=E5=90=8E=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/package/index.ts | 6 ++++++ src/views/wms/inventoryManage/package/index.vue | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/api/wms/package/index.ts b/src/api/wms/package/index.ts index 64a9fbf06..8854a8b3d 100644 --- a/src/api/wms/package/index.ts +++ b/src/api/wms/package/index.ts @@ -101,6 +101,12 @@ export const batchPrintingLable = async (data: any) => { return await request.post({ url: `/wms/package/batchPrintingLable`, data }) } + +// 批量打印标签多选 +export const batchPrintingLables = async (data: any) => { + return await request.post({ url: `/wms/package/batchPrintingLables`, data }) +} + // 打印标签获取包装列表 export const getLabel = async (id: number) => { return await request.get({ url: `/wms/package/getLabel?id=` + id }) diff --git a/src/views/wms/inventoryManage/package/index.vue b/src/views/wms/inventoryManage/package/index.vue index aee66956f..405d9989c 100644 --- a/src/views/wms/inventoryManage/package/index.vue +++ b/src/views/wms/inventoryManage/package/index.vue @@ -359,7 +359,7 @@ const formsSuccess = async (formType,data) => { const labelType = ref('') // 标签类别 采购还是制造等 const handlePoint = async (row) => { console.log(row.packingNumber,445555555555555); - PackageApi.batchPrintingLable([row.number]).then(res => { + PackageApi.batchPrintingLables([row.number]).then(res => { console.log('批量打印res',res); if(res.zzLabel){ //制造标签 From 481e8d2f29d6bdfcfbdcff794f7b046878c80a18 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 21 Aug 2024 13:16:29 +0800 Subject: [PATCH 07/62] =?UTF-8?q?HL-5281=E4=B8=8B=E6=9E=B6=E7=AD=96?= =?UTF-8?q?=E7=95=A5=E7=BC=96=E8=BE=91=EF=BC=8C=E5=BA=93=E5=AD=98=E4=BA=8B?= =?UTF-8?q?=E5=8A=A1=E5=BA=94=E8=AF=A5=E6=98=AF=E5=A4=9A=E9=80=89=EF=BC=8C?= =?UTF-8?q?=E8=80=8C=E4=B8=8D=E6=98=AF=E5=A1=AB=E5=86=99=EF=BC=8C=E5=90=A6?= =?UTF-8?q?=E5=88=99=E6=97=A0=E6=B3=95=E4=BF=9D=E8=AF=81=E5=A1=AB=E5=86=99?= =?UTF-8?q?=E7=9A=84=E4=BF=A1=E6=81=AF=E6=98=AF=E6=AD=A3=E7=A1=AE=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../strategy/downShelfStrategy/AddForm.vue | 39 +++++++++++++++++-- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue index ed8ffd727..d9fb3656a 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue @@ -305,12 +305,19 @@ :key="'库存事务Operator'+cur.value" /> - + /> --> + + + @@ -639,6 +646,11 @@ import * as LocationApi from '@/api/wms/location' import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data' import { isString } from '@/utils/is' import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' +import * as TransactiontypeApi from '@/api/wms/transactiontype' +import { Transactiontype } from '@/views/wms/basicDataManage/documentSetting/transactiontype/transactiontype.data' + + + const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 @@ -904,8 +916,22 @@ const filterMethodWarehouseList = (query: string) => { const searchTableRef = ref() -const searchWarehouse = ()=>{ +//事务类型 +const searchTransactionType = ()=>{ + searchTableRef.value.open( + '请选择事务类型', + Transactiontype.allSchemas, + TransactiontypeApi.getTransactiontypePage, + 'TransactionType', + 'code', + true, + undefined, + undefined, + undefined + ) +} +const searchWarehouse = ()=>{ if(warehouseType.value == 'WarehouseCode'){ // 仓库 @@ -964,6 +990,13 @@ const searchWarehouse = ()=>{ } const searchTableSuccess = (formField, searchField, val, type, row) => { + if(formField=='TransactionType'){ + let transactionType = formData.value.condition.find(item=>item['ParamCode']=='TransactionType') + if(transactionType){ + transactionType.Value = val.map(item=>(item['code'])).join(',') + } + return + } // let searchTableTitle = warehouseType.value == 'WarehouseCode'?'请选择仓库':warehouseType.value == 'AreaCode'?'请选择库区':warehouseType.value == 'LocationGroupCode'?'请选择库位组':warehouseType.value == 'LocationCode'?'请选择库位':'' console.log('searchTableSuccess',formField, searchField, val, type, row) console.log(val.map(item=>(item['code'])).join(',')) From cc3141372bb6042705663b6daf30dac4ed2c2526 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 21 Aug 2024 13:19:06 +0800 Subject: [PATCH 08/62] =?UTF-8?q?HL-5484=20scp=E4=BF=AE=E6=94=B9=E5=8C=85?= =?UTF-8?q?=E8=A3=85=E6=95=B0=E5=8A=9F=E8=83=BD=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/supplierdeliverRequestMain/labelForm.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue index cea9e2c05..87d493a03 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue @@ -448,6 +448,11 @@ const addX = (oneRow, oneIndex, twoRow, twoIndex, type) => { // 有父级托的时候 if (type == 1) { // 在托下添加箱 + // 在托下添加箱 + if (parseFloat(twoRow.xNumber) == parseFloat(oneRow.otherNumber)) { + message.warning('每托箱个数最多' + oneRow.otherNumber + '箱') + return + } twoRow.children.push({ id: twoId.value, // xPoNumber: From d9be31dde916093fb23132da943bd06016d1dfad Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Wed, 21 Aug 2024 13:30:00 +0800 Subject: [PATCH 09/62] =?UTF-8?q?WMS=20=E9=9C=80=E6=B1=82=EF=BC=9AHL-5418?= =?UTF-8?q?=20=E5=8C=85=E8=A3=85=E4=BF=A1=E6=81=AF=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/inventoryManage/package/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/inventoryManage/package/index.vue b/src/views/wms/inventoryManage/package/index.vue index 405d9989c..6746eb1e1 100644 --- a/src/views/wms/inventoryManage/package/index.vue +++ b/src/views/wms/inventoryManage/package/index.vue @@ -193,7 +193,7 @@ const handleSelectionPoint = async ()=>{ text: 'loading...', background: 'rgba(0, 0, 0, 0.7)' }) - PackageApi.batchPrintingLable(rows).then(res => { + PackageApi.batchPrintingLables(rows).then(res => { console.log('批量打印res',res); getLoading?.close() if(res.zzLabel){ From c2f4e2b125ba2d134f2945311ad93610ec355b53 Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Wed, 21 Aug 2024 13:35:52 +0800 Subject: [PATCH 10/62] =?UTF-8?q?HL-5424=20=E5=88=B6=E5=93=81=E5=9B=9E?= =?UTF-8?q?=E6=94=B6=20=E5=AF=BC=E5=87=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/productredressJobMain/index.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/api/wms/productredressJobMain/index.ts b/src/api/wms/productredressJobMain/index.ts index bbbddcbd9..8e90c034c 100644 --- a/src/api/wms/productredressJobMain/index.ts +++ b/src/api/wms/productredressJobMain/index.ts @@ -90,10 +90,15 @@ export const abandonProductredressJobMain = async (id: number) => { // 导出制品回收任务主 Excel export const exportProductredressJobMain = async (params) => { - return await request.download({ url: `/wms/productredress-job-main/export-excel`, params }) + if (params.isSearch){ + const data = {...params} + return await request.downloadPost({ url: `/wms/productredress-job-main/export-excel-senior`, data }) + }else { + return await request.download({ url: `/wms/productredress-job-main/export-excel`, params }) + } } // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/productredress-job-main/get-import-template' }) -} \ No newline at end of file +} From 708283fa7be6f0657a326449b9ed1aaf2b3de1f4 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 21 Aug 2024 13:36:31 +0800 Subject: [PATCH 11/62] =?UTF-8?q?HL-5416=E4=B8=8A=E6=9E=B6=E7=AD=96?= =?UTF-8?q?=E7=95=A5=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=87=BA=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../strategy/upShelfStrategy/index.vue | 61 +++++++++++++++++-- 1 file changed, 56 insertions(+), 5 deletions(-) diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue index 27be15c7c..f3ac86752 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue @@ -45,6 +45,16 @@ + + @@ -54,6 +64,8 @@ import { DICT_TYPE } from '@/utils/dict' import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as RuleApi from '@/api/wms/rule' import AddForm from './AddForm.vue' +import download from '@/utils/download' +import { formatDate } from '@/utils/formatTime' defineOptions({ name: 'SupplieDeliveryStrategy' }) const queryFormRef = ref() // 搜索的表单 @@ -111,11 +123,7 @@ const handleDelete = async (id: number) => { getList() } catch { } } -// 列表头部按钮 -const HeadButttondata = [ - defaultButtons.defaultAddBtn(null), // 新增 -] - +const route = useRoute() // 路由信息 // 头部按钮事件 @@ -143,6 +151,49 @@ const isShowMainButton = (row,val) => { } } +/** 导出按钮操作 */ +const exportLoading = ref(false) // 导出的加载中 +const handleExport = async () => { + console.log('queryParams',queryParams) + try { + // 导出的二次确认 + await message.exportConfirm() + // 发起导出 + exportLoading.value = true + const excelTitle = ref(route.meta.title) + const data = await SupplierdeliverRequestMainApi.exportSupplierdeliverRequestMain( + queryParams + ) + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) + } catch { + } finally { + exportLoading.value = false + } +} +/** 导入 */ +const importFormRef = ref() +const handleImport = () => { + importFormRef.value.open() +} + +// 列表头部按钮 +const HeadButttondata = [ + defaultButtons.defaultAddBtn(null), // 新增 + // defaultButtons.defaultImportBtn({ hasPermi: 'wms:supplierdeliver-request-main:import' }), // 导入 + // defaultButtons.defaultExportBtn({ hasPermi: 'wms:supplierdeliver-request-main:export' }), // 导出 + +] +// 导入附件弹窗所需的参数 +const importTemplateData = reactive({ + templateUrl: '', + templateTitle: `【${route.meta.title}】导入模版.xlsx` +}) + + +// 导入成功之后 +const importSuccess = () => { + getList() +} // 列表-操作按钮 const butttondata = (row) => { return [ From ab29df2d6b0e0b2d551eb725d2cc01b8622737a9 Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Wed, 21 Aug 2024 13:36:43 +0800 Subject: [PATCH 12/62] =?UTF-8?q?HL-5424=20=E5=8F=91=E6=96=99=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=20=E5=88=9B=E5=BB=BA=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/issueManage/issue/issueJobMain/issueJobMain.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts index 4ca560e46..3d5102883 100644 --- a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts +++ b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts @@ -357,7 +357,7 @@ export const IssueJobMain = useCrudSchemas( table: { width: 150 }, - isTable: false + isTable: true }, { label: '最后更新时间', From 0191a901907f659e161e3c2759ce8f03d8f57760 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 21 Aug 2024 13:49:52 +0800 Subject: [PATCH 13/62] =?UTF-8?q?=E7=94=9F=E6=95=88=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unplannedreceiptRecordMain.data.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts index 381a511d7..1395ba2ee 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts @@ -128,9 +128,9 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive( search: { component: 'DatePicker', componentProps: { - valueFormat: 'YYYY-MM-DD', + valueFormat: 'YYYY-MM-DD HH:mm:ss', type: 'daterange', - defaultTime: [new Date('1'), new Date('1')] + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, }, From 8741675fa84cab4c25846c60b6c31090e249089d Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Wed, 21 Aug 2024 13:50:42 +0800 Subject: [PATCH 14/62] =?UTF-8?q?HL-5424=20=E5=A4=87=E4=BB=B6=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=20=E5=88=9B=E5=BB=BA=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliverJobMain/deliverJobMain.data.ts | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts index cf585acbb..0eb87c4c6 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts @@ -575,7 +575,7 @@ export const DeliverJobMain = useCrudSchemas( table: { width: 180 }, - isTable: true, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -584,7 +584,7 @@ export const DeliverJobMain = useCrudSchemas( valueFormat: 'x' } }, - isSearch: true, + isSearch: false, search: { component: 'DatePicker', componentProps: { @@ -601,7 +601,7 @@ export const DeliverJobMain = useCrudSchemas( table: { width: 150 }, - isTable: true + isTable: false }, { label: '最后更新时间', @@ -894,7 +894,7 @@ export const DeliverJobDetail = useCrudSchemas(reactive([ table: { width: 180 }, - isTable: false, + isTable: true, form: { component: 'DatePicker', componentProps: { @@ -903,6 +903,15 @@ export const DeliverJobDetail = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isSearch: true, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + }, + }, }, { label: '创建者', @@ -911,7 +920,7 @@ export const DeliverJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, - isTable: false, + isTable: true, }, ])) From 93384d48ec1b3184aae0a002ab757772355136ec Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 21 Aug 2024 13:50:46 +0800 Subject: [PATCH 15/62] =?UTF-8?q?=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unplannedreceiptRecordMain.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts index 1395ba2ee..8df92cf66 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts @@ -391,7 +391,7 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive( component: 'DatePicker', componentProps: { valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', + type: 'datetimerange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, From 9a9d1da02140f19bf534163fb12f44aae77d52ef Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Wed, 21 Aug 2024 13:56:37 +0800 Subject: [PATCH 16/62] =?UTF-8?q?=E9=87=87=E6=A0=B7=E6=96=B9=E6=A1=88?= =?UTF-8?q?=E3=80=81=E6=A0=B7=E6=9C=AC=E5=AD=97=E7=A0=81=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/qms/sampleCode/index.ts | 8 +++++++- src/api/qms/samplingScheme/index.ts | 8 +++++++- src/views/qms/sampleCode/sampleCode.data.ts | 4 ++-- src/views/qms/samplingScheme/samplingScheme.data.ts | 4 ++-- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/api/qms/sampleCode/index.ts b/src/api/qms/sampleCode/index.ts index 9f7f9f13e..871035867 100644 --- a/src/api/qms/sampleCode/index.ts +++ b/src/api/qms/sampleCode/index.ts @@ -48,7 +48,13 @@ export const deleteSampleCode = async (id: number) => { // 导出样本字码 Excel export const exportSampleCode = async (params) => { - return await request.download({ url: `/qms/sample-code/export-excel`, params }) + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return request.downloadPost({ url: '/qms/sample-code/export-excel-senior', data }) + } else { + return await request.download({ url: `/qms/sample-code/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/api/qms/samplingScheme/index.ts b/src/api/qms/samplingScheme/index.ts index fdf76e455..8512eeaec 100644 --- a/src/api/qms/samplingScheme/index.ts +++ b/src/api/qms/samplingScheme/index.ts @@ -40,7 +40,13 @@ export const deleteSamplingScheme = async (id: number) => { // 导出采样方案 Excel export const exportSamplingScheme = async (params) => { - return await request.download({ url: `/qms/sampling-scheme/export-excel`, params }) + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return request.downloadPost({ url: '/qms/sampling-scheme/export-excel-senior', data }) + } else { + return await request.download({ url: `/qms/sampling-scheme/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/views/qms/sampleCode/sampleCode.data.ts b/src/views/qms/sampleCode/sampleCode.data.ts index 44795cfe0..a8baaf580 100644 --- a/src/views/qms/sampleCode/sampleCode.data.ts +++ b/src/views/qms/sampleCode/sampleCode.data.ts @@ -165,7 +165,7 @@ export const SampleCode = useCrudSchemas( sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -188,7 +188,7 @@ export const SampleCode = useCrudSchemas( field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } diff --git a/src/views/qms/samplingScheme/samplingScheme.data.ts b/src/views/qms/samplingScheme/samplingScheme.data.ts index 30edb172f..af0d71b9f 100644 --- a/src/views/qms/samplingScheme/samplingScheme.data.ts +++ b/src/views/qms/samplingScheme/samplingScheme.data.ts @@ -92,7 +92,7 @@ export const SamplingScheme = useCrudSchemas( sort: 'custom', isDetail: true, isForm: false, - isTable: false, + isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -115,7 +115,7 @@ export const SamplingScheme = useCrudSchemas( field: 'updater', isDetail: true, isForm: false, - isTable: false, + isTable: true, table: { width: 150 } From c5c3ab465754744c939afbc25ef68452757b9fc2 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 21 Aug 2024 14:13:16 +0800 Subject: [PATCH 17/62] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9C=AA=E5=BC=80?= =?UTF-8?q?=E5=8F=91=E5=AE=8C=E6=88=90=EF=BC=8C=E6=92=A4=E9=94=80=E6=8A=A5?= =?UTF-8?q?=E5=B7=A5=E6=8C=89=E9=92=AE=E6=9A=82=E6=97=B6=E5=8E=BB=E6=8E=89?= 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 ca527db82..fa7d5c65c 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue @@ -198,7 +198,7 @@ const butttondata = (row,$index) => { // defaultButtons.mainInspectRequestBtn({hasPermi:'wms:productreceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请 defaultButtons.mainInspectRequestBtn({hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请 defaultButtons.mainListPointBtn(null), // 标签打印 - defaultButtons.mainListRecoveryBtn(null), // 制品回收 + // defaultButtons.mainListRecoveryBtn(null), // 制品回收 ] } diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue index 3fa05b7aa..d827f1408 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue @@ -236,7 +236,7 @@ const butttondata = (row,$index) => { defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请 defaultButtons.mainPutawayRequestCpBtn({hasPermi:'wms:purchasereceipt-record-main:createPutawayRequest',hide:row.putawayRequestFlag == "FALSE" }),// 生成采购上架申请 defaultButtons.mainListPointBtn(null), // 标签打印 - defaultButtons.mainListRecoveryBtn(null), // 制品回收 + // defaultButtons.mainListRecoveryBtn(null), // 制品回收 ] } From 1b96671e580e963a01e70bacceef507eb4fd3a51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Wed, 21 Aug 2024 14:14:28 +0800 Subject: [PATCH 18/62] =?UTF-8?q?Q2=E9=80=9A=E7=9F=A5=E5=8D=95=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=B9=B6?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=93=8D=E4=BD=9C=E8=BF=87=E7=A8=8B=EF=BC=8C?= =?UTF-8?q?=20=20HL-5385?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/qms/inspectionQ2/index.ts | 5 + src/views/qms/inspectionQ2/index.vue | 103 +++++-- .../qms/inspectionQ2/inspectionQ2.data.ts | 285 +++++++++++++----- 3 files changed, 287 insertions(+), 106 deletions(-) diff --git a/src/api/qms/inspectionQ2/index.ts b/src/api/qms/inspectionQ2/index.ts index 36c186445..d2220bd6d 100644 --- a/src/api/qms/inspectionQ2/index.ts +++ b/src/api/qms/inspectionQ2/index.ts @@ -71,3 +71,8 @@ export const importTemplate = () => { export const finishQ2 = async (id: number) => { return await request.get({ url: `/qms/inspectionQ2/finish?id=` + id }) } + +// 获取系统中的email地址 +export const getEmail = () => { + return request.get({ url: `/qms/inspectionQ2/getEmail`}) +} diff --git a/src/views/qms/inspectionQ2/index.vue b/src/views/qms/inspectionQ2/index.vue index 13e5fc996..3e4efc71d 100644 --- a/src/views/qms/inspectionQ2/index.vue +++ b/src/views/qms/inspectionQ2/index.vue @@ -119,18 +119,44 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { } }) } + + if (formField == 'purchaseReceiptNumber') { + console.log("wolaile", + val[0].qty + ); + + setV['wmsQty'] = val[0].qty + } + + if (formField == 'lightItemCode') { + setV['lightItemCode'] = val[0].code + setV['lightItemName'] = val[0].name + } + if (formField == 'itemCode') { setV['SupplierCode'] = '' setV['SupplierName'] = '' setV['itemName'] = '' setV['standardCostPrice'] = '' - setV['qty'] = '' + setV['lightQty'] = '' setV['claimAmount'] = '' - + setV['otherclaimAmount'] = '' + setV['summaryAmount'] = '' + setV['disbursementAmount'] = '' + setV['remainingAmount'] = '' setV['uom'] = val[0].supplierUom + + Q2Api.getEmail().then((res) => { + if (res) { + formRef.setValues({ + cashierEmail: res + }) + } + }) + const supplieritemParams = { by: 'ASC', - filters: [{ column: 'itemCode', action: '==', value: val[0].itemCode}], + filters: [{ column: 'itemCode', action: '==', value: val[0].itemCode }], pageNo: 1, pageSize: 500, sort: '' @@ -154,6 +180,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { pageSize: 500, sort: '' } + itembasicParams.isSearch = true ItembasicApi.getItembasicPage(itembasicParams).then((res) => { if (res.list?.length > 0) { @@ -186,36 +213,60 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { } const onChange = (field, e) => { - if (field == 'qty') { + if (field == 'lightQty') { + basicFormRef.value.formRef.formModel.claimAmount = ( + parseFloat(basicFormRef.value.formRef.formModel.lightQty) * + parseFloat(basicFormRef.value.formRef.formModel.standardCostPrice) * + parseFloat(basicFormRef.value.formRef.formModel.claimMultiple) + ).toFixed(6) + basicFormRef.value.formRef.formModel.summaryAmount = ( + parseFloat(basicFormRef.value.formRef.formModel.claimAmount) + + parseFloat(basicFormRef.value.formRef.formModel.otherclaimAmount) + ).toFixed(6) + } + if (field == 'claimMultiple') { basicFormRef.value.formRef.formModel.claimAmount = ( - parseFloat(basicFormRef.value.formRef.formModel.qty) * parseFloat(basicFormRef.value.formRef.formModel.standardCostPrice) + parseFloat(basicFormRef.value.formRef.formModel.lightQty) * + parseFloat(basicFormRef.value.formRef.formModel.standardCostPrice) * + parseFloat(basicFormRef.value.formRef.formModel.claimMultiple) ).toFixed(6) - basicFormRef.value.formRef.formModel.summaryAmount = ( - parseFloat(basicFormRef.value.formRef.formModel.claimAmount) + parseFloat(basicFormRef.value.formRef.formModel.otherclaimAmount) + basicFormRef.value.formRef.formModel.summaryAmount = ( + parseFloat(basicFormRef.value.formRef.formModel.claimAmount) + + parseFloat(basicFormRef.value.formRef.formModel.otherclaimAmount) ).toFixed(6) } if (field == 'otherclaimAmount') { basicFormRef.value.formRef.formModel.summaryAmount = ( - parseFloat(basicFormRef.value.formRef.formModel.claimAmount) + parseFloat(basicFormRef.value.formRef.formModel.otherclaimAmount) - + parseFloat(basicFormRef.value.formRef.formModel.claimAmount) + + parseFloat(basicFormRef.value.formRef.formModel.otherclaimAmount) ).toFixed(6) } - if (field == 'supplierCode') { - basicFormRef.value.formRef.formModel.supplierName = '' - const paramsCustomer = { - by: 'ASC', - filters: [{ column: 'code', action: '==', value: basicFormRef.value.formRef.formModel.supplierCode }], - pageNo: 1, - pageSize: 500, - sort: '' - } - paramsCustomer.isSearch = true - SupplierApi.getSupplierPage(paramsCustomer).then((res) => { - if (res.list?.length > 0) { - basicFormRef.value.formRef.formModel.supplierName = res.list[0].name - } - }) + + if (field == 'disbursementAmount') { + basicFormRef.value.formRef.formModel.remainingAmount = ( + parseFloat(basicFormRef.value.formRef.formModel.summaryAmount) - + parseFloat(basicFormRef.value.formRef.formModel.disbursementAmount) + ).toFixed(6) + } + + if (field == 'supplierCode') { + basicFormRef.value.formRef.formModel.supplierName = '' + const paramsCustomer = { + by: 'ASC', + filters: [ + { column: 'code', action: '==', value: basicFormRef.value.formRef.formModel.supplierCode } + ], + pageNo: 1, + pageSize: 500, + sort: '' } + paramsCustomer.isSearch = true + SupplierApi.getSupplierPage(paramsCustomer).then((res) => { + if (res.list?.length > 0) { + basicFormRef.value.formRef.formModel.supplierName = res.list[0].name + } + }) + } } // 字段设置 更新主列表字段 @@ -346,11 +397,11 @@ const formsSuccess = async (formType, data) => { return } } - if (data.qty > data.wmsQty) { + if (data.lightQty > data.wmsQty) { message.error('数量不能大于记录中的收货数量') return } - if (data.qty == 0) { + if (data.lightQty == 0) { message.error('数量不能为0') return } diff --git a/src/views/qms/inspectionQ2/inspectionQ2.data.ts b/src/views/qms/inspectionQ2/inspectionQ2.data.ts index 342e3f3c9..067a5a8ef 100644 --- a/src/views/qms/inspectionQ2/inspectionQ2.data.ts +++ b/src/views/qms/inspectionQ2/inspectionQ2.data.ts @@ -10,30 +10,30 @@ import { Q1 } from '@/views/qms/inspectionQ1/inspectionQ1.data' import * as SupplieritemApi from '@/api/wms/supplieritem' import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data' -import * as SupplierApi from '@/api/wms/supplier' -import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data' - import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecordDetail' import { PurchasereceiptRecordDetail } from '@/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data' +import * as ItembasicApi from '@/api/wms/itembasic' +import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data' + import { useUserStore } from '@/store/modules/user' const userStore = useUserStore() // 表单校验 export const Q2Rules = reactive({ - number: [required], - supplierCode: [required], - itemCode: [required], - purchaseReceiptNumber: [required], - qty: [required], - code: [required], - priority: [required], - claimAmount: [required], - costCode: [required], - claimTime: [required], - handleTime: [required], - available: [required], - concurrencyStamp: [required] + itemCode: [{ required: true, message: '请选择供应商物料代码', trigger: 'change' }], + supplierCode: [{ required: true, message: '请选择供应商代码', trigger: 'change' }], + purchaseReceiptNumber: [{ required: true, message: '请选择采购收货单号', trigger: 'change' }], + claimTime: [{ required: true, message: '请选择索赔日期', trigger: 'change' }], + lightItemCode: [{ required: true, message: '请选择整灯物料代码', trigger: 'change' }], + lightQty: [{ required: true, message: '请选择整灯数量', trigger: 'change' }], + code: [{ required: true, message: '请选择缺陷代码', trigger: 'change' }], + priority: [{ required: true, message: '请选择优先级', trigger: 'change' }], + claimMultiple: [{ required: true, message: '请选择索赔倍数', trigger: 'change' }], + claimAmount: [{ required: true, message: '请输入索赔金额', trigger: 'change' }], + costCode: [{ required: true, message: '请选择选择成本中心代码', trigger: 'change' }], + cashierEmail: [{ required: true, message: '请选择选择出纳邮件地址', trigger: 'change' }], + handleTime: [{ required: true, message: '请选择选择处理时间', trigger: 'change' }] }) export const Q2 = useCrudSchemas( @@ -50,7 +50,7 @@ export const Q2 = useCrudSchemas( } }, { - label: '物料代码', + label: '供应商物料代码', field: 'itemCode', sort: 'custom', table: { @@ -72,6 +72,11 @@ export const Q2 = useCrudSchemas( key: 'available', value: 'TRUE', isMainValue: false + }, + { + key: 'type', + value: 'Q2', + isMainValue: false } ], verificationParams: [ @@ -88,7 +93,7 @@ export const Q2 = useCrudSchemas( } }, { - label: '物料名称', + label: '供应商物料名称', field: 'itemName', sort: 'custom', dictClass: 'string', @@ -97,6 +102,9 @@ export const Q2 = useCrudSchemas( tableForm: { disabled: true }, + table: { + width: 150 + }, form: { componentProps: { disabled: true @@ -113,6 +121,9 @@ export const Q2 = useCrudSchemas( tableForm: { disabled: true }, + table: { + width: 120 + }, form: { component: 'Select', componentProps: { @@ -132,6 +143,9 @@ export const Q2 = useCrudSchemas( dictClass: 'string', isSearch: false, isTable: true, + table: { + width: 180 + }, tableForm: { disabled: true }, @@ -154,6 +168,7 @@ export const Q2 = useCrudSchemas( componentProps: { enterSearch: true, disabled: true, + multiple: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择采购收货记录单号', // 输入框占位文本 searchField: 'number', // 查询弹窗赋值字段 @@ -206,64 +221,73 @@ export const Q2 = useCrudSchemas( } } }, - { - label: '数量', - field: 'qty', + label: '整灯物料代码', + field: 'lightItemCode', sort: 'custom', - isTable: true, - isSearch: false, table: { width: 150 }, + isSearch: true, form: { - component: 'InputNumber', + // labelMessage: '信息提示说明！！！', componentProps: { - min: 0, - precision: 2 + enterSearch: true, + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择物料代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '物料基础信息', // 查询弹窗标题 + searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类 + searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法 + searchCondition: [ + { + key: 'available', + value: 'TRUE', + isMainValue: false + }, + { + key: 'type', + value: 'CCP', + isMainValue: false + } + ], + verificationParams: [ + { + key: 'lightItemCode', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true + } + ] // 失去焦点校验参数 } } }, { - label: '单位', - field: 'uom', + label: '整灯物料名称', + field: 'lightItemName', sort: 'custom', - dictType: DICT_TYPE.UOM, dictClass: 'string', isSearch: false, isTable: true, - tableForm: { - type: 'Select', - disabled: true - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '标准成本价格', - field: 'standardCostPrice', - sort: 'custom', - isSearch: false, table: { width: 150 }, + tableForm: { + disabled: true + }, form: { - component: 'InputNumber', componentProps: { - min: 0, - precision: 6, disabled: true } } }, { - label: '索赔金额', - field: 'claimAmount', + label: '整灯数量', + field: 'lightQty', sort: 'custom', - isTable: false, + isTable: true, isSearch: false, table: { width: 150 @@ -303,6 +327,60 @@ export const Q2 = useCrudSchemas( type: 'Select' } }, + { + label: '索赔倍数', + field: 'claimMultiple', + sort: 'custom', + dictType: DICT_TYPE.QMS_CLAIM_MULTIPLE, + dictClass: 'string', + isTable: true, + isSearch: false, + table: { + width: 100 + }, + tableForm: { + type: 'Select', + disabled: true + }, + form: { + componentProps: {} + } + }, + { + label: '标准成本价格', + field: 'standardCostPrice', + sort: 'custom', + isSearch: false, + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 0, + precision: 6, + disabled: true + } + } + }, + { + label: '索赔金额', + field: 'claimAmount', + sort: 'custom', + isTable: false, + isSearch: false, + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 0, + precision: 2 + } + } + }, + { label: '其他索赔描述', field: 'otherClaimDesc', @@ -328,7 +406,7 @@ export const Q2 = useCrudSchemas( component: 'InputNumber', componentProps: { min: 0, - precision: 6, + precision: 6 } } }, @@ -350,39 +428,35 @@ export const Q2 = useCrudSchemas( } }, { - label: '成本中心代码', - field: 'costCode', + label: '抛账金额', + field: 'disbursementAmount', sort: 'custom', isSearch: false, - isTable: false, - isForm: true, + table: { + width: 150 + }, form: { - // labelMessage: '信息提示说明！！！', + component: 'InputNumber', componentProps: { - enterSearch: true, - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择成本中心', // 输入框占位文本 - searchField: 'costcentreCode', // 查询弹窗赋值字段 - searchTitle: '成本中心信息', // 查询弹窗标题 - searchAllSchemas: QadCostcentre.allSchemas, // 查询弹窗所需类 - searchPage: QadCostcentreApi.getQadCostcentrePage, // 查询弹窗所需分页方法 - searchCondition: [ - { - key: 'available', - value: 'TRUE', - isMainValue: false - } - ], - verificationParams: [ - { - key: 'costcentreCode', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true - } - ] // 失去焦点校验参数 + min: 0, + precision: 6 + } + } + }, + { + label: '剩余金额', + field: 'remainingAmount', + sort: 'custom', + isSearch: false, + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 0, + precision: 6, + disabled: true } } }, @@ -430,6 +504,57 @@ export const Q2 = useCrudSchemas( }, isSearch: true }, + { + label: '成本中心代码', + field: 'costCode', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: true, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + enterSearch: true, + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择成本中心', // 输入框占位文本 + searchField: 'costcentreCode', // 查询弹窗赋值字段 + searchTitle: '成本中心信息', // 查询弹窗标题 + searchAllSchemas: QadCostcentre.allSchemas, // 查询弹窗所需类 + searchPage: QadCostcentreApi.getQadCostcentrePage, // 查询弹窗所需分页方法 + searchCondition: [ + { + key: 'available', + value: 'TRUE', + isMainValue: false + } + ], + verificationParams: [ + { + key: 'costcentreCode', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true + } + ] // 失去焦点校验参数 + } + } + }, + { + label: '出纳邮件地址', + field: 'cashierEmail', + sort: 'custom', + isSearch: false, + table: { + width: '150' + }, + form: { + component: 'Input', + componentProps: {} + } + }, + { label: '负责用户', field: 'responUser', From 2de470c5881b60ef91171340848a6f144887a7a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Wed, 21 Aug 2024 14:16:23 +0800 Subject: [PATCH 19/62] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/dict.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 7f6ceb033..800462d54 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -329,6 +329,7 @@ export enum DICT_TYPE { DEFECT_LOCATION = 'defect_location', // 质量通知缺陷位置 DEFECT_TYPE = 'defect_type', // 质量通知缺陷类型 PROBLEM_REASON = 'problem_reason', // 质量通知问题原因 + QMS_CLAIM_MULTIPLE = 'qms_claim_multiple', //质量通知索赔倍数 // ========== 业务 - mes -gaojs ========== QUALIFY_STATUS = 'qualify_status', //质检状态 From ed95321fd342b42edefd45fb6e0355a0413cdbe0 Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Wed, 21 Aug 2024 14:18:30 +0800 Subject: [PATCH 20/62] =?UTF-8?q?HL-5424=20=E5=AE=A2=E6=88=B7=E9=80=80?= =?UTF-8?q?=E8=B4=A7=E4=BB=BB=E5=8A=A1=20=E5=88=9B=E5=BB=BA=E4=BA=BA?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreturnJobMain.data.ts | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts index 53ff33579..090d03149 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts @@ -612,7 +612,7 @@ export const CustomerreturnJobMain = useCrudSchemas( table: { width: 180 }, - isTable: true, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -621,15 +621,6 @@ export const CustomerreturnJobMain = useCrudSchemas( valueFormat: 'x' } }, - isSearch: true, - search: { - component: 'DatePicker', - componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - }, - }, }, { label: '创建者', @@ -638,7 +629,7 @@ export const CustomerreturnJobMain = useCrudSchemas( table: { width: 150 }, - isTable: true + isTable: false }, { label: '最后更新时间', @@ -955,7 +946,7 @@ export const CustomerreturnJobDetail = useCrudSchemas(reactive([ table: { width: 180 }, - isTable: false, + isTable: true, form: { component: 'DatePicker', componentProps: { @@ -964,6 +955,15 @@ export const CustomerreturnJobDetail = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isSearch: true, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + }, + }, }, { label: '创建者', @@ -972,7 +972,7 @@ export const CustomerreturnJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, - isTable: false, + isTable: true, }, ])) From 8a2f0831679985fe763ddaa06fc24299921eaf23 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Wed, 21 Aug 2024 14:22:03 +0800 Subject: [PATCH 21/62] =?UTF-8?q?=E9=A6=96=E4=BB=B6=E6=A3=80=E9=AA=8C?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E9=87=8D=E7=BD=AE=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionRecordFirst/index.vue | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/views/qms/inspectionRecordFirst/index.vue b/src/views/qms/inspectionRecordFirst/index.vue index b3ee003d1..75180396d 100644 --- a/src/views/qms/inspectionRecordFirst/index.vue +++ b/src/views/qms/inspectionRecordFirst/index.vue @@ -2,10 +2,7 @@ @@ -306,7 +303,7 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async () => { tableObject.params = { - available: true, + available: 'TRUE', inspectionType:'11' } getList() From 0cd3efa642535d3b03d979bb3984b793538669a8 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 21 Aug 2024 14:32:24 +0800 Subject: [PATCH 22/62] =?UTF-8?q?HL-5395WMS=EF=BC=8CSCP=EF=BC=8CQMS?= =?UTF-8?q?=E5=9C=A8=E6=89=80=E6=9C=89=E5=88=97=E8=A1=A8=E9=A1=B5=E4=B8=8A?= =?UTF-8?q?=E9=9D=A2=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=A1=86=E4=B8=AD=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E4=BF=A1=E6=81=AF=E5=90=8E=E6=8C=89=E3=80=90=E5=9B=9E?= =?UTF-8?q?=E8=BD=A6=E3=80=91=EF=BC=8C=E5=8F=AF=E4=BB=A5=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=8C=E7=9B=B8=E5=BD=93=E4=BA=8E=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E4=BA=86=E3=80=90=E6=9F=A5=E8=AF=A2=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Form/src/Form.vue | 7 ++++++- src/components/Search/src/Search.vue | 7 +++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/components/Form/src/Form.vue b/src/components/Form/src/Form.vue index 1a9076d65..33db690db 100644 --- a/src/components/Form/src/Form.vue +++ b/src/components/Form/src/Form.vue @@ -55,7 +55,7 @@ export default defineComponent({ vLoading: propTypes.bool.def(false), labelPosition: propTypes.string.def('left'), }, - emits: ['register','opensearchTable','clearSearchInput', 'onChange', 'onBlur','onFocus','onEnter','hiddenFilterButton','changeDialogWidth','onInput'], + emits: ['register','opensearchTable','clearSearchInput', 'onChange', 'onSubmit', 'onBlur','onFocus','onEnter','hiddenFilterButton','changeDialogWidth','onInput'], setup(props, { slots, expose, emit }) { // element form 实例 const elFormRef = ref>() @@ -196,6 +196,10 @@ export default defineComponent({ const onChange = (field, cur) => { emit('onChange', field, cur) } + const onSubmit = (event) => { + emit('onSubmit', event) + } + /** * 监听失去焦点 * @param field 当前操作字段 @@ -461,6 +465,7 @@ export default defineComponent({ class={prefixCls} v-loading={props.vLoading} label-position={props.labelPosition} + onSubmit={(e)=>{onSubmit(e)}} > {{ // 如果需要自定义，就什么都不渲染，而是提供默认插槽 diff --git a/src/components/Search/src/Search.vue b/src/components/Search/src/Search.vue index f75d6fa2f..deea2f7a7 100644 --- a/src/components/Search/src/Search.vue +++ b/src/components/Search/src/Search.vue @@ -122,7 +122,12 @@ const onInput = (field,value) => { const onChange = (field, value)=>{ emit('onChange', field,value) } + +const onSubmit = (e) => { + e.preventDefault(); +} const onEnter = async (field, value, e) => { + if(props.enterSearch){ search() }else{ @@ -183,6 +188,7 @@ const opensearchTable = ( return } } + }else if(searchCondition[i].isTableRowValue){ if(searchCondition[i].required){ if (row[searchCondition[i].value] == '' ||row[searchCondition[i].value] == undefined) { @@ -305,6 +311,7 @@ defineExpose({setFormValues,search}) // 提供 open 方法，用于打开弹窗 @opensearchTable="opensearchTable" @onChange="onChange" @onEnter="onEnter" + @onSubmit="onSubmit" >