From 09f973a418f366083ee4019258a36f429de070df Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Fri, 23 Aug 2024 08:35:46 +0800 Subject: [PATCH 01/85] =?UTF-8?q?HL-5424=20=E5=99=A8=E5=85=B7=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20=E5=88=9B=E5=BB=BA=E4=BA=BA=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../containerRecordMain.data.ts | 34 ++++++++++++++++--- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts index 57daad0dd..8b65a711b 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts @@ -126,7 +126,7 @@ export const ContainerRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, - isSearch: true, + isSearch: false, search: { component: 'DatePicker', componentProps: { @@ -135,7 +135,7 @@ export const ContainerRecordMain = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, - isTable: true, + isTable: false, isForm: false, }, { @@ -145,7 +145,7 @@ export const ContainerRecordMain = useCrudSchemas(reactive([ width: 130 }, isForm: false, - isTable: true + isTable: false }, { label: '最后更新时间', @@ -274,6 +274,20 @@ export const ContainerRecordDetail = useCrudSchemas(reactive([ field: 'createTime', sort: 'custom', formatter: dateFormatter, + detail: { + dateFormat : 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, search: { component: 'DatePicker', componentProps: { @@ -282,9 +296,19 @@ export const ContainerRecordDetail = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, - isTable: false, + isTable: true, + isForm: false, + isTableForm: false, + isSearch: true, + }, + { + label: '创建者', + field: 'creator', + table: { + width: 130 + }, isForm: false, - isTableForm: false + isTable: true }, { label: '地点ID', From fd8e27022e7435a9ee679c8fc9d0b8c0ee13182a Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Fri, 23 Aug 2024 09:05:16 +0800 Subject: [PATCH 02/85] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-5565=E6=8A=A5?= =?UTF-8?q?=E5=BA=9F=E5=87=BA=E5=BA=93=E5=A4=87=E6=B3=A8=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=8D=95=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts | 2 +- .../scrap/scrapRecordMain/scrapRecordMain.data.ts | 2 +- .../wms/inventoryjobManage/scrap/scrapRequestMain/index.vue | 3 +++ .../scrap/scrapRequestMain/scrapRequestMain.data.ts | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts index b6f29dca9..032f68823 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts @@ -354,7 +354,7 @@ export const ScrapJobMain = useCrudSchemas( } }, { - label: '备注', + label: '通知单描述', field: 'remark', sort: 'custom', table: { diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts index b5da4fca0..833d98069 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts @@ -357,7 +357,7 @@ export const ScrapRecordMain = useCrudSchemas( } }, { - label: '备注', + label: '通知单描述', field: 'remark', sort: 'custom', table: { diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue index b09097359..50518741e 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue @@ -190,6 +190,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => console.log("报废出库主表") const setV = {} if (formField == 'q1Number') { + setV['remark'] = val[0]['desc'] ScrapRequestMain.allSchemas.formSchema.forEach((item) => { if (item.field == 'q2Number' || item.field == 'q3Number') { item.componentProps.enterSearch = false @@ -199,6 +200,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => }) } if (formField == 'q2Number') { + setV['remark'] = val[0]['desc'] ScrapRequestMain.allSchemas.formSchema.forEach((item) => { if (item.field == 'q1Number' || item.field == 'q3Number') { item.componentProps.enterSearch = false @@ -208,6 +210,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => }) } if (formField == 'q3Number') { + setV['remark'] = val[0]['desc'] ScrapRequestMain.allSchemas.formSchema.forEach((item) => { if (item.field == 'q1Number' || item.field == 'q2Number') { item.componentProps.enterSearch = false diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts index 2aed0a8b8..8960f82cc 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts @@ -617,7 +617,7 @@ export const ScrapRequestMain = useCrudSchemas( } }, { - label: '备注', + label: '通知单描述', field: 'remark', sort: 'custom', isTable: false, From 475e854c4bda44b839d3e9e7fe8a4389d1f2e796 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Fri, 23 Aug 2024 09:29:45 +0800 Subject: [PATCH 03/85] =?UTF-8?q?HL-5284:WMS=E8=A6=81=E6=8F=90=E4=BE=9B?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E7=9A=84=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=92=8C=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/purchaseMainWms/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/index.vue index 8affbe3d8..10d9797a9 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMainWms/index.vue @@ -231,7 +231,7 @@ console.log('PurchaseMain.allSchemas.searchSchema',PurchaseMain.allSchemas.searc const HeadButttondata = [ // defaultButtons.defaultAddBtn({ hasPermi: 'wms:purchase-main:create' }), // 新增 // defaultButtons.defaultImportBtn({ hasPermi: 'wms:purchase-main:import' }), // 导入 - defaultButtons.defaultExportBtn({ hasPermi: 'wms:purchase-main-wms:export' }), // 导出 + defaultButtons.defaultExportBtn({ hasPermi: 'wms:purchase-main:export' }), // 导出 // defaultButtons.mainListSelectionOrderPubBtn(null), // 批量发布 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 From 6f8642ab83a74d6f68f7b1d8fc128b7960ae9131 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 23 Aug 2024 09:46:10 +0800 Subject: [PATCH 04/85] =?UTF-8?q?HL-5508=20=E5=A2=9E=E5=8A=A0=E5=8D=95?= =?UTF-8?q?=E7=8B=AC=E7=9A=84=E8=8F=9C=E5=8D=95=E6=98=BE=E7=A4=BA=EF=BC=8C?= =?UTF-8?q?=E9=9A=94=E7=A6=BB=E9=80=80=E6=96=99=E7=94=B3=E8=AF=B7=E7=94=9F?= =?UTF-8?q?=E6=88=90=E7=9A=84=E9=9A=94=E7=A6=BB=E9=80=80=E6=96=99=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E3=80=82=E5=8E=9F=E6=9D=A5=E7=9A=84=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E9=80=80=E6=96=99=E7=94=B3=E8=AF=B7=E5=AF=B9=E5=BA=94=E7=8E=B0?= =?UTF-8?q?=E6=9C=89=E7=9A=84=E7=94=9F=E4=BA=A7=E9=80=80=E6=96=99=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/productionreturnJobDetail/index.ts | 21 +++++++++++++++++++ src/api/wms/productionreturnJobMain/index.ts | 21 +++++++++++++++++++ .../wms/productionreturnRecordMain/index.ts | 18 ++++++++++++++++ .../productionreturnJobMain/index.vue | 16 +++++++++++--- .../productionreturnRecordMain/index.vue | 12 +++++++++-- 5 files changed, 83 insertions(+), 5 deletions(-) diff --git a/src/api/wms/productionreturnJobDetail/index.ts b/src/api/wms/productionreturnJobDetail/index.ts index f2bd6d534..50b625701 100644 --- a/src/api/wms/productionreturnJobDetail/index.ts +++ b/src/api/wms/productionreturnJobDetail/index.ts @@ -34,6 +34,27 @@ export const getProductionreturnJobDetailPage = async (params) => { return await request.get({ url: `/wms/productionreturn-job-detail/page`, params }) } } +// 查询生产退料任务子列表 +export const getProductionreturnJobDetailPageStore = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/productionreturn-job-detail-store/senior', data }) + } else { + return await request.get({ url: `/wms/productionreturn-job-detail-store/page`, params }) + } +} + +// 查询隔离退料任务子列表 +export const getProductionreturnJobDetailPageHold = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/productionreturn-job-detail-hold/senior', data }) + } else { + return await request.get({ url: `/wms/productionreturn-job-detail-hold/page`, params }) + } +} // 查询生产退料任务子详情 export const getProductionreturnJobDetail = async (id: number) => { diff --git a/src/api/wms/productionreturnJobMain/index.ts b/src/api/wms/productionreturnJobMain/index.ts index 0848605bd..74bd69d6f 100644 --- a/src/api/wms/productionreturnJobMain/index.ts +++ b/src/api/wms/productionreturnJobMain/index.ts @@ -81,6 +81,27 @@ export const exportProductionreturnJobMain = async (params) => { } } +// 导出生产退料任务主 Excel -store +export const exportProductionreturnJobMainStore = async (params) => { + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/productionreturn-job-detail-store/export-excel-senior`, data }) + } else { + return await request.download({ url: `/wms/productionreturn-job-detail-store/export-excel`, params }) + } +} + +// 导出隔离退料任务主 Excel -hold +export const exportProductionreturnJobMainHold = async (params) => { + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/productionreturn-job-detail-hold/export-excel-senior`, data }) + } else { + return await request.download({ url: `/wms/productionreturn-job-detail-hold/export-excel`, params }) + } +} + + // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/productionreturn-job-main/get-import-template' }) diff --git a/src/api/wms/productionreturnRecordMain/index.ts b/src/api/wms/productionreturnRecordMain/index.ts index 9908d416e..517717011 100644 --- a/src/api/wms/productionreturnRecordMain/index.ts +++ b/src/api/wms/productionreturnRecordMain/index.ts @@ -67,6 +67,24 @@ export const exportProductionreturnRecordMain = async (params) => { return await request.download({ url: `/wms/productionreturn-record-main/export-excel`, params }) } } +// 导出生产退料记录主 Excel -store +export const exportProductionreturnRecordMainStore = async (params) => { + if (params.isSearch){ + const data = {...params} + return await request.downloadPost({ url: `/wms/productionreturn-job-detail-store/export-excel-senior`, data }) + }else { + return await request.download({ url: `/wms/productionreturn-job-detail-store/export-excel`, params }) + } +} +// 导出隔离退料记录主 Excel -hold +export const exportProductionreturnRecordMainHold = async (params) => { + if (params.isSearch){ + const data = {...params} + return await request.downloadPost({ url: `/wms/productionreturn-job-detail-hold/export-excel-senior`, data }) + }else { + return await request.download({ url: `/wms/productionreturn-job-detail-hold/export-excel`, params }) + } +} // 下载用户导入模板 export const importTemplate = () => { diff --git a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue index 20e67efd2..5e738580e 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue @@ -117,7 +117,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => } const { tableObject, tableMethods } = useTable({ - getListApi: ProductionreturnJobDetailApi.getProductionreturnJobDetailPage // 分页接口 + getListApi: 'ProductionreturnJobMain'==routeName.value?ProductionreturnJobDetailApi.getProductionreturnJobDetailPageStore:ProductionreturnJobDetailApi.getProductionreturnJobDetailPageHold // 分页接口 + }) // 获得表格的各种操作 @@ -274,8 +275,17 @@ const handleExport = async () => { // 发起导出 loadStart() const excelTitle = ref(route.meta.title) - const data = await ProductionreturnJobMainApi.exportProductionreturnJobMain(tableObject.params) - download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) + if('ProductionreturnJobMain'==routeName.value){ + //生产退料任务导出 + const data = await ProductionreturnJobMainApi.exportProductionreturnJobMainStore(tableObject.params) + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) + }else{ + // 隔离退料任务导出 + const data = await ProductionreturnJobMainApi.exportProductionreturnJobMainHold(tableObject.params) + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) + } + + } catch { } finally { loadDone() diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue index 0cc61c972..87c75fc7c 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/index.vue @@ -159,8 +159,16 @@ const handleExport = async () => { // 发起导出 loadStart() const excelTitle = ref(route.meta.title) - const data = await ProductionreturnRecordMainApi.exportProductionreturnRecordMain(tableObject.params) - download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) + if('ProductionreturnRecordMain'==routeName.value){ + //生产退料记录导出 + const data = await ProductionreturnRecordMainApi.exportProductionreturnRecordMainStore(tableObject.params) + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) + }else{ + // 隔离退料记录导出 + const data = await ProductionreturnRecordMainApi.exportProductionreturnRecordMainHold(tableObject.params) + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) + } + } catch { } finally { loadDone() From 63d01c03c234a19731cf871cd382f629fee7eddb Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 23 Aug 2024 10:22:52 +0800 Subject: [PATCH 05/85] =?UTF-8?q?HL-5499=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E5=8F=91=E7=A5=A8=E4=BD=9C=E5=BA=9F=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRecordMain/index.vue | 42 ++++++--- .../supplierinvoiceRecordMain.data.ts | 85 ++++++++++++++++++- 2 files changed, 114 insertions(+), 13 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue index db9995306..8d2249c80 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue @@ -44,17 +44,20 @@ - + + + import download from '@/utils/download' -import { SupplierinvoiceRecordMain,SupplierinvoiceRecordMainRules,SupplierinvoiceRecordDetail,SupplierinvoiceRecordDetailRules,SupplierinvoiceRecordDetailMain } from './supplierinvoiceRecordMain.data' +import { SupplierinvoiceRecordMain,SupplierinvoiceRecordMainRules,SupplierinvoiceRecordDetail,SupplierinvoiceRecordDetailRules,SupplierinvoiceRecordDetailMain,SupplierinvoiceRecordMainTransfer,SupplierinvoiceRecordMainTransferRules } from './supplierinvoiceRecordMain.data' import * as SupplierinvoiceRecordMainApi from '@/api/wms/supplierinvoiceRecordMain' import * as SupplierinvoiceRecordDetailApi from '@/api/wms/supplierinvoiceRecordDeatil' import * as defaultButtons from '@/utils/disposition/defaultButtons' @@ -234,7 +237,7 @@ const handleSelectionPoint = async ()=>{ // 列表-操作按钮 const butttondata = (row,$index) => { return [ - { + { label: t('ts.查看明细'), name: 'open_detail', type: 'primary', @@ -242,16 +245,31 @@ const butttondata = (row,$index) => { color: '', hasPermi: '', link: true, // 文本展现按钮 - } + }, + // { + // label: t('ts.发票回转'), + // name: 'transfer', + // type: 'primary', + // icon: '', + // color: '', + // hasPermi: '', + // hide:!(row['status']==5&&!!row['voucherNumber']), + // link: true, // 文本展现按钮 + // } ] } - +/** 添加/修改操作 */ +const basicFormRef = ref() // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { if (val == 'open_detail') { // 查看明细 openDetail(row, '单据号', row.number) + }else if(val == 'transfer'){ + //发票回转 + basicFormRef.value.open('create', row) } } + // 获取部门 用于详情 部门回显 const { wsCache } = useCache() /** 详情操作 */ diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index 997a8518e..b2b16183c 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -467,6 +467,17 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ sortTableDefault:6, isForm: false }, + // { + // label: '回转凭证号', + // field: 'transferNumber', + // sort: 'custom', + // table: { + // width: 200, + // }, + // isTable:true, + // sortTableDefault:6, + // isForm: false + // }, { label: '业务类型', field:'businessType', @@ -808,7 +819,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ isDetail: false, isForm: false, table: { - width: 150, + width: 200, fixed: 'right' }, } @@ -1620,3 +1631,75 @@ export const SupplierinvoiceRecordDetailRules = reactive({ { required: true, message: '请输入创建者', trigger: 'blur' } ], }) + + +// 发票回转 +export const SupplierinvoiceRecordMainTransfer = useCrudSchemas(reactive([ + { + label: '冲销日记帐', + field: 'reverseInvoiceJournal', + form: { + componentProps: { + value:'APINVCOR', + disabled: true, + } + }, + }, + { + label: '调整账代码', + field: 'adjustmentJournal', + form: { + componentProps: { + value:'APINVCOR', + disabled: true, + } + }, + }, + { + label: '过账日期', + field: 'reversepostingdate', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + sortTableDefault:11, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'date', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + } + }, + }, + { + label: '说明', + field: 'tcCInvoiceRemark', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: true, + isDetail:false, + form: { + componentProps: { + type:"textarea", + maxlength:50, + showWordLimit:true + } + } + } +])) + + +//表单校验 +export const SupplierinvoiceRecordMainTransferRules = reactive({ + requestNumber: [ + { required: true, message: '请选择申请单号', trigger: 'change' } + ], +}) + From ec86d40b90b40b07a3a652d32774ce766f7dab1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Fri, 23 Aug 2024 10:53:29 +0800 Subject: [PATCH 06/85] =?UTF-8?q?Q2=E9=80=9A=E7=9F=A5=E5=8D=95=E9=9C=80?= =?UTF-8?q?=E6=B1=82=E4=BF=AE=E6=94=B9=20=20HL-5385?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionQ2/index.vue | 41 ++++++++++++++++++- .../qms/inspectionQ2/inspectionQ2.data.ts | 21 +++++++++- .../purchasereturnRecordMain/index.vue | 6 +-- .../purchasereturnRequestMain/index.vue | 18 +++++++- 4 files changed, 79 insertions(+), 7 deletions(-) diff --git a/src/views/qms/inspectionQ2/index.vue b/src/views/qms/inspectionQ2/index.vue index 20be438ea..a624b9859 100644 --- a/src/views/qms/inspectionQ2/index.vue +++ b/src/views/qms/inspectionQ2/index.vue @@ -49,6 +49,14 @@ { /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { - basicFormRef.value.open(type, row) + if (row && row.claimAddress?.trim()) { + row.filePathList = row.claimAddress.split(',') + } + + if (row && row.filePathList && row.filePathList.length > 0) { + row.filePathListView = row.filePathList.map((item) => { + return { + name: item, + url: item + } + }) + } + if(!row || !row.claimAmount){ nextTick(() => { basicFormRef.value.formRef.setValues({ @@ -463,7 +483,26 @@ const openForm = (type: string, row?: any) => { disbursementAmount: 0 }) }) + const currentTime = new Date().getTime() + const fileId = Q2.allSchemas.formSchema.find((item) => item.field == 'fileId') + const uploadFile = Q2.allSchemas.formSchema.find( + (item) => item.field == 'claimAddress' + ) + if (fileId) { + fileId['value'] = currentTime + } + if (uploadFile) { + uploadFile['componentProps']['upData']['tableId'] = currentTime + uploadFile['componentProps']['modelValue'] = [] + } } + else if (type == 'update') { + const uploadFile = Q2.allSchemas.formSchema.find( + (item) => item.field == 'claimAddress' + ) + uploadFile['componentProps']['modelValue'] = row.filePathListView + } + basicFormRef.value.open(type, row) } // form表单提交 diff --git a/src/views/qms/inspectionQ2/inspectionQ2.data.ts b/src/views/qms/inspectionQ2/inspectionQ2.data.ts index 2f1c9b16f..408786daf 100644 --- a/src/views/qms/inspectionQ2/inspectionQ2.data.ts +++ b/src/views/qms/inspectionQ2/inspectionQ2.data.ts @@ -596,7 +596,26 @@ export const Q2 = useCrudSchemas( } } }, - + { + label: '索赔单附件', + field: 'claimAddress', + sort: 'custom', + isTable: true, + table: { + width: 150 + }, + form: { + component: 'UploadFile', + componentProps: { + upData: { + tableName: 'basicInspectionQ2', + tableId: '' + }, + fileType: ['doc', 'xls', 'ppt', 'txt'], + modelValue: [] + } + } + }, { label: '状态', field: 'status', diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue index e6c4d78ae..646d22353 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue @@ -143,15 +143,15 @@ const butttondata = (row,$index) => { const buttonTableClick = async (val, row) => { if (val == 'documentPrint') { // 单据打印 - handleDocumentPrint(row.id) + handleDocumentPrint(row.requestNumber,row.itemCode) } } // 单据打印 const BASE_URL = getJmreportBaseUrl() const documentSrc = ref(BASE_URL + '/jmreport/view/920874172025987072?token=' + getAccessToken()) -const handleDocumentPrint = async (id) => { - window.open(documentSrc.value + '&id=' + id) +const handleDocumentPrint = async (requestNumber,itemCode) => { + window.open(documentSrc.value + '&requestNumber=' + requestNumber +'&itemCode=' + itemCode) } // 获取部门 用于详情 部门回显 const { wsCache } = useCache() diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index 4441297a9..e45740eed 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -562,7 +562,10 @@ const butttondata = (row, $index) => { defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:purchasereturn-request-main:update' - }) // 编辑 + }), // 编辑 + defaultButtons.mainListDocumentPrintBtn({ + hide: isShowMainButton(row, ['8']) + })// 打印标签 // { // label: '生成标签', // name: 'ssbq', @@ -608,12 +611,23 @@ const buttonTableClick = async (val, row) => { genLabelId.value = row.masterId await getDetailList() formLabelRef.value.open('create', row, null, 'createLabel') //创建标签页面 createLabel 标题 - } else if (val == 'point') { + } + else if (val == 'documentPrint') { + // 单据打印 + handleDocumentPrint(row.number,row.itemCode) + }else if (val == 'point') { // 标签打印 labelPrint(row) } } +// 单据打印 +const BASE_URL2 = getJmreportBaseUrl() +const documentSrc = ref(BASE_URL2 + '/jmreport/view/920874172025987072?token=' + getAccessToken()) +const handleDocumentPrint = async (number,itemCode) => { + window.open(documentSrc.value + '&requestNumber=' + number +'&itemCode=' + itemCode) +} + /** 添加/修改操作 */ const formRef = ref() const openForm = async (type: string, row?: number) => { From 9c44f709fd02ab8c6f8addc86fbc191d6fc08cb0 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 23 Aug 2024 13:31:59 +0800 Subject: [PATCH 07/85] =?UTF-8?q?HL-5614=20=E4=B8=8A=E6=9E=B6=E7=AD=96?= =?UTF-8?q?=E7=95=A5=E8=A7=84=E5=88=99=E9=85=8D=E7=BD=AE=E4=B8=AD=EF=BC=8C?= =?UTF-8?q?=E5=9C=A8=E7=AC=AC=E4=BA=8C=E8=A1=8C=E5=A2=9E=E5=8A=A0=EF=BC=9A?= =?UTF-8?q?=E6=BA=A2=E5=87=BA=E5=BA=93=E4=BD=8D=E3=80=82=E5=B1=95=E7=8E=B0?= =?UTF-8?q?=E5=BD=A2=E5=BC=8F=E4=B8=8B=E6=8B=89=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=A5=E6=BA=90=E4=B8=BA=E5=BA=93=E5=8C=BA?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=BA=E6=BA=A2=E5=87=BA=E5=BA=93=E5=8C=BA?= =?UTF-8?q?=E7=9A=84=E5=BA=93=E4=BD=8D=E5=88=97=E8=A1=A8=EF=BC=9B=E5=9C=A8?= =?UTF-8?q?=E6=8E=A8=E8=8D=90=E4=B8=8A=E6=9E=B6=E5=BA=93=E4=BD=8D=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=97=A0=E5=8F=AF=E7=94=A8=E7=9A=84?= =?UTF-8?q?=E6=8E=A8=E8=8D=90=E5=BA=93=E4=BD=8D=EF=BC=8C=E5=88=99=E6=8E=A8?= =?UTF-8?q?=E8=8D=90=E6=BA=A2=E5=87=BA=E5=BA=93=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../strategy/upShelfStrategy/AddForm.vue | 28 +++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue index 4cc04b55e..31fed6cd8 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue @@ -445,6 +445,26 @@ --> + + @@ -657,7 +677,9 @@ const formData = ref({ // 行排序方向 RowOrder: 'ASC', // 列排序方向 - ColumOrder: 'ASC' + ColumOrder: 'ASC', + //溢出库位 + OverFlowLocation:'' } }) // 验证规则 @@ -1252,7 +1274,9 @@ const resetForm = () => { // 行排序方向 RowOrder: 'ASC', // 列排序方向 - ColumOrder: 'ASC' + ColumOrder: 'ASC', + //溢出库位 + OverFlowLocation:'' } } } From 4c01c7d5dabc6d032b4122279e2ff8785db321d0 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 23 Aug 2024 13:51:54 +0800 Subject: [PATCH 08/85] =?UTF-8?q?HL-5603=E5=8F=91=E6=96=99=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=9C=A8?= =?UTF-8?q?=E5=8C=85=E8=A3=85=E5=8F=B7=E5=90=8E=E9=9D=A2=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=8F=91=E6=96=99=E6=95=B0=E9=87=8F=E5=AD=97=E6=AE=B5=EF=BC=8C?= =?UTF-8?q?=E5=8F=96=E5=80=BC=E4=B8=BA=E6=98=8E=E7=BB=86=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../issue/issueRecordMain/issueRecordMain.data.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts b/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts index 718af8ea1..e56e76c67 100644 --- a/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts +++ b/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts @@ -356,6 +356,15 @@ export const IssueRecordMain = useCrudSchemas( }, sortTableDefault: 6 }, + { + label: '发料数量', // 子表数据 只是为了展示 + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 6 + }, { label: '批次', // 子表数据 只是为了展示 field: 'fromBatch', From af2a4c807314d1002e91ab93fced55cee1d57c01 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 23 Aug 2024 13:54:54 +0800 Subject: [PATCH 09/85] =?UTF-8?q?HL-5618WMS=E9=A2=84=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E8=AE=B0=E5=BD=95=E5=92=8C=E8=A3=85=E9=85=8D?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E8=AE=B0=E5=BD=95=E4=B8=AD=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E6=92=A4=E9=94=80=E6=8A=A5=E5=B7=A5=E6=8C=89=E9=92=AE?= 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 294fb6096..1bd9e00ec 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue @@ -200,7 +200,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({hide:row.recoveryRequestFlag == "TRUE" }), // 制品回收 //recoveryRequestFlag==TRUE不展示 + // defaultButtons.mainListRecoveryBtn({hide:row.recoveryRequestFlag == "TRUE" }), // 制品回收 //recoveryRequestFlag==TRUE不展示 ] } diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue index 195e1dab4..6228531c7 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue @@ -237,7 +237,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({hide:row.recoveryRequestFlag == "TRUE" }), // 制品回收 //recoveryRequestFlag==TRUE不展示 + // defaultButtons.mainListRecoveryBtn({hide:row.recoveryRequestFlag == "TRUE" }), // 制品回收 //recoveryRequestFlag==TRUE不展示 ] } From f4a3339b4c612d0b954101fa9396f4f382c90562 Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Fri, 23 Aug 2024 13:56:48 +0800 Subject: [PATCH 10/85] =?UTF-8?q?WMS=20=E9=9C=80=E6=B1=82=EF=BC=9AHL-5517?= =?UTF-8?q?=20WMS=E5=8F=91=E6=96=99=E7=AE=A1=E7=90=86-=E9=9A=94=E7=A6=BB?= =?UTF-8?q?=E9=80=80=E6=96=99=E7=94=B3=E8=AF=B7=E5=AD=97=E6=AE=B5=E5=8F=98?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionreturnRequestMain/index.vue | 12 +- .../productionreturnRequestMain.data.ts | 162 +++++++++--------- .../productionreturnRequestMainNo/index.vue | 12 +- .../productionreturnRequestMainNo.data.ts | 103 ++++++----- 4 files changed, 155 insertions(+), 134 deletions(-) diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue index 1b110156f..7438456ca 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue @@ -209,6 +209,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => } else { row['batch'] = '000000' } + row['packUnit'] = val[0]['packUnit'] + row['packQty'] = val[0]['packQty'] // HL-4885 聂喜婷：@邱晨 @王宇飞 先把数量的校验拿掉 // 修改 tableform 属性 数量最大值设置为库存余额中数量 // TODO: tableFormColumns 修改属性目前只限于整个列 并不满足行要求 例如： 第一条数据最大10 第二条数据最大20 那么第一条数据会变成最大20限制 @@ -226,10 +228,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => newRow['fromLocationCode'] = item['rawLocationCode'] tableData.value.push(newRow) }) - } else if(formField == 'packUnit') { - row['packUnit'] = val[0]['packUnit'] - row['packQty'] = val[0]['packQty'] - } else { + } + // else if(formField == 'packUnit') { + // row['packUnit'] = val[0]['packUnit'] + // row['packQty'] = val[0]['packQty'] + // } + else { row[formField] = val[0][searchField] } } else { diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts index b31c3985a..9c5da4822 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts @@ -521,9 +521,9 @@ export const ProductionreturnRequestMainRules = reactive({ workshopCode: [ { required: true, message: '请选择车间', trigger: 'change' } ], - productionLineCode: [ - { required: true, message: '请选择生产线代码', trigger: 'change' } - ], + // productionLineCode: [ + // { required: true, message: '请选择生产线代码', trigger: 'change' } + // ], }) /** @@ -623,21 +623,34 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive row['uom'] = val[0]['uom'] row['inventoryStatus'] = val[0]['inventoryStatus'] row['qty'] = Number(val[0]['qty']) + row['packUnit'] = val[0]['packUnit'] + row['packQty'] = val[0]['packQty'] // HL-4885 聂喜婷：@邱晨 @王宇飞 先把数量的校验拿掉 // 修改 tableform 属性 数量最大值设置为库存余额中数量 // ProductionreturnRequestDetail.allSchemas.tableFormColumns.forEach(item => { @@ -212,10 +214,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => newRow['fromLocationCode'] = item['rawLocationCode'] tableData.value.push(newRow) }) - } else if(formField == 'packUnit') { - row['packUnit'] = val[0]['packUnit'] - row['packQty'] = val[0]['packQty'] - } else { + } + // else if(formField == 'packUnit') { + // row['packUnit'] = val[0]['packUnit'] + // row['packQty'] = val[0]['packQty'] + // } + else { row[formField] = val[0][searchField] } } else { diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts index 40ace6f98..4b2658f20 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts @@ -129,20 +129,29 @@ export const ProductionreturnRequestDetail = useCrudSchemas( { key: 'available', value: 'TRUE', + action: '==', // 查询拼接条件 + isSearch: true, // 使用自定义拼接条件 isMainValue: false }, { key: 'workshopCode', value: 'workshopCode', message: '请选择车间信息！', - isMainValue: true + action: '==', // 查询拼接条件 + isSearch: true, // 使用自定义拼接条件 + isMainValue: false, // 拼接条件必须要 false 同时不能与 isMainValue: true 同用 + isFormModel:true, // filters中添加筛选的数据--取于formModel + required:true, // 前置添加必有，和isFormModel结合使用 }, { - key: 'productionLineCode', - value: 'productionLineCode', - message: '请选择生产线信息！', - isMainValue: true - } + key: 'productionLineCode', // 查询列表中字段 + value: 'productionLineCode', // 指查询具体值 + action: '==', // 查询拼接条件 + isSearch: true, // 使用自定义拼接条件 + isMainValue: false, // 拼接条件必须要 false 同时不能与 isMainValue: true 同用 + isFormModel:true, // filters中添加筛选的数据--取于formModel + required:false, // 前置添加必有，和isFormModel结合使用 + }, ], verificationPage: WorkstationApi.getWorkstationByCodes, // 校验数去焦点输入是否正确的方法 isShowTableFormSearch: true, @@ -159,10 +168,30 @@ export const ProductionreturnRequestDetail = useCrudSchemas( ] // 失去焦点校验参数 } }, + { + label: '来源库位', + field: 'fromLocationCode', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: true, + tableForm: { + disabled: true + }, + form: { + componentProps: { + disabled: true + } + } + }, { label: '目标库位', field: 'toLocationCode', sort: 'custom', + table: { + width: 150 + }, tableForm: { multiple: true,//多选 isInpuFocusShow: true, // 开启查询弹窗 @@ -405,23 +434,6 @@ export const ProductionreturnRequestDetail = useCrudSchemas( } } }, - { - label: '来源库位', - field: 'fromLocationCode', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - tableForm: { - disabled: true - }, - form: { - componentProps: { - disabled: true - } - } - }, { label: '从货主', field: 'fromOwnerCode', @@ -533,29 +545,30 @@ export const ProductionreturnRequestDetail = useCrudSchemas( table: { width: 120 }, - isTable:false, + isTable:true, isTableForm:true, tableForm: { - isInpuFocusShow: true, - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择包装规格', // 输入框占位文本 - searchField: 'packUnit', // 查询弹窗赋值字段 - searchTitle: '物料包装信息', // 查询弹窗标题 - searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类 - searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法 - searchCondition: [ - { - key: 'available', - value: 'TRUE', - isMainValue: false - }, - { - key: 'itemCode', - value: 'itemCode', - message: '请先选择物料代码！', - isMainValue: true - } - ] + disabled: true + // isInpuFocusShow: true, + // isSearchList: true, // 开启查询弹窗 + // searchListPlaceholder: '请选择包装规格', // 输入框占位文本 + // searchField: 'packUnit', // 查询弹窗赋值字段 + // searchTitle: '物料包装信息', // 查询弹窗标题 + // searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类 + // searchPage: ItempackagingApi.getItempackagingPage, // 查询弹窗所需分页方法 + // searchCondition: [ + // { + // key: 'available', + // value: 'TRUE', + // isMainValue: false + // }, + // { + // key: 'itemCode', + // value: 'itemCode', + // message: '请先选择物料代码！', + // isMainValue: true + // } + // ] }, form: { // labelMessage: '信息提示说明！！！', @@ -589,7 +602,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas( table: { width: 120 }, - isTable: false, + isTable: true, isTableForm: true, tableForm: { disabled: true From a806c40fa89a2ce5664d7ec556150390da429386 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 23 Aug 2024 13:57:08 +0800 Subject: [PATCH 11/85] =?UTF-8?q?HL-5603=E5=8F=91=E6=96=99=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=9C=A8?= =?UTF-8?q?=E5=8C=85=E8=A3=85=E5=8F=B7=E5=90=8E=E9=9D=A2=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=8F=91=E6=96=99=E6=95=B0=E9=87=8F=E5=AD=97=E6=AE=B5=EF=BC=8C?= =?UTF-8?q?=E5=8F=96=E5=80=BC=E4=B8=BA=E6=98=8E=E7=BB=86=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../issue/issueRecordMain/issueRecordMain.data.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts b/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts index 718af8ea1..e56e76c67 100644 --- a/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts +++ b/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts @@ -356,6 +356,15 @@ export const IssueRecordMain = useCrudSchemas( }, sortTableDefault: 6 }, + { + label: '发料数量', // 子表数据 只是为了展示 + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 6 + }, { label: '批次', // 子表数据 只是为了展示 field: 'fromBatch', From a69c8c46f281ab17efb61334f15ae7cdb1babd7e Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 23 Aug 2024 13:58:26 +0800 Subject: [PATCH 12/85] =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BC=A0value=E4=B8=BA=E7=A9=BA=E9=97=AE=E9=A2=98=E7=9A=84?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/BasicForm/src/BasicForm.vue | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 8256576c8..8b0acf8e9 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -537,11 +537,14 @@ const opensearchTable = ( return } } - filters.push({ - action: searchCondition[i].action, - column: searchCondition[i].key, - value: formRef.value.formModel[searchCondition[i].value] - }) + if(formRef.value.formModel[searchCondition[i].value]){ + filters.push({ + action: searchCondition[i].action, + column: searchCondition[i].key, + value: formRef.value.formModel[searchCondition[i].value] + }) + } + } else { filters.push({ action: searchCondition[i].action, From 463b92fb8786d831e4b285df71a811455da2435b Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 23 Aug 2024 14:07:47 +0800 Subject: [PATCH 13/85] =?UTF-8?q?HL-5600WMS=E8=A1=A5=E6=96=99=E5=92=8C?= =?UTF-8?q?=E5=8F=91=E6=96=99=E7=94=B3=E8=AF=B7=E5=BA=94=E8=AF=A5=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../issueManage/issue/issueRequestMain/issueRequestMain.data.ts | 1 + .../repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts index 1904b7842..702906bb6 100644 --- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts +++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts @@ -246,6 +246,7 @@ export const IssueRequestMain = useCrudSchemas( dictClass: 'string', isForm: false, isTable: true, + isSearch: true, sort: 'custom', table: { width: 150 diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts index e6a3daef5..d9cb3db5d 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts +++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts @@ -56,6 +56,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive([ dictClass: 'string', isForm:false, isTable: true, + isSearch: true, sort: 'custom', sortTableDefault:1, table: { From 73ac7eb3b39e703663ff15f7fb40ca7095b88024 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 23 Aug 2024 14:08:34 +0800 Subject: [PATCH 14/85] =?UTF-8?q?HL-5471=E6=A3=80=E9=AA=8C=E5=B7=A5?= =?UTF-8?q?=E5=BA=8F=E5=8F=AF=E4=BB=A5=E6=8B=96=E5=8A=A8=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionScheme/addForm.vue | 960 ++++++++++--------- src/views/qms/inspectionTemplate/addForm.vue | 928 +++++++++--------- 2 files changed, 1013 insertions(+), 875 deletions(-) diff --git a/src/views/qms/inspectionScheme/addForm.vue b/src/views/qms/inspectionScheme/addForm.vue index 60d97c60a..e817d31bc 100644 --- a/src/views/qms/inspectionScheme/addForm.vue +++ b/src/views/qms/inspectionScheme/addForm.vue @@ -247,450 +247,450 @@ --> - - - + +