From 022e903299e16156ad14d9f960d3bb10aba64fc7 Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Mon, 5 Aug 2024 16:31:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerDeliveryForecast/index.vue | 4 +-- .../documentSetting/businesstype/index.vue | 4 +-- .../documentSetting/documentsetting/index.vue | 26 ++++++++-------- .../documentSetting/jobsetting/index.vue | 24 +++++++-------- .../documentSetting/plansetting/index.vue | 28 ++++++++--------- .../documentSetting/recordsetting/index.vue | 28 ++++++++--------- .../documentSetting/requestsetting/index.vue | 28 ++++++++--------- .../documentSetting/switch/index.vue | 26 ++++++++-------- .../documentSetting/transactiontype/index.vue | 28 ++++++++--------- .../factoryModeling/dock/index.vue | 28 ++++++++--------- .../itemManage/itemarea/index.vue | 24 +++++++-------- .../itemManage/itempackage/index.vue | 6 ++-- .../relegate/relegateRecord/index.vue | 22 +++++++------- .../relegate/relegateRequest/index.vue | 30 +++++++++---------- .../labelManage/barbasic/index.vue | 2 +- .../labelManage/barcode/index.vue | 30 +++++++++---------- .../labelManage/callmaterials/index.vue | 6 ++-- .../labelManage/labeltype/index.vue | 6 ++-- .../strategySetting/configuration/index.vue | 26 ++++++++-------- .../configurationsetting/index.vue | 4 +-- .../strategySetting/paramsetting/index.vue | 26 ++++++++-------- .../strategySetting/rule/index.vue | 4 +-- .../saleShipmentMainRecord/index.vue | 10 +++---- .../saleShipmentMainRequest/index.vue | 2 +- .../stockup/stockupMainJob/index.vue | 2 +- .../stockup/stockupMainRecord/index.vue | 2 +- .../stockup/stockupMainRequest/index.vue | 16 +++++----- .../containerBindRecord/index.vue | 2 +- .../containerinit/containerRepair/index.vue | 2 +- .../containerUnbindRecord/index.vue | 2 +- .../containerinit/containerinitadd/index.vue | 2 +- .../containerinitrecord/index.vue | 2 +- .../containerMainRequest/index.vue | 8 ++--- .../initialContainerMainRequest/index.vue | 2 +- .../scrapContainerMainRequest/index.vue | 12 ++++---- .../packageoverJobMain/index.vue | 4 +-- .../packageoverRetrospect/index.vue | 2 +- .../processproductionRequest/index.vue | 20 ++++++------- .../qadproductionplan/index.vue | 2 +- .../supplierdeliver/supplierPackage/index.vue | 14 ++++----- .../supplierdeliverInspectionDetail/index.vue | 2 +- .../supplierApbalanceDetail/index.vue | 2 +- .../supplierApbalanceMain/index.vue | 4 +-- .../supplierinvoiceInvoiced/index.vue | 4 +-- 44 files changed, 264 insertions(+), 264 deletions(-) diff --git a/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/index.vue b/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/index.vue index 8753a492e..1a56ece5c 100644 --- a/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/index.vue +++ b/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/index.vue @@ -165,7 +165,7 @@ const formsSuccess = async (formType,data) => { } if(data.activeTime==0)data.activeTime = null; if(data.expireTime==0)data.expireTime = null; - + basicFormRef.value.formLoading = true try { if (formType === 'create') { @@ -186,7 +186,7 @@ const formsSuccess = async (formType,data) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue, 'basicCustomerDeliveryForecast') + detailRef.value.openDetail(row, titleName, titleValue, 'customerDeliveryForecast') } /** 删除按钮操作 */ diff --git a/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue b/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue index dd394b284..f16aa82a2 100644 --- a/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue @@ -338,7 +338,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue, 'basicBusinesstype') + detailRef.value.openDetail(row, titleName, titleValue, 'documentBusinesstype') } /** 删除按钮操作 */ @@ -399,7 +399,7 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async () => { await getList() - + importTemplateData.templateUrl = await BusinesstypeApi.importTemplate() }) diff --git a/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue index 7cbb2c584..1950075a3 100644 --- a/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue @@ -6,9 +6,9 @@ - { if (val == 'add') { // 新增 openForm('create') @@ -123,7 +123,7 @@ const buttonBaseClick = (val, item) => { getList() } } else if (val == 'filtrate') { // 筛选 - } else { // 其他按钮 + } else { // 其他按钮 console.log('其他按钮', item) } } @@ -134,7 +134,7 @@ const butttondata = [ // defaultButtons.mainListDeleteBtn({hasPermi:'wms:documentsetting:delete'}), // 删除 ] -// 列表-操作按钮事件 +// 列表-操作按钮事件 const buttonTableClick = async (val, row) => { if (val == 'edit') { // 编辑 // const res = await DocumentsettingApi.getItempackaging(row.id) @@ -182,7 +182,7 @@ const formsSuccess = async (formType,data) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue, 'basicDocumentsetting') + detailRef.value.openDetail(row, titleName, titleValue, 'documentDocumentsetting') } /** 删除按钮操作 */ @@ -245,4 +245,4 @@ onMounted(async() => { getList() importTemplateData.templateUrl = await DocumentsettingApi.importTemplate() }) - \ No newline at end of file + diff --git a/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue index c96f041dc..6b8df2456 100644 --- a/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue @@ -6,9 +6,9 @@ - { } const { tableObject, tableMethods } = useTable({ - getListApi: JobsettingApi.getJobsettingPage // 分页接口 + getListApi: JobsettingApi.getJobsettingPage // 分页接口 }) // 获得表格的各种操作 @@ -106,7 +106,7 @@ const HeadButttondata = [ // }, ] -// 头部按钮事件 +// 头部按钮事件 const buttonBaseClick = (val, item) => { if (val == 'add') { // 新增 openForm('create') @@ -123,7 +123,7 @@ const buttonBaseClick = (val, item) => { getList() } } else if (val == 'filtrate') { // 筛选 - } else { // 其他按钮 + } else { // 其他按钮 console.log('其他按钮', item) } } @@ -134,7 +134,7 @@ const butttondata = [ // defaultButtons.mainListDeleteBtn({hasPermi:'wms:jobsetting:delete'}), // 删除 ] -// 列表-操作按钮事件 +// 列表-操作按钮事件 const buttonTableClick = async (val, row) => { if (val == 'edit') { // 编辑 // const res = await JobsettingApi.getItempackaging(row.id) @@ -182,7 +182,7 @@ const formsSuccess = async (formType,data) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue, 'basicJobsetting') + detailRef.value.openDetail(row, titleName, titleValue, 'documentJobsetting') } /** 删除按钮操作 */ @@ -245,4 +245,4 @@ onMounted(async() => { getList() importTemplateData.templateUrl = await JobsettingApi.importTemplate() }) - \ No newline at end of file + diff --git a/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue b/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue index b71de84b7..dfcf9269b 100644 --- a/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue @@ -6,9 +6,9 @@ - { if (val == 'add') { // 新增 openForm('create') @@ -123,7 +123,7 @@ const buttonBaseClick = (val, item) => { getList() } } else if (val == 'filtrate') { // 筛选 - } else { // 其他按钮 + } else { // 其他按钮 console.log('其他按钮', item) } } @@ -134,7 +134,7 @@ const butttondata = [ // defaultButtons.mainListDeleteBtn({hasPermi:'wms:plansetting:delete'}), // 删除 ] -// 列表-操作按钮事件 +// 列表-操作按钮事件 const buttonTableClick = async (val, row) => { if (val == 'edit') { // 编辑 openForm('update', row) @@ -162,7 +162,7 @@ const formsSuccess = async (formType,data) => { } if(data.activeTime==0)data.activeTime = null; if(data.expireTime==0)data.expireTime = null; - + basicFormRef.value.formLoading = true try { if (formType === 'create') { @@ -183,7 +183,7 @@ const formsSuccess = async (formType,data) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue, 'basicPlansetting') + detailRef.value.openDetail(row, titleName, titleValue, 'documentPlansetting') } /** 删除按钮操作 */ @@ -246,4 +246,4 @@ onMounted(async() => { getList() importTemplateData.templateUrl = await PlansettingApi.importTemplate() }) - \ No newline at end of file + diff --git a/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue index 4b0dac5c4..ec3da3e17 100644 --- a/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue @@ -6,9 +6,9 @@ - { if (val == 'add') { // 新增 openForm('create') @@ -123,7 +123,7 @@ const buttonBaseClick = (val, item) => { getList() } } else if (val == 'filtrate') { // 筛选 - } else { // 其他按钮 + } else { // 其他按钮 console.log('其他按钮', item) } } @@ -134,7 +134,7 @@ const butttondata = [ // defaultButtons.mainListDeleteBtn({hasPermi:'wms:recordsetting:delete'}), // 删除 ] -// 列表-操作按钮事件 +// 列表-操作按钮事件 const buttonTableClick = async (val, row) => { if (val == 'edit') { // 编辑 // const res = await RecordsettingApi.getItempackaging(row.id) @@ -163,7 +163,7 @@ const formsSuccess = async (formType,data) => { } if(data.activeTime==0)data.activeTime = null; if(data.expireTime==0)data.expireTime = null; - + basicFormRef.value.formLoading = true try { if (formType === 'create') { @@ -183,7 +183,7 @@ const formsSuccess = async (formType,data) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue, 'basicRecordsetting') + detailRef.value.openDetail(row, titleName, titleValue, 'documentRecordsetting') } /** 删除按钮操作 */ @@ -246,4 +246,4 @@ onMounted(async() => { getList() importTemplateData.templateUrl = await RecordsettingApi.importTemplate() }) - \ No newline at end of file + diff --git a/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue index 9cb8b0297..1eac21e51 100644 --- a/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue @@ -6,9 +6,9 @@ - { if (val == 'add') { // 新增 openForm('create') @@ -123,7 +123,7 @@ const buttonBaseClick = (val, item) => { getList() } } else if (val == 'filtrate') { // 筛选 - } else { // 其他按钮 + } else { // 其他按钮 console.log('其他按钮', item) } } @@ -134,7 +134,7 @@ const butttondata = [ // defaultButtons.mainListDeleteBtn({hasPermi:'wms:requestsetting:delete'}), // 删除 ] -// 列表-操作按钮事件 +// 列表-操作按钮事件 const buttonTableClick = async (val, row) => { if (val == 'edit') { // 编辑 // const res = await RequestsettingApi.getItempackaging(row.id) @@ -163,7 +163,7 @@ const formsSuccess = async (formType,data) => { } if(data.activeTime==0)data.activeTime = null; if(data.expireTime==0)data.expireTime = null; - + basicFormRef.value.formLoading = true try { if (formType === 'create') { @@ -183,7 +183,7 @@ const formsSuccess = async (formType,data) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue, 'basicRequestsetting') + detailRef.value.openDetail(row, titleName, titleValue, 'documentRequestsetting') } /** 删除按钮操作 */ @@ -246,4 +246,4 @@ onMounted(async() => { getList() importTemplateData.templateUrl = await RequestsettingApi.importTemplate() }) - \ No newline at end of file + diff --git a/src/views/wms/basicDataManage/documentSetting/switch/index.vue b/src/views/wms/basicDataManage/documentSetting/switch/index.vue index 3b94a5363..4fca0adf1 100644 --- a/src/views/wms/basicDataManage/documentSetting/switch/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/switch/index.vue @@ -6,9 +6,9 @@ - { if (val == 'add') { // 新增 openForm('create') @@ -123,14 +123,14 @@ const buttonBaseClick = (val, item) => { getList() } } else if (val == 'filtrate') { // 筛选 - } else { // 其他按钮 + } else { // 其他按钮 console.log('其他按钮', item) } } // 列表-操作按钮 -const butttondata = (row, $index)=>{ +const butttondata = (row, $index)=>{ const hiddenArray = ['CreatePutawayRequestAfterInspectRecordCreated', 'CreateBackflushRecordAfterProductreceiptRecordCreated', 'CreateProductputawayRequestAfterProductreceiptRecordCreated', @@ -144,7 +144,7 @@ const butttondata = (row, $index)=>{ ] } -// 列表-操作按钮事件 +// 列表-操作按钮事件 const buttonTableClick = async (val, row) => { if (val == 'edit') { // 编辑 // const res = await SwitchApi.getItempackaging(row.id) @@ -163,7 +163,7 @@ const openForm = (type: string, row?: any) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue, 'basicSwitch') + detailRef.value.openDetail(row, titleName, titleValue, 'documentSwitch') } /** 删除按钮操作 */ @@ -235,7 +235,7 @@ const success = async (formType, data) => { basicFormRef.value.dialogVisible = false } - + } /** 初始化 **/ @@ -243,4 +243,4 @@ onMounted(async() => { getList() // importTemplateData.templateUrl = await SwitchApi.importTemplate() }) - \ No newline at end of file + diff --git a/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue b/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue index c9c74251a..78a9c6374 100644 --- a/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue @@ -6,9 +6,9 @@ - { if (val == 'add') { // 新增 openForm('create') @@ -123,7 +123,7 @@ const buttonBaseClick = (val, item) => { getList() } } else if (val == 'filtrate') { // 筛选 - } else { // 其他按钮 + } else { // 其他按钮 console.log('其他按钮', item) } } @@ -134,7 +134,7 @@ const butttondata = [ // defaultButtons.mainListDeleteBtn({hasPermi:'wms:transactiontype:delete'}), // 删除 ] -// 列表-操作按钮事件 +// 列表-操作按钮事件 const buttonTableClick = async (val, row) => { if (val == 'edit') { // 编辑 // const res = await TransactiontypeApi.getItempackaging(row.id) @@ -163,7 +163,7 @@ const formsSuccess = async (formType,data) => { } if(data.activeTime==0)data.activeTime = null; if(data.expireTime==0)data.expireTime = null; - + basicFormRef.value.formLoading = true try { if (formType === 'create') { @@ -184,7 +184,7 @@ const formsSuccess = async (formType,data) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue, 'basicTransactiontype') + detailRef.value.openDetail(row, titleName, titleValue, 'documentTransactiontype') } /** 删除按钮操作 */ @@ -247,4 +247,4 @@ onMounted(async() => { getList() importTemplateData.templateUrl = await TransactiontypeApi.importTemplate() }) - \ No newline at end of file + diff --git a/src/views/wms/basicDataManage/factoryModeling/dock/index.vue b/src/views/wms/basicDataManage/factoryModeling/dock/index.vue index 25e09d46c..7938b20bb 100644 --- a/src/views/wms/basicDataManage/factoryModeling/dock/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/dock/index.vue @@ -6,9 +6,9 @@ - { if (val == 'add') { // 新增 openForm('create') @@ -128,7 +128,7 @@ const buttonBaseClick = (val, item) => { getList() } } else if (val == 'filtrate') { // 筛选 - } else { // 其他按钮 + } else { // 其他按钮 console.log('其他按钮', item) } } @@ -139,7 +139,7 @@ const butttondata = [ defaultButtons.mainListDeleteBtn({hasPermi:'wms:dock:delete'}), // 删除 ] -// 列表-操作按钮事件 +// 列表-操作按钮事件 const buttonTableClick = async (val, row) => { if (val == 'edit') { // 编辑 // const res = await DockApi.getItempackaging(row.id) @@ -157,14 +157,14 @@ const openForm = (type: string, row?: any) => { if (item.field == 'code') { item.componentProps.disabled = true } - }) - + }) + }else { Dock.allSchemas.formSchema.forEach((item) => { if (item.field == 'code') { item.componentProps.disabled = false } - }) + }) } basicFormRef.value.open(type, row) } @@ -201,7 +201,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue, 'baiscDock') + detailRef.value.openDetail(row, titleName, titleValue, 'basicDock') } // form表单提交 diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue index 787bbce56..8a71dfb8e 100644 --- a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue +++ b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue @@ -31,7 +31,7 @@ {{ row.itemCode }} - + @@ -98,7 +98,7 @@ import { CACHE_KEY, useCache } from '@/hooks/web/useCache'   import TableHead from '@/components/TableHead/src/TableHead.vue'   import ImportForm from '@/components/ImportForm/src/ImportForm.vue'   import Detail from '@/components/Detail/src/Detail.vue' -  +  // 发货申请 defineOptions({ name: 'Itemarea' }) @@ -128,7 +128,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => if(formField == 'locationCode') { if(tableData.value.find(item1=>item1['locationCode'] == item['code'])) return newRow['locationCode'] = item['code'] - }else{ + }else{ newRow[formField] = item[searchField] } newRow['id'] = item['id'] @@ -137,16 +137,16 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => } else { row[formField] = val[0][searchField] } - + }else{ - const setV = {} + const setV = {} if(formField == 'areaCode') { console.log(val[0]); setV['areaCode'] = val[0]['code'] setV['areaType'] = val[0]['type'] setV['manageMode'] = val[0]['manageMode'] - + }else if(formField == 'inPackUnit') { setV['inPackUnit'] = val[0]['packUnit'] }else if(formField == 'outPackUnit') { @@ -157,7 +157,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => setV['overflowLocationCode'] = val[0]['code'] }else if(formField == 'repleinshFromArea') { setV['repleinshFromArea'] = val[0]['code'] - }else{ + }else{ setV[formField] = setV[0][searchField] } formRef.setValues(setV) @@ -259,7 +259,7 @@ const butttondata = (row) => { // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { - if (val == 'edit') { // 编辑 + if (val == 'edit') { // 编辑 openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) @@ -287,7 +287,7 @@ const openForm =async (type: string, row?: number) => { if (item.field == 'itemCode') { item.componentProps.isSearchList = true } - }) + }) } tableData.value = [] // 重置明细数据 formRef.value.open(type, row) @@ -295,7 +295,7 @@ const openForm =async (type: string, row?: number) => { /** * 详情 编辑页面打开 - * @param row + * @param row */ const detailOpenForm = (type) => { @@ -309,7 +309,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => { const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode)) row.status = "1"; - detailRef.value.openDetail(row, titleName, titleValue,'itemarea') + detailRef.value.openDetail(row, titleName, titleValue,'basicItemarea') } /** 删除按钮操作 */ diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue index 41db7ca3e..e6fc7f1dc 100644 --- a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue +++ b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue @@ -204,7 +204,7 @@ const openForm = (type: string, row?: any) => { if (item.field == 'packType') { item.componentProps.disabled = true } - }) + }) } basicFormRef.value.open(type, row) } @@ -220,7 +220,7 @@ const formsSuccess = async (formType, data) => { } if (data.activeTime == 0) data.activeTime = null if (data.expireTime == 0) data.expireTime = null - + basicFormRef.value.formLoading = true try { if (formType === 'create') { @@ -290,7 +290,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue, 'basicItempackaging') + detailRef.value.openDetail(row, titleName, titleValue, 'basicItempackage') } /** 删除按钮操作 */ diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/index.vue b/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/index.vue index 84cc1d5d0..3fe661ce1 100644 --- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/index.vue +++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/index.vue @@ -42,33 +42,33 @@ - @@ -199,7 +199,7 @@ const submitForm = async (formType,data) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue, 'basicRelegateRecordMain') + detailRef.value.openDetail(row, titleName, titleValue, 'recordRelegateMain') } /** 删除按钮操作 */ diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue index 51a9c00ee..cafb56f89 100644 --- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue +++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue @@ -30,17 +30,17 @@ - @@ -216,7 +216,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => } console.log(res) }) - + } else if (formField == 'downItemCode') { // if(row['itemCode'] == val[0]['spareItemCode']){ // row['downItemCode'] = val[0]['productionItemCode'] //量产件 @@ -518,7 +518,7 @@ const buttonTableClick = async (val, row) => { formLabelRef.value.open('create', row) detatableData.tableList.map((item) => { console.log(item); - + // item.batch = '000000' // 查询物料类型 原料 只能选择 供应商代码 半成品成品其他 只能选择 生产线 ItembasicApi.getItembasicPage({ @@ -594,7 +594,7 @@ const openForm = (type: string, row?: any) => { item.componentProps.disabled = false item.componentProps.isSearchList = true } - }) + }) } } //为true表示子表数据中存在数量为0的数据 @@ -640,7 +640,7 @@ const submitForm = async (formType, data) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue, 'basicRelegateRequestMain') + detailRef.value.openDetail(row, titleName, titleValue, 'requestRelegateMain') } const BASE_URL = getJmreportBaseUrl() // 批量打印 diff --git a/src/views/wms/basicDataManage/labelManage/barbasic/index.vue b/src/views/wms/basicDataManage/labelManage/barbasic/index.vue index def5b33c9..4505faf86 100644 --- a/src/views/wms/basicDataManage/labelManage/barbasic/index.vue +++ b/src/views/wms/basicDataManage/labelManage/barbasic/index.vue @@ -172,7 +172,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue, 'basicBarbasic') + detailRef.value.openDetail(row, titleName, titleValue, 'labelBarbasic') } /** 删除按钮操作 */ diff --git a/src/views/wms/basicDataManage/labelManage/barcode/index.vue b/src/views/wms/basicDataManage/labelManage/barcode/index.vue index 231a58889..2b4f6ec11 100644 --- a/src/views/wms/basicDataManage/labelManage/barcode/index.vue +++ b/src/views/wms/basicDataManage/labelManage/barcode/index.vue @@ -6,9 +6,9 @@ - { if (val == 'add') { // 新增 openForm('create') @@ -125,7 +125,7 @@ const buttonBaseClick = (val, item) => { getList() } } else if (val == 'filtrate') { // 筛选 - } else { // 其他按钮 + } else { // 其他按钮 console.log('其他按钮', item) } } @@ -136,7 +136,7 @@ const butttondata = [ defaultButtons.mainListDeleteBtn({hasPermi:'wms:barcode:delete'}), // 删除 ] -// 列表-操作按钮事件 +// 列表-操作按钮事件 const buttonTableClick = async (val, row) => { if (val == 'edit') { // 编辑 // const res = await BarcodeApi.getItempackaging(row.id) @@ -154,20 +154,20 @@ const openForm = (type: string, row?: any) => { if (item.field == 'code') { item.componentProps.disabled = true } - }) + }) }else { Barcode.allSchemas.formSchema.forEach((item) => { if (item.field == 'code') { item.componentProps.disabled = false } - }) + }) } basicFormRef.value.open(type, row) } // form表单提交 const formsSuccess = async (formType,data) => { - + basicFormRef.value.formLoading = true try { if (formType === 'create') { @@ -187,7 +187,7 @@ const formsSuccess = async (formType,data) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue, 'basicBarcode') + detailRef.value.openDetail(row, titleName, titleValue, 'labelBarcode') } /** 删除按钮操作 */ @@ -251,4 +251,4 @@ onMounted(async() => { getList() importTemplateData.templateUrl = await BarcodeApi.importTemplate() }) - \ No newline at end of file + diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue index 74d8dd474..bfe9bf270 100644 --- a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue +++ b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue @@ -114,7 +114,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { nextTick(() => { console.log('searchTableSuccess',formField, searchField, val) - + const setV = {} if (formField == 'itemCode') { setV['itemCode'] = val[0]['code'] @@ -247,7 +247,7 @@ const formsSuccess = async (formType,data) => { } finally { basicFormRef.value.formLoading = false } - + basicFormRef.value.dialogVisible = false getList() } @@ -255,7 +255,7 @@ const formsSuccess = async (formType,data) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue, 'basicCallmaterials') + detailRef.value.openDetail(row, titleName, titleValue, 'labelCallmaterials') } /** 删除按钮操作 */ diff --git a/src/views/wms/basicDataManage/labelManage/labeltype/index.vue b/src/views/wms/basicDataManage/labelManage/labeltype/index.vue index ec20b19ba..f50ffea94 100644 --- a/src/views/wms/basicDataManage/labelManage/labeltype/index.vue +++ b/src/views/wms/basicDataManage/labelManage/labeltype/index.vue @@ -157,13 +157,13 @@ const openForm = (type: string, row?: any) => { if (item.field == 'labelCode') { item.componentProps.disabled = true } - }) + }) }else { Labeltype.allSchemas.formSchema.forEach((item) => { if (item.field == 'labelCode') { item.componentProps.disabled = false } - }) + }) } basicFormRef.value.open(type, row) } @@ -198,7 +198,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue, 'basicLabeltype') + detailRef.value.openDetail(row, titleName, titleValue, 'labelLabeltype') } /** 删除按钮操作 */ diff --git a/src/views/wms/basicDataManage/strategySetting/configuration/index.vue b/src/views/wms/basicDataManage/strategySetting/configuration/index.vue index 5abe735fd..05ad656fe 100644 --- a/src/views/wms/basicDataManage/strategySetting/configuration/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/configuration/index.vue @@ -6,9 +6,9 @@ - { if (val == 'add') { // 新增 openForm('create') @@ -123,7 +123,7 @@ const buttonBaseClick = (val, item) => { getList() } } else if (val == 'filtrate') { // 筛选 - } else { // 其他按钮 + } else { // 其他按钮 console.log('其他按钮', item) } } @@ -134,7 +134,7 @@ const butttondata = [ defaultButtons.mainListDeleteBtn({hasPermi:'wms:configuration:delete'}), // 删除 ] -// 列表-操作按钮事件 +// 列表-操作按钮事件 const buttonTableClick = async (val, row) => { if (val == 'edit') { // 编辑 // const res = await ConfigurationApi.getItempackaging(row.id) @@ -153,7 +153,7 @@ const openForm = (type: string, row?: any) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue, 'basicConfiguration') + detailRef.value.openDetail(row, titleName, titleValue, 'strategyConfiguration') } /** 删除按钮操作 */ @@ -216,4 +216,4 @@ onMounted(async() => { getList() importTemplateData.templateUrl = await ConfigurationApi.importTemplate() }) - \ No newline at end of file + diff --git a/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue b/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue index c4737a072..89b6d5fe8 100644 --- a/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/configurationsetting/index.vue @@ -183,7 +183,7 @@ const formsSuccess = async (formType, data) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue, 'basicConfigurationsetting') + detailRef.value.openDetail(row, titleName, titleValue, 'strategyConfigurationsetting') } /** 删除按钮操作 */ @@ -249,4 +249,4 @@ onMounted(async () => { getList() importTemplateData.templateUrl = await ConfigurationsettingApi.importTemplate() }) - \ No newline at end of file + diff --git a/src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue b/src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue index 7638fafb5..6eeaa78b1 100644 --- a/src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/paramsetting/index.vue @@ -6,9 +6,9 @@ - { if (val == 'add') { // 新增 openForm('create') @@ -124,7 +124,7 @@ const buttonBaseClick = (val, item) => { getList() } } else if (val == 'filtrate') { // 筛选 - } else { // 其他按钮 + } else { // 其他按钮 console.log('其他按钮', item) } } @@ -135,7 +135,7 @@ const butttondata = [ defaultButtons.mainListDeleteBtn({hasPermi:'wms:paramsetting:delete'}), // 删除 ] -// 列表-操作按钮事件 +// 列表-操作按钮事件 const buttonTableClick = async (val, row) => { if (val == 'edit') { // 编辑 // const res = await ParamsettingApi.getItempackaging(row.id) @@ -154,7 +154,7 @@ const openForm = (type: string, row?: any) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue, 'basicParamsetting') + detailRef.value.openDetail(row, titleName, titleValue, 'strategyParamsetting') } /** 删除按钮操作 */ @@ -220,4 +220,4 @@ onMounted(async() => { getList() importTemplateData.templateUrl = await ParamsettingApi.importTemplate() }) - \ No newline at end of file + diff --git a/src/views/wms/basicDataManage/strategySetting/rule/index.vue b/src/views/wms/basicDataManage/strategySetting/rule/index.vue index de47835d7..fa1d9922e 100644 --- a/src/views/wms/basicDataManage/strategySetting/rule/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/rule/index.vue @@ -182,7 +182,7 @@ const formsSuccess = async (formType, data) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue, 'basicRule') + detailRef.value.openDetail(row, titleName, titleValue, 'strategyRule') } /** 删除按钮操作 */ @@ -244,4 +244,4 @@ const searchFormClick = (searchData) => { onMounted(async () => { getList() }) - \ No newline at end of file + diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue index 59d72454d..c6bc737b7 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue @@ -52,10 +52,10 @@ /> - { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue, 'basicSaleShipmentMainRecord') + detailRef.value.openDetail(row, titleName, titleValue, 'recordSaleShipmentMain') } /** 删除按钮操作 */ diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue index d5407b550..b4f467c92 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue @@ -418,7 +418,7 @@ const tableSelectionDelete = (selection) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue, 'basicSaleShipmentMain') + detailRef.value.openDetail(row, titleName, titleValue, 'requestSaleShipmentMain') } /** 删除按钮操作 */ diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue index 3c0bd0bb5..c9e7fb277 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue @@ -218,7 +218,7 @@ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode)) - detailRef.value.openDetail(row, titleName, titleValue,'stockupMainJob') + detailRef.value.openDetail(row, titleName, titleValue,'jobStockupMain') } const handleHandle = async (data) => { diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue index 5e5dda7fa..55550578f 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/index.vue @@ -145,7 +145,7 @@ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode)) - detailRef.value.openDetail(row, titleName, titleValue,'stockupMainRecord') + detailRef.value.openDetail(row, titleName, titleValue,'recordStockupMain') } /** 导出按钮操作 */ diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue index ef987afd1..fd025b091 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue @@ -32,7 +32,7 @@ {{ row.number }} - + @@ -121,7 +121,7 @@ const updataTableColumns = (val) => { const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { nextTick(() => { const setV = {} - setV[formField] = val[0][searchField] + setV[formField] = val[0][searchField] if (type == 'tableForm') { // if(formField == 'itemCode') { // row['itemCode'] = val[0]['code'] @@ -151,7 +151,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => } } else { const setV = {} - setV[formField] = val[0][searchField] + setV[formField] = val[0][searchField] if(formField == 'deliverPlanNumber') { setV['deliverPlanNumber'] = val[0]['number'] if(setV['deliverPlanNumber'] != null){ @@ -180,7 +180,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => formRef.setValues(setV) }) } - } + } }) } // 查询页面返回——详情 @@ -337,7 +337,7 @@ const buttonTableClick = async (val, row) => { tableObject.loading = false console.log(err) }) - } else if (val == 'edit') { // 编辑 + } else if (val == 'edit') { // 编辑 openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.masterId) @@ -353,7 +353,7 @@ const openForm = (type: string, row?: number) => { /** * 详情 编辑页面打开 - * @param row + * @param row */ const detailOpenForm = (type) => { // if(type == 'update'){ @@ -384,7 +384,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => { } const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode)) - detailRef.value.openDetail(row, titleName, titleValue,'stockupMainRequest') + detailRef.value.openDetail(row, titleName, titleValue,'requestStockupMain') } /** 删除按钮操作 */ diff --git a/src/views/wms/inventoryManage/containerinit/containerBindRecord/index.vue b/src/views/wms/inventoryManage/containerinit/containerBindRecord/index.vue index 94f4f18c6..087457ae7 100644 --- a/src/views/wms/inventoryManage/containerinit/containerBindRecord/index.vue +++ b/src/views/wms/inventoryManage/containerinit/containerBindRecord/index.vue @@ -194,7 +194,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue, 'basicContainerBindRecordMain') + detailRef.value.openDetail(row, titleName, titleValue, 'recordContainerBindMain') } /** 删除按钮操作 */ diff --git a/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue b/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue index 9b60a6338..92b1d1884 100644 --- a/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue +++ b/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue @@ -193,7 +193,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue, 'basicContainerRepairRecordMain') + detailRef.value.openDetail(row, titleName, titleValue, 'recordContainerRepairMain') } /** 删除按钮操作 */ diff --git a/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue b/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue index dddc7cb22..2cab32a20 100644 --- a/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue +++ b/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue @@ -193,7 +193,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue, 'basicContainerUnbindRecordMain') + detailRef.value.openDetail(row, titleName, titleValue, 'recordContainerUnbindMain') } /** 删除按钮操作 */ diff --git a/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue b/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue index 036d0a32c..c5d9a536b 100644 --- a/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue +++ b/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue @@ -245,7 +245,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue,"transactionContainerMain") + detailRef.value.openDetail(row, titleName, titleValue,"requestContainerMain") } /** 删除按钮操作 */ diff --git a/src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue b/src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue index 80788bf96..755a0d8eb 100644 --- a/src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue +++ b/src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue @@ -191,7 +191,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue, 'basicContainerInitRecordMain') + detailRef.value.openDetail(row, titleName, titleValue, 'recordContainerInitMain') } /** 删除按钮操作 */ diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue index 011b6b43d..bc48196fa 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue @@ -112,7 +112,7 @@ const { tableObject, tableMethods } = useTable({ }) // 判断 路由名称 进行条件过滤 /** - * + * */ if ( routeName.value == 'ReturnContainerManageRequest') { tableObject.params = { @@ -203,7 +203,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { // 修改 tableform 属性 ContainerDetailRequest.allSchemas.tableFormColumns.map(item => { console.log(businessType.value+99999999); - + if(item.field == 'containerNumber') { if (fromLocationCode.value == null) { item.tableForm.searchCondition = [ @@ -458,7 +458,7 @@ const submitForm = async (formType,submitData) => { if(data.masterId){ data.id = data.masterId } - data.subList = tableData.value // 拼接子表数据参数 + data.subList = tableData.value // 拼接子表数据参数 data.subList.forEach(item => { if(item.toQty == 0){ message.error(`到数量不能为0!`) @@ -486,7 +486,7 @@ const submitForm = async (formType,submitData) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue, 'basicContainerMainRequest') + detailRef.value.openDetail(row, titleName, titleValue, 'requestContainerMain') } /** 删除按钮操作 */ diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue index 4563f3671..96b9229c3 100644 --- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue @@ -441,7 +441,7 @@ const submitForm = async (formType,submitData) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue, 'basicContainerMainRequest') + detailRef.value.openDetail(row, titleName, titleValue, 'requestContainerMain') } /** 删除按钮操作 */ diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue index 34eb56e4c..08285130b 100644 --- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue @@ -112,7 +112,7 @@ const { tableObject, tableMethods } = useTable({ }) // 判断 路由名称 进行条件过滤 /** - * + * */ if ( routeName.value == 'ScrapContainerManageRequest') { tableObject.params = { @@ -121,7 +121,7 @@ const { tableObject, tableMethods } = useTable({ ContainerMainRequest.allSchemas.formSchema.forEach(item=>{ if(item.field == 'type'){ item.value = "SCRAP" - }}); + }}); businessType.value = 'ScrapContainerManage' importFileName.value = '器具报废申请' } @@ -436,20 +436,20 @@ const submitForm = async (formType,submitData) => { if(data.masterId){ data.id = data.masterId } - data.subList = tableData.value // 拼接子表数据参数 + data.subList = tableData.value // 拼接子表数据参数 data.subList.forEach(item => { if(item.qty == 0){ message.error(`到数量不能为0!`) flag.value = true return; - } + } }) basicFormRef.value.formLoading = true try { if (formType === 'create') { data.businessType = businessType.value console.log(data.businessType,999); - + await ContainerMainRequestApi.createContainerMainRequest(data) message.success(t('common.createSuccess')) } else { @@ -466,7 +466,7 @@ const submitForm = async (formType,submitData) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue, 'basicContainerMainRequest') + detailRef.value.openDetail(row, titleName, titleValue, 'requestContainerMain') } /** 删除按钮操作 */ diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue index 2f6f71de1..fd8dd5624 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue @@ -161,7 +161,7 @@ const isShowMainButton = (row, val) => { } // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { - + if (val == 'mainClose') { // 关闭 // 发起关闭 await message.confirm('确认要关闭吗？') @@ -217,7 +217,7 @@ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode)) - detailRef.value.openDetail(row, titleName, titleValue, 'basicPackageoverJobMain') + detailRef.value.openDetail(row, titleName, titleValue, 'jobPackageoverMain') } /** 删除按钮操作 */ diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue index 80f672fb3..22242c0af 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue @@ -136,7 +136,7 @@ const buttonBaseClick = (val, item) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue, 'basicPackageoverRetrospect') + detailRef.value.openDetail(row, titleName, titleValue, 'recordPackageoverRetrospect') } /** 导出按钮操作 */ diff --git a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue index e4708e8f2..671af6840 100644 --- a/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue +++ b/src/views/wms/productionManage/processproduction/processproductionRequest/index.vue @@ -60,10 +60,10 @@ /> - - // if(res?.list?.length>0){ // newRow['componentItemCode'] = res.list[0].componentItemCode // } - // }) + // }) tableData.value.push(newRow) }) }else if(formField === 'processCode'){ @@ -396,7 +396,7 @@ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode)) - detailRef.value.openDetail(row, titleName, titleValue, 'basicProcessproductionRequestMain') + detailRef.value.openDetail(row, titleName, titleValue, 'requestProcessproductionMain') } /** 导出按钮操作 */ diff --git a/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue b/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue index 333e11c55..a81de7ad2 100644 --- a/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue +++ b/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue @@ -179,7 +179,7 @@ const formsSuccess = async (formType,data) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue, 'basicQadProductionPlanMain') + detailRef.value.openDetail(row, titleName, titleValue, 'planQadProductionMain') } /** 删除按钮操作 */ diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/index.vue index d5aaf02c0..fee722120 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierPackage/index.vue @@ -39,11 +39,11 @@ - { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue,'supplierPackage') + detailRef.value.openDetail(row, titleName, titleValue,'transactionPackage') } /** 删除按钮操作 */ diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/index.vue index 522f05e2b..3e932f05f 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/index.vue @@ -179,7 +179,7 @@ const formsSuccess = async (formType,data) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue, 'basicSupplierdeliverInspectionDetail') + detailRef.value.openDetail(row, titleName, titleValue, 'supplierdeliverInspectionDetail') } /** 删除按钮操作 */ diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceDetail/index.vue b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceDetail/index.vue index bcc776831..914e8787c 100644 --- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceDetail/index.vue +++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceDetail/index.vue @@ -179,7 +179,7 @@ const formsSuccess = async (formType,data) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue, 'basicSupplierApbalanceDetail') + detailRef.value.openDetail(row, titleName, titleValue, 'exportSupplierApbalanceDetail') } /** 删除按钮操作 */ diff --git a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue index 21da66053..513463068 100644 --- a/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue +++ b/src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue @@ -221,8 +221,8 @@ const openDetail = async (row: any, titleName: any, titleValue: any) => { console.log('res',res) rowData.value = row adjustmentData.value = res - detailRef.value.openDetail(row, titleName, titleValue, 'basicSupplierApbalanceMain') - + detailRef.value.openDetail(row, titleName, titleValue, 'exportSupplierApbalanceMain') + } //打印 diff --git a/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue b/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue index 8eb82cd74..d8475ef40 100644 --- a/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue +++ b/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue @@ -164,7 +164,7 @@ const butttondata = (row) =>{ hasPermi: 'wms:supplierinvoice-invoiced:refuse' } ] -} +} // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { @@ -212,7 +212,7 @@ const formsSuccess = async (formType,data) => { /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { - detailRef.value.openDetail(row, titleName, titleValue, 'basicSupplierinvoiceInvoiced') + detailRef.value.openDetail(row, titleName, titleValue, 'qadSupplierinvoiceInvoiced') } /** 删除按钮操作 */